Bug 1823763 - Convert consumers of toolkit/components/reader/ to import ES modules directly. r=Gijs

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

browser/actors/AboutReaderChild.sys.mjs

@@ -5,21 +5,11 @@
 
 const lazy = {};
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "AboutReader",
-  "resource://gre/modules/AboutReader.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "ReaderMode",
-  "resource://gre/modules/ReaderMode.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "Readerable",
-  "resource://gre/modules/Readerable.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+  AboutReader: "resource://gre/modules/AboutReader.sys.mjs",
+  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
+  Readerable: "resource://gre/modules/Readerable.sys.mjs",
+});
 
 var gUrlsToDocContentType = new Map();
 var gUrlsToDocTitle = new Map();

browser/actors/AboutReaderParent.sys.mjs

@@ -7,12 +7,8 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
 });
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "ReaderMode",
-  "resource://gre/modules/ReaderMode.jsm"
-);
 ChromeUtils.defineModuleGetter(
   lazy,
   "pktApi",

browser/base/content/browser.js

@@ -40,6 +40,7 @@ ChromeUtils.defineESModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
   PromptUtils: "resource://gre/modules/PromptUtils.sys.mjs",
+  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
   Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
   ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
   SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs",
@@ -88,8 +89,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   PanelView: "resource:///modules/PanelMultiView.jsm",
   Pocket: "chrome://pocket/content/Pocket.jsm",
   ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
-  // TODO (Bug 1529552): Remove once old urlbar code goes away.
-  ReaderMode: "resource://gre/modules/ReaderMode.jsm",
   SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
   SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
   SiteDataManager: "resource:///modules/SiteDataManager.jsm",

browser/components/pocket/content/pktUI.js

@@ -46,12 +46,8 @@
 
 ChromeUtils.defineESModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
+  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
 });
-ChromeUtils.defineModuleGetter(
-  this,
-  "ReaderMode",
-  "resource://gre/modules/ReaderMode.jsm"
-);
 ChromeUtils.defineModuleGetter(
   this,
   "pktApi",

browser/components/urlbar/UrlbarInput.sys.mjs

@@ -17,6 +17,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
   SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs",
   SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
   UrlbarController: "resource:///modules/UrlbarController.sys.mjs",
@@ -34,7 +35,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   BrowserUIUtils: "resource:///modules/BrowserUIUtils.jsm",
   ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
-  ReaderMode: "resource://gre/modules/ReaderMode.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetter(

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

@@ -28,11 +28,11 @@ 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",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
-  ReaderMode: "resource://gre/modules/ReaderMode.jsm",
   TabsStore: "resource://gre/modules/RustTabs.jsm",
 });
 

toolkit/actors/PrintingChild.sys.mjs

@@ -7,15 +7,10 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
+  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "ReaderMode",
-  "resource://gre/modules/ReaderMode.jsm"
-);
-
 let gPendingPreviewsMap = new Map();
 
 export class PrintingChild extends JSWindowActorChild {

toolkit/components/reader/AboutReader.sys.mjs

@@ -2,9 +2,8 @@
  * 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/. */
 
-const { ReaderMode } = ChromeUtils.import(
-  "resource://gre/modules/ReaderMode.jsm"
-);
+import { ReaderMode } from "resource://gre/modules/ReaderMode.sys.mjs";
+
 import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 

toolkit/components/reader/ReaderMode.sys.mjs

@@ -32,20 +32,12 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "ReaderWorker",
-  "resource://gre/modules/reader/ReaderWorker.jsm"
-);
 ChromeUtils.defineESModuleGetters(lazy, {
   LanguageDetector:
     "resource://gre/modules/translation/LanguageDetector.sys.mjs",
+  ReaderWorker: "resource://gre/modules/reader/ReaderWorker.sys.mjs",
+  Readerable: "resource://gre/modules/Readerable.sys.mjs",
 });
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "Readerable",
-  "resource://gre/modules/Readerable.jsm"
-);
 
 const gIsFirefoxDesktop =
   Services.appinfo.ID == "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";

toolkit/components/reader/test/browser_readerMode.js

@@ -179,8 +179,8 @@ add_task(async function test_reader_button() {
 });
 
 add_task(async function test_getOriginalUrl() {
-  let { ReaderMode } = ChromeUtils.import(
-    "resource://gre/modules/ReaderMode.jsm"
+  let { ReaderMode } = ChromeUtils.importESModule(
+    "resource://gre/modules/ReaderMode.sys.mjs"
   );
   let url = "https://foo.com/article.html";
 

toolkit/modules/BrowserUtils.sys.mjs

@@ -9,13 +9,10 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
+  ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ReaderMode: "resource://gre/modules/ReaderMode.jsm",
-});
-
 XPCOMUtils.defineLazyPreferenceGetter(
   lazy,
   "INVALID_SHAREABLE_SCHEMES",

tools/esmify/mach_commands.py

@@ -110,7 +110,7 @@ excluded_from_imports_prefix = list(
             "remote/shared/messagehandler/test/browser/resources/modules/root/invalid.sys.mjs",
             "testing/talos/talos/startup_test/sessionrestore/profile-manywindows/sessionstore.js",
             "testing/talos/talos/startup_test/sessionrestore/profile/sessionstore.js",
-            "toolkit/components/reader/Readerable.jsm",
+            "toolkit/components/reader/Readerable.sys.mjs",
             "toolkit/components/workerloader/tests/moduleF-syntax-error.js",
             "tools/lint/test/",
             "tools/update-packaging/test/",