Bug 1788765 - Convert browser/actors/AboutNewTab* JSM modules to ESMs…

… r=mconley Differential Revision: https://phabricator.services.mozilla.com/D157055
dothq · Sep 12, 2022 · 8eb399b · 8eb399b
1 parent 850b97d
commit 8eb399b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/browser/actors/AboutNewTabChild.jsm → browser/actors/AboutNewTabChild.sys.mjs b/browser/actors/AboutNewTabChild.jsm → browser/actors/AboutNewTabChild.sys.mjs
@@ -4,11 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-var EXPORTED_SYMBOLS = ["AboutNewTabChild"];
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
-const { XPCOMUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/XPCOMUtils.sys.mjs"
-);
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
@@ -30,7 +27,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
   false
 );
 
-class AboutNewTabChild extends JSWindowActorChild {
+export class AboutNewTabChild extends JSWindowActorChild {
   handleEvent(event) {
     if (event.type == "DOMContentLoaded") {
       // If the separate about:welcome page is enabled, we can skip all of this,

diff --git a/browser/actors/AboutNewTabParent.jsm → browser/actors/AboutNewTabParent.sys.mjs b/browser/actors/AboutNewTabParent.jsm → browser/actors/AboutNewTabParent.sys.mjs
@@ -4,19 +4,15 @@
 
 "use strict";
 
-var EXPORTED_SYMBOLS = ["AboutNewTabParent"];
-
-const { XPCOMUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/XPCOMUtils.sys.mjs"
-);
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
 });
 
-class AboutNewTabParent extends JSWindowActorParent {
+export class AboutNewTabParent extends JSWindowActorParent {
   async receiveMessage(message) {
     switch (message.name) {
       case "AboutNewTabVisible":

diff --git a/browser/actors/moz.build b/browser/actors/moz.build
@@ -32,8 +32,8 @@ with Files("WebRTCChild.jsm"):
     BUG_COMPONENT = ("Firefox", "Site Permissions")
 
 FINAL_TARGET_FILES.actors += [
-    "AboutNewTabChild.jsm",
-    "AboutNewTabParent.jsm",
+    "AboutNewTabChild.sys.mjs",
+    "AboutNewTabParent.sys.mjs",
     "AboutPluginsChild.sys.mjs",
     "AboutPluginsParent.sys.mjs",
     "AboutPocketChild.jsm",

diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
@@ -248,10 +248,10 @@ let JSWINDOWACTORS = {
 
   AboutNewTab: {
     parent: {
-      moduleURI: "resource:///actors/AboutNewTabParent.jsm",
+      esModuleURI: "resource:///actors/AboutNewTabParent.sys.mjs",
     },
     child: {
-      moduleURI: "resource:///actors/AboutNewTabChild.jsm",
+      esModuleURI: "resource:///actors/AboutNewTabChild.sys.mjs",
       events: {
         DOMContentLoaded: {},
         pageshow: {},