From 0b327f09742f901b4f101935d59abc362b00acb9 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 23 Sep 2022 21:19:12 +0000 Subject: [PATCH] Bug 1788925 - Convert AboutReader from JSM to ESM. r=Gijs. Differential Revision: https://phabricator.services.mozilla.com/D157034 --- .../{AboutReaderChild.jsm => AboutReaderChild.sys.mjs} | 4 +--- .../{AboutReaderParent.jsm => AboutReaderParent.sys.mjs} | 4 +--- browser/actors/moz.build | 4 ++-- browser/base/content/browser.js | 2 +- .../content/test/performance/browser_startup_content.js | 2 +- browser/components/BrowserGlue.jsm | 4 ++-- browser/components/extensions/parent/ext-browser.js | 8 +++----- .../components/newtab/lib/ASRouterTriggerListeners.jsm | 5 ++++- browser/components/pocket/content/SaveToPocket.jsm | 8 +++----- browser/components/uitour/UITour.jsm | 5 ++++- 10 files changed, 22 insertions(+), 24 deletions(-) rename browser/actors/{AboutReaderChild.jsm => AboutReaderChild.sys.mjs} (98%) rename browser/actors/{AboutReaderParent.jsm => AboutReaderParent.sys.mjs} (99%) diff --git a/browser/actors/AboutReaderChild.jsm b/browser/actors/AboutReaderChild.sys.mjs similarity index 98% rename from browser/actors/AboutReaderChild.jsm rename to browser/actors/AboutReaderChild.sys.mjs index 993cee751dba..ca4ecdb038e6 100644 --- a/browser/actors/AboutReaderChild.jsm +++ b/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(); diff --git a/browser/actors/AboutReaderParent.jsm b/browser/actors/AboutReaderParent.sys.mjs similarity index 99% rename from browser/actors/AboutReaderParent.jsm rename to browser/actors/AboutReaderParent.sys.mjs index e08bae31137f..4a10ba665e0f 100644 --- a/browser/actors/AboutReaderParent.jsm +++ b/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); diff --git a/browser/actors/moz.build b/browser/actors/moz.build index e6df031e08b7..47f52185f4a7 100644 --- a/browser/actors/moz.build +++ b/browser/actors/moz.build @@ -42,8 +42,8 @@ FINAL_TARGET_FILES.actors += [ "AboutPrivateBrowsingParent.jsm", "AboutProtectionsChild.jsm", "AboutProtectionsParent.jsm", - "AboutReaderChild.jsm", - "AboutReaderParent.jsm", + "AboutReaderChild.sys.mjs", + "AboutReaderParent.sys.mjs", "AboutTabCrashedChild.sys.mjs", "AboutTabCrashedParent.sys.mjs", "BlockedSiteChild.jsm", diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 9294d96e77ab..fc303cd881d1 100644 --- a/browser/base/content/browser.js +++ b/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", diff --git a/browser/base/content/test/performance/browser_startup_content.js b/browser/base/content/test/performance/browser_startup_content.js index 149988181c7d..e9faf87a15dc 100644 --- a/browser/base/content/test/performance/browser_startup_content.js +++ b/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", diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index d1ebd6747f3a..e4d3c86d46a7 100644 --- a/browser/components/BrowserGlue.jsm +++ b/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 }, diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js index 559ae5a7cd78..f487d68e8b0f 100644 --- a/browser/components/extensions/parent/ext-browser.js +++ b/browser/components/extensions/parent/ext-browser.js @@ -25,11 +25,9 @@ ChromeUtils.defineModuleGetter( "PromiseUtils", "resource://gre/modules/PromiseUtils.jsm" ); -ChromeUtils.defineModuleGetter( - this, - "AboutReaderParent", - "resource:///actors/AboutReaderParent.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs", +}); var { ExtensionError } = ExtensionUtils; diff --git a/browser/components/newtab/lib/ASRouterTriggerListeners.jsm b/browser/components/newtab/lib/ASRouterTriggerListeners.jsm index 45dec285deec..18ffd6d2cce3 100644 --- a/browser/components/newtab/lib/ASRouterTriggerListeners.jsm +++ b/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", diff --git a/browser/components/pocket/content/SaveToPocket.jsm b/browser/components/pocket/content/SaveToPocket.jsm index e04422af3c8e..6df56ca44e04 100644 --- a/browser/components/pocket/content/SaveToPocket.jsm +++ b/browser/components/pocket/content/SaveToPocket.jsm @@ -19,11 +19,9 @@ ChromeUtils.defineModuleGetter( "CustomizableUI", "resource:///modules/CustomizableUI.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "AboutReaderParent", - "resource:///actors/AboutReaderParent.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs", +}); var EXPORTED_SYMBOLS = ["SaveToPocket"]; diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index 21f45f0defa9..d9ff657f5b8b 100644 --- a/browser/components/uitour/UITour.jsm +++ b/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",