Bug 1830460 - Convert ComponentUtils.jsm to ESM. r=arai,webdriver-rev…

…iewers,webcompat-reviewers,credential-management-reviewers,devtools-reviewers,twisniewski,sgalich,whimboo Differential Revision: https://phabricator.services.mozilla.com/D176782
dothq · May 3, 2023 · 5ee28fe · 5ee28fe
1 parent fc609bf
commit 5ee28fe
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/browser/extensions/webcompat/about-compat/aboutPageProcessScript.js b/browser/extensions/webcompat/about-compat/aboutPageProcessScript.js
@@ -14,8 +14,8 @@ const Cm = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
 const classID = Components.ID("{97bf9550-2a7b-11e9-b56e-0800200c9a66}");
 
 if (!Cm.isCIDRegistered(classID)) {
-  const { ComponentUtils } = ChromeUtils.import(
-    "resource://gre/modules/ComponentUtils.jsm"
+  const { ComponentUtils } = ChromeUtils.importESModule(
+    "resource://gre/modules/ComponentUtils.sys.mjs"
   );
 
   const factory = ComponentUtils.generateSingletonFactory(function() {

diff --git a/devtools/server/actors/network-monitor/channel-event-sink.js b/devtools/server/actors/network-monitor/channel-event-sink.js
@@ -4,8 +4,8 @@
 
 "use strict";
 
-const { ComponentUtils } = ChromeUtils.import(
-  "resource://gre/modules/ComponentUtils.jsm"
+const { ComponentUtils } = ChromeUtils.importESModule(
+  "resource://gre/modules/ComponentUtils.sys.mjs"
 );
 
 /**

diff --git a/js/xpconnect/loader/ComponentUtils.jsm → js/xpconnect/loader/ComponentUtils.sys.mjs b/js/xpconnect/loader/ComponentUtils.jsm → js/xpconnect/loader/ComponentUtils.sys.mjs
@@ -9,11 +9,9 @@
  * loader.
  */
 
-var EXPORTED_SYMBOLS = ["ComponentUtils"];
-
 const nsIFactoryQI = ChromeUtils.generateQI(["nsIFactory"]);
 
-var ComponentUtils = {
+export var ComponentUtils = {
   /**
    * Generates a singleton nsIFactory implementation that can be used as
    * an argument to nsIComponentRegistrar.registerFactory.

diff --git a/js/xpconnect/loader/moz.build b/js/xpconnect/loader/moz.build
@@ -49,7 +49,7 @@ EXPORTS.mozilla.loader += [
 ]
 
 EXTRA_JS_MODULES += [
-    "ComponentUtils.jsm",
+    "ComponentUtils.sys.mjs",
     "XPCOMUtils.sys.mjs",
 ]
 

diff --git a/remote/cdp/observers/ChannelEventSink.sys.mjs b/remote/cdp/observers/ChannelEventSink.sys.mjs
@@ -2,9 +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/. */
 
-const { ComponentUtils } = ChromeUtils.import(
-  "resource://gre/modules/ComponentUtils.jsm"
-);
+import { ComponentUtils } from "resource://gre/modules/ComponentUtils.sys.mjs";
 
 const Cm = Components.manager;
 

diff --git a/toolkit/components/formautofill/AutofillProfileAutoComplete.sys.mjs b/toolkit/components/formautofill/AutofillProfileAutoComplete.sys.mjs
@@ -17,16 +17,13 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   AddressResult: "resource://autofill/ProfileAutoCompleteResult.sys.mjs",
+  ComponentUtils: "resource://gre/modules/ComponentUtils.sys.mjs",
   CreditCardResult: "resource://autofill/ProfileAutoCompleteResult.sys.mjs",
   FormAutofill: "resource://autofill/FormAutofill.sys.mjs",
   FormAutofillUtils: "resource://gre/modules/shared/FormAutofillUtils.sys.mjs",
   InsecurePasswordUtils: "resource://gre/modules/InsecurePasswordUtils.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ComponentUtils: "resource://gre/modules/ComponentUtils.jsm",
-});
-
 const autocompleteController = Cc[
   "@mozilla.org/autocomplete/controller;1"
 ].getService(Ci.nsIAutoCompleteController);