Bug 1839388 - Convert distribution.js to an ES module. r=mkaply

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

Author: Standard8

browser/components/BrowserGlue.sys.mjs

@@ -898,8 +898,8 @@ export function BrowserGlue() {
   );
 
   XPCOMUtils.defineLazyGetter(this, "_distributionCustomizer", function () {
-    const { DistributionCustomizer } = ChromeUtils.import(
-      "resource:///modules/distribution.js"
+    const { DistributionCustomizer } = ChromeUtils.importESModule(
+      "resource:///modules/distribution.sys.mjs"
     );
     return new DistributionCustomizer();
   });

browser/components/distribution.js renamed to browser/components/distribution.sys.mjs

@@ -2,24 +2,21 @@
  * 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/. */
 
-var EXPORTED_SYMBOLS = ["DistributionCustomizer"];
-
 const DISTRIBUTION_CUSTOMIZATION_COMPLETE_TOPIC =
   "distribution-customization-complete";
 
 const PREF_CACHED_FILE_EXISTENCE = "distribution.iniFile.exists.value";
 const PREF_CACHED_FILE_APPVERSION = "distribution.iniFile.exists.appversion";
 
-const { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
+import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
+
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
 });
 
-function DistributionCustomizer() {}
+export function DistributionCustomizer() {}
 
 DistributionCustomizer.prototype = {
   // These prefixes must only contain characters

browser/components/moz.build

@@ -7,7 +7,7 @@
 with Files("**"):
     BUG_COMPONENT = ("Firefox", "General")
 
-with Files("distribution.js"):
+with Files("distribution.sys.mjs"):
     BUG_COMPONENT = ("Firefox", "Distributions")
 
 with Files("tests/**"):
@@ -92,7 +92,7 @@ EXTRA_COMPONENTS += [
 EXTRA_JS_MODULES += [
     "BrowserContentHandler.sys.mjs",
     "BrowserGlue.sys.mjs",
-    "distribution.js",
+    "distribution.sys.mjs",
 ]
 
 if CONFIG["MOZ_DEBUG"] or CONFIG["MOZ_DEV_EDITION"] or CONFIG["NIGHTLY_BUILD"]:

browser/components/places/tests/unit/test_browserGlue_distribution.js

@@ -47,8 +47,8 @@ registerCleanupFunction(function () {
 });
 
 add_task(async function () {
-  let { DistributionCustomizer } = ChromeUtils.import(
-    "resource:///modules/distribution.js"
+  let { DistributionCustomizer } = ChromeUtils.importESModule(
+    "resource:///modules/distribution.sys.mjs"
   );
   let distribution = new DistributionCustomizer();
 

browser/components/tests/unit/test_distribution_cachedexistence.js

@@ -23,8 +23,8 @@ add_task(async function () {
   Services.prefs.clearUserPref(PREF_CACHED_FILE_EXISTENCE);
   setupTest();
 
-  let { DistributionCustomizer } = ChromeUtils.import(
-    "resource:///modules/distribution.js"
+  let { DistributionCustomizer } = ChromeUtils.importESModule(
+    "resource:///modules/distribution.sys.mjs"
   );
   let distribution = new DistributionCustomizer();