Bug 1951072 - switch reader mode modules to use moz-src URLs, r=firefox-desktop-core-reviewers ,sync-reviewers,urlbar-reviewers,mossop,jteow,markh

Differential Revision: https://phabricator.services.mozilla.com/D240004

browser/actors/AboutReaderChild.sys.mjs

@@ -6,8 +6,8 @@
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  AboutReader: "resource://gre/modules/AboutReader.sys.mjs",
+  AboutReader: "moz-src:///toolkit/components/reader/AboutReader.sys.mjs",
-  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
   Readerable: "resource://gre/modules/Readerable.sys.mjs",
 });
 

browser/actors/AboutReaderParent.sys.mjs

@@ -8,7 +8,7 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   PageActions: "resource:///modules/PageActions.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
-  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
 });
 
 // A set of all of the AboutReaderParent actors that exist.

browser/base/content/browser.js

@@ -67,7 +67,7 @@ ChromeUtils.defineESModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.sys.mjs",
   PromptUtils: "resource://gre/modules/PromptUtils.sys.mjs",
-  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
   ResetPBMPanel: "resource:///modules/ResetPBMPanel.sys.mjs",
   SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs",
   Sanitizer: "resource:///modules/Sanitizer.sys.mjs",

browser/base/content/nsContextMenu.sys.mjs

@@ -20,7 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   NetUtil: "resource://gre/modules/NetUtil.sys.mjs",
   PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
   ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
   TranslationsParent: "resource://gre/actors/TranslationsParent.sys.mjs",
   WebsiteFilter: "resource:///modules/policies/WebsiteFilter.sys.mjs",

browser/components/pocket/content/pktUI.js

@@ -49,7 +49,7 @@ ChromeUtils.defineESModuleGetters(this, {
   pktApi: "chrome://pocket/content/pktApi.sys.mjs",
   pktTelemetry: "chrome://pocket/content/pktTelemetry.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
   SaveToPocket: "chrome://pocket/content/SaveToPocket.sys.mjs",
 });
 

browser/components/urlbar/UrlbarInput.sys.mjs

@@ -19,7 +19,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
   SearchModeSwitcher: "resource:///modules/SearchModeSwitcher.sys.mjs",
   SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs",
   SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",

services/sync/modules/engines/tabs.sys.mjs

@@ -28,7 +28,7 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
   getTabsStore: "resource://services-sync/TabsStore.sys.mjs",
   RemoteTabRecord: "resource://gre/modules/RustTabs.sys.mjs",
 });

toolkit/actors/PrintingChild.sys.mjs

@@ -7,7 +7,7 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
-  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
 

toolkit/components/reader/AboutReader.sys.mjs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { ReaderMode } from "resource://gre/modules/ReaderMode.sys.mjs";
+import { ReaderMode } from "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs";
 
 import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
 

toolkit/components/reader/Reader.worker.js

@@ -13,8 +13,8 @@
 /* import-globals-from /toolkit/components/reader/readability/Readability.js */
 importScripts(
   "resource://gre/modules/workers/require.js",
-  "resource://gre/modules/reader/JSDOMParser.js",
+  "moz-src:///toolkit/components/reader/readability/JSDOMParser.js",
-  "resource://gre/modules/reader/Readability.js"
+  "moz-src:///toolkit/components/reader/readability/Readability.js"
 );
 
 var PromiseWorker = require("resource://gre/modules/workers/PromiseWorker.js");

toolkit/components/reader/ReaderMode.sys.mjs

@@ -35,7 +35,7 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   LanguageDetector:
     "resource://gre/modules/translations/LanguageDetector.sys.mjs",
-  ReaderWorker: "resource://gre/modules/reader/ReaderWorker.sys.mjs",
+  ReaderWorker: "moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs",
   Readerable: "resource://gre/modules/Readerable.sys.mjs",
 });
 

toolkit/components/reader/ReaderWorker.sys.mjs

@@ -9,5 +9,5 @@
 import { BasePromiseWorker } from "resource://gre/modules/PromiseWorker.sys.mjs";
 
 export var ReaderWorker = new BasePromiseWorker(
-  "resource://gre/modules/reader/Reader.worker.js"
+  "moz-src:///toolkit/components/reader/Reader.worker.js"
 );

toolkit/components/reader/moz.build

@@ -6,22 +6,19 @@
 
 JAR_MANIFESTS += ["jar.mn"]
 
-EXTRA_JS_MODULES += [
+MOZ_SRC_FILES += [
     "AboutReader.sys.mjs",
+    "readability/JSDOMParser.js",
+    "readability/Readability.js",
+    "Reader.worker.js",
     "ReaderMode.sys.mjs",
+    "ReaderWorker.sys.mjs",
 ]
 
 EXTRA_PP_JS_MODULES += [
     "Readerable.sys.mjs",
 ]
 
-EXTRA_JS_MODULES.reader = [
-    "readability/JSDOMParser.js",
-    "readability/Readability.js",
-    "Reader.worker.js",
-    "ReaderWorker.sys.mjs",
-]
-
 BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"]
 
 MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"]

toolkit/components/reader/tests/browser/browser_readerMode.js

@@ -185,7 +185,7 @@ add_task(async function test_reader_button() {
 
 add_task(async function test_getOriginalUrl() {
   let { ReaderMode } = ChromeUtils.importESModule(
-    "resource://gre/modules/ReaderMode.sys.mjs"
+    "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs"
   );
   let url = "https://foo.com/article.html";
 

toolkit/modules/BrowserUtils.sys.mjs

@@ -9,7 +9,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
-  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
 });