Bug 1788925 - Convert AboutReader from JSM to ESM. r=Gijs.

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

browser/actors/AboutReaderChild.sys.mjs

@@ -4,8 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-var EXPORTED_SYMBOLS = ["AboutReaderChild"];
-
 const lazy = {};
 
 ChromeUtils.defineModuleGetter(
@@ -27,7 +25,7 @@ ChromeUtils.defineModuleGetter(
 var gUrlsToDocContentType = new Map();
 var gUrlsToDocTitle = new Map();
 
-class AboutReaderChild extends JSWindowActorChild {
+export class AboutReaderChild extends JSWindowActorChild {
   constructor() {
     super();
 

browser/actors/AboutReaderParent.sys.mjs

@@ -5,8 +5,6 @@
 
 "use strict";
 
-var EXPORTED_SYMBOLS = ["AboutReaderParent"];
-
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
@@ -40,7 +38,7 @@ let gListeners = new Map();
 // parent while switching to it.
 let gCachedArticles = new Map();
 
-class AboutReaderParent extends JSWindowActorParent {
+export class AboutReaderParent extends JSWindowActorParent {
   didDestroy() {
     gAllActors.delete(this);
 

browser/actors/moz.build

@@ -42,8 +42,8 @@ FINAL_TARGET_FILES.actors += [
     "AboutPrivateBrowsingParent.jsm",
     "AboutProtectionsChild.jsm",
     "AboutProtectionsParent.jsm",
-    "AboutReaderChild.jsm",
+    "AboutReaderChild.sys.mjs",
-    "AboutReaderParent.jsm",
+    "AboutReaderParent.sys.mjs",
     "AboutTabCrashedChild.sys.mjs",
     "AboutTabCrashedParent.sys.mjs",
     "BlockedSiteChild.jsm",

browser/base/content/browser.js

@@ -14,6 +14,7 @@ ChromeUtils.import("resource://gre/modules/NotificationDB.jsm");
 // lazy module getters
 
 ChromeUtils.defineESModuleGetters(this, {
+  AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
   BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
   FirefoxViewNotificationManager:
     "resource:///modules/firefox-view-notification-manager.sys.mjs",
@@ -34,7 +35,6 @@ ChromeUtils.defineESModuleGetters(this, {
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AboutNewTab: "resource:///modules/AboutNewTab.jsm",
-  AboutReaderParent: "resource:///actors/AboutReaderParent.jsm",
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AMTelemetry: "resource://gre/modules/AddonManager.jsm",
   NewTabPagePreloading: "resource:///modules/NewTabPagePreloading.jsm",

browser/base/content/test/performance/browser_startup_content.js

@@ -32,7 +32,7 @@ const known_scripts = {
     "resource://gre/modules/Log.jsm",
 
     // Browser front-end
-    "resource:///actors/AboutReaderChild.jsm",
+    "resource:///actors/AboutReaderChild.sys.mjs",
     "resource:///actors/BrowserTabChild.sys.mjs",
     "resource:///actors/LinkHandlerChild.jsm",
     "resource:///actors/PageStyleChild.jsm",

browser/components/BrowserGlue.jsm

@@ -335,10 +335,10 @@ let JSWINDOWACTORS = {
 
   AboutReader: {
     parent: {
-      moduleURI: "resource:///actors/AboutReaderParent.jsm",
+      esModuleURI: "resource:///actors/AboutReaderParent.sys.mjs",
     },
     child: {
-      moduleURI: "resource:///actors/AboutReaderChild.jsm",
+      esModuleURI: "resource:///actors/AboutReaderChild.sys.mjs",
       events: {
         DOMContentLoaded: {},
         pageshow: { mozSystemGroup: true },

browser/components/extensions/parent/ext-browser.js

@@ -25,11 +25,9 @@ ChromeUtils.defineModuleGetter(
   "PromiseUtils",
   "resource://gre/modules/PromiseUtils.jsm"
 );
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(this, {
-  this,
+  AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
-  "AboutReaderParent",
+});
-  "resource:///actors/AboutReaderParent.jsm"
-);
 
 var { ExtensionError } = ExtensionUtils;
 

browser/components/newtab/lib/ASRouterTriggerListeners.jsm

@@ -9,8 +9,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  AboutReaderParent: "resource:///actors/AboutReaderParent.jsm",
   BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
   EveryWindow: "resource:///modules/EveryWindow.jsm",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",

browser/components/pocket/content/SaveToPocket.jsm

@@ -19,11 +19,9 @@ ChromeUtils.defineModuleGetter(
   "CustomizableUI",
   "resource:///modules/CustomizableUI.jsm"
 );
-ChromeUtils.defineModuleGetter(
+ChromeUtils.defineESModuleGetters(lazy, {
-  lazy,
+  AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
-  "AboutReaderParent",
+});
-  "resource:///actors/AboutReaderParent.jsm"
-);
 
 var EXPORTED_SYMBOLS = ["SaveToPocket"];
 

browser/components/uitour/UITour.jsm

@@ -15,8 +15,11 @@ const { AppConstants } = ChromeUtils.import(
 
 const lazy = {};
 
+ChromeUtils.defineESModuleGetters(lazy, {
+  AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
+});
+
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  AboutReaderParent: "resource:///actors/AboutReaderParent.jsm",
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
   BuiltInThemes: "resource:///modules/BuiltInThemes.jsm",