diff --git a/browser/actors/AboutPrivateBrowsingParent.jsm b/browser/actors/AboutPrivateBrowsingParent.jsm
index 8218d6d12ba7..2c42eaecaa8e 100644
--- a/browser/actors/AboutPrivateBrowsingParent.jsm
+++ b/browser/actors/AboutPrivateBrowsingParent.jsm
@@ -9,8 +9,8 @@ var EXPORTED_SYMBOLS = ["AboutPrivateBrowsingParent"];
const { ASRouter } = ChromeUtils.import(
"resource://activity-stream/lib/ASRouter.jsm"
);
-const { BrowserUtils } = ChromeUtils.import(
- "resource://gre/modules/BrowserUtils.jsm"
+const { BrowserUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/BrowserUtils.sys.mjs"
);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
diff --git a/browser/actors/AboutProtectionsParent.jsm b/browser/actors/AboutProtectionsParent.jsm
index ee5b89a0bcfb..79fa212e8e03 100644
--- a/browser/actors/AboutProtectionsParent.jsm
+++ b/browser/actors/AboutProtectionsParent.jsm
@@ -12,11 +12,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
- BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
FXA_PWDMGR_HOST: "resource://gre/modules/FxAccountsCommon.js",
FXA_PWDMGR_REALM: "resource://gre/modules/FxAccountsCommon.js",
AddonManager: "resource://gre/modules/AddonManager.jsm",
diff --git a/browser/actors/ClickHandlerChild.jsm b/browser/actors/ClickHandlerChild.jsm
index cf274b210b7d..f746619cc3ed 100644
--- a/browser/actors/ClickHandlerChild.jsm
+++ b/browser/actors/ClickHandlerChild.jsm
@@ -27,11 +27,9 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/E10SUtils.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "BrowserUtils",
- "resource://gre/modules/BrowserUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+});
class MiddleMousePasteHandlerChild extends JSWindowActorChild {
handleEvent(clickEvent) {
diff --git a/browser/actors/ContextMenuChild.jsm b/browser/actors/ContextMenuChild.jsm
index 4dfc3e8db361..befcffc201bd 100644
--- a/browser/actors/ContextMenuChild.jsm
+++ b/browser/actors/ContextMenuChild.jsm
@@ -14,15 +14,18 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ InlineSpellCheckerContent:
+ "resource://gre/modules/InlineSpellCheckerContent.sys.mjs",
+ SelectionUtils: "resource://gre/modules/SelectionUtils.sys.mjs",
+ SpellCheckHelper: "resource://gre/modules/InlineSpellChecker.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
E10SUtils: "resource://gre/modules/E10SUtils.jsm",
- SpellCheckHelper: "resource://gre/modules/InlineSpellChecker.jsm",
LoginManagerChild: "resource://gre/modules/LoginManagerChild.jsm",
WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
- SelectionUtils: "resource://gre/modules/SelectionUtils.jsm",
- InlineSpellCheckerContent:
- "resource://gre/modules/InlineSpellCheckerContent.jsm",
ContentDOMReference: "resource://gre/modules/ContentDOMReference.jsm",
});
diff --git a/browser/actors/FormValidationChild.sys.mjs b/browser/actors/FormValidationChild.sys.mjs
index 33a59552063f..6fa2e3c90d4a 100644
--- a/browser/actors/FormValidationChild.sys.mjs
+++ b/browser/actors/FormValidationChild.sys.mjs
@@ -7,9 +7,7 @@
* the display of the help panel on invalid elements.
*/
-const { LayoutUtils } = ChromeUtils.import(
- "resource://gre/modules/LayoutUtils.jsm"
-);
+import { LayoutUtils } from "resource://gre/modules/LayoutUtils.sys.mjs";
export class FormValidationChild extends JSWindowActorChild {
constructor() {
diff --git a/browser/actors/NetErrorParent.jsm b/browser/actors/NetErrorParent.jsm
index 598225cf2b6a..4e1fe6e99506 100644
--- a/browser/actors/NetErrorParent.jsm
+++ b/browser/actors/NetErrorParent.jsm
@@ -22,11 +22,9 @@ const PREF_SSL_IMPACT_ROOTS = [
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "BrowserUtils",
- "resource://gre/modules/BrowserUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+});
class CaptivePortalObserver {
constructor(actor) {
diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js
index c046f05da92a..67fd755a782c 100644
--- a/browser/base/content/aboutDialog-appUpdater.js
+++ b/browser/base/content/aboutDialog-appUpdater.js
@@ -10,10 +10,14 @@
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
+
+ChromeUtils.defineESModuleGetters(this, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
AppUpdater: "resource:///modules/AppUpdater.jsm",
DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
});
var UPDATING_MIN_DISPLAY_TIME_MS = 1500;
diff --git a/browser/base/content/browser-data-submission-info-bar.js b/browser/base/content/browser-data-submission-info-bar.js
index f19c3a272ed0..896542796c54 100644
--- a/browser/base/content/browser-data-submission-info-bar.js
+++ b/browser/base/content/browser-data-submission-info-bar.js
@@ -14,7 +14,9 @@ var gDataNotificationInfoBar = {
_DATA_REPORTING_NOTIFICATION: "data-reporting",
get _log() {
- let { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+ let { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+ );
delete this._log;
return (this._log = Log.repository.getLoggerWithMessagePrefix(
"Toolkit.Telemetry",
diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
index 1410744668bd..5b51785d03a0 100644
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -347,7 +347,9 @@ var gSync = {
get log() {
if (!this._log) {
- const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+ const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+ );
let syncLog = Log.repository.getLogger("Sync.Browser");
syncLog.manageLevelFromPref("services.sync.log.logger.browser");
this._log = syncLog;
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a88d46e1f231..d9493efdf6ef 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -16,13 +16,24 @@ ChromeUtils.import("resource://gre/modules/NotificationDB.jsm");
ChromeUtils.defineESModuleGetters(this, {
AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
+ BrowserTelemetryUtils: "resource://gre/modules/BrowserTelemetryUtils.sys.mjs",
+ Color: "resource://gre/modules/Color.sys.mjs",
FirefoxViewNotificationManager:
"resource:///modules/firefox-view-notification-manager.sys.mjs",
+ LightweightThemeConsumer:
+ "resource://gre/modules/LightweightThemeConsumer.sys.mjs",
+ Log: "resource://gre/modules/Log.sys.mjs",
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
PictureInPicture: "resource://gre/modules/PictureInPicture.sys.mjs",
PlacesTransactions: "resource://gre/modules/PlacesTransactions.sys.mjs",
PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+ SubDialog: "resource://gre/modules/SubDialog.sys.mjs",
+ SubDialogManager: "resource://gre/modules/SubDialog.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
UrlbarInput: "resource:///modules/UrlbarInput.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarProviderSearchTips:
@@ -39,11 +50,9 @@ XPCOMUtils.defineLazyModuleGetters(this, {
AMTelemetry: "resource://gre/modules/AddonManager.jsm",
NewTabPagePreloading: "resource:///modules/NewTabPagePreloading.jsm",
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
- BrowserTelemetryUtils: "resource://gre/modules/BrowserTelemetryUtils.jsm",
BrowserUIUtils: "resource:///modules/BrowserUIUtils.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
CFRPageActions: "resource://activity-stream/lib/CFRPageActions.jsm",
- Color: "resource://gre/modules/Color.jsm",
ContextualIdentityService:
"resource://gre/modules/ContextualIdentityService.jsm",
CustomizableUI: "resource:///modules/CustomizableUI.jsm",
@@ -56,14 +65,10 @@ XPCOMUtils.defineLazyModuleGetters(this, {
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
HomePage: "resource:///modules/HomePage.jsm",
- LightweightThemeConsumer:
- "resource://gre/modules/LightweightThemeConsumer.jsm",
- Log: "resource://gre/modules/Log.jsm",
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
LoginManagerParent: "resource://gre/modules/LoginManagerParent.jsm",
MigrationUtils: "resource:///modules/MigrationUtils.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
- NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.jsm",
PageActions: "resource:///modules/PageActions.jsm",
PageThumbs: "resource://gre/modules/PageThumbs.jsm",
@@ -73,7 +78,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
Pocket: "chrome://pocket/content/Pocket.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
PromptUtils: "resource://gre/modules/SharedPromptUtils.jsm",
// TODO (Bug 1529552): Remove once old urlbar code goes away.
ReaderMode: "resource://gre/modules/ReaderMode.jsm",
@@ -83,17 +87,13 @@ XPCOMUtils.defineLazyModuleGetters(this, {
SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
- ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
SiteDataManager: "resource:///modules/SiteDataManager.jsm",
SitePermissions: "resource:///modules/SitePermissions.jsm",
- SubDialog: "resource://gre/modules/SubDialog.jsm",
- SubDialogManager: "resource://gre/modules/SubDialog.jsm",
TabModalPrompt: "chrome://global/content/tabprompts.jsm",
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
Translation: "resource:///modules/translation/TranslationParent.jsm",
UITour: "resource:///modules/UITour.jsm",
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
Weave: "resource://services-sync/main.js",
WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
webrtcUI: "resource:///modules/webrtcUI.jsm",
@@ -421,16 +421,16 @@ XPCOMUtils.defineLazyGetter(this, "gNotificationBox", () => {
});
XPCOMUtils.defineLazyGetter(this, "InlineSpellCheckerUI", () => {
- let { InlineSpellChecker } = ChromeUtils.import(
- "resource://gre/modules/InlineSpellChecker.jsm"
+ let { InlineSpellChecker } = ChromeUtils.importESModule(
+ "resource://gre/modules/InlineSpellChecker.sys.mjs"
);
return new InlineSpellChecker();
});
XPCOMUtils.defineLazyGetter(this, "PopupNotifications", () => {
// eslint-disable-next-line no-shadow
- let { PopupNotifications } = ChromeUtils.import(
- "resource://gre/modules/PopupNotifications.jsm"
+ let { PopupNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/PopupNotifications.sys.mjs"
);
try {
// Hide all PopupNotifications while the URL is being edited and the
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index c013d8b32f93..3175e7f5b60a 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -257,8 +257,8 @@ class nsContextMenu {
this.selectionInfo = this.contentData.selectionInfo;
this.actor = this.contentData.actor;
} else {
- const { SelectionUtils } = ChromeUtils.import(
- "resource://gre/modules/SelectionUtils.jsm"
+ const { SelectionUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/SelectionUtils.sys.mjs"
);
this.browser = this.ownerDoc.defaultView.docShell.chromeEventHandler;
diff --git a/browser/base/content/safeMode.js b/browser/base/content/safeMode.js
index abb7c94c2da6..b5ebf0620666 100644
--- a/browser/base/content/safeMode.js
+++ b/browser/base/content/safeMode.js
@@ -5,8 +5,8 @@
const appStartup = Services.startup;
-const { ResetProfile } = ChromeUtils.import(
- "resource://gre/modules/ResetProfile.jsm"
+const { ResetProfile } = ChromeUtils.importESModule(
+ "resource://gre/modules/ResetProfile.sys.mjs"
);
var defaultToReset = false;
diff --git a/browser/base/content/test/favicons/browser_favicon_load.js b/browser/base/content/test/favicons/browser_favicon_load.js
index 5501b0b9315a..1ee3808ef4b0 100644
--- a/browser/base/content/test/favicons/browser_favicon_load.js
+++ b/browser/base/content/test/favicons/browser_favicon_load.js
@@ -20,13 +20,9 @@ const THIRD_PARTY_FAVICON_URI =
TEST_THIRD_PARTY_SITE +
"/browser/browser/base/content/test/favicons/file_favicon.png";
-ChromeUtils.defineModuleGetter(
- this,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
ChromeUtils.defineESModuleGetters(this, {
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
let systemPrincipal = Services.scriptSecurityManager.getSystemPrincipal();
diff --git a/browser/base/content/test/general/browser_remoteTroubleshoot.js b/browser/base/content/test/general/browser_remoteTroubleshoot.js
index 69da62d47de6..45bddf599e78 100644
--- a/browser/base/content/test/general/browser_remoteTroubleshoot.js
+++ b/browser/base/content/test/general/browser_remoteTroubleshoot.js
@@ -82,8 +82,9 @@ add_task(async function() {
let updateChannel = null;
try {
- updateChannel = ChromeUtils.import("resource://gre/modules/UpdateUtils.jsm")
- .UpdateUtils.UpdateChannel;
+ updateChannel = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
+ ).UpdateUtils.UpdateChannel;
} catch (ex) {}
if (!updateChannel) {
Assert.ok(
diff --git a/browser/base/content/test/plugins/head.js b/browser/base/content/test/plugins/head.js
index e0c0805e885d..c02af8b28175 100644
--- a/browser/base/content/test/plugins/head.js
+++ b/browser/base/content/test/plugins/head.js
@@ -4,12 +4,8 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
ChromeUtils.defineESModuleGetters(this, {
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
-ChromeUtils.defineModuleGetter(
- this,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
// Various tests in this directory may define gTestBrowser, to use as the
// default browser under test in some of the functions below.
diff --git a/browser/base/content/test/protectionsUI/head.js b/browser/base/content/test/protectionsUI/head.js
index 571623d16976..b48e8f2fcec9 100644
--- a/browser/base/content/test/protectionsUI/head.js
+++ b/browser/base/content/test/protectionsUI/head.js
@@ -2,7 +2,9 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
+const { Sqlite } = ChromeUtils.importESModule(
+ "resource://gre/modules/Sqlite.sys.mjs"
+);
XPCOMUtils.defineLazyServiceGetter(
this,
diff --git a/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js b/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
index b5f19610f2e0..e5d21857252e 100644
--- a/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
+++ b/browser/base/content/test/startup/browser_preXULSkeletonUIRegistry.js
@@ -1,8 +1,6 @@
-ChromeUtils.defineModuleGetter(
- this,
- "WindowsRegistry",
- "resource://gre/modules/WindowsRegistry.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
+});
function getFirefoxExecutableFile() {
let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
diff --git a/browser/base/content/test/static/browser_parsable_css.js b/browser/base/content/test/static/browser_parsable_css.js
index 7bb44b2fb9ab..8e3823d5760a 100644
--- a/browser/base/content/test/static/browser_parsable_css.js
+++ b/browser/base/content/test/static/browser_parsable_css.js
@@ -409,8 +409,8 @@ add_task(async function checkAllTheCSS() {
// Create a clean iframe to load all the files into. This needs to live at a
// chrome URI so that it's allowed to load and parse any styles.
let testFile = getRootDirectory(gTestPath) + "dummy_page.html";
- let { HiddenFrame } = ChromeUtils.import(
- "resource://gre/modules/HiddenFrame.jsm"
+ let { HiddenFrame } = ChromeUtils.importESModule(
+ "resource://gre/modules/HiddenFrame.sys.mjs"
);
let hiddenFrame = new HiddenFrame();
let win = await hiddenFrame.get();
diff --git a/browser/base/content/test/static/browser_sentence_case_strings.js b/browser/base/content/test/static/browser_sentence_case_strings.js
index a17cc02c8642..42f5316a8972 100644
--- a/browser/base/content/test/static/browser_sentence_case_strings.js
+++ b/browser/base/content/test/static/browser_sentence_case_strings.js
@@ -15,8 +15,8 @@ const { CustomizableUITestUtils } = ChromeUtils.import(
"resource://testing-common/CustomizableUITestUtils.jsm"
);
-const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
// These are brand names, proper names, or other things that we expect to
diff --git a/browser/base/content/test/sync/browser_fxa_badge.js b/browser/base/content/test/sync/browser_fxa_badge.js
index 497f3b348e60..227d778d6c44 100644
--- a/browser/base/content/test/sync/browser_fxa_badge.js
+++ b/browser/base/content/test/sync/browser_fxa_badge.js
@@ -3,8 +3,8 @@
"use strict";
-const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
add_task(async function test_unconfigured_no_badge() {
diff --git a/browser/base/content/test/webextensions/head.js b/browser/base/content/test/webextensions/head.js
index 35dbaa292bef..11dc18acddd7 100644
--- a/browser/base/content/test/webextensions/head.js
+++ b/browser/base/content/test/webextensions/head.js
@@ -58,8 +58,8 @@ function promisePopupNotificationShown(name) {
}
function promiseAppMenuNotificationShown(id) {
- const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+ const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
return new Promise(resolve => {
function popupshown() {
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
index db730d8baec5..a33cb685889a 100644
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -11,9 +11,12 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
+ChromeUtils.defineESModuleGetters(this, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
- BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
ContextualIdentityService:
"resource://gre/modules/ContextualIdentityService.jsm",
diff --git a/browser/components/BrowserContentHandler.jsm b/browser/components/BrowserContentHandler.jsm
index 8050c5a07ee5..9c4fdf9e3e16 100644
--- a/browser/components/BrowserContentHandler.jsm
+++ b/browser/components/BrowserContentHandler.jsm
@@ -16,11 +16,14 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FirstStartup: "resource://gre/modules/FirstStartup.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
HeadlessShell: "resource:///modules/HeadlessShell.jsm",
HomePage: "resource:///modules/HomePage.jsm",
- FirstStartup: "resource://gre/modules/FirstStartup.jsm",
LaterRun: "resource:///modules/LaterRun.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index d4cf5f8ef69f..0fd0cf692822 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -19,10 +19,15 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
BookmarkHTMLUtils: "resource://gre/modules/BookmarkHTMLUtils.sys.mjs",
BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.sys.mjs",
BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
+ Integration: "resource://gre/modules/Integration.sys.mjs",
Interactions: "resource:///modules/Interactions.sys.mjs",
+ Log: "resource://gre/modules/Log.sys.mjs",
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+ OsEnvironment: "resource://gre/modules/OsEnvironment.sys.mjs",
PageDataService: "resource:///modules/pagedata/PageDataService.sys.mjs",
PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs",
PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs",
@@ -30,16 +35,17 @@ ChromeUtils.defineESModuleGetters(lazy, {
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
SnapshotMonitor: "resource:///modules/SnapshotMonitor.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs",
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
AddonManager: "resource://gre/modules/AddonManager.jsm",
- AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
ASRouterDefaultConfig:
"resource://activity-stream/lib/ASRouterDefaultConfig.jsm",
ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm",
@@ -63,16 +69,12 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
FeatureGate: "resource://featuregates/FeatureGate.jsm",
FxAccounts: "resource://gre/modules/FxAccounts.jsm",
HomePage: "resource:///modules/HomePage.jsm",
- Integration: "resource://gre/modules/Integration.jsm",
- Log: "resource://gre/modules/Log.jsm",
LoginBreaches: "resource:///modules/LoginBreaches.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
- NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
Normandy: "resource://normandy/Normandy.jsm",
OnboardingMessageProvider:
"resource://activity-stream/lib/OnboardingMessageProvider.jsm",
- OsEnvironment: "resource://gre/modules/OsEnvironment.jsm",
PageActions: "resource:///modules/PageActions.jsm",
PageThumbs: "resource://gre/modules/PageThumbs.jsm",
PdfJs: "resource://pdf.js/PdfJs.jsm",
@@ -91,7 +93,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
ShellService: "resource:///modules/ShellService.jsm",
- ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
SpecialMessageActions:
"resource://messaging-system/lib/SpecialMessageActions.jsm",
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
@@ -100,7 +101,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
TRRRacer: "resource:///modules/TRRPerformance.jsm",
UIState: "resource://services-sync/UIState.jsm",
WebChannel: "resource://gre/modules/WebChannel.jsm",
- WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
});
if (AppConstants.MOZ_UPDATER) {
@@ -1388,8 +1388,8 @@ BrowserGlue.prototype = {
return;
}
- const { ResetProfile } = ChromeUtils.import(
- "resource://gre/modules/ResetProfile.jsm"
+ const { ResetProfile } = ChromeUtils.importESModule(
+ "resource://gre/modules/ResetProfile.sys.mjs"
);
if (!ResetProfile.resetSupported()) {
return;
@@ -1625,8 +1625,8 @@ BrowserGlue.prototype = {
);
channel.listen((id, data, target) => {
if (data.command == "request") {
- let { Troubleshoot } = ChromeUtils.import(
- "resource://gre/modules/Troubleshoot.jsm"
+ let { Troubleshoot } = ChromeUtils.importESModule(
+ "resource://gre/modules/Troubleshoot.sys.mjs"
);
Troubleshoot.snapshot(snapshotData => {
// for privacy we remove crash IDs and all preferences (but bug 1091944
@@ -1657,8 +1657,8 @@ BrowserGlue.prototype = {
// Check if we were just re-installed and offer Firefox Reset
let updateChannel;
try {
- updateChannel = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+ updateChannel = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
).UpdateUtils.UpdateChannel;
} catch (ex) {}
if (updateChannel) {
@@ -2320,8 +2320,8 @@ BrowserGlue.prototype = {
}
if (AppConstants.ASAN_REPORTER) {
- var { AsanReporter } = ChromeUtils.import(
- "resource://gre/modules/AsanReporter.jsm"
+ var { AsanReporter } = ChromeUtils.importESModule(
+ "resource://gre/modules/AsanReporter.sys.mjs"
);
AsanReporter.init();
}
@@ -2940,8 +2940,8 @@ BrowserGlue.prototype = {
},
() => {
- let { GMPInstallManager } = ChromeUtils.import(
- "resource://gre/modules/GMPInstallManager.jsm"
+ let { GMPInstallManager } = ChromeUtils.importESModule(
+ "resource://gre/modules/GMPInstallManager.sys.mjs"
);
this._gmpInstallManager = new GMPInstallManager();
// We don't really care about the results, if someone is interested they
diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
index d4bdeec4a56a..f1045254e0af 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -22,13 +22,16 @@ const { E10SUtils } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
LoginBreaches: "resource:///modules/LoginBreaches.jsm",
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
LoginExport: "resource://gre/modules/LoginExport.jsm",
LoginCSVImport: "resource://gre/modules/LoginCSVImport.jsm",
MigrationUtils: "resource:///modules/MigrationUtils.jsm",
- OSKeyStore: "resource://gre/modules/OSKeyStore.jsm",
UIState: "resource://services-sync/UIState.jsm",
});
diff --git a/browser/components/aboutlogins/tests/browser/browser_openExport.js b/browser/components/aboutlogins/tests/browser/browser_openExport.js
index fe5f668c3463..48315d084b93 100644
--- a/browser/components/aboutlogins/tests/browser/browser_openExport.js
+++ b/browser/components/aboutlogins/tests/browser/browser_openExport.js
@@ -8,8 +8,8 @@
* Test the export logins file picker appears.
*/
-let { OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+let { OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
);
let { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
index 16e79a7ecd28..6762a59f2d36 100644
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -14,6 +14,10 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
@@ -21,7 +25,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
CustomizableWidgets: "resource:///modules/CustomizableWidgets.jsm",
PanelMultiView: "resource:///modules/PanelMultiView.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
- ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
HomePage: "resource:///modules/HomePage.jsm",
});
diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm
index a66250e9ab6c..b583e446b587 100644
--- a/browser/components/customizableui/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/CustomizableWidgets.jsm
@@ -21,10 +21,13 @@ const { PrivateBrowsingUtils } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
RecentlyClosedTabsAndWindowsMenuUtils:
"resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm",
- ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
});
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index 25a980d7ed5b..ff0a5bbece30 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -2,16 +2,10 @@
* 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/. */
-ChromeUtils.defineModuleGetter(
- this,
- "AppMenuNotifications",
- "resource://gre/modules/AppMenuNotifications.jsm"
-);
-ChromeUtils.defineModuleGetter(
- this,
- "NewTabUtils",
- "resource://gre/modules/NewTabUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
"PanelMultiView",
diff --git a/browser/components/customizableui/test/browser_panelUINotifications.js b/browser/components/customizableui/test/browser_panelUINotifications.js
index 794c658b6fa3..3126ac25e37e 100644
--- a/browser/components/customizableui/test/browser_panelUINotifications.js
+++ b/browser/components/customizableui/test/browser_panelUINotifications.js
@@ -1,7 +1,7 @@
"use strict";
-const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
/**
diff --git a/browser/components/customizableui/test/browser_panelUINotifications_bannerVisibility.js b/browser/components/customizableui/test/browser_panelUINotifications_bannerVisibility.js
index fd20120eb9bc..ff4c10ee11db 100644
--- a/browser/components/customizableui/test/browser_panelUINotifications_bannerVisibility.js
+++ b/browser/components/customizableui/test/browser_panelUINotifications_bannerVisibility.js
@@ -3,8 +3,8 @@
"use strict";
-const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
/**
diff --git a/browser/components/customizableui/test/browser_panelUINotifications_fullscreen.js b/browser/components/customizableui/test/browser_panelUINotifications_fullscreen.js
index 9c07c9d75b17..4b3340696b69 100644
--- a/browser/components/customizableui/test/browser_panelUINotifications_fullscreen.js
+++ b/browser/components/customizableui/test/browser_panelUINotifications_fullscreen.js
@@ -1,7 +1,7 @@
"use strict";
-const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
add_task(async function testFullscreen() {
diff --git a/browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js b/browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js
index eebcb33c0305..2cf691b046cf 100644
--- a/browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js
+++ b/browser/components/customizableui/test/browser_panelUINotifications_fullscreen_noAutoHideToolbar.js
@@ -6,8 +6,8 @@
// error.
SimpleTest.ignoreAllUncaughtExceptions(true);
-const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
function waitForDocshellActivated() {
diff --git a/browser/components/customizableui/test/browser_panelUINotifications_modals.js b/browser/components/customizableui/test/browser_panelUINotifications_modals.js
index 5c5b23078e09..87be14fcee12 100644
--- a/browser/components/customizableui/test/browser_panelUINotifications_modals.js
+++ b/browser/components/customizableui/test/browser_panelUINotifications_modals.js
@@ -3,8 +3,8 @@
"use strict";
-const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
add_task(async function testModals() {
diff --git a/browser/components/customizableui/test/browser_panelUINotifications_multiWindow.js b/browser/components/customizableui/test/browser_panelUINotifications_multiWindow.js
index cadc8b5160a1..43fa1f7aaba3 100644
--- a/browser/components/customizableui/test/browser_panelUINotifications_multiWindow.js
+++ b/browser/components/customizableui/test/browser_panelUINotifications_multiWindow.js
@@ -1,7 +1,7 @@
"use strict";
-const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
/**
diff --git a/browser/components/distribution.js b/browser/components/distribution.js
index debd2d94d5e0..7bfe9420c689 100644
--- a/browser/components/distribution.js
+++ b/browser/components/distribution.js
@@ -361,8 +361,8 @@ DistributionCustomizer.prototype = {
return;
}
- let { ProfileAge } = ChromeUtils.import(
- "resource://gre/modules/ProfileAge.jsm"
+ let { ProfileAge } = ChromeUtils.importESModule(
+ "resource://gre/modules/ProfileAge.sys.mjs"
);
let profileAge = await ProfileAge();
let resetDate = await profileAge.reset;
diff --git a/browser/components/doh/test/unit/head.js b/browser/components/doh/test/unit/head.js
index 33ce7b703710..040bb799e470 100644
--- a/browser/components/doh/test/unit/head.js
+++ b/browser/components/doh/test/unit/head.js
@@ -5,8 +5,8 @@
"use strict";
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { TestUtils } = ChromeUtils.import(
diff --git a/browser/components/downloads/DownloadsViewUI.jsm b/browser/components/downloads/DownloadsViewUI.jsm
index 5c3fd0a2507b..f4d81f9e4be2 100644
--- a/browser/components/downloads/DownloadsViewUI.jsm
+++ b/browser/components/downloads/DownloadsViewUI.jsm
@@ -18,6 +18,7 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
});
@@ -26,7 +27,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
Downloads: "resource://gre/modules/Downloads.jsm",
DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
});
XPCOMUtils.defineLazyServiceGetter(
@@ -43,8 +43,8 @@ XPCOMUtils.defineLazyServiceGetter(
Ci.nsIApplicationReputationService
);
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
Integration.downloads.defineModuleGetter(
diff --git a/browser/components/downloads/DownloadsViewableInternally.jsm b/browser/components/downloads/DownloadsViewableInternally.jsm
index b8db08e063fb..e71fc7a14f60 100644
--- a/browser/components/downloads/DownloadsViewableInternally.jsm
+++ b/browser/components/downloads/DownloadsViewableInternally.jsm
@@ -37,11 +37,9 @@ XPCOMUtils.defineLazyServiceGetter(
"nsIMIMEService"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "Integration",
- "resource://gre/modules/Integration.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ Integration: "resource://gre/modules/Integration.sys.mjs",
+});
const PREF_BRANCH = "browser.download.viewableInternally.";
const PREF_ENABLED_TYPES = PREF_BRANCH + "enabledTypes";
diff --git a/browser/components/downloads/content/allDownloadsView.js b/browser/components/downloads/content/allDownloadsView.js
index 0bcc7008dc57..82761056711d 100644
--- a/browser/components/downloads/content/allDownloadsView.js
+++ b/browser/components/downloads/content/allDownloadsView.js
@@ -8,6 +8,7 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
);
ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
@@ -16,7 +17,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
Downloads: "resource://gre/modules/Downloads.jsm",
DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
DownloadsViewUI: "resource:///modules/DownloadsViewUI.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
});
diff --git a/browser/components/downloads/content/downloads.js b/browser/components/downloads/content/downloads.js
index a1626854b764..a3aa6bafded6 100644
--- a/browser/components/downloads/content/downloads.js
+++ b/browser/components/downloads/content/downloads.js
@@ -40,22 +40,18 @@ ChromeUtils.defineModuleGetter(
"DownloadsViewUI",
"resource:///modules/DownloadsViewUI.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
"NetUtil",
"resource://gre/modules/NetUtil.jsm"
);
-ChromeUtils.defineESModuleGetters(this, {
- PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
-});
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
/* global DownloadIntegration */
diff --git a/browser/components/downloads/test/browser/head.js b/browser/components/downloads/test/browser/head.js
index 7721371dc50f..2b35fe2b7843 100644
--- a/browser/components/downloads/test/browser/head.js
+++ b/browser/components/downloads/test/browser/head.js
@@ -19,12 +19,8 @@ ChromeUtils.defineModuleGetter(
"DownloadsCommon",
"resource:///modules/DownloadsCommon.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
ChromeUtils.defineModuleGetter(
diff --git a/browser/components/downloads/test/unit/head.js b/browser/components/downloads/test/unit/head.js
index 19d9d66e19ce..734286dabc2e 100644
--- a/browser/components/downloads/test/unit/head.js
+++ b/browser/components/downloads/test/unit/head.js
@@ -8,11 +8,9 @@ ChromeUtils.defineModuleGetter(
"DownloadsCommon",
"resource:///modules/DownloadsCommon.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
"FileTestUtils",
diff --git a/browser/components/downloads/test/unit/test_DownloadsViewableInternally.js b/browser/components/downloads/test/unit/test_DownloadsViewableInternally.js
index 652eaa850228..4b07216ad732 100644
--- a/browser/components/downloads/test/unit/test_DownloadsViewableInternally.js
+++ b/browser/components/downloads/test/unit/test_DownloadsViewableInternally.js
@@ -11,8 +11,8 @@ const SVG_MIME = "image/svg+xml";
const AVIF_MIME = "image/avif";
const WEBP_MIME = "image/webp";
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
const {
DownloadsViewableInternally,
diff --git a/browser/components/enterprisepolicies/Policies.sys.mjs b/browser/components/enterprisepolicies/Policies.sys.mjs
index 36186890b681..03b797252b7b 100644
--- a/browser/components/enterprisepolicies/Policies.sys.mjs
+++ b/browser/components/enterprisepolicies/Policies.sys.mjs
@@ -26,6 +26,7 @@ XPCOMUtils.defineLazyServiceGetters(lazy, {
ChromeUtils.defineESModuleGetters(lazy, {
BookmarksPolicies: "resource:///modules/policies/BookmarksPolicies.sys.mjs",
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
ProxyPolicies: "resource:///modules/policies/ProxyPolicies.sys.mjs",
WebsiteFilter: "resource:///modules/policies/WebsiteFilter.sys.mjs",
});
@@ -33,7 +34,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
CustomizableUI: "resource:///modules/CustomizableUI.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
});
const PREF_LOGLEVEL = "browser.policies.loglevel";
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_app_auto_update.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_app_auto_update.js
index 5af081042b26..0cae8369e415 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_app_auto_update.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_app_auto_update.js
@@ -2,11 +2,9 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.defineModuleGetter(
- this,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
async function test_app_update_auto(expectedEnabled, expectedLocked) {
let actualEnabled = await UpdateUtils.getAppUpdateAutoEnabled();
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_app_update.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_app_update.js
index 8d87602998fe..14a9c92bc5b1 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_app_update.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_app_update.js
@@ -2,11 +2,9 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.defineModuleGetter(
- this,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
var updateService = Cc["@mozilla.org/updates/update-service;1"].getService(
Ci.nsIApplicationUpdateService
);
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_background_app_update.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_background_app_update.js
index 5595ec07ab2e..a529e79be72b 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_background_app_update.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_background_app_update.js
@@ -2,11 +2,9 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-ChromeUtils.defineModuleGetter(
- this,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
const PREF_NAME = "app.update.background.enabled";
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_profile_reset.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_profile_reset.js
index 70a53872a150..2a60ca964e6a 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_profile_reset.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_disable_profile_reset.js
@@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-let { ResetProfile } = ChromeUtils.import(
- "resource://gre/modules/ResetProfile.jsm"
+let { ResetProfile } = ChromeUtils.importESModule(
+ "resource://gre/modules/ResetProfile.sys.mjs"
);
// For this test to work properly, this profile actually needs to be
diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
index f487d68e8b0f..aecf4b37f39b 100644
--- a/browser/components/extensions/parent/ext-browser.js
+++ b/browser/components/extensions/parent/ext-browser.js
@@ -20,13 +20,9 @@ ChromeUtils.defineModuleGetter(
"BrowserWindowTracker",
"resource:///modules/BrowserWindowTracker.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
ChromeUtils.defineESModuleGetters(this, {
AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
var { ExtensionError } = ExtensionUtils;
diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
index b1ff2a263e04..8a571c5aba38 100644
--- a/browser/components/extensions/parent/ext-tabs.js
+++ b/browser/components/extensions/parent/ext-tabs.js
@@ -26,11 +26,9 @@ ChromeUtils.defineModuleGetter(
"PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
"SessionStore",
diff --git a/browser/components/extensions/parent/ext-topSites.js b/browser/components/extensions/parent/ext-topSites.js
index 815e7afecec1..61ab8c3be54b 100644
--- a/browser/components/extensions/parent/ext-topSites.js
+++ b/browser/components/extensions/parent/ext-topSites.js
@@ -6,9 +6,12 @@
"use strict";
+ChromeUtils.defineESModuleGetters(this, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
- NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
shortURL: "resource://activity-stream/lib/ShortURL.jsm",
getSearchProvider: "resource://activity-stream/lib/SearchShortcuts.jsm",
});
diff --git a/browser/components/extensions/test/browser/browser_ext_webRequest.js b/browser/components/extensions/test/browser/browser_ext_webRequest.js
index 9df48ebc1446..dda1e661d001 100644
--- a/browser/components/extensions/test/browser/browser_ext_webRequest.js
+++ b/browser/components/extensions/test/browser/browser_ext_webRequest.js
@@ -5,8 +5,8 @@
/* import-globals-from ../../../../../toolkit/components/extensions/test/mochitest/head_webrequest.js */
loadTestSubscript("head_webrequest.js");
-const { HiddenFrame } = ChromeUtils.import(
- "resource://gre/modules/HiddenFrame.jsm"
+const { HiddenFrame } = ChromeUtils.importESModule(
+ "resource://gre/modules/HiddenFrame.sys.mjs"
);
const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
diff --git a/browser/components/extensions/test/xpcshell/head.js b/browser/components/extensions/test/xpcshell/head.js
index f7d9ea568880..fbe9c9ac68da 100644
--- a/browser/components/extensions/test/xpcshell/head.js
+++ b/browser/components/extensions/test/xpcshell/head.js
@@ -10,11 +10,14 @@ const { AppConstants } = ChromeUtils.import(
);
// eslint-disable-next-line no-unused-vars
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
Extension: "resource://gre/modules/Extension.jsm",
ExtensionData: "resource://gre/modules/Extension.jsm",
ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
HttpServer: "resource://testing-common/httpd.js",
NetUtil: "resource://gre/modules/NetUtil.jsm",
Schemas: "resource://gre/modules/Schemas.jsm",
diff --git a/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js b/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
index f38c4e366ee6..71b987044e9a 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
@@ -5,10 +5,14 @@
const { AddonTestUtils } = ChromeUtils.import(
"resource://testing-common/AddonTestUtils.jsm"
);
+
+ChromeUtils.defineESModuleGetters(this, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
HomePage: "resource:///modules/HomePage.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
sinon: "resource://testing-common/Sinon.jsm",
});
diff --git a/browser/components/extensions/test/xpcshell/test_ext_topSites.js b/browser/components/extensions/test/xpcshell/test_ext_topSites.js
index ce53892f4665..e41463d0e7b2 100644
--- a/browser/components/extensions/test/xpcshell/test_ext_topSites.js
+++ b/browser/components/extensions/test/xpcshell/test_ext_topSites.js
@@ -3,8 +3,8 @@
const { PlacesUtils } = ChromeUtils.importESModule(
"resource://gre/modules/PlacesUtils.sys.mjs"
);
-const { NewTabUtils } = ChromeUtils.import(
- "resource://gre/modules/NewTabUtils.jsm"
+const { NewTabUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/NewTabUtils.sys.mjs"
);
const { PlacesTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PlacesTestUtils.sys.mjs"
diff --git a/browser/components/firefoxview/firefox-view-tabs-setup-manager.sys.mjs b/browser/components/firefoxview/firefox-view-tabs-setup-manager.sys.mjs
index 17c3da5e7098..0d68a8293c49 100644
--- a/browser/components/firefoxview/firefox-view-tabs-setup-manager.sys.mjs
+++ b/browser/components/firefoxview/firefox-view-tabs-setup-manager.sys.mjs
@@ -12,8 +12,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
);
const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- Log: "resource://gre/modules/Log.jsm",
UIState: "resource://services-sync/UIState.jsm",
SyncedTabs: "resource://services-sync/SyncedTabs.jsm",
Weave: "resource://services-sync/main.js",
diff --git a/browser/components/firefoxview/helpers.mjs b/browser/components/firefoxview/helpers.mjs
index 6229a531a04f..e38c4f3e4eb1 100644
--- a/browser/components/firefoxview/helpers.mjs
+++ b/browser/components/firefoxview/helpers.mjs
@@ -7,12 +7,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "BrowserUtils",
- "resource://gre/modules/BrowserUtils.jsm"
-);
ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
});
diff --git a/browser/components/ion/test/browser/browser_ion_ui.js b/browser/components/ion/test/browser/browser_ion_ui.js
index 7836ff594b47..eb8f8f34655a 100644
--- a/browser/components/ion/test/browser/browser_ion_ui.js
+++ b/browser/components/ion/test/browser/browser_ion_ui.js
@@ -4,8 +4,8 @@
"use strict";
-const { JsonSchema } = ChromeUtils.import(
- "resource://gre/modules/JsonSchema.jsm"
+const { JsonSchema } = ChromeUtils.importESModule(
+ "resource://gre/modules/JsonSchema.sys.mjs"
);
const { TelemetryArchive } = ChromeUtils.import(
diff --git a/browser/components/migration/360seMigrationUtils.jsm b/browser/components/migration/360seMigrationUtils.jsm
index 6e2e657a8c85..7cd894ee5c0b 100644
--- a/browser/components/migration/360seMigrationUtils.jsm
+++ b/browser/components/migration/360seMigrationUtils.jsm
@@ -18,10 +18,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- Sqlite: "resource://gre/modules/Sqlite.jsm",
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
});
XPCOMUtils.defineLazyGetter(
diff --git a/browser/components/migration/FirefoxProfileMigrator.jsm b/browser/components/migration/FirefoxProfileMigrator.jsm
index b2f074946484..2ce1a2826377 100644
--- a/browser/components/migration/FirefoxProfileMigrator.jsm
+++ b/browser/components/migration/FirefoxProfileMigrator.jsm
@@ -20,7 +20,9 @@ const { MigrationUtils, MigratorPrototype } = ChromeUtils.import(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs",
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
@@ -28,16 +30,6 @@ ChromeUtils.defineModuleGetter(
"resource:///modules/sessionstore/SessionMigration.jsm"
);
ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm");
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "ProfileAge",
- "resource://gre/modules/ProfileAge.jsm"
-);
function FirefoxProfileMigrator() {
this.wrappedJSObject = this; // for testing...
diff --git a/browser/components/migration/MSMigrationUtils.jsm b/browser/components/migration/MSMigrationUtils.jsm
index aa4f3e118cad..c1ddb3383421 100644
--- a/browser/components/migration/MSMigrationUtils.jsm
+++ b/browser/components/migration/MSMigrationUtils.jsm
@@ -18,12 +18,8 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
});
-ChromeUtils.defineModuleGetter(
- lazy,
- "WindowsRegistry",
- "resource://gre/modules/WindowsRegistry.jsm"
-);
const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
const EDGE_COOKIE_PATH_OPTIONS = ["", "#!001\\", "#!002\\"];
diff --git a/browser/components/migration/MigrationUtils.jsm b/browser/components/migration/MigrationUtils.jsm
index f33ecde6679d..7c7d91299fd0 100644
--- a/browser/components/migration/MigrationUtils.jsm
+++ b/browser/components/migration/MigrationUtils.jsm
@@ -21,32 +21,16 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
BookmarkHTMLUtils: "resource://gre/modules/BookmarkHTMLUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+ ResponsivenessMonitor: "resource://gre/modules/ResponsivenessMonitor.sys.mjs",
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
"LoginHelper",
"resource://gre/modules/LoginHelper.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "ResponsivenessMonitor",
- "resource://gre/modules/ResponsivenessMonitor.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "Sqlite",
- "resource://gre/modules/Sqlite.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "WindowsRegistry",
- "resource://gre/modules/WindowsRegistry.jsm"
-);
ChromeUtils.defineModuleGetter(
lazy,
"setTimeout",
diff --git a/browser/components/migration/SafariProfileMigrator.jsm b/browser/components/migration/SafariProfileMigrator.jsm
index 063647c9830a..5e6e63b920fe 100644
--- a/browser/components/migration/SafariProfileMigrator.jsm
+++ b/browser/components/migration/SafariProfileMigrator.jsm
@@ -4,8 +4,8 @@
"use strict";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
const { MigrationUtils, MigratorPrototype } = ChromeUtils.import(
@@ -14,14 +14,10 @@ const { MigrationUtils, MigratorPrototype } = ChromeUtils.import(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "PropertyListUtils",
- "resource://gre/modules/PropertyListUtils.jsm"
-);
ChromeUtils.defineESModuleGetters(lazy, {
PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ PropertyListUtils: "resource://gre/modules/PropertyListUtils.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/browser/components/migration/tests/unit/head_migration.js b/browser/components/migration/tests/unit/head_migration.js
index 588c5586527c..df9cd528b948 100644
--- a/browser/components/migration/tests/unit/head_migration.js
+++ b/browser/components/migration/tests/unit/head_migration.js
@@ -13,8 +13,8 @@ var { PlacesUtils } = ChromeUtils.importESModule(
var { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
-var { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+var { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
@@ -26,16 +26,10 @@ var { PlacesTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PlacesTestUtils.sys.mjs"
);
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
- this,
- "Sqlite",
- "resource://gre/modules/Sqlite.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
+});
// Initialize profile.
var gProfD = do_get_profile();
diff --git a/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm b/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
index d0bcba825aac..1e7bf2c26b23 100644
--- a/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
+++ b/browser/components/newtab/aboutwelcome/AboutWelcomeParent.jsm
@@ -13,12 +13,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
- BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
BuiltInThemes: "resource:///modules/BuiltInThemes.jsm",
FxAccounts: "resource://gre/modules/FxAccounts.jsm",
MigrationUtils: "resource:///modules/MigrationUtils.jsm",
@@ -28,7 +29,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
"resource://activity-stream/aboutwelcome/lib/AboutWelcomeTelemetry.jsm",
AboutWelcomeDefaults:
"resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
ShellService: "resource:///modules/ShellService.jsm",
LangPackMatcher: "resource://gre/modules/LangPackMatcher.jsm",
});
diff --git a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
index 40b50e10e9a0..1a724492c55f 100644
--- a/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
+++ b/browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
@@ -14,11 +14,14 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
AttributionCode: "resource:///modules/AttributionCode.jsm",
BuiltInThemes: "resource:///modules/BuiltInThemes.jsm",
- BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
});
XPCOMUtils.defineLazyPreferenceGetter(
diff --git a/browser/components/newtab/lib/ASRouterTargeting.jsm b/browser/components/newtab/lib/ASRouterTargeting.jsm
index 9afc8aeb7729..34ef248cf2fe 100644
--- a/browser/components/newtab/lib/ASRouterTargeting.jsm
+++ b/browser/components/newtab/lib/ASRouterTargeting.jsm
@@ -12,8 +12,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { NewTabUtils } = ChromeUtils.import(
- "resource://gre/modules/NewTabUtils.jsm"
+const { NewTabUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/NewTabUtils.sys.mjs"
);
const { ShellService } = ChromeUtils.import(
"resource:///modules/ShellService.jsm"
@@ -22,6 +22,7 @@ const { ShellService } = ChromeUtils.import(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
});
@@ -29,7 +30,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
ASRouterPreferences: "resource://activity-stream/lib/ASRouterPreferences.jsm",
AddonManager: "resource://gre/modules/AddonManager.jsm",
ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
- ProfileAge: "resource://gre/modules/ProfileAge.jsm",
TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
AttributionCode: "resource:///modules/AttributionCode.jsm",
TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
diff --git a/browser/components/newtab/lib/ASRouterTriggerListeners.jsm b/browser/components/newtab/lib/ASRouterTriggerListeners.jsm
index 18ffd6d2cce3..85c24790e97f 100644
--- a/browser/components/newtab/lib/ASRouterTriggerListeners.jsm
+++ b/browser/components/newtab/lib/ASRouterTriggerListeners.jsm
@@ -11,10 +11,10 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
- BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
EveryWindow: "resource:///modules/EveryWindow.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
diff --git a/browser/components/newtab/lib/ActivityStreamStorage.jsm b/browser/components/newtab/lib/ActivityStreamStorage.jsm
index 807ec8de86a2..f34e289f8ad3 100644
--- a/browser/components/newtab/lib/ActivityStreamStorage.jsm
+++ b/browser/components/newtab/lib/ActivityStreamStorage.jsm
@@ -4,11 +4,9 @@
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "IndexedDB",
- "resource://gre/modules/IndexedDB.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs",
+});
class ActivityStreamStorage {
/**
diff --git a/browser/components/newtab/lib/DiscoveryStreamFeed.jsm b/browser/components/newtab/lib/DiscoveryStreamFeed.jsm
index 4f77400170fc..35f48bdac3e9 100644
--- a/browser/components/newtab/lib/DiscoveryStreamFeed.jsm
+++ b/browser/components/newtab/lib/DiscoveryStreamFeed.jsm
@@ -4,11 +4,10 @@
"use strict";
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "NewTabUtils",
- "resource://gre/modules/NewTabUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+ Region: "resource://gre/modules/Region.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
@@ -25,9 +24,6 @@ const { setTimeout, clearTimeout } = ChromeUtils.import(
const { actionTypes: at, actionCreators: ac } = ChromeUtils.import(
"resource://activity-stream/common/Actions.jsm"
);
-ChromeUtils.defineESModuleGetters(lazy, {
- Region: "resource://gre/modules/Region.sys.mjs",
-});
ChromeUtils.defineModuleGetter(
lazy,
"PersistentCache",
diff --git a/browser/components/newtab/lib/DownloadsManager.jsm b/browser/components/newtab/lib/DownloadsManager.jsm
index 1892c44df098..5dbc5a2e3856 100644
--- a/browser/components/newtab/lib/DownloadsManager.jsm
+++ b/browser/components/newtab/lib/DownloadsManager.jsm
@@ -11,11 +11,14 @@ const { actionTypes: at } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
DownloadsCommon: "resource:///modules/DownloadsCommon.jsm",
DownloadsViewUI: "resource:///modules/DownloadsViewUI.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
- NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
});
const DOWNLOAD_CHANGED_DELAY_TIME = 1000; // time in ms to delay timer for downloads changed events
diff --git a/browser/components/newtab/lib/FaviconFeed.jsm b/browser/components/newtab/lib/FaviconFeed.jsm
index 6560c2770ca8..29968a6b31cd 100644
--- a/browser/components/newtab/lib/FaviconFeed.jsm
+++ b/browser/components/newtab/lib/FaviconFeed.jsm
@@ -16,13 +16,9 @@ const { RemoteSettings } = ChromeUtils.import(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
-ChromeUtils.defineModuleGetter(
- lazy,
- "NewTabUtils",
- "resource://gre/modules/NewTabUtils.jsm"
-);
const MIN_FAVICON_SIZE = 96;
diff --git a/browser/components/newtab/lib/HighlightsFeed.jsm b/browser/components/newtab/lib/HighlightsFeed.jsm
index c44a8122e91f..47f8a646aaf6 100644
--- a/browser/components/newtab/lib/HighlightsFeed.jsm
+++ b/browser/components/newtab/lib/HighlightsFeed.jsm
@@ -33,11 +33,9 @@ ChromeUtils.defineModuleGetter(
"LinksCache",
"resource://activity-stream/lib/LinksCache.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "NewTabUtils",
- "resource://gre/modules/NewTabUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"Screenshots",
diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
index 459331536401..051cc524bf50 100644
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -16,8 +16,11 @@ const { FeatureCalloutMessages } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
ShellService: "resource:///modules/ShellService.jsm",
BuiltInThemes: "resource:///modules/BuiltInThemes.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
diff --git a/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm b/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm
index 7f403614da3d..5812666bc943 100644
--- a/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm
+++ b/browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm
@@ -17,11 +17,9 @@ ChromeUtils.defineModuleGetter(
"resource://services-settings/Utils.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "NewTabUtils",
- "resource://gre/modules/NewTabUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
const { BasePromiseWorker } = ChromeUtils.import(
"resource://gre/modules/PromiseWorker.jsm"
diff --git a/browser/components/newtab/lib/PlacesFeed.jsm b/browser/components/newtab/lib/PlacesFeed.jsm
index c887b0c6cfb7..be69d9b68a19 100644
--- a/browser/components/newtab/lib/PlacesFeed.jsm
+++ b/browser/components/newtab/lib/PlacesFeed.jsm
@@ -21,19 +21,15 @@ const { AboutNewTab } = ChromeUtils.import(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "NewTabUtils",
- "resource://gre/modules/NewTabUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+ PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"PartnerLinkAttribution",
"resource:///modules/PartnerLinkAttribution.jsm"
);
-ChromeUtils.defineESModuleGetters(lazy, {
- PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
-});
ChromeUtils.defineModuleGetter(
lazy,
"PrivateBrowsingUtils",
diff --git a/browser/components/newtab/lib/RemoteImages.jsm b/browser/components/newtab/lib/RemoteImages.jsm
index 0a3d30154c64..aeedba83119e 100644
--- a/browser/components/newtab/lib/RemoteImages.jsm
+++ b/browser/components/newtab/lib/RemoteImages.jsm
@@ -3,9 +3,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm");
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { JSONFile } = ChromeUtils.importESModule(
+ "resource://gre/modules/JSONFile.sys.mjs"
+);
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
diff --git a/browser/components/newtab/lib/TelemetryFeed.jsm b/browser/components/newtab/lib/TelemetryFeed.jsm
index 55e4b4011e18..2e7e1b4eb5d8 100644
--- a/browser/components/newtab/lib/TelemetryFeed.jsm
+++ b/browser/components/newtab/lib/TelemetryFeed.jsm
@@ -43,11 +43,9 @@ ChromeUtils.defineModuleGetter(
"UTEventReporting",
"resource://activity-stream/lib/UTEventReporting.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"HomePage",
diff --git a/browser/components/newtab/lib/TopSitesFeed.jsm b/browser/components/newtab/lib/TopSitesFeed.jsm
index 7c78dd41759d..091c8b21cdf6 100644
--- a/browser/components/newtab/lib/TopSitesFeed.jsm
+++ b/browser/components/newtab/lib/TopSitesFeed.jsm
@@ -47,11 +47,10 @@ ChromeUtils.defineModuleGetter(
"LinksCache",
"resource://activity-stream/lib/LinksCache.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "NewTabUtils",
- "resource://gre/modules/NewTabUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+ Region: "resource://gre/modules/Region.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"Screenshots",
@@ -67,9 +66,6 @@ ChromeUtils.defineModuleGetter(
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
-ChromeUtils.defineESModuleGetters(lazy, {
- Region: "resource://gre/modules/Region.sys.mjs",
-});
XPCOMUtils.defineLazyGetter(lazy, "log", () => {
const { Logger } = ChromeUtils.import(
diff --git a/browser/components/newtab/lib/TopStoriesFeed.jsm b/browser/components/newtab/lib/TopStoriesFeed.jsm
index b1f1020333f1..a77a54976987 100644
--- a/browser/components/newtab/lib/TopStoriesFeed.jsm
+++ b/browser/components/newtab/lib/TopStoriesFeed.jsm
@@ -3,10 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { NewTabUtils } = ChromeUtils.import(
- "resource://gre/modules/NewTabUtils.jsm"
-);
-
const { actionTypes: at, actionCreators: ac } = ChromeUtils.import(
"resource://activity-stream/common/Actions.jsm"
);
@@ -24,6 +20,11 @@ const { PersistentCache } = ChromeUtils.import(
);
const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
+
ChromeUtils.defineModuleGetter(
lazy,
"pktApi",
@@ -252,7 +253,7 @@ class TopStoriesFeed {
}
const calcResult = items
- .filter(s => !NewTabUtils.blockedLinks.isBlocked({ url: s.url }))
+ .filter(s => !lazy.NewTabUtils.blockedLinks.isBlocked({ url: s.url }))
.map(s => {
let mapped = {
guid: s.id,
diff --git a/browser/components/newtab/test/browser/browser_asrouter_remoteimages.js b/browser/components/newtab/test/browser/browser_asrouter_remoteimages.js
index 106b3eebb300..8ae74d628666 100644
--- a/browser/components/newtab/test/browser/browser_asrouter_remoteimages.js
+++ b/browser/components/newtab/test/browser/browser_asrouter_remoteimages.js
@@ -6,8 +6,8 @@
const { ASRouter } = ChromeUtils.import(
"resource://activity-stream/lib/ASRouter.jsm"
);
-const { BrowserUtils } = ChromeUtils.import(
- "resource://gre/modules/BrowserUtils.jsm"
+const { BrowserUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/BrowserUtils.sys.mjs"
);
const { BrowserTestUtils } = ChromeUtils.import(
"resource://testing-common/BrowserTestUtils.jsm"
diff --git a/browser/components/newtab/test/browser/browser_asrouter_targeting.js b/browser/components/newtab/test/browser/browser_asrouter_targeting.js
index 1efe22cf49ad..2c1d80ba3772 100644
--- a/browser/components/newtab/test/browser/browser_asrouter_targeting.js
+++ b/browser/components/newtab/test/browser/browser_asrouter_targeting.js
@@ -10,11 +10,6 @@ const { BuiltInThemes } = ChromeUtils.import(
const { CFRMessageProvider } = ChromeUtils.import(
"resource://activity-stream/lib/CFRMessageProvider.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "ProfileAge",
- "resource://gre/modules/ProfileAge.jsm"
-);
ChromeUtils.defineModuleGetter(
this,
"AddonManager",
@@ -25,13 +20,10 @@ ChromeUtils.defineModuleGetter(
"ShellService",
"resource:///modules/ShellService.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "NewTabUtils",
- "resource://gre/modules/NewTabUtils.jsm"
-);
ChromeUtils.defineESModuleGetters(this, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
});
ChromeUtils.defineModuleGetter(
diff --git a/browser/components/newtab/test/browser/browser_topsites_annotation.js b/browser/components/newtab/test/browser/browser_topsites_annotation.js
index 874290b99d1b..4aaf22490d0c 100644
--- a/browser/components/newtab/test/browser/browser_topsites_annotation.js
+++ b/browser/components/newtab/test/browser/browser_topsites_annotation.js
@@ -14,8 +14,12 @@ if (AppConstants.platform === "macosx") {
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
+
+ChromeUtils.defineESModuleGetters(this, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
- NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.jsm",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm",
diff --git a/browser/components/newtab/test/xpcshell/head.js b/browser/components/newtab/test/xpcshell/head.js
index d43cdf44ec84..49463fe0a85c 100644
--- a/browser/components/newtab/test/xpcshell/head.js
+++ b/browser/components/newtab/test/xpcshell/head.js
@@ -10,11 +10,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "JsonSchema",
- "resource://gre/modules/JsonSchema.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
+});
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
diff --git a/browser/components/originattributes/test/browser/browser_favicon_userContextId.js b/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
index 8e790aa8d0b0..c2619b858fc4 100644
--- a/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
+++ b/browser/components/originattributes/test/browser/browser_favicon_userContextId.js
@@ -12,13 +12,9 @@ Services.scriptloader.loadSubScript(
EventUtils
);
-ChromeUtils.defineModuleGetter(
- this,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
ChromeUtils.defineESModuleGetters(this, {
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
const TEST_SITE = "http://example.net";
diff --git a/browser/components/pagedata/PageDataParent.sys.mjs b/browser/components/pagedata/PageDataParent.sys.mjs
index d9943c8854c6..c3e7743b9942 100644
--- a/browser/components/pagedata/PageDataParent.sys.mjs
+++ b/browser/components/pagedata/PageDataParent.sys.mjs
@@ -2,16 +2,11 @@
* 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/. */
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
PageDataService: "resource:///modules/pagedata/PageDataService.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
/**
diff --git a/browser/components/pagedata/PageDataService.sys.mjs b/browser/components/pagedata/PageDataService.sys.mjs
index c629e4736bce..c0f837c90483 100644
--- a/browser/components/pagedata/PageDataService.sys.mjs
+++ b/browser/components/pagedata/PageDataService.sys.mjs
@@ -10,11 +10,14 @@ const { EventEmitter } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ HiddenFrame: "resource://gre/modules/HiddenFrame.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
E10SUtils: "resource://gre/modules/E10SUtils.jsm",
- HiddenFrame: "resource://gre/modules/HiddenFrame.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "logConsole", function() {
diff --git a/browser/components/pagedata/tests/unit/test_queue.js b/browser/components/pagedata/tests/unit/test_queue.js
index b50af4a7d271..3d180edd1317 100644
--- a/browser/components/pagedata/tests/unit/test_queue.js
+++ b/browser/components/pagedata/tests/unit/test_queue.js
@@ -3,10 +3,7 @@
ChromeUtils.defineESModuleGetters(this, {
PageDataService: "resource:///modules/pagedata/PageDataService.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(this, {
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
// Test that urls are retrieved in the expected order.
diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
index a4460f56079a..c50c39699b6e 100644
--- a/browser/components/places/PlacesUIUtils.sys.mjs
+++ b/browser/components/places/PlacesUIUtils.sys.mjs
@@ -17,6 +17,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
PlacesTransactions: "resource://gre/modules/PlacesTransactions.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -26,7 +27,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.jsm",
PluralForm: "resource://gre/modules/PluralForm.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
Weave: "resource://services-sync/main.js",
});
diff --git a/browser/components/pocket/content/pktApi.jsm b/browser/components/pocket/content/pktApi.jsm
index 53b03acdbf7f..8fd270116cf6 100644
--- a/browser/components/pocket/content/pktApi.jsm
+++ b/browser/components/pocket/content/pktApi.jsm
@@ -48,11 +48,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "IndexedDB",
- "resource://gre/modules/IndexedDB.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"PrivateBrowsingUtils",
diff --git a/browser/components/preferences/extensionControlled.js b/browser/components/preferences/extensionControlled.js
index 584bfb5d8fc4..7c005db8e925 100644
--- a/browser/components/preferences/extensionControlled.js
+++ b/browser/components/preferences/extensionControlled.js
@@ -12,9 +12,12 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
// Note: we get loaded in dialogs so we need to define our
// own getters, separate from preferences.js .
+ChromeUtils.defineESModuleGetters(this, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
- BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
DeferredTask: "resource://gre/modules/DeferredTask.jsm",
ExtensionPreferencesManager:
"resource://gre/modules/ExtensionPreferencesManager.jsm",
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
index 19dda7cf39eb..26febe9b0e30 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -22,8 +22,8 @@ var { AppConstants } = ChromeUtils.import(
);
var { Downloads } = ChromeUtils.import("resource://gre/modules/Downloads.jsm");
-var { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+var { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
/* global DownloadIntegration */
Integration.downloads.defineModuleGetter(
@@ -61,7 +61,12 @@ XPCOMUtils.defineLazyServiceGetters(this, {
});
ChromeUtils.defineESModuleGetters(this, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarProviderQuickActions:
"resource:///modules/UrlbarProviderQuickActions.sys.mjs",
@@ -72,31 +77,26 @@ ChromeUtils.defineESModuleGetters(this, {
XPCOMUtils.defineLazyModuleGetters(this, {
AMTelemetry: "resource://gre/modules/AddonManager.jsm",
- BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
ContextualIdentityService:
"resource://gre/modules/ContextualIdentityService.jsm",
DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
ExtensionPreferencesManager:
"resource://gre/modules/ExtensionPreferencesManager.jsm",
ExtensionSettingsStore: "resource://gre/modules/ExtensionSettingsStore.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
FeatureGate: "resource://featuregates/FeatureGate.jsm",
HomePage: "resource:///modules/HomePage.jsm",
LangPackMatcher: "resource://gre/modules/LangPackMatcher.jsm",
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
- OSKeyStore: "resource://gre/modules/OSKeyStore.jsm",
SelectionChangedMenulist: "resource:///modules/SelectionChangedMenulist.jsm",
- ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
SiteDataManager: "resource:///modules/SiteDataManager.jsm",
TransientPrefs: "resource:///modules/TransientPrefs.jsm",
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
UIState: "resource://services-sync/UIState.jsm",
});
XPCOMUtils.defineLazyGetter(this, "gSubDialog", function() {
- const { SubDialogManager } = ChromeUtils.import(
- "resource://gre/modules/SubDialog.jsm"
+ const { SubDialogManager } = ChromeUtils.importESModule(
+ "resource://gre/modules/SubDialog.sys.mjs"
);
return new SubDialogManager({
dialogStack: document.getElementById("dialogStack"),
diff --git a/browser/components/preferences/tests/browser_primaryPassword.js b/browser/components/preferences/tests/browser_primaryPassword.js
index a9e4ea39fda9..ff8f62488ceb 100644
--- a/browser/components/preferences/tests/browser_primaryPassword.js
+++ b/browser/components/preferences/tests/browser_primaryPassword.js
@@ -1,8 +1,8 @@
const { OSKeyStoreTestUtils } = ChromeUtils.import(
"resource://testing-common/OSKeyStoreTestUtils.jsm"
);
-const { OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+const { OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
);
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js
index 35cd25f272fe..751713eb2894 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_DownloadLastDirWithCPS.js
@@ -41,8 +41,8 @@ function clearHistoryAndWait() {
*/
async function runTest() {
- let { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+ let { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
let { DownloadLastDir } = ChromeUtils.import(
"resource://gre/modules/DownloadLastDir.jsm"
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js
index dcf7d889f990..bf10914efbc8 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir.js
@@ -6,8 +6,8 @@
function test() {
waitForExplicitFinish();
- let { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+ let { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
let { DownloadLastDir } = ChromeUtils.import(
"resource://gre/modules/DownloadLastDir.jsm"
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js
index 0f44be8d7d84..c5a2f5aa5e0a 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_c.js
@@ -6,8 +6,8 @@
function test() {
waitForExplicitFinish();
- let { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+ let { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
let { DownloadLastDir } = ChromeUtils.import(
"resource://gre/modules/DownloadLastDir.jsm"
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js
index 678781df9b39..40c247a68d80 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_downloadLastDir_toggle.js
@@ -1,5 +1,5 @@
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { DownloadLastDir } = ChromeUtils.import(
"resource://gre/modules/DownloadLastDir.jsm"
diff --git a/browser/components/privatebrowsing/test/browser/head.js b/browser/components/privatebrowsing/test/browser/head.js
index 8702ab4625fd..b22d9d83cdc9 100644
--- a/browser/components/privatebrowsing/test/browser/head.js
+++ b/browser/components/privatebrowsing/test/browser/head.js
@@ -1,10 +1,11 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-var { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+var { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
@@ -13,11 +14,6 @@ ChromeUtils.defineModuleGetter(
"TestUtils",
"resource://testing-common/TestUtils.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
XPCOMUtils.defineLazyModuleGetters(this, {
ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
diff --git a/browser/components/protections/test/browser/browser_protections_report_ui.js b/browser/components/protections/test/browser/browser_protections_report_ui.js
index 472a7642eae6..5f79a1a39559 100644
--- a/browser/components/protections/test/browser/browser_protections_report_ui.js
+++ b/browser/components/protections/test/browser/browser_protections_report_ui.js
@@ -5,7 +5,9 @@
// Note: This test may cause intermittents if run at exactly midnight.
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
+const { Sqlite } = ChromeUtils.importESModule(
+ "resource://gre/modules/Sqlite.sys.mjs"
+);
const { AboutProtectionsParent } = ChromeUtils.import(
"resource:///actors/AboutProtectionsParent.jsm"
);
diff --git a/browser/components/screenshots/ScreenshotsUtils.sys.mjs b/browser/components/screenshots/ScreenshotsUtils.sys.mjs
index 31f830258a9d..7f9b5b16c373 100644
--- a/browser/components/screenshots/ScreenshotsUtils.sys.mjs
+++ b/browser/components/screenshots/ScreenshotsUtils.sys.mjs
@@ -6,9 +6,12 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
Downloads: "resource://gre/modules/Downloads.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
});
const PanelPosition = "bottomright topright";
diff --git a/browser/components/screenshots/content/screenshots.js b/browser/components/screenshots/content/screenshots.js
index af8c8f489b39..af137c53246a 100644
--- a/browser/components/screenshots/content/screenshots.js
+++ b/browser/components/screenshots/content/screenshots.js
@@ -9,9 +9,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
Downloads: "resource://gre/modules/Downloads.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
});
class ScreenshotsUI extends HTMLElement {
diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm
index e07b04698077..4d045227cbbe 100644
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -255,6 +255,7 @@ XPCOMUtils.defineLazyServiceGetters(lazy, {
ChromeUtils.defineESModuleGetters(lazy, {
DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -263,7 +264,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
E10SUtils: "resource://gre/modules/E10SUtils.jsm",
HomePage: "resource:///modules/HomePage.jsm",
PrivacyFilter: "resource://gre/modules/sessionstore/PrivacyFilter.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
RunState: "resource:///modules/sessionstore/RunState.jsm",
SessionCookies: "resource:///modules/sessionstore/SessionCookies.jsm",
SessionFile: "resource:///modules/sessionstore/SessionFile.jsm",
diff --git a/browser/components/shell/HeadlessShell.jsm b/browser/components/shell/HeadlessShell.jsm
index 58601ec367ea..2290267acad4 100644
--- a/browser/components/shell/HeadlessShell.jsm
+++ b/browser/components/shell/HeadlessShell.jsm
@@ -9,8 +9,8 @@ var EXPORTED_SYMBOLS = ["HeadlessShell", "ScreenshotParent"];
const { E10SUtils } = ChromeUtils.import(
"resource://gre/modules/E10SUtils.jsm"
);
-const { HiddenFrame } = ChromeUtils.import(
- "resource://gre/modules/HiddenFrame.jsm"
+const { HiddenFrame } = ChromeUtils.importESModule(
+ "resource://gre/modules/HiddenFrame.sys.mjs"
);
// Refrences to the progress listeners to keep them from being gc'ed
diff --git a/browser/components/shell/ShellService.jsm b/browser/components/shell/ShellService.jsm
index 640bd2a10be2..31b61eda2917 100644
--- a/browser/components/shell/ShellService.jsm
+++ b/browser/components/shell/ShellService.jsm
@@ -13,11 +13,15 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
Subprocess: "resource://gre/modules/Subprocess.jsm",
- WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
});
XPCOMUtils.defineLazyServiceGetter(
diff --git a/browser/components/shell/test/browser_1119088.js b/browser/components/shell/test/browser_1119088.js
index f097699565b4..fd95fb94afc5 100644
--- a/browser/components/shell/test/browser_1119088.js
+++ b/browser/components/shell/test/browser_1119088.js
@@ -13,8 +13,8 @@ const kDefaultBackgroundImage_10_14 =
const kDefaultBackgroundImage_10_15 =
"/System/Library/Desktop Pictures/Solid Colors/Teal.png";
-XPCOMUtils.defineLazyModuleGetters(this, {
- FileUtils: "resource://gre/modules/FileUtils.jsm",
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
});
function getPythonExecutableFile() {
diff --git a/browser/components/syncedtabs/SyncedTabsDeckComponent.js b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
index 513e8c4dff8b..529418c0eea7 100644
--- a/browser/components/syncedtabs/SyncedTabsDeckComponent.js
+++ b/browser/components/syncedtabs/SyncedTabsDeckComponent.js
@@ -28,8 +28,8 @@ let { getChromeWindow } = ChromeUtils.import(
);
const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
-let log = ChromeUtils.import(
- "resource://gre/modules/Log.jsm"
+let log = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
).Log.repository.getLogger("Sync.RemoteTabs");
var EXPORTED_SYMBOLS = ["SyncedTabsDeckComponent"];
diff --git a/browser/components/syncedtabs/SyncedTabsDeckView.js b/browser/components/syncedtabs/SyncedTabsDeckView.js
index a9702c289ef0..ecbbbed8fb4d 100644
--- a/browser/components/syncedtabs/SyncedTabsDeckView.js
+++ b/browser/components/syncedtabs/SyncedTabsDeckView.js
@@ -4,8 +4,8 @@
"use strict";
-let log = ChromeUtils.import(
- "resource://gre/modules/Log.jsm"
+let log = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
).Log.repository.getLogger("Sync.RemoteTabs");
var EXPORTED_SYMBOLS = ["SyncedTabsDeckView"];
diff --git a/browser/components/syncedtabs/TabListComponent.js b/browser/components/syncedtabs/TabListComponent.js
index 4e2a9a30ac90..c96d17dd8730 100644
--- a/browser/components/syncedtabs/TabListComponent.js
+++ b/browser/components/syncedtabs/TabListComponent.js
@@ -8,8 +8,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-let log = ChromeUtils.import(
- "resource://gre/modules/Log.jsm"
+let log = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
).Log.repository.getLogger("Sync.RemoteTabs");
const lazy = {};
diff --git a/browser/components/syncedtabs/TabListView.js b/browser/components/syncedtabs/TabListView.js
index 8613031ecb53..8fb837c31e30 100644
--- a/browser/components/syncedtabs/TabListView.js
+++ b/browser/components/syncedtabs/TabListView.js
@@ -16,8 +16,8 @@ let { getChromeWindow } = ChromeUtils.import(
"resource:///modules/syncedtabs/util.js"
);
-let log = ChromeUtils.import(
- "resource://gre/modules/Log.jsm"
+let log = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
).Log.repository.getLogger("Sync.RemoteTabs");
var EXPORTED_SYMBOLS = ["TabListView"];
diff --git a/browser/components/tests/browser/browser_contentpermissionprompt.js b/browser/components/tests/browser/browser_contentpermissionprompt.js
index f300d8ede1df..10092a8b54c0 100644
--- a/browser/components/tests/browser/browser_contentpermissionprompt.js
+++ b/browser/components/tests/browser/browser_contentpermissionprompt.js
@@ -9,8 +9,8 @@
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
XPCOMUtils.defineLazyServiceGetter(
diff --git a/browser/components/translation/BingTranslator.jsm b/browser/components/translation/BingTranslator.jsm
index 5f37f6182b7d..40871549f2b5 100644
--- a/browser/components/translation/BingTranslator.jsm
+++ b/browser/components/translation/BingTranslator.jsm
@@ -6,11 +6,13 @@
var EXPORTED_SYMBOLS = ["BingTranslator"];
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
-const { httpRequest } = ChromeUtils.import("resource://gre/modules/Http.jsm");
+const { httpRequest } = ChromeUtils.importESModule(
+ "resource://gre/modules/Http.sys.mjs"
+);
// The maximum amount of net data allowed per request on Bing's API.
const MAX_REQUEST_DATA = 5000; // Documentation says 10000 but anywhere
diff --git a/browser/components/translation/GoogleTranslator.jsm b/browser/components/translation/GoogleTranslator.jsm
index 9d68607916b4..e0520f2a19a0 100644
--- a/browser/components/translation/GoogleTranslator.jsm
+++ b/browser/components/translation/GoogleTranslator.jsm
@@ -6,10 +6,12 @@
var EXPORTED_SYMBOLS = ["GoogleTranslator"];
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
+);
+const { httpRequest } = ChromeUtils.importESModule(
+ "resource://gre/modules/Http.sys.mjs"
);
-const { httpRequest } = ChromeUtils.import("resource://gre/modules/Http.jsm");
// The maximum amount of net data allowed per request on Google's API.
const MAX_REQUEST_DATA = 5000; // XXX This is the Bing value
diff --git a/browser/components/translation/YandexTranslator.jsm b/browser/components/translation/YandexTranslator.jsm
index 82550b1b5721..506bd1bd8551 100644
--- a/browser/components/translation/YandexTranslator.jsm
+++ b/browser/components/translation/YandexTranslator.jsm
@@ -6,11 +6,13 @@
var EXPORTED_SYMBOLS = ["YandexTranslator"];
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
-const { httpRequest } = ChromeUtils.import("resource://gre/modules/Http.jsm");
+const { httpRequest } = ChromeUtils.importESModule(
+ "resource://gre/modules/Http.sys.mjs"
+);
// The maximum amount of net data allowed per request on Bing's API.
const MAX_REQUEST_DATA = 5000; // Documentation says 10000 but anywhere
diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm
index 30311ffdac6e..f49c31bb03f6 100644
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -17,6 +17,9 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
+ ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@@ -26,10 +29,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
CustomizableUI: "resource:///modules/CustomizableUI.jsm",
FxAccounts: "resource://gre/modules/FxAccounts.jsm",
PanelMultiView: "resource:///modules/PanelMultiView.jsm",
- ProfileAge: "resource://gre/modules/ProfileAge.jsm",
- ResetProfile: "resource://gre/modules/ResetProfile.jsm",
TelemetryController: "resource://gre/modules/TelemetryController.jsm",
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {
diff --git a/browser/components/uitour/test/browser_UITour.js b/browser/components/uitour/test/browser_UITour.js
index da7b1a850730..d1a9fbb23492 100644
--- a/browser/components/uitour/test/browser_UITour.js
+++ b/browser/components/uitour/test/browser_UITour.js
@@ -6,12 +6,15 @@
var gTestTab;
var gContentAPI;
+ChromeUtils.defineESModuleGetters(this, {
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
- ProfileAge: "resource://gre/modules/ProfileAge.jsm",
TelemetryArchiveTesting:
"resource://testing-common/TelemetryArchiveTesting.jsm",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
});
function test() {
diff --git a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
index 704866c4bf07..cf915e77f332 100644
--- a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
+++ b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs
@@ -8,6 +8,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.sys.mjs",
+ ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarProviderQuickActions:
"resource:///modules/UrlbarProviderQuickActions.sys.mjs",
@@ -21,7 +22,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
AppUpdater: "resource:///modules/AppUpdater.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
- ResetProfile: "resource://gre/modules/ResetProfile.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "BrowserUpdater", () => {
diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
index adbaeb27efa5..ab89672ada99 100644
--- a/browser/components/urlbar/UrlbarInput.sys.mjs
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs
@@ -14,6 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
ExtensionSearchHandler:
"resource://gre/modules/ExtensionSearchHandler.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
UrlbarController: "resource:///modules/UrlbarController.sys.mjs",
@@ -34,7 +35,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
"resource:///modules/PartnerLinkAttribution.jsm",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
ReaderMode: "resource://gre/modules/ReaderMode.jsm",
PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
});
diff --git a/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs b/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs
index 78f95a1fd25c..edab15ae298c 100644
--- a/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs
+++ b/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs
@@ -6,8 +6,6 @@
* This module exports a provider that offers about pages.
*/
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
import {
UrlbarProvider,
UrlbarUtils,
@@ -16,13 +14,10 @@ import {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AboutPagesUtils: "resource://gre/modules/AboutPagesUtils.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- AboutPagesUtils: "resource://gre/modules/AboutPagesUtils.jsm",
-});
-
/**
* Class used to create the provider.
*/
diff --git a/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs b/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs
index 78da6d97d7e0..352e8153c006 100644
--- a/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs
+++ b/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs
@@ -6,8 +6,6 @@
* This module exports a provider that provides an autofill result.
*/
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
import {
UrlbarProvider,
UrlbarUtils,
@@ -16,6 +14,7 @@ import {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AboutPagesUtils: "resource://gre/modules/AboutPagesUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
@@ -23,10 +22,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- AboutPagesUtils: "resource://gre/modules/AboutPagesUtils.jsm",
-});
-
// AutoComplete query type constants.
// Describes the various types of queries that we can process rows for.
const QUERYTYPE = {
diff --git a/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs b/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs
index a4d7dbbff14f..68e3eddc933c 100644
--- a/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs
+++ b/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs
@@ -6,8 +6,6 @@
* This module exports a provider that offers bookmarks with keywords.
*/
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
import {
UrlbarProvider,
UrlbarUtils,
@@ -16,14 +14,11 @@ import {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ KeywordUtils: "resource://gre/modules/KeywordUtils.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- KeywordUtils: "resource://gre/modules/KeywordUtils.jsm",
-});
-
/**
* Class used to create the provider.
*/
diff --git a/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs b/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
index a77dd5445eff..54745f919f1d 100644
--- a/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
+++ b/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
@@ -12,6 +12,8 @@ import {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ NLP: "resource://gre/modules/NLP.sys.mjs",
+ ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
});
@@ -19,9 +21,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
AppUpdater: "resource:///modules/AppUpdater.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
- NLP: "resource://gre/modules/NLP.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
- ResetProfile: "resource://gre/modules/ResetProfile.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm",
});
diff --git a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
index ebcd059a5208..7a446d3251c2 100644
--- a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
+++ b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs
@@ -104,7 +104,10 @@ import {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ KeywordUtils: "resource://gre/modules/KeywordUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.sys.mjs",
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
@@ -114,10 +117,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
- KeywordUtils: "resource://gre/modules/KeywordUtils.jsm",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
- Sqlite: "resource://gre/modules/Sqlite.jsm",
});
function setTimeout(callback, ms) {
diff --git a/browser/components/urlbar/UrlbarProviderPreloadedSites.sys.mjs b/browser/components/urlbar/UrlbarProviderPreloadedSites.sys.mjs
index 7481a673585d..401f6cbc5d1a 100644
--- a/browser/components/urlbar/UrlbarProviderPreloadedSites.sys.mjs
+++ b/browser/components/urlbar/UrlbarProviderPreloadedSites.sys.mjs
@@ -18,15 +18,12 @@ import {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- ProfileAge: "resource://gre/modules/ProfileAge.jsm",
-});
-
const MS_PER_DAY = 86400000; // 24 * 60 * 60 * 1000
function PreloadedSite(url, title) {
diff --git a/browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs b/browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs
index 0a4c9c0d1ea6..73c9ffd336a7 100644
--- a/browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs
+++ b/browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs
@@ -17,16 +17,16 @@ import {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarProviderTopSites: "resource:///modules/UrlbarProviderTopSites.sys.mjs",
UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
- AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
DefaultBrowserCheck: "resource:///modules/BrowserGlue.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
- ProfileAge: "resource://gre/modules/ProfileAge.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
});
diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs
index f84956ec7be5..7621fb35e17a 100644
--- a/browser/components/urlbar/UrlbarUtils.sys.mjs
+++ b/browser/components/urlbar/UrlbarUtils.sys.mjs
@@ -12,10 +12,14 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ KeywordUtils: "resource://gre/modules/KeywordUtils.sys.mjs",
+ Log: "resource://gre/modules/Log.sys.mjs",
PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+
SearchSuggestionController:
"resource://gre/modules/SearchSuggestionController.sys.mjs",
+
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs",
@@ -25,8 +29,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
FormHistory: "resource://gre/modules/FormHistory.jsm",
- KeywordUtils: "resource://gre/modules/KeywordUtils.jsm",
- Log: "resource://gre/modules/Log.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
diff --git a/browser/components/urlbar/tests/browser-tips/browser_searchTips.js b/browser/components/urlbar/tests/browser-tips/browser_searchTips.js
index 410478f84d99..ec5e1a7c24f9 100644
--- a/browser/components/urlbar/tests/browser-tips/browser_searchTips.js
+++ b/browser/components/urlbar/tests/browser-tips/browser_searchTips.js
@@ -11,15 +11,15 @@
"use strict";
ChromeUtils.defineESModuleGetters(this, {
+ AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarProviderSearchTips:
"resource:///modules/UrlbarProviderSearchTips.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
- AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
HttpServer: "resource://testing-common/httpd.js",
- ProfileAge: "resource://gre/modules/ProfileAge.jsm",
});
// These should match the same consts in UrlbarProviderSearchTips.jsm.
diff --git a/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js b/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js
index 628cbfa28da3..9152b432cdf2 100644
--- a/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js
+++ b/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js
@@ -10,15 +10,15 @@
"use strict";
ChromeUtils.defineESModuleGetters(this, {
+ AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
UrlbarProviderSearchTips:
"resource:///modules/UrlbarProviderSearchTips.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
- AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
HttpServer: "resource://testing-common/httpd.js",
- ProfileAge: "resource://gre/modules/ProfileAge.jsm",
});
XPCOMUtils.defineLazyServiceGetter(
diff --git a/browser/components/urlbar/tests/browser-tips/head.js b/browser/components/urlbar/tests/browser-tips/head.js
index 7344d165604a..278f50a8df9d 100644
--- a/browser/components/urlbar/tests/browser-tips/head.js
+++ b/browser/components/urlbar/tests/browser-tips/head.js
@@ -15,6 +15,7 @@ Services.scriptloader.loadSubScript(
);
ChromeUtils.defineESModuleGetters(this, {
+ ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
UrlbarProviderInterventions:
"resource:///modules/UrlbarProviderInterventions.sys.mjs",
UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs",
@@ -23,7 +24,6 @@ ChromeUtils.defineESModuleGetters(this, {
XPCOMUtils.defineLazyModuleGetters(this, {
HttpServer: "resource://testing-common/httpd.js",
- ResetProfile: "resource://gre/modules/ResetProfile.jsm",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
});
diff --git a/browser/components/urlbar/tests/browser/browser_top_sites.js b/browser/components/urlbar/tests/browser/browser_top_sites.js
index d5c09a89cf63..042300a4eb1e 100644
--- a/browser/components/urlbar/tests/browser/browser_top_sites.js
+++ b/browser/components/urlbar/tests/browser/browser_top_sites.js
@@ -3,9 +3,12 @@
"use strict";
+ChromeUtils.defineESModuleGetters(this, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
- NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
});
const EN_US_TOPSITES =
diff --git a/browser/components/urlbar/tests/browser/browser_top_sites_private.js b/browser/components/urlbar/tests/browser/browser_top_sites_private.js
index b17838da8fc4..0e03b93b4318 100644
--- a/browser/components/urlbar/tests/browser/browser_top_sites_private.js
+++ b/browser/components/urlbar/tests/browser/browser_top_sites_private.js
@@ -3,9 +3,12 @@
"use strict";
+ChromeUtils.defineESModuleGetters(this, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
- NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
});
const EN_US_TOPSITES =
diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_sponsored_topsites.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_sponsored_topsites.js
index 71a7ceaa51c4..5fce926378a6 100644
--- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_sponsored_topsites.js
+++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_sponsored_topsites.js
@@ -3,12 +3,15 @@
"use strict";
+ChromeUtils.defineESModuleGetters(this, {
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
CONTEXTUAL_SERVICES_PING_TYPES:
"resource:///modules/PartnerLinkAttribution.jsm",
HttpServer: "resource://testing-common/httpd.js",
PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm",
- NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
});
const EN_US_TOPSITES =
diff --git a/browser/components/urlbar/tests/browser/head.js b/browser/components/urlbar/tests/browser/head.js
index b68893b8fedb..3b341f7fb0af 100644
--- a/browser/components/urlbar/tests/browser/head.js
+++ b/browser/components/urlbar/tests/browser/head.js
@@ -12,6 +12,8 @@ const { AppConstants } = ChromeUtils.import(
);
ChromeUtils.defineESModuleGetters(this, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+ ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
UrlbarController: "resource:///modules/UrlbarController.sys.mjs",
UrlbarQueryContext: "resource:///modules/UrlbarUtils.sys.mjs",
@@ -27,8 +29,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
- ResetProfile: "resource://gre/modules/ResetProfile.jsm",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
});
diff --git a/browser/components/urlbar/tests/unit/head.js b/browser/components/urlbar/tests/unit/head.js
index f890228f3f9c..ea5fb0084d55 100644
--- a/browser/components/urlbar/tests/unit/head.js
+++ b/browser/components/urlbar/tests/unit/head.js
@@ -18,6 +18,7 @@ var {
ChromeUtils.defineESModuleGetters(this, {
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
UrlbarController: "resource:///modules/UrlbarController.sys.mjs",
UrlbarInput: "resource:///modules/UrlbarInput.sys.mjs",
@@ -32,7 +33,6 @@ ChromeUtils.defineESModuleGetters(this, {
XPCOMUtils.defineLazyModuleGetters(this, {
AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
HttpServer: "resource://testing-common/httpd.js",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
TestUtils: "resource://testing-common/TestUtils.jsm",
});
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
diff --git a/browser/components/urlbar/tests/unit/test_UrlbarController_integration.js b/browser/components/urlbar/tests/unit/test_UrlbarController_integration.js
index b5154935e4ce..d94de4f439f7 100644
--- a/browser/components/urlbar/tests/unit/test_UrlbarController_integration.js
+++ b/browser/components/urlbar/tests/unit/test_UrlbarController_integration.js
@@ -7,8 +7,8 @@
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const TEST_URL = "http://example.com";
diff --git a/browser/components/urlbar/tests/unit/test_about_urls.js b/browser/components/urlbar/tests/unit/test_about_urls.js
index 05ffd8ccb74d..277ddb8ee1dd 100644
--- a/browser/components/urlbar/tests/unit/test_about_urls.js
+++ b/browser/components/urlbar/tests/unit/test_about_urls.js
@@ -4,8 +4,8 @@
"use strict";
-const { AboutPagesUtils } = ChromeUtils.import(
- "resource://gre/modules/AboutPagesUtils.jsm"
+const { AboutPagesUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/AboutPagesUtils.sys.mjs"
);
testEngine_setup();
diff --git a/browser/extensions/formautofill/content/manageDialog.js b/browser/extensions/formautofill/content/manageDialog.js
index 70f1d0feed2c..0bda2a83034e 100644
--- a/browser/extensions/formautofill/content/manageDialog.js
+++ b/browser/extensions/formautofill/content/manageDialog.js
@@ -20,11 +20,10 @@ const { FormAutofill } = ChromeUtils.import(
"resource://autofill/FormAutofill.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "CreditCard",
- "resource://gre/modules/CreditCard.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
"formAutofillStorage",
@@ -35,11 +34,6 @@ ChromeUtils.defineModuleGetter(
"FormAutofillUtils",
"resource://autofill/FormAutofillUtils.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "OSKeyStore",
- "resource://gre/modules/OSKeyStore.jsm"
-);
const lazy = {};
XPCOMUtils.defineLazyGetter(
diff --git a/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js b/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js
index 7289d5a86934..1169648a7bbd 100644
--- a/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js
+++ b/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js
@@ -253,8 +253,8 @@ add_task(async function test_reauth() {
await SpecialPowers.pushPrefEnv({
set: [[AUTOFILL_CREDITCARDS_AVAILABLE_PREF, "on"]],
});
- let { OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+ let { OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
);
let finalPrefPaneLoaded = TestUtils.topicObserved(
diff --git a/browser/extensions/formautofill/test/browser/head.js b/browser/extensions/formautofill/test/browser/head.js
index b46e053cca10..d82025426123 100644
--- a/browser/extensions/formautofill/test/browser/head.js
+++ b/browser/extensions/formautofill/test/browser/head.js
@@ -1,7 +1,7 @@
"use strict";
-const { OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+const { OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
);
const { OSKeyStoreTestUtils } = ChromeUtils.import(
"resource://testing-common/OSKeyStoreTestUtils.jsm"
@@ -410,8 +410,8 @@ async function focusAndWaitForFieldsIdentified(browserOrContext, selector) {
browserOrContext,
[selector],
async function(selector) {
- const { FormLikeFactory } = ChromeUtils.import(
- "resource://gre/modules/FormLikeFactory.jsm"
+ const { FormLikeFactory } = ChromeUtils.importESModule(
+ "resource://gre/modules/FormLikeFactory.sys.mjs"
);
const input = content.document.querySelector(selector);
const rootElement = FormLikeFactory.findRootForField(input);
@@ -461,8 +461,8 @@ async function focusAndWaitForFieldsIdentified(browserOrContext, selector) {
await sleep();
await SpecialPowers.spawn(browserOrContext, [], async function() {
- const { FormLikeFactory } = ChromeUtils.import(
- "resource://gre/modules/FormLikeFactory.jsm"
+ const { FormLikeFactory } = ChromeUtils.importESModule(
+ "resource://gre/modules/FormLikeFactory.sys.mjs"
);
FormLikeFactory.findRootForField(
content.document.activeElement
diff --git a/browser/extensions/formautofill/test/unit/head.js b/browser/extensions/formautofill/test/unit/head.js
index e8c7a720d515..4086b2a48874 100644
--- a/browser/extensions/formautofill/test/unit/head.js
+++ b/browser/extensions/formautofill/test/unit/head.js
@@ -10,8 +10,8 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
var { ObjectUtils } = ChromeUtils.import(
"resource://gre/modules/ObjectUtils.jsm"
);
-var { FormLikeFactory } = ChromeUtils.import(
- "resource://gre/modules/FormLikeFactory.jsm"
+var { FormLikeFactory } = ChromeUtils.importESModule(
+ "resource://gre/modules/FormLikeFactory.sys.mjs"
);
var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.import(
"resource://testing-common/AddonTestUtils.jsm"
@@ -45,11 +45,9 @@ ChromeUtils.defineModuleGetter(
"DownloadPaths",
"resource://gre/modules/DownloadPaths.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
diff --git a/browser/extensions/formautofill/test/unit/test_autofillFormFields.js b/browser/extensions/formautofill/test/unit/test_autofillFormFields.js
index 0060e101a549..438a842995cb 100644
--- a/browser/extensions/formautofill/test/unit/test_autofillFormFields.js
+++ b/browser/extensions/formautofill/test/unit/test_autofillFormFields.js
@@ -14,8 +14,8 @@ add_setup(async () => {
({ FormAutofillHandler } = ChromeUtils.import(
"resource://autofill/FormAutofillHandler.jsm"
));
- ({ OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+ ({ OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
));
});
diff --git a/browser/extensions/formautofill/test/unit/test_creditCardRecords.js b/browser/extensions/formautofill/test/unit/test_creditCardRecords.js
index 41b9725b19df..e17941f87491 100644
--- a/browser/extensions/formautofill/test/unit/test_creditCardRecords.js
+++ b/browser/extensions/formautofill/test/unit/test_creditCardRecords.js
@@ -9,8 +9,8 @@ ChromeUtils.defineModuleGetter(
"Preferences",
"resource://gre/modules/Preferences.jsm"
);
-const { CreditCard } = ChromeUtils.import(
- "resource://gre/modules/CreditCard.jsm"
+const { CreditCard } = ChromeUtils.importESModule(
+ "resource://gre/modules/CreditCard.sys.mjs"
);
let FormAutofillStorage;
diff --git a/browser/extensions/formautofill/test/unit/test_getCreditCardLogo.js b/browser/extensions/formautofill/test/unit/test_getCreditCardLogo.js
index 3b3f768a9d0b..e740d6102a51 100644
--- a/browser/extensions/formautofill/test/unit/test_getCreditCardLogo.js
+++ b/browser/extensions/formautofill/test/unit/test_getCreditCardLogo.js
@@ -4,8 +4,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
add_task(async function test_getCreditCardLogo() {
- const { CreditCard } = ChromeUtils.import(
- "resource://gre/modules/CreditCard.jsm"
+ const { CreditCard } = ChromeUtils.importESModule(
+ "resource://gre/modules/CreditCard.sys.mjs"
);
// Credit card logos can be either PNG or SVG
// so we construct an array that includes both of these file extensions
diff --git a/browser/extensions/formautofill/test/unit/test_getRecords.js b/browser/extensions/formautofill/test/unit/test_getRecords.js
index d4dfc802d72f..147b328f857d 100644
--- a/browser/extensions/formautofill/test/unit/test_getRecords.js
+++ b/browser/extensions/formautofill/test/unit/test_getRecords.js
@@ -4,8 +4,8 @@
"use strict";
-const { CreditCard } = ChromeUtils.import(
- "resource://gre/modules/CreditCard.jsm"
+const { CreditCard } = ChromeUtils.importESModule(
+ "resource://gre/modules/CreditCard.sys.mjs"
);
let FormAutofillParent, FormAutofillStatus;
@@ -14,8 +14,8 @@ add_setup(async () => {
({ FormAutofillParent, FormAutofillStatus } = ChromeUtils.import(
"resource://autofill/FormAutofillParent.jsm"
));
- ({ OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+ ({ OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
));
});
diff --git a/browser/extensions/formautofill/test/unit/test_previewFormFields.js b/browser/extensions/formautofill/test/unit/test_previewFormFields.js
index 22dd935e9502..ea01b0525f3f 100644
--- a/browser/extensions/formautofill/test/unit/test_previewFormFields.js
+++ b/browser/extensions/formautofill/test/unit/test_previewFormFields.js
@@ -16,8 +16,8 @@ const { FIELD_STATES } = FormAutofillUtils;
const PREVIEW = FIELD_STATES.PREVIEW;
const NORMAL = FIELD_STATES.NORMAL;
-const { OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+const { OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
);
const TESTCASES = [
diff --git a/browser/modules/AppUpdater.jsm b/browser/modules/AppUpdater.jsm
index 36ee68d97d3b..42895004d12c 100644
--- a/browser/modules/AppUpdater.jsm
+++ b/browser/modules/AppUpdater.jsm
@@ -15,16 +15,16 @@ var gLogfileOutputStream;
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const PREF_APP_UPDATE_LOG = "app.update.log";
const PREF_APP_UPDATE_LOG_FILE = "app.update.log.file";
const KEY_PROFILE_DIR = "ProfD";
const FILE_UPDATE_MESSAGES = "update_messages.log";
const lazy = {};
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "gLogEnabled", function aus_gLogEnabled() {
return (
diff --git a/browser/modules/ExtensionsUI.jsm b/browser/modules/ExtensionsUI.jsm
index c81c53b9ac86..a4935a61ec0a 100644
--- a/browser/modules/ExtensionsUI.jsm
+++ b/browser/modules/ExtensionsUI.jsm
@@ -14,11 +14,14 @@ const { EventEmitter } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
AMTelemetry: "resource://gre/modules/AddonManager.jsm",
- AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
ExtensionData: "resource://gre/modules/Extension.jsm",
ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.jsm",
OriginControls: "resource://gre/modules/ExtensionPermissions.jsm",
diff --git a/browser/modules/FaviconLoader.jsm b/browser/modules/FaviconLoader.jsm
index c54fbf0b91a9..82526aa412fc 100644
--- a/browser/modules/FaviconLoader.jsm
+++ b/browser/modules/FaviconLoader.jsm
@@ -13,11 +13,9 @@ ChromeUtils.defineModuleGetter(
"DeferredTask",
"resource://gre/modules/DeferredTask.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
const STREAM_SEGMENT_SIZE = 4096;
const PR_UINT32_MAX = 0xffffffff;
diff --git a/browser/modules/PageActions.jsm b/browser/modules/PageActions.jsm
index bd7d3fbc8e2c..c49154b1e21f 100644
--- a/browser/modules/PageActions.jsm
+++ b/browser/modules/PageActions.jsm
@@ -18,9 +18,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ BinarySearch: "resource://gre/modules/BinarySearch.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
- BinarySearch: "resource://gre/modules/BinarySearch.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
diff --git a/browser/modules/PingCentre.jsm b/browser/modules/PingCentre.jsm
index 398c465661e9..f72e1fb5ef6f 100644
--- a/browser/modules/PingCentre.jsm
+++ b/browser/modules/PingCentre.jsm
@@ -6,11 +6,9 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"TelemetryEnvironment",
diff --git a/browser/modules/test/browser/browser_PermissionUI.js b/browser/modules/test/browser/browser_PermissionUI.js
index 8657544c6edb..201493fb3a15 100644
--- a/browser/modules/test/browser/browser_PermissionUI.js
+++ b/browser/modules/test/browser/browser_PermissionUI.js
@@ -6,8 +6,8 @@
"use strict";
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
const { PermissionUI } = ChromeUtils.import(
"resource:///modules/PermissionUI.jsm"
diff --git a/browser/modules/test/browser/browser_PermissionUI_prompts.js b/browser/modules/test/browser/browser_PermissionUI_prompts.js
index ab8004db2ed4..954502485eb9 100644
--- a/browser/modules/test/browser/browser_PermissionUI_prompts.js
+++ b/browser/modules/test/browser/browser_PermissionUI_prompts.js
@@ -6,8 +6,8 @@
"use strict";
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
const { PermissionUI } = ChromeUtils.import(
"resource:///modules/PermissionUI.jsm"
diff --git a/browser/modules/test/browser/browser_ProcessHangNotifications.js b/browser/modules/test/browser/browser_ProcessHangNotifications.js
index 2359d76f92b7..6812683190be 100644
--- a/browser/modules/test/browser/browser_ProcessHangNotifications.js
+++ b/browser/modules/test/browser/browser_ProcessHangNotifications.js
@@ -4,8 +4,8 @@ const { WebExtensionPolicy } = Cu.getGlobalForObject(
ChromeUtils.import("resource://gre/modules/AppConstants.jsm")
);
-const { UpdateUtils } = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+const { UpdateUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
);
function promiseNotificationShown(aWindow, aName) {
diff --git a/browser/modules/test/browser/browser_UnsubmittedCrashHandler.js b/browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
index 0a45016cfcc2..745157650f9d 100644
--- a/browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
+++ b/browser/modules/test/browser/browser_UnsubmittedCrashHandler.js
@@ -8,8 +8,8 @@
const { UnsubmittedCrashHandler } = ChromeUtils.import(
"resource:///modules/ContentCrashHandlers.jsm"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { makeFakeAppDir } = ChromeUtils.import(
"resource://testing-common/AppData.jsm"
diff --git a/browser/modules/test/unit/test_InstallationTelemetry.js b/browser/modules/test/unit/test_InstallationTelemetry.js
index 09f4e5fa4b00..e825ab81e45d 100644
--- a/browser/modules/test/unit/test_InstallationTelemetry.js
+++ b/browser/modules/test/unit/test_InstallationTelemetry.js
@@ -12,11 +12,9 @@ const { BrowserUsageTelemetry } = ChromeUtils.import(
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
const TIMESTAMP_PREF = "app.installation.timestamp";
diff --git a/browser/modules/test/unit/test_PingCentre.js b/browser/modules/test/unit/test_PingCentre.js
index 311bd387f250..b88b6777d345 100644
--- a/browser/modules/test/unit/test_PingCentre.js
+++ b/browser/modules/test/unit/test_PingCentre.js
@@ -13,8 +13,8 @@ const { TelemetryEnvironment } = ChromeUtils.import(
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { UpdateUtils } = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+const { UpdateUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
diff --git a/browser/themes/Windows8WindowFrameColor.jsm b/browser/themes/Windows8WindowFrameColor.jsm
index 08a4d899b448..3a7c81cca7be 100644
--- a/browser/themes/Windows8WindowFrameColor.jsm
+++ b/browser/themes/Windows8WindowFrameColor.jsm
@@ -6,8 +6,8 @@
var EXPORTED_SYMBOLS = ["Windows8WindowFrameColor"];
-var { WindowsRegistry: Registry } = ChromeUtils.import(
- "resource://gre/modules/WindowsRegistry.jsm"
+var { WindowsRegistry: Registry } = ChromeUtils.importESModule(
+ "resource://gre/modules/WindowsRegistry.sys.mjs"
);
var Windows8WindowFrameColor = {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm b/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
index 161fedd4326a..5a229d82b6bb 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
@@ -16,7 +16,9 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
-const { Rect } = ChromeUtils.import("resource://gre/modules/Geometry.jsm");
+const { Rect } = ChromeUtils.importESModule(
+ "resource://gre/modules/Geometry.sys.mjs"
+);
const lazy = {};
diff --git a/browser/tools/mozscreenshots/tests/browser/browser_screenshots_cropping.js b/browser/tools/mozscreenshots/tests/browser/browser_screenshots_cropping.js
index 1c29e6532b0a..f47889333177 100644
--- a/browser/tools/mozscreenshots/tests/browser/browser_screenshots_cropping.js
+++ b/browser/tools/mozscreenshots/tests/browser/browser_screenshots_cropping.js
@@ -6,7 +6,9 @@
/* import-globals-from ../../head.js */
-const { Rect } = ChromeUtils.import("resource://gre/modules/Geometry.jsm");
+const { Rect } = ChromeUtils.importESModule(
+ "resource://gre/modules/Geometry.sys.mjs"
+);
async function draw(window, src) {
const { document, Image } = window;
diff --git a/devtools/client/framework/browser-toolbox/Launcher.sys.mjs b/devtools/client/framework/browser-toolbox/Launcher.sys.mjs
index 5038e5c46a40..801b4861af94 100644
--- a/devtools/client/framework/browser-toolbox/Launcher.sys.mjs
+++ b/devtools/client/framework/browser-toolbox/Launcher.sys.mjs
@@ -30,11 +30,9 @@ ChromeUtils.defineModuleGetter(
"BackgroundTasksUtils",
"resource://gre/modules/BackgroundTasksUtils.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
XPCOMUtils.defineLazyServiceGetters(lazy, {
XreDirProvider: [
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_filesave.js b/devtools/client/styleeditor/test/browser_styleeditor_filesave.js
index 850aeb09362f..2794687c3b2f 100644
--- a/devtools/client/styleeditor/test/browser_styleeditor_filesave.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_filesave.js
@@ -7,8 +7,8 @@
const TESTCASE_URI_HTML = TEST_BASE_HTTP + "simple.html";
const TESTCASE_URI_CSS = TEST_BASE_HTTP + "simple.css";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
add_task(async function() {
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_import.js b/devtools/client/styleeditor/test/browser_styleeditor_import.js
index 9b7d33f36184..fc133a0d0216 100644
--- a/devtools/client/styleeditor/test/browser_styleeditor_import.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_import.js
@@ -7,8 +7,8 @@
// http rather than chrome to improve coverage
const TESTCASE_URI = TEST_BASE_HTTP + "simple.html";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const FILENAME = "styleeditor-import-test.css";
diff --git a/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js b/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
index fccc33aab61d..72ab088e7e5d 100644
--- a/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_sourcemap_watching.js
@@ -15,8 +15,8 @@ const TRANSITIONS_PREF = "devtools.styleeditor.transitions";
const CSS_TEXT = "* { color: blue }";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
add_task(async function() {
diff --git a/devtools/client/webconsole/test/browser/browser_console.js b/devtools/client/webconsole/test/browser/browser_console.js
index 0c2eeddc1639..d5ddc4721a2d 100644
--- a/devtools/client/webconsole/test/browser/browser_console.js
+++ b/devtools/client/webconsole/test/browser/browser_console.js
@@ -187,7 +187,9 @@ async function testMessages() {
// Check messages logged in content with Log.jsm
await SpecialPowers.spawn(gBrowser.selectedBrowser, [], () => {
- const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+ const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+ );
const logger = Log.repository.getLogger("TEST_LOGGER_" + Date.now());
logger.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
logger.level = Log.Level.Info;
diff --git a/devtools/client/webconsole/test/browser/browser_console_screenshot.js b/devtools/client/webconsole/test/browser/browser_console_screenshot.js
index 24680c1563cb..77c5e00f4c37 100644
--- a/devtools/client/webconsole/test/browser/browser_console_screenshot.js
+++ b/devtools/client/webconsole/test/browser/browser_console_screenshot.js
@@ -31,8 +31,8 @@ const TEST_URI = `data:text/html,
`;
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
add_task(async function() {
diff --git a/devtools/client/webconsole/test/browser/browser_jsterm_file_load_save_keyboard_shortcut.js b/devtools/client/webconsole/test/browser/browser_jsterm_file_load_save_keyboard_shortcut.js
index b2840e514fef..5faaf8da20cc 100644
--- a/devtools/client/webconsole/test/browser/browser_jsterm_file_load_save_keyboard_shortcut.js
+++ b/devtools/client/webconsole/test/browser/browser_jsterm_file_load_save_keyboard_shortcut.js
@@ -7,8 +7,8 @@
const TEST_URI =
"data:text/html;charset=utf-8,Test load/save keyboard shortcut";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const LOCAL_FILE_NAME = "snippet.js";
const LOCAL_FILE_ORIGINAL_CONTENT = `"Hello from local file"`;
diff --git a/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js
index e66de286cf73..2d39e26358b7 100644
--- a/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js
+++ b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_file.js
@@ -9,8 +9,8 @@ const TEST_URI =
"http://example.com/browser/devtools/client/webconsole/" +
"test/browser/test_jsterm_screenshot_command.html";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
// on some machines, such as macOS, dpr is set to 2. This is expected behavior, however
// to keep tests consistant across OSs we are setting the dpr to 1
diff --git a/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_fixed_header.js b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_fixed_header.js
index 6e34f2fbb5b4..7de161f5c8a0 100644
--- a/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_fixed_header.js
+++ b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_fixed_header.js
@@ -8,8 +8,8 @@
const TEST_URI =
"http://example.com/browser/devtools/client/webconsole/test/browser/test_jsterm_screenshot_command.html";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
// on some machines, such as macOS, dpr is set to 2. This is expected behavior, however
diff --git a/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_selector.js b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_selector.js
index 45121e2d4e0e..64eea64f3053 100644
--- a/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_selector.js
+++ b/devtools/client/webconsole/test/browser/browser_jsterm_screenshot_command_selector.js
@@ -9,8 +9,8 @@ const TEST_URI =
"http://example.com/browser/devtools/client/webconsole/" +
"test/browser/test_jsterm_screenshot_command.html";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
// on some machines, such as macOS, dpr is set to 2. This is expected behavior, however
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js
index 336806e4ca46..5375913b0bcc 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_context_menu_export_console_output.js
@@ -42,8 +42,9 @@ const { MockFilePicker } = SpecialPowers;
MockFilePicker.init(window);
MockFilePicker.returnValue = MockFilePicker.returnOK;
-var FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm")
- .FileUtils;
+var FileUtils = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+).FileUtils;
// Test the export visible messages to clipboard of the webconsole copies the expected
// clipboard text for different log messages to find if everything is copied to clipboard.
diff --git a/devtools/shared/tests/xpcshell/test_fetch-file.js b/devtools/shared/tests/xpcshell/test_fetch-file.js
index 187a6547fda5..8b2602a9c416 100644
--- a/devtools/shared/tests/xpcshell/test_fetch-file.js
+++ b/devtools/shared/tests/xpcshell/test_fetch-file.js
@@ -4,8 +4,8 @@
// Tests for DevToolsUtils.fetch on file:// URI's.
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const TEST_CONTENT = "aéd";
diff --git a/devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js b/devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js
index 338df79c49b6..26a673b82b78 100644
--- a/devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js
+++ b/devtools/shared/transport/tests/xpcshell/test_client_server_bulk.js
@@ -3,7 +3,9 @@
"use strict";
-var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+);
var Pipe = Components.Constructor("@mozilla.org/pipe;1", "nsIPipe", "init");
function run_test() {
diff --git a/devtools/shared/transport/tests/xpcshell/test_queue.js b/devtools/shared/transport/tests/xpcshell/test_queue.js
index a3915b5c06ba..1ab6caf13f6f 100644
--- a/devtools/shared/transport/tests/xpcshell/test_queue.js
+++ b/devtools/shared/transport/tests/xpcshell/test_queue.js
@@ -8,7 +8,9 @@
* packets are scheduled simultaneously.
*/
-var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+);
function run_test() {
initTestDevToolsServer();
diff --git a/devtools/shared/transport/tests/xpcshell/test_transport_bulk.js b/devtools/shared/transport/tests/xpcshell/test_transport_bulk.js
index b3824527f93f..55288a6c5860 100644
--- a/devtools/shared/transport/tests/xpcshell/test_transport_bulk.js
+++ b/devtools/shared/transport/tests/xpcshell/test_transport_bulk.js
@@ -3,7 +3,9 @@
"use strict";
-var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+);
function run_test() {
initTestDevToolsServer();
diff --git a/docshell/test/browser/browser_fission_maxOrigins.js b/docshell/test/browser/browser_fission_maxOrigins.js
index 6fc17a15b179..a46ba738f506 100644
--- a/docshell/test/browser/browser_fission_maxOrigins.js
+++ b/docshell/test/browser/browser_fission_maxOrigins.js
@@ -134,8 +134,8 @@ add_task(async function() {
],
});
- const { BrowserTelemetryUtils } = ChromeUtils.import(
- "resource://gre/modules/BrowserTelemetryUtils.jsm"
+ const { BrowserTelemetryUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/BrowserTelemetryUtils.sys.mjs"
);
// Make sure we actually record telemetry for our disqualifying origin
diff --git a/dom/ipc/tests/browser_bug1646088.js b/dom/ipc/tests/browser_bug1646088.js
index 4466c67129b2..b88fbe423c2f 100644
--- a/dom/ipc/tests/browser_bug1646088.js
+++ b/dom/ipc/tests/browser_bug1646088.js
@@ -1,5 +1,5 @@
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
let dir = getChromeDir(getResolvedURI(gTestPath));
diff --git a/dom/manifest/Manifest.jsm b/dom/manifest/Manifest.jsm
index 1049c19476bd..989d5e1fb918 100644
--- a/dom/manifest/Manifest.jsm
+++ b/dom/manifest/Manifest.jsm
@@ -24,11 +24,9 @@ const { ManifestIcons } = ChromeUtils.import(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
/**
* Generates an hash for the given string.
diff --git a/dom/notification/new/NotificationDB.jsm b/dom/notification/new/NotificationDB.jsm
index 5bddf2148257..a2e7fadf8e41 100644
--- a/dom/notification/new/NotificationDB.jsm
+++ b/dom/notification/new/NotificationDB.jsm
@@ -13,11 +13,9 @@ function debug(s) {
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"KeyValueService",
diff --git a/dom/push/PushBroadcastService.jsm b/dom/push/PushBroadcastService.jsm
index 80df53ee49af..ea1c4706ee9d 100644
--- a/dom/push/PushBroadcastService.jsm
+++ b/dom/push/PushBroadcastService.jsm
@@ -8,11 +8,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
// BroadcastService is exported for test purposes.
const EXPORTED_SYMBOLS = ["pushBroadcastService", "BroadcastService"];
diff --git a/dom/push/test/xpcshell/test_broadcast_success.js b/dom/push/test/xpcshell/test_broadcast_success.js
index a0ed86fc73a7..533e68bf340e 100644
--- a/dom/push/test/xpcshell/test_broadcast_success.js
+++ b/dom/push/test/xpcshell/test_broadcast_success.js
@@ -9,7 +9,9 @@ do_get_profile();
const { BroadcastService } = ChromeUtils.import(
"resource://gre/modules/PushBroadcastService.jsm"
);
-const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm");
+const { JSONFile } = ChromeUtils.importESModule(
+ "resource://gre/modules/JSONFile.sys.mjs"
+);
const { FileTestUtils } = ChromeUtils.import(
"resource://testing-common/FileTestUtils.jsm"
diff --git a/gfx/tests/browser/browser_windowless_troubleshoot_crash.js b/gfx/tests/browser/browser_windowless_troubleshoot_crash.js
index 0c86c5fcc2d4..fa4d5f77a8a3 100644
--- a/gfx/tests/browser/browser_windowless_troubleshoot_crash.js
+++ b/gfx/tests/browser/browser_windowless_troubleshoot_crash.js
@@ -39,8 +39,8 @@ add_task(async function test_windowlessBrowserTroubleshootCrash() {
}
ok(true, "not crashed");
- var { Troubleshoot } = ChromeUtils.import(
- "resource://gre/modules/Troubleshoot.jsm"
+ var { Troubleshoot } = ChromeUtils.importESModule(
+ "resource://gre/modules/Troubleshoot.sys.mjs"
);
var data = await new Promise((resolve, reject) => {
Troubleshoot.snapshot(data => {
diff --git a/layout/tools/reftest/reftest.jsm b/layout/tools/reftest/reftest.jsm
index 0fe75ae54a22..37c4436a2a41 100644
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -10,8 +10,8 @@ var EXPORTED_SYMBOLS = [
"OnRefTestUnload",
];
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const {
XHTML_NS,
diff --git a/memory/replace/dmd/test/test_dmd.js b/memory/replace/dmd/test/test_dmd.js
index f9213ba6b33a..92d40866c393 100644
--- a/memory/replace/dmd/test/test_dmd.js
+++ b/memory/replace/dmd/test/test_dmd.js
@@ -6,8 +6,8 @@
"use strict";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
// The xpcshell test harness sets PYTHON so we can read it here.
diff --git a/mobile/android/actors/GeckoViewAutoFillChild.jsm b/mobile/android/actors/GeckoViewAutoFillChild.jsm
index e1820e5b18bd..323a3dd3903a 100644
--- a/mobile/android/actors/GeckoViewAutoFillChild.jsm
+++ b/mobile/android/actors/GeckoViewAutoFillChild.jsm
@@ -14,8 +14,11 @@ const { GeckoViewUtils } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm",
LoginManagerChild: "resource://gre/modules/LoginManagerChild.jsm",
});
diff --git a/mobile/android/components/extensions/ext-tabs.js b/mobile/android/components/extensions/ext-tabs.js
index 161471ce4fa6..a293fde37abc 100644
--- a/mobile/android/components/extensions/ext-tabs.js
+++ b/mobile/android/components/extensions/ext-tabs.js
@@ -2,11 +2,9 @@
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
-ChromeUtils.defineModuleGetter(
- this,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
diff --git a/mobile/android/components/geckoview/FilePickerDelegate.jsm b/mobile/android/components/geckoview/FilePickerDelegate.jsm
index 30485a6dcbac..f9b8c0c39e23 100644
--- a/mobile/android/components/geckoview/FilePickerDelegate.jsm
+++ b/mobile/android/components/geckoview/FilePickerDelegate.jsm
@@ -15,8 +15,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- FileUtils: "resource://gre/modules/FileUtils.jsm",
GeckoViewPrompter: "resource://gre/modules/GeckoViewPrompter.jsm",
});
diff --git a/mobile/android/modules/geckoview/GeckoViewProgress.jsm b/mobile/android/modules/geckoview/GeckoViewProgress.jsm
index 71f032fc8e57..746115c6db6f 100644
--- a/mobile/android/modules/geckoview/GeckoViewProgress.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewProgress.jsm
@@ -29,8 +29,11 @@ XPCOMUtils.defineLazyServiceGetter(
"nsIIDNService"
);
+ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserTelemetryUtils: "resource://gre/modules/BrowserTelemetryUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- BrowserTelemetryUtils: "resource://gre/modules/BrowserTelemetryUtils.jsm",
HistogramStopwatch: "resource://gre/modules/GeckoViewTelemetry.jsm",
});
diff --git a/mobile/android/modules/geckoview/GeckoViewUtils.jsm b/mobile/android/modules/geckoview/GeckoViewUtils.jsm
index 6b111f98b663..e3ba81d7b428 100644
--- a/mobile/android/modules/geckoview/GeckoViewUtils.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewUtils.jsm
@@ -6,7 +6,9 @@
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { clearTimeout, setTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
diff --git a/netwerk/dns/PublicSuffixList.jsm b/netwerk/dns/PublicSuffixList.jsm
index db4eddf8ae9e..13907b23a7da 100644
--- a/netwerk/dns/PublicSuffixList.jsm
+++ b/netwerk/dns/PublicSuffixList.jsm
@@ -6,8 +6,9 @@
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
);
-const FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm")
- .FileUtils;
+const FileUtils = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+).FileUtils;
const EXPORTED_SYMBOLS = ["PublicSuffixList"];
diff --git a/netwerk/test/unit/test_tls_server.js b/netwerk/test/unit/test_tls_server.js
index 6973e6cc9be9..a79bb7ce7c38 100644
--- a/netwerk/test/unit/test_tls_server.js
+++ b/netwerk/test/unit/test_tls_server.js
@@ -11,8 +11,8 @@ Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
const { MockRegistrar } = ChromeUtils.import(
"resource://testing-common/MockRegistrar.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const certOverrideService = Cc[
"@mozilla.org/security/certoverride;1"
diff --git a/netwerk/test/unit/test_tls_server_multiple_clients.js b/netwerk/test/unit/test_tls_server_multiple_clients.js
index eb29be9983e1..2ae69f813b2a 100644
--- a/netwerk/test/unit/test_tls_server_multiple_clients.js
+++ b/netwerk/test/unit/test_tls_server_multiple_clients.js
@@ -8,8 +8,8 @@ do_get_profile();
// Ensure PSM is initialized
Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const certOverrideService = Cc[
"@mozilla.org/security/certoverride;1"
diff --git a/remote/marionette/addon.js b/remote/marionette/addon.js
index 8065e5c4e193..acac4aa337e7 100644
--- a/remote/marionette/addon.js
+++ b/remote/marionette/addon.js
@@ -12,10 +12,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
-
error: "chrome://remote/content/shared/webdriver/Errors.jsm",
});
diff --git a/remote/shared/Log.jsm b/remote/shared/Log.jsm
index 37a5243cbf67..6c2a138e016e 100644
--- a/remote/shared/Log.jsm
+++ b/remote/shared/Log.jsm
@@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["Log"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log: StdLog } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log: StdLog } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const PREF_REMOTE_LOG_LEVEL = "remote.log.level";
diff --git a/security/manager/ssl/tests/unit/head_psm.js b/security/manager/ssl/tests/unit/head_psm.js
index 671a20a1749d..c9f5818e97ea 100644
--- a/security/manager/ssl/tests/unit/head_psm.js
+++ b/security/manager/ssl/tests/unit/head_psm.js
@@ -8,16 +8,16 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
const { MockRegistrar } = ChromeUtils.import(
"resource://testing-common/MockRegistrar.jsm"
);
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
diff --git a/security/manager/tools/genRootCAHashes.js b/security/manager/tools/genRootCAHashes.js
index e85625a6279e..ea5794a2aadf 100644
--- a/security/manager/tools/genRootCAHashes.js
+++ b/security/manager/tools/genRootCAHashes.js
@@ -12,8 +12,8 @@
const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
const CertDb = Cc[nsX509CertDB].getService(Ci.nsIX509CertDB);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { CommonUtils } = ChromeUtils.import(
diff --git a/services/automation/ServicesAutomation.jsm b/services/automation/ServicesAutomation.jsm
index ad9ff0ab8628..af75b7c2ae9c 100644
--- a/services/automation/ServicesAutomation.jsm
+++ b/services/automation/ServicesAutomation.jsm
@@ -31,8 +31,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- Log: "resource://gre/modules/Log.jsm",
Weave: "resource://services-sync/main.js",
Svc: "resource://services-sync/util.js",
FxAccountsClient: "resource://gre/modules/FxAccountsClient.jsm",
diff --git a/services/common/hawkclient.js b/services/common/hawkclient.js
index fcb7aed270a4..3c199bdc369c 100644
--- a/services/common/hawkclient.js
+++ b/services/common/hawkclient.js
@@ -32,7 +32,9 @@ const { HAWKAuthenticatedRESTRequest } = ChromeUtils.import(
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/services/common/hawkrequest.js b/services/common/hawkrequest.js
index 8a411deac071..7b1320e90720 100644
--- a/services/common/hawkrequest.js
+++ b/services/common/hawkrequest.js
@@ -12,7 +12,9 @@ var EXPORTED_SYMBOLS = [
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
);
diff --git a/services/common/kinto-storage-adapter.js b/services/common/kinto-storage-adapter.js
index a5773a58c809..6627093ca0bf 100644
--- a/services/common/kinto-storage-adapter.js
+++ b/services/common/kinto-storage-adapter.js
@@ -11,7 +11,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
+const { Sqlite } = ChromeUtils.importESModule(
+ "resource://gre/modules/Sqlite.sys.mjs"
+);
const { Kinto } = ChromeUtils.import(
"resource://services-common/kinto-offline-client.js"
);
diff --git a/services/common/logmanager.js b/services/common/logmanager.js
index e5ce91f8734b..e30c81b58243 100644
--- a/services/common/logmanager.js
+++ b/services/common/logmanager.js
@@ -3,15 +3,15 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict;";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm");
const { Preferences } = ChromeUtils.import(
diff --git a/services/common/modules-testing/logging.js b/services/common/modules-testing/logging.js
index 2d5ad04e0934..b03ba970d25a 100644
--- a/services/common/modules-testing/logging.js
+++ b/services/common/modules-testing/logging.js
@@ -6,7 +6,9 @@
var EXPORTED_SYMBOLS = ["getTestLogger", "initTestLogging"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
function initTestLogging(level) {
function LogStats() {
diff --git a/services/common/rest.js b/services/common/rest.js
index c44aeb254b33..f28806464ec4 100644
--- a/services/common/rest.js
+++ b/services/common/rest.js
@@ -9,9 +9,11 @@ var EXPORTED_SYMBOLS = [
];
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
diff --git a/services/common/tests/unit/head_helpers.js b/services/common/tests/unit/head_helpers.js
index fb820036ac89..9dc58db09e2f 100644
--- a/services/common/tests/unit/head_helpers.js
+++ b/services/common/tests/unit/head_helpers.js
@@ -4,7 +4,7 @@
/* import-globals-from head_global.js */
-var { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+var { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs");
var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
var {
HTTP_400,
diff --git a/services/common/tests/unit/test_logmanager.js b/services/common/tests/unit/test_logmanager.js
index c1da01977d50..efae44ca8990 100644
--- a/services/common/tests/unit/test_logmanager.js
+++ b/services/common/tests/unit/test_logmanager.js
@@ -7,8 +7,8 @@
const { LogManager } = ChromeUtils.import(
"resource://services-common/logmanager.js"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
// Returns an array of [consoleAppender, dumpAppender, [fileAppenders]] for
diff --git a/services/common/tests/unit/test_storage_adapter.js b/services/common/tests/unit/test_storage_adapter.js
index f86661468b6a..ecc6d3b4f7fe 100644
--- a/services/common/tests/unit/test_storage_adapter.js
+++ b/services/common/tests/unit/test_storage_adapter.js
@@ -1,7 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
+const { Sqlite } = ChromeUtils.importESModule(
+ "resource://gre/modules/Sqlite.sys.mjs"
+);
const { FirefoxAdapter } = ChromeUtils.import(
"resource://services-common/kinto-storage-adapter.js"
);
diff --git a/services/common/tokenserverclient.js b/services/common/tokenserverclient.js
index 30dc7292d843..41133de2ca12 100644
--- a/services/common/tokenserverclient.js
+++ b/services/common/tokenserverclient.js
@@ -11,7 +11,9 @@ var EXPORTED_SYMBOLS = [
"TokenServerClientServerError",
];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
);
diff --git a/services/common/utils.js b/services/common/utils.js
index f482b59218d6..de4bfa5dac09 100644
--- a/services/common/utils.js
+++ b/services/common/utils.js
@@ -7,7 +7,9 @@ var EXPORTED_SYMBOLS = ["CommonUtils"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const lazy = {};
ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm");
diff --git a/services/fxaccounts/Credentials.jsm b/services/fxaccounts/Credentials.jsm
index 582ab6946eaa..302caea1a665 100644
--- a/services/fxaccounts/Credentials.jsm
+++ b/services/fxaccounts/Credentials.jsm
@@ -13,7 +13,9 @@
var EXPORTED_SYMBOLS = ["Credentials"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { CryptoUtils } = ChromeUtils.import(
"resource://services-crypto/utils.js"
);
diff --git a/services/fxaccounts/FxAccounts.jsm b/services/fxaccounts/FxAccounts.jsm
index 31f758594195..c00606e7a190 100644
--- a/services/fxaccounts/FxAccounts.jsm
+++ b/services/fxaccounts/FxAccounts.jsm
@@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { CryptoUtils } = ChromeUtils.import(
"resource://services-crypto/utils.js"
diff --git a/services/fxaccounts/FxAccountsCommon.js b/services/fxaccounts/FxAccountsCommon.js
index e09c58d52ac7..ceadbea95eee 100644
--- a/services/fxaccounts/FxAccountsCommon.js
+++ b/services/fxaccounts/FxAccountsCommon.js
@@ -8,7 +8,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { LogManager } = ChromeUtils.import(
"resource://services-common/logmanager.js"
);
diff --git a/services/fxaccounts/FxAccountsKeys.jsm b/services/fxaccounts/FxAccountsKeys.jsm
index 1db238617e26..a27b53eb7c70 100644
--- a/services/fxaccounts/FxAccountsKeys.jsm
+++ b/services/fxaccounts/FxAccountsKeys.jsm
@@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
diff --git a/services/fxaccounts/tests/xpcshell/test_accounts.js b/services/fxaccounts/tests/xpcshell/test_accounts.js
index 0df08986b040..50ad3bdb3e0a 100644
--- a/services/fxaccounts/tests/xpcshell/test_accounts.js
+++ b/services/fxaccounts/tests/xpcshell/test_accounts.js
@@ -22,8 +22,8 @@ const {
DEPRECATED_SCOPE_ECOSYSTEM_TELEMETRY,
PREF_LAST_FXA_USER,
} = ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js");
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
// We grab some additional stuff via backstage passes.
diff --git a/services/fxaccounts/tests/xpcshell/test_profile.js b/services/fxaccounts/tests/xpcshell/test_profile.js
index 172e20896b1f..809a4b41cce6 100644
--- a/services/fxaccounts/tests/xpcshell/test_profile.js
+++ b/services/fxaccounts/tests/xpcshell/test_profile.js
@@ -12,8 +12,8 @@ const { FxAccountsProfileClient } = ChromeUtils.import(
const { FxAccountsProfile } = ChromeUtils.import(
"resource://gre/modules/FxAccountsProfile.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
index a8b0c67ce19d..de557af4275b 100644
--- a/services/settings/Utils.jsm
+++ b/services/settings/Utils.jsm
@@ -7,8 +7,8 @@ var EXPORTED_SYMBOLS = ["Utils"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { ServiceRequest } = ChromeUtils.import(
- "resource://gre/modules/ServiceRequest.jsm"
+const { ServiceRequest } = ChromeUtils.importESModule(
+ "resource://gre/modules/ServiceRequest.sys.mjs"
);
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
diff --git a/services/sync/Weave.jsm b/services/sync/Weave.jsm
index 67f7e6540b1c..21d07eff5b8f 100644
--- a/services/sync/Weave.jsm
+++ b/services/sync/Weave.jsm
@@ -6,11 +6,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
XPCOMUtils.defineLazyPreferenceGetter(
lazy,
diff --git a/services/sync/modules-testing/fxa_utils.js b/services/sync/modules-testing/fxa_utils.js
index 17fb4bd47277..f55e07c4b8b7 100644
--- a/services/sync/modules-testing/fxa_utils.js
+++ b/services/sync/modules-testing/fxa_utils.js
@@ -6,7 +6,9 @@
var EXPORTED_SYMBOLS = ["initializeIdentityWithTokenServerResponse"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { SyncAuthManager } = ChromeUtils.import(
"resource://services-sync/sync_auth.js"
diff --git a/services/sync/modules/SyncDisconnect.jsm b/services/sync/modules/SyncDisconnect.jsm
index 0010f118419a..9bcaa274fd83 100644
--- a/services/sync/modules/SyncDisconnect.jsm
+++ b/services/sync/modules/SyncDisconnect.jsm
@@ -11,8 +11,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- Log: "resource://gre/modules/Log.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
diff --git a/services/sync/modules/SyncedTabs.jsm b/services/sync/modules/SyncedTabs.jsm
index d7d9ee9f0b95..c50ef66fcfb3 100644
--- a/services/sync/modules/SyncedTabs.jsm
+++ b/services/sync/modules/SyncedTabs.jsm
@@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["SyncedTabs"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
diff --git a/services/sync/modules/addonsreconciler.js b/services/sync/modules/addonsreconciler.js
index c9da4d6f6cf8..2a269f97321a 100644
--- a/services/sync/modules/addonsreconciler.js
+++ b/services/sync/modules/addonsreconciler.js
@@ -17,7 +17,9 @@
"use strict";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Svc, Utils } = ChromeUtils.import("resource://services-sync/util.js");
const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
diff --git a/services/sync/modules/addonutils.js b/services/sync/modules/addonutils.js
index 306821b316ae..ff6efee56cee 100644
--- a/services/sync/modules/addonutils.js
+++ b/services/sync/modules/addonutils.js
@@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["AddonUtils"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Svc } = ChromeUtils.import("resource://services-sync/util.js");
const lazy = {};
diff --git a/services/sync/modules/bridged_engine.js b/services/sync/modules/bridged_engine.js
index d1a189a910f3..b3c972bedfa3 100644
--- a/services/sync/modules/bridged_engine.js
+++ b/services/sync/modules/bridged_engine.js
@@ -14,9 +14,6 @@
* for your subclass to wrap, and optionally implement and override the tracker.
*/
-const { XPCOMUtils } = ChromeUtils.importESModule(
- "resource://gre/modules/XPCOMUtils.sys.mjs"
-);
const { Changeset, SyncEngine, Tracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
@@ -27,13 +24,10 @@ const { RawCryptoWrapper } = ChromeUtils.import(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- Log: "resource://gre/modules/Log.jsm",
-});
-
var EXPORTED_SYMBOLS = ["BridgeWrapperXPCOM", "BridgedEngine", "LogAdapter"];
/**
diff --git a/services/sync/modules/doctor.js b/services/sync/modules/doctor.js
index 229df4017712..670e0fed35f8 100644
--- a/services/sync/modules/doctor.js
+++ b/services/sync/modules/doctor.js
@@ -11,7 +11,9 @@
var EXPORTED_SYMBOLS = ["Doctor"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
diff --git a/services/sync/modules/engines.js b/services/sync/modules/engines.js
index 587eaced592c..755b68a26302 100644
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@@ -14,8 +14,12 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm");
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { JSONFile } = ChromeUtils.importESModule(
+ "resource://gre/modules/JSONFile.sys.mjs"
+);
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
diff --git a/services/sync/modules/engines/forms.js b/services/sync/modules/engines/forms.js
index 78eb11560bfb..72cd0728aa27 100644
--- a/services/sync/modules/engines/forms.js
+++ b/services/sync/modules/engines/forms.js
@@ -18,7 +18,9 @@ const { CollectionProblemData, CollectionValidator } = ChromeUtils.import(
"resource://services-sync/collection_validator.js"
);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/services/sync/modules/engines/tabs.js b/services/sync/modules/engines/tabs.js
index a859157c6364..78d22392ac46 100644
--- a/services/sync/modules/engines/tabs.js
+++ b/services/sync/modules/engines/tabs.js
@@ -10,7 +10,9 @@ const TAB_ENTRIES_LIMIT = 5; // How many URLs to include in tab history.
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Store, SyncEngine, Tracker } = ChromeUtils.import(
"resource://services-sync/engines.js"
);
diff --git a/services/sync/modules/keys.js b/services/sync/modules/keys.js
index b45f9fe0cd8e..7e5986d82391 100644
--- a/services/sync/modules/keys.js
+++ b/services/sync/modules/keys.js
@@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["BulkKeyBundle"];
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Weave } = ChromeUtils.import("resource://services-sync/main.js");
const { Utils } = ChromeUtils.import("resource://services-sync/util.js");
diff --git a/services/sync/modules/policies.js b/services/sync/modules/policies.js
index 469280642dfe..e972928a8b2b 100644
--- a/services/sync/modules/policies.js
+++ b/services/sync/modules/policies.js
@@ -7,7 +7,9 @@ var EXPORTED_SYMBOLS = ["ErrorHandler", "SyncScheduler"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const {
CREDENTIALS_CHANGED,
ENGINE_APPLY_FAIL,
diff --git a/services/sync/modules/record.js b/services/sync/modules/record.js
index 3c6cf9d3f53e..69a79dbbc971 100644
--- a/services/sync/modules/record.js
+++ b/services/sync/modules/record.js
@@ -16,7 +16,9 @@ var EXPORTED_SYMBOLS = [
const CRYPTO_COLLECTION = "crypto";
const KEYS_WBO = "keys";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const {
DEFAULT_DOWNLOAD_BATCH_SIZE,
DEFAULT_KEYBUNDLE_NAME,
diff --git a/services/sync/modules/resource.js b/services/sync/modules/resource.js
index abdf73edca85..0dac0be33eba 100644
--- a/services/sync/modules/resource.js
+++ b/services/sync/modules/resource.js
@@ -7,7 +7,9 @@ var EXPORTED_SYMBOLS = ["Resource"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 269bcc826e14..b05ae3abe8fe 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -16,7 +16,9 @@ const KEYS_WBO = "keys";
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
diff --git a/services/sync/modules/stages/declined.js b/services/sync/modules/stages/declined.js
index 92d8e1fb6a51..ca2073aa0802 100644
--- a/services/sync/modules/stages/declined.js
+++ b/services/sync/modules/stages/declined.js
@@ -11,7 +11,9 @@
var EXPORTED_SYMBOLS = ["DeclinedEngines"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
diff --git a/services/sync/modules/stages/enginesync.js b/services/sync/modules/stages/enginesync.js
index 1fd8325a9f4d..b31b355c3086 100644
--- a/services/sync/modules/stages/enginesync.js
+++ b/services/sync/modules/stages/enginesync.js
@@ -8,7 +8,9 @@
var EXPORTED_SYMBOLS = ["EngineSynchronizer"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const {
ABORT_SYNC_COMMAND,
LOGIN_FAILED_NETWORK_ERROR,
diff --git a/services/sync/modules/status.js b/services/sync/modules/status.js
index ec4755c849fe..08a304c85500 100644
--- a/services/sync/modules/status.js
+++ b/services/sync/modules/status.js
@@ -16,7 +16,9 @@ const {
SYNC_FAILED_PARTIAL,
SYNC_SUCCEEDED,
} = ChromeUtils.import("resource://services-sync/constants.js");
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { SyncAuthManager } = ChromeUtils.import(
"resource://services-sync/sync_auth.js"
);
diff --git a/services/sync/modules/sync_auth.js b/services/sync/modules/sync_auth.js
index 3fb27992adeb..73116cbebffe 100644
--- a/services/sync/modules/sync_auth.js
+++ b/services/sync/modules/sync_auth.js
@@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["SyncAuthManager", "AuthenticationError"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { TokenServerClient } = ChromeUtils.import(
"resource://services-common/tokenserverclient.js"
diff --git a/services/sync/modules/telemetry.js b/services/sync/modules/telemetry.js
index 6bc867da2d59..e44d7297d166 100644
--- a/services/sync/modules/telemetry.js
+++ b/services/sync/modules/telemetry.js
@@ -23,7 +23,9 @@ var EXPORTED_SYMBOLS = [
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const lazy = {};
diff --git a/services/sync/tests/unit/head_helpers.js b/services/sync/tests/unit/head_helpers.js
index e476097e3b86..ca4dad251257 100644
--- a/services/sync/tests/unit/head_helpers.js
+++ b/services/sync/tests/unit/head_helpers.js
@@ -67,8 +67,8 @@ add_setup(async function head_setup() {
});
XPCOMUtils.defineLazyGetter(this, "SyncPingSchema", function() {
- let { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+ let { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
let { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
let stream = Cc["@mozilla.org/network/file-input-stream;1"].createInstance(
@@ -92,8 +92,8 @@ XPCOMUtils.defineLazyGetter(this, "SyncPingSchema", function() {
});
XPCOMUtils.defineLazyGetter(this, "SyncPingValidator", function() {
- const { JsonSchema } = ChromeUtils.import(
- "resource://gre/modules/JsonSchema.jsm"
+ const { JsonSchema } = ChromeUtils.importESModule(
+ "resource://gre/modules/JsonSchema.sys.mjs"
);
return new JsonSchema.Validator(SyncPingSchema);
});
diff --git a/services/sync/tests/unit/head_http_server.js b/services/sync/tests/unit/head_http_server.js
index 37259420a06d..32fea7487f94 100644
--- a/services/sync/tests/unit/head_http_server.js
+++ b/services/sync/tests/unit/head_http_server.js
@@ -5,7 +5,7 @@
var Cm = Components.manager;
// Shared logging for all HTTP server functions.
-var { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+var { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs");
var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
var { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
diff --git a/services/sync/tests/unit/test_addons_store.js b/services/sync/tests/unit/test_addons_store.js
index 8c9ee9e02f09..7a1804f53efc 100644
--- a/services/sync/tests/unit/test_addons_store.js
+++ b/services/sync/tests/unit/test_addons_store.js
@@ -10,8 +10,8 @@ const { AddonsEngine } = ChromeUtils.import(
"resource://services-sync/engines/addons.js"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const HTTP_PORT = 8888;
diff --git a/services/sync/tests/unit/test_engine.js b/services/sync/tests/unit/test_engine.js
index 0483584704ce..2661a005b084 100644
--- a/services/sync/tests/unit/test_engine.js
+++ b/services/sync/tests/unit/test_engine.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
diff --git a/services/sync/tests/unit/test_errorhandler_2.js b/services/sync/tests/unit/test_errorhandler_2.js
index 8462f84c8392..fedf4f2a47ee 100644
--- a/services/sync/tests/unit/test_errorhandler_2.js
+++ b/services/sync/tests/unit/test_errorhandler_2.js
@@ -3,8 +3,8 @@
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { Status } = ChromeUtils.import("resource://services-sync/status.js");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const fakeServer = new SyncServer();
diff --git a/services/sync/tests/unit/test_errorhandler_filelog.js b/services/sync/tests/unit/test_errorhandler_filelog.js
index 7edbecff3c6b..db11d537a2a8 100644
--- a/services/sync/tests/unit/test_errorhandler_filelog.js
+++ b/services/sync/tests/unit/test_errorhandler_filelog.js
@@ -7,8 +7,8 @@ const { Service } = ChromeUtils.import("resource://services-sync/service.js");
const { logManager } = ChromeUtils.import(
"resource://gre/modules/FxAccountsCommon.js"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
diff --git a/services/sync/tests/unit/test_fxa_node_reassignment.js b/services/sync/tests/unit/test_fxa_node_reassignment.js
index 7fa570021ae5..6a2b49cbe865 100644
--- a/services/sync/tests/unit/test_fxa_node_reassignment.js
+++ b/services/sync/tests/unit/test_fxa_node_reassignment.js
@@ -15,8 +15,8 @@ const { Status } = ChromeUtils.import("resource://services-sync/status.js");
const { SyncAuthManager } = ChromeUtils.import(
"resource://services-sync/sync_auth.js"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
add_task(async function setup() {
diff --git a/services/sync/tests/unit/test_node_reassignment.js b/services/sync/tests/unit/test_node_reassignment.js
index f129d19f0117..a03cbb9de194 100644
--- a/services/sync/tests/unit/test_node_reassignment.js
+++ b/services/sync/tests/unit/test_node_reassignment.js
@@ -10,8 +10,8 @@ const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
add_task(async function setup() {
diff --git a/services/sync/tests/unit/test_service_cluster.js b/services/sync/tests/unit/test_service_cluster.js
index 19a62764e76d..5d37ce02be23 100644
--- a/services/sync/tests/unit/test_service_cluster.js
+++ b/services/sync/tests/unit/test_service_cluster.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { Service } = ChromeUtils.import("resource://services-sync/service.js");
diff --git a/services/sync/tests/unit/test_utils_json.js b/services/sync/tests/unit/test_utils_json.js
index 6887d35cfd68..37573435bcc3 100644
--- a/services/sync/tests/unit/test_utils_json.js
+++ b/services/sync/tests/unit/test_utils_json.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
add_task(async function test_roundtrip() {
diff --git a/services/sync/tps/extensions/tps/api.js b/services/sync/tps/extensions/tps/api.js
index 289704614988..b33d5ad5a03d 100644
--- a/services/sync/tps/extensions/tps/api.js
+++ b/services/sync/tps/extensions/tps/api.js
@@ -2,8 +2,8 @@
* 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 { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
/* globals ExtensionAPI, Services, XPCOMUtils */
diff --git a/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm b/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm
index 455a62cc31ac..aed55c1f91ae 100644
--- a/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm
+++ b/services/sync/tps/extensions/tps/resource/auth/fxaccounts.jsm
@@ -6,7 +6,9 @@
var EXPORTED_SYMBOLS = ["Authentication"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { clearTimeout, setTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
diff --git a/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm b/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm
index b0866751cec6..7cd17995dd0a 100644
--- a/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/formautofill.jsm
@@ -24,11 +24,9 @@ ChromeUtils.defineModuleGetter(
"resource://autofill/FormAutofillStorage.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "OSKeyStore",
- "resource://gre/modules/OSKeyStore.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+});
class FormAutofillBase {
constructor(props, subStorageName, fields) {
diff --git a/services/sync/tps/extensions/tps/resource/modules/forms.jsm b/services/sync/tps/extensions/tps/resource/modules/forms.jsm
index a58fb60096f5..730d9a394383 100644
--- a/services/sync/tps/extensions/tps/resource/modules/forms.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/forms.jsm
@@ -14,7 +14,9 @@ const { Logger } = ChromeUtils.import("resource://tps/logger.jsm");
const { FormHistory } = ChromeUtils.import(
"resource://gre/modules/FormHistory.jsm"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
/**
* FormDB
diff --git a/services/sync/tps/extensions/tps/resource/tps.jsm b/services/sync/tps/extensions/tps/resource/tps.jsm
index f06d5069cf3a..2daaaaa66423 100644
--- a/services/sync/tps/extensions/tps/resource/tps.jsm
+++ b/services/sync/tps/extensions/tps/resource/tps.jsm
@@ -29,13 +29,16 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
+ Log: "resource://gre/modules/Log.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
@@ -46,9 +49,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindows: "resource://tps/modules/windows.jsm",
CommonUtils: "resource://services-common/utils.js",
extensionStorageSync: "resource://gre/modules/ExtensionStorageSync.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
- JsonSchema: "resource://gre/modules/JsonSchema.jsm",
- Log: "resource://gre/modules/Log.jsm",
Logger: "resource://tps/logger.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
Svc: "resource://services-sync/util.js",
diff --git a/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js b/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js
index 62e8aa08bba1..065c38f8fa71 100644
--- a/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js
+++ b/taskcluster/docker/periodic-updates/scripts/genHPKPStaticPins.js
@@ -20,7 +20,9 @@ if (arguments.length != 2) {
}
var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+);
var gCertDB = Cc["@mozilla.org/security/x509certdb;1"].getService(
Ci.nsIX509CertDB
diff --git a/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js b/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js
index 8e4c7fb8dba3..6d5ecbd3af00 100644
--- a/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js
+++ b/taskcluster/docker/periodic-updates/scripts/getHSTSPreloadList.js
@@ -12,8 +12,8 @@ var gSSService = Cc["@mozilla.org/ssservice;1"].getService(
Ci.nsISiteSecurityService
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const SOURCE =
@@ -435,10 +435,6 @@ function filterForcedInclusions(inHosts, outNotForced, outForced) {
function output(statuses) {
dump("INFO: Writing output to " + OUTPUT + "\n");
try {
- var { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
- );
-
let file = new FileUtils.File(
PathUtils.join(Services.dirsvc.get("CurWorkD", Ci.nsIFile).path, OUTPUT)
);
diff --git a/testing/modules/FileTestUtils.jsm b/testing/modules/FileTestUtils.jsm
index 900b8378b7fe..aeb6c5a75aec 100644
--- a/testing/modules/FileTestUtils.jsm
+++ b/testing/modules/FileTestUtils.jsm
@@ -13,8 +13,8 @@ var EXPORTED_SYMBOLS = ["FileTestUtils"];
const { DownloadPaths } = ChromeUtils.import(
"resource://gre/modules/DownloadPaths.jsm"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
const { XPCOMUtils } = ChromeUtils.importESModule(
diff --git a/testing/modules/MockRegistrar.jsm b/testing/modules/MockRegistrar.jsm
index 93332b4937d8..3c9b734b3c57 100644
--- a/testing/modules/MockRegistrar.jsm
+++ b/testing/modules/MockRegistrar.jsm
@@ -8,7 +8,9 @@ var EXPORTED_SYMBOLS = ["MockRegistrar"];
const Cm = Components.manager;
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
var logger = Log.repository.getLogger("MockRegistrar");
var MockRegistrar = Object.freeze({
diff --git a/testing/specialpowers/api.js b/testing/specialpowers/api.js
index a668fda70983..2526fe69b71d 100644
--- a/testing/specialpowers/api.js
+++ b/testing/specialpowers/api.js
@@ -4,8 +4,8 @@
/* globals ExtensionAPI, Services, XPCOMUtils */
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
XPCOMUtils.defineLazyServiceGetter(
diff --git a/testing/specialpowers/content/MockFilePicker.jsm b/testing/specialpowers/content/MockFilePicker.jsm
index 630c6ca7a2bd..473910bd8729 100644
--- a/testing/specialpowers/content/MockFilePicker.jsm
+++ b/testing/specialpowers/content/MockFilePicker.jsm
@@ -16,11 +16,9 @@ const Cm = Components.manager;
const CONTRACT_ID = "@mozilla.org/filepicker;1";
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
/* globals __URI__ */
if (__URI__.includes("specialpowers")) {
diff --git a/testing/specialpowers/content/SpecialPowersParent.jsm b/testing/specialpowers/content/SpecialPowersParent.jsm
index 08b87878559a..737779e850d0 100644
--- a/testing/specialpowers/content/SpecialPowersParent.jsm
+++ b/testing/specialpowers/content/SpecialPowersParent.jsm
@@ -15,13 +15,16 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ HiddenFrame: "resource://gre/modules/HiddenFrame.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
ExtensionData: "resource://gre/modules/Extension.jsm",
ExtensionTestCommon: "resource://testing-common/ExtensionTestCommon.jsm",
PerTestCoverageUtils: "resource://testing-common/PerTestCoverageUtils.jsm",
ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.jsm",
SpecialPowersSandbox: "resource://specialpowers/SpecialPowersSandbox.jsm",
- HiddenFrame: "resource://gre/modules/HiddenFrame.jsm",
});
class SpecialPowersError extends Error {
diff --git a/testing/talos/talos/pageloader/chrome/Profiler.js b/testing/talos/talos/pageloader/chrome/Profiler.js
index 2bd5806bdea1..55b959ea63db 100644
--- a/testing/talos/talos/pageloader/chrome/Profiler.js
+++ b/testing/talos/talos/pageloader/chrome/Profiler.js
@@ -131,8 +131,8 @@ var Profiler;
const { NetUtil } = ChromeUtils.import(
"resource://gre/modules/NetUtil.jsm"
);
- const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+ const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
var file = Cc["@mozilla.org/file/local;1"].createInstance(
diff --git a/testing/talos/talos/startup_test/sessionrestore/addon/api.js b/testing/talos/talos/startup_test/sessionrestore/addon/api.js
index 4fb473401af8..230579fdbe92 100644
--- a/testing/talos/talos/startup_test/sessionrestore/addon/api.js
+++ b/testing/talos/talos/startup_test/sessionrestore/addon/api.js
@@ -8,9 +8,12 @@
/* globals Services, XPCOMUtils */
+ChromeUtils.defineESModuleGetters(this, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
StartupPerformance: "resource:///modules/sessionstore/StartupPerformance.jsm",
diff --git a/testing/talos/talos/talos-powers/api.js b/testing/talos/talos/talos-powers/api.js
index b6bae1eb694e..4489ca91f118 100644
--- a/testing/talos/talos/talos-powers/api.js
+++ b/testing/talos/talos/talos-powers/api.js
@@ -406,8 +406,8 @@ TalosPowersService.prototype = {
},
dumpAboutSupport(arg, callback, win) {
- const { Troubleshoot } = ChromeUtils.import(
- "resource://gre/modules/Troubleshoot.jsm"
+ const { Troubleshoot } = ChromeUtils.importESModule(
+ "resource://gre/modules/Troubleshoot.sys.mjs"
);
Troubleshoot.snapshot(function(snapshot) {
dump("about:support\t" + JSON.stringify(snapshot) + "\n");
diff --git a/toolkit/actors/AutoCompleteChild.jsm b/toolkit/actors/AutoCompleteChild.jsm
index 3dd5a012ad23..25a79381d906 100644
--- a/toolkit/actors/AutoCompleteChild.jsm
+++ b/toolkit/actors/AutoCompleteChild.jsm
@@ -9,11 +9,9 @@ var EXPORTED_SYMBOLS = ["AutoCompleteChild"];
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "LayoutUtils",
- "resource://gre/modules/LayoutUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ LayoutUtils: "resource://gre/modules/LayoutUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/actors/AutoScrollChild.jsm b/toolkit/actors/AutoScrollChild.jsm
index 1e0652385d1b..8dbcb28f52dd 100644
--- a/toolkit/actors/AutoScrollChild.jsm
+++ b/toolkit/actors/AutoScrollChild.jsm
@@ -7,11 +7,9 @@ var EXPORTED_SYMBOLS = ["AutoScrollChild"];
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "BrowserUtils",
- "resource://gre/modules/BrowserUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+});
class AutoScrollChild extends JSWindowActorChild {
constructor() {
diff --git a/toolkit/actors/DateTimePickerChild.jsm b/toolkit/actors/DateTimePickerChild.jsm
index 40ffdc1ba677..7a212c383155 100644
--- a/toolkit/actors/DateTimePickerChild.jsm
+++ b/toolkit/actors/DateTimePickerChild.jsm
@@ -3,11 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "LayoutUtils",
- "resource://gre/modules/LayoutUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ LayoutUtils: "resource://gre/modules/LayoutUtils.sys.mjs",
+});
var EXPORTED_SYMBOLS = ["DateTimePickerChild"];
diff --git a/toolkit/actors/DateTimePickerParent.jsm b/toolkit/actors/DateTimePickerParent.jsm
index 59425aed4dc4..406b7d784fff 100644
--- a/toolkit/actors/DateTimePickerParent.jsm
+++ b/toolkit/actors/DateTimePickerParent.jsm
@@ -14,11 +14,9 @@ function debug(aStr) {
var EXPORTED_SYMBOLS = ["DateTimePickerParent"];
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "DateTimePickerPanel",
- "resource://gre/modules/DateTimePickerPanel.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ DateTimePickerPanel: "resource://gre/modules/DateTimePickerPanel.sys.mjs",
+});
/*
* DateTimePickerParent receives message from content side (input box) and
diff --git a/toolkit/actors/FindBarChild.jsm b/toolkit/actors/FindBarChild.jsm
index be15f115b061..17e19c0fe5dd 100644
--- a/toolkit/actors/FindBarChild.jsm
+++ b/toolkit/actors/FindBarChild.jsm
@@ -12,11 +12,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "BrowserUtils",
- "resource://gre/modules/BrowserUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+});
class FindBarChild extends JSWindowActorChild {
constructor() {
@@ -28,8 +26,8 @@ class FindBarChild extends JSWindowActorChild {
this,
"FindBarContent",
() => {
- const { FindBarContent } = ChromeUtils.import(
- "resource://gre/modules/FindBarContent.jsm"
+ const { FindBarContent } = ChromeUtils.importESModule(
+ "resource://gre/modules/FindBarContent.sys.mjs"
);
return new FindBarContent(this);
},
diff --git a/toolkit/actors/FinderChild.jsm b/toolkit/actors/FinderChild.jsm
index e2e050300083..02dcc0f180cd 100644
--- a/toolkit/actors/FinderChild.jsm
+++ b/toolkit/actors/FinderChild.jsm
@@ -8,11 +8,9 @@ var EXPORTED_SYMBOLS = ["FinderChild"];
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "Finder",
- "resource://gre/modules/Finder.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ Finder: "resource://gre/modules/Finder.sys.mjs",
+});
class FinderChild extends JSWindowActorChild {
get finder() {
diff --git a/toolkit/actors/InlineSpellCheckerChild.jsm b/toolkit/actors/InlineSpellCheckerChild.jsm
index 946a1380581a..d6837c4f2ae4 100644
--- a/toolkit/actors/InlineSpellCheckerChild.jsm
+++ b/toolkit/actors/InlineSpellCheckerChild.jsm
@@ -10,11 +10,10 @@ var EXPORTED_SYMBOLS = ["InlineSpellCheckerChild"];
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "InlineSpellCheckerContent",
- "resource://gre/modules/InlineSpellCheckerContent.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ InlineSpellCheckerContent:
+ "resource://gre/modules/InlineSpellCheckerContent.sys.mjs",
+});
class InlineSpellCheckerChild extends JSWindowActorChild {
receiveMessage(msg) {
diff --git a/toolkit/actors/PictureInPictureChild.sys.mjs b/toolkit/actors/PictureInPictureChild.sys.mjs
index 442845db5cc7..19d522fccc5c 100644
--- a/toolkit/actors/PictureInPictureChild.sys.mjs
+++ b/toolkit/actors/PictureInPictureChild.sys.mjs
@@ -12,15 +12,11 @@ ChromeUtils.defineModuleGetter(
);
ChromeUtils.defineESModuleGetters(lazy, {
KEYBOARD_CONTROLS: "resource://gre/modules/PictureInPictureControls.sys.mjs",
+ Rect: "resource://gre/modules/Geometry.sys.mjs",
TOGGLE_POLICIES: "resource://gre/modules/PictureInPictureControls.sys.mjs",
TOGGLE_POLICY_STRINGS:
"resource://gre/modules/PictureInPictureControls.sys.mjs",
});
-ChromeUtils.defineModuleGetter(
- lazy,
- "Rect",
- "resource://gre/modules/Geometry.jsm"
-);
ChromeUtils.defineModuleGetter(
lazy,
"ContentDOMReference",
diff --git a/toolkit/actors/RemotePageChild.jsm b/toolkit/actors/RemotePageChild.jsm
index 589fca44318d..e3839d7823e0 100644
--- a/toolkit/actors/RemotePageChild.jsm
+++ b/toolkit/actors/RemotePageChild.jsm
@@ -15,21 +15,16 @@ var EXPORTED_SYMBOLS = ["RemotePageChild"];
*/
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "AsyncPrefs",
- "resource://gre/modules/AsyncPrefs.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ AsyncPrefs: "resource://gre/modules/AsyncPrefs.sys.mjs",
+ RemotePageAccessManager:
+ "resource://gre/modules/RemotePageAccessManager.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"PrivateBrowsingUtils",
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "RemotePageAccessManager",
- "resource://gre/modules/RemotePageAccessManager.jsm"
-);
class RemotePageChild extends JSWindowActorChild {
actorCreated() {
diff --git a/toolkit/actors/SelectChild.jsm b/toolkit/actors/SelectChild.jsm
index 81e75639faa2..9e43f4b8171c 100644
--- a/toolkit/actors/SelectChild.jsm
+++ b/toolkit/actors/SelectChild.jsm
@@ -12,11 +12,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "LayoutUtils",
- "resource://gre/modules/LayoutUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ LayoutUtils: "resource://gre/modules/LayoutUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"DeferredTask",
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js
index a7ca0fdccbc2..5ec4e9caf7cf 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.js
+++ b/toolkit/components/aboutmemory/content/aboutMemory.js
@@ -38,11 +38,9 @@ ChromeUtils.defineModuleGetter(
"Downloads",
"resource://gre/modules/Downloads.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
XPCOMUtils.defineLazyGetter(this, "nsBinaryStream", () =>
CC(
diff --git a/toolkit/components/aboutthirdparty/content/aboutThirdParty.js b/toolkit/components/aboutthirdparty/content/aboutThirdParty.js
index f7bdc52c545e..d47b84b5045b 100644
--- a/toolkit/components/aboutthirdparty/content/aboutThirdParty.js
+++ b/toolkit/components/aboutthirdparty/content/aboutThirdParty.js
@@ -7,8 +7,8 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { ProcessType } = ChromeUtils.import(
- "resource://gre/modules/ProcessType.jsm"
+const { ProcessType } = ChromeUtils.importESModule(
+ "resource://gre/modules/ProcessType.sys.mjs"
);
let AboutThirdParty = null;
diff --git a/toolkit/components/antitracking/TrackingDBService.jsm b/toolkit/components/antitracking/TrackingDBService.jsm
index 68915fd2e162..5220fb6f23ee 100644
--- a/toolkit/components/antitracking/TrackingDBService.jsm
+++ b/toolkit/components/antitracking/TrackingDBService.jsm
@@ -7,7 +7,9 @@
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
+const { Sqlite } = ChromeUtils.importESModule(
+ "resource://gre/modules/Sqlite.sys.mjs"
+);
const SCHEMA_VERSION = 1;
const TRACKERS_BLOCKED_COUNT = "contentblocking.trackers_blocked_count";
diff --git a/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js b/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js
index 4c686e4a07f8..eed2a566cecd 100644
--- a/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js
+++ b/toolkit/components/antitracking/test/xpcshell/test_tracking_db_service.js
@@ -6,7 +6,9 @@
"use strict";
-const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
+const { Sqlite } = ChromeUtils.importESModule(
+ "resource://gre/modules/Sqlite.sys.mjs"
+);
XPCOMUtils.defineLazyServiceGetter(
this,
"TrackingDBService",
diff --git a/toolkit/components/asyncshutdown/AsyncShutdown.jsm b/toolkit/components/asyncshutdown/AsyncShutdown.jsm
index c3dce8b1948a..bffedf967a38 100644
--- a/toolkit/components/asyncshutdown/AsyncShutdown.jsm
+++ b/toolkit/components/asyncshutdown/AsyncShutdown.jsm
@@ -44,11 +44,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
XPCOMUtils.defineLazyServiceGetter(
lazy,
"gDebug",
diff --git a/toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js b/toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js
index 5f8b9a9d2f97..d618a6a53e09 100644
--- a/toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js
+++ b/toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js
@@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
add_task(async function test_no_condition() {
diff --git a/toolkit/components/backgroundtasks/BackgroundTask_message.jsm b/toolkit/components/backgroundtasks/BackgroundTask_message.jsm
index 25839c020e54..875f5be20484 100644
--- a/toolkit/components/backgroundtasks/BackgroundTask_message.jsm
+++ b/toolkit/components/backgroundtasks/BackgroundTask_message.jsm
@@ -71,11 +71,14 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
ClientEnvironmentBase:
"resource://gre/modules/components-utils/ClientEnvironment.jsm",
ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm",
- IndexedDB: "resource://gre/modules/IndexedDB.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
ToastNotification: "resource://activity-stream/lib/ToastNotification.jsm",
diff --git a/toolkit/components/contentprefs/ContentPrefService2.jsm b/toolkit/components/contentprefs/ContentPrefService2.jsm
index 611663b60650..b3a5ac64ed68 100644
--- a/toolkit/components/contentprefs/ContentPrefService2.jsm
+++ b/toolkit/components/contentprefs/ContentPrefService2.jsm
@@ -12,11 +12,9 @@ const { ContentPrefStore } = ChromeUtils.import(
"resource://gre/modules/ContentPrefStore.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "Sqlite",
- "resource://gre/modules/Sqlite.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
+});
const CACHE_MAX_GROUP_ENTRIES = 100;
diff --git a/toolkit/components/contextualidentity/ContextualIdentityService.jsm b/toolkit/components/contextualidentity/ContextualIdentityService.jsm
index 1387309de8e0..b2f39c82633b 100644
--- a/toolkit/components/contextualidentity/ContextualIdentityService.jsm
+++ b/toolkit/components/contextualidentity/ContextualIdentityService.jsm
@@ -40,11 +40,9 @@ ChromeUtils.defineModuleGetter(
"DeferredTask",
"resource://gre/modules/DeferredTask.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"NetUtil",
diff --git a/toolkit/components/cookiebanners/CookieBannerListService.jsm b/toolkit/components/cookiebanners/CookieBannerListService.jsm
index e2a11e0e4998..3ff03943e21f 100644
--- a/toolkit/components/cookiebanners/CookieBannerListService.jsm
+++ b/toolkit/components/cookiebanners/CookieBannerListService.jsm
@@ -11,9 +11,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
+ChromeUtils.defineESModuleGetters(lazy, {
+ JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
- JsonSchema: "resource://gre/modules/JsonSchema.jsm",
});
XPCOMUtils.defineLazyPreferenceGetter(
diff --git a/toolkit/components/crashes/CrashManager.in.jsm b/toolkit/components/crashes/CrashManager.in.jsm
index c3eceda4d235..6bfef17b7f99 100644
--- a/toolkit/components/crashes/CrashManager.in.jsm
+++ b/toolkit/components/crashes/CrashManager.in.jsm
@@ -4,8 +4,8 @@
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const { XPCOMUtils } = ChromeUtils.importESModule(
@@ -14,8 +14,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- Log: "resource://gre/modules/Log.jsm",
TelemetryController: "resource://gre/modules/TelemetryController.jsm",
});
diff --git a/toolkit/components/crashes/CrashManagerTest.jsm b/toolkit/components/crashes/CrashManagerTest.jsm
index 19d795b41c4b..2225ecc7144d 100644
--- a/toolkit/components/crashes/CrashManagerTest.jsm
+++ b/toolkit/components/crashes/CrashManagerTest.jsm
@@ -25,8 +25,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- Log: "resource://gre/modules/Log.jsm",
OS: "resource://gre/modules/osfile.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
});
diff --git a/toolkit/components/crashmonitor/CrashMonitor.jsm b/toolkit/components/crashmonitor/CrashMonitor.jsm
index b01e7e21ac64..d22d86b887b7 100644
--- a/toolkit/components/crashmonitor/CrashMonitor.jsm
+++ b/toolkit/components/crashmonitor/CrashMonitor.jsm
@@ -36,8 +36,8 @@ var EXPORTED_SYMBOLS = ["CrashMonitor"];
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const SESSIONSTORE_WINDOWS_RESTORED_TOPIC = "sessionstore-windows-restored";
diff --git a/toolkit/components/downloads/DownloadCore.jsm b/toolkit/components/downloads/DownloadCore.jsm
index fd23d956c6d8..0338dcbb893f 100644
--- a/toolkit/components/downloads/DownloadCore.jsm
+++ b/toolkit/components/downloads/DownloadCore.jsm
@@ -19,8 +19,8 @@ var EXPORTED_SYMBOLS = [
"DownloadLegacySaver",
];
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
@@ -31,14 +31,17 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
DownloadHistory: "resource://gre/modules/DownloadHistory.jsm",
DownloadPaths: "resource://gre/modules/DownloadPaths.jsm",
E10SUtils: "resource://gre/modules/E10SUtils.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
OS: "resource://gre/modules/osfile.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
});
XPCOMUtils.defineLazyServiceGetter(
diff --git a/toolkit/components/downloads/DownloadHistory.jsm b/toolkit/components/downloads/DownloadHistory.jsm
index 23bce9e98642..f4aec11b25a0 100644
--- a/toolkit/components/downloads/DownloadHistory.jsm
+++ b/toolkit/components/downloads/DownloadHistory.jsm
@@ -25,12 +25,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Downloads: "resource://gre/modules/Downloads.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
OS: "resource://gre/modules/osfile.jsm",
});
diff --git a/toolkit/components/downloads/DownloadIntegration.jsm b/toolkit/components/downloads/DownloadIntegration.jsm
index 8ff07237c621..8ab29d77ab74 100644
--- a/toolkit/components/downloads/DownloadIntegration.jsm
+++ b/toolkit/components/downloads/DownloadIntegration.jsm
@@ -17,8 +17,8 @@ const { AppConstants } = ChromeUtils.import(
const { Downloads } = ChromeUtils.import(
"resource://gre/modules/Downloads.jsm"
);
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
@@ -46,11 +46,9 @@ ChromeUtils.defineModuleGetter(
"DownloadUIHelper",
"resource://gre/modules/DownloadUIHelper.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"NetUtil",
diff --git a/toolkit/components/downloads/Downloads.jsm b/toolkit/components/downloads/Downloads.jsm
index 21bc0e32813f..ab1b0d9cdb0a 100644
--- a/toolkit/components/downloads/Downloads.jsm
+++ b/toolkit/components/downloads/Downloads.jsm
@@ -10,8 +10,8 @@
var EXPORTED_SYMBOLS = ["Downloads"];
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
const { Download, DownloadError } = ChromeUtils.import(
"resource://gre/modules/DownloadCore.jsm"
diff --git a/toolkit/components/downloads/test/unit/common_test_Download.js b/toolkit/components/downloads/test/unit/common_test_Download.js
index 8f0017b38e29..0ac7cbca1979 100644
--- a/toolkit/components/downloads/test/unit/common_test_Download.js
+++ b/toolkit/components/downloads/test/unit/common_test_Download.js
@@ -18,11 +18,9 @@
const kDeleteTempFileOnExit = "browser.helperApps.deleteTempFileOnExit";
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
/**
* Creates and starts a new download, using either DownloadCopySaver or
diff --git a/toolkit/components/downloads/test/unit/head.js b/toolkit/components/downloads/test/unit/head.js
index 640334b69ff8..906fde8a8e85 100644
--- a/toolkit/components/downloads/test/unit/head.js
+++ b/toolkit/components/downloads/test/unit/head.js
@@ -9,8 +9,8 @@
"use strict";
-var { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+var { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
@@ -20,7 +20,9 @@ const { AppConstants } = ChromeUtils.import(
);
ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
@@ -28,12 +30,10 @@ XPCOMUtils.defineLazyModuleGetters(this, {
Downloads: "resource://gre/modules/Downloads.jsm",
E10SUtils: "resource://gre/modules/E10SUtils.jsm",
FileTestUtils: "resource://testing-common/FileTestUtils.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
HttpServer: "resource://testing-common/httpd.js",
MockRegistrar: "resource://testing-common/MockRegistrar.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
OS: "resource://gre/modules/osfile.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",
TestUtils: "resource://testing-common/TestUtils.jsm",
});
diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
index ed2e89ab3ef7..0a7ba257a4d4 100644
--- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
+++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
@@ -266,8 +266,8 @@ EnterprisePoliciesManager.prototype = {
this._callbacks[timing] = [];
}
- let { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+ let { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
// Simulate the startup process. This step-by-step is a bit ugly but it
// tries to emulate the same behavior as of a normal startup.
diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm
index ce8e49973e63..0abaead8ca05 100644
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -49,6 +49,10 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
@@ -64,7 +68,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
ExtensionStorageIDB: "resource://gre/modules/ExtensionStorageIDB.jsm",
ExtensionTelemetry: "resource://gre/modules/ExtensionTelemetry.jsm",
LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm",
- Log: "resource://gre/modules/Log.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
PluralForm: "resource://gre/modules/PluralForm.jsm",
Schemas: "resource://gre/modules/Schemas.jsm",
diff --git a/toolkit/components/extensions/ExtensionChild.jsm b/toolkit/components/extensions/ExtensionChild.jsm
index 80dc2c1caf5e..2d67f1d11aa7 100644
--- a/toolkit/components/extensions/ExtensionChild.jsm
+++ b/toolkit/components/extensions/ExtensionChild.jsm
@@ -32,13 +32,16 @@ XPCOMUtils.defineLazyServiceGetter(
"nsIFinalizationWitnessService"
);
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
ExtensionContent: "resource://gre/modules/ExtensionContent.jsm",
ExtensionPageChild: "resource://gre/modules/ExtensionPageChild.jsm",
ExtensionProcessScript: "resource://gre/modules/ExtensionProcessScript.jsm",
NativeApp: "resource://gre/modules/NativeMessaging.jsm",
PerformanceCounters: "resource://gre/modules/PerformanceCounters.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
});
// We're using the pref to avoid loading PerformanceCounters.jsm for nothing.
diff --git a/toolkit/components/extensions/ExtensionPermissions.jsm b/toolkit/components/extensions/ExtensionPermissions.jsm
index ebc3f2237a85..47f1f95ad506 100644
--- a/toolkit/components/extensions/ExtensionPermissions.jsm
+++ b/toolkit/components/extensions/ExtensionPermissions.jsm
@@ -14,9 +14,13 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
ExtensionParent: "resource://gre/modules/ExtensionParent.jsm",
- JSONFile: "resource://gre/modules/JSONFile.jsm",
});
XPCOMUtils.defineLazyGetter(
@@ -31,12 +35,6 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/kvstore.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
-
XPCOMUtils.defineLazyGetter(
lazy,
"Management",
diff --git a/toolkit/components/extensions/ExtensionScriptingStore.jsm b/toolkit/components/extensions/ExtensionScriptingStore.jsm
index cf0c71bc3e18..ff45991adf08 100644
--- a/toolkit/components/extensions/ExtensionScriptingStore.jsm
+++ b/toolkit/components/extensions/ExtensionScriptingStore.jsm
@@ -21,8 +21,11 @@ const { StartupCache } = ExtensionParent;
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- FileUtils: "resource://gre/modules/FileUtils.jsm",
KeyValueService: "resource://gre/modules/kvstore.jsm",
});
diff --git a/toolkit/components/extensions/ExtensionSettingsStore.jsm b/toolkit/components/extensions/ExtensionSettingsStore.jsm
index ecc76cec8fff..8c397bbb637f 100644
--- a/toolkit/components/extensions/ExtensionSettingsStore.jsm
+++ b/toolkit/components/extensions/ExtensionSettingsStore.jsm
@@ -53,11 +53,9 @@ ChromeUtils.defineModuleGetter(
"AddonManager",
"resource://gre/modules/AddonManager.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
// Defined for readability of precedence and selection code. keyInfo.selected will be
// one of these defines, or the id of an extension if an extension has been explicitly
diff --git a/toolkit/components/extensions/ExtensionShortcuts.jsm b/toolkit/components/extensions/ExtensionShortcuts.jsm
index 7413228a2f12..4bde3054df6f 100644
--- a/toolkit/components/extensions/ExtensionShortcuts.jsm
+++ b/toolkit/components/extensions/ExtensionShortcuts.jsm
@@ -12,12 +12,13 @@ const { ExtensionCommon } = ChromeUtils.import(
const { ExtensionUtils } = ChromeUtils.import(
"resource://gre/modules/ExtensionUtils.jsm"
);
-const { ShortcutUtils } = ChromeUtils.import(
- "resource://gre/modules/ShortcutUtils.jsm"
-);
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+});
+
ChromeUtils.defineModuleGetter(
lazy,
"ExtensionParent",
@@ -504,7 +505,7 @@ class ExtensionShortcuts {
// The modifiers are the remaining elements.
keyElement.setAttribute(
"modifiers",
- ShortcutUtils.getModifiersAttribute(parts)
+ lazy.ShortcutUtils.getModifiersAttribute(parts)
);
// A keyElement with key "NumpadX" is created above and isn't from the
@@ -514,7 +515,7 @@ class ExtensionShortcuts {
keyElement.setAttribute("id", id);
}
- let [attribute, value] = ShortcutUtils.getKeyAttribute(chromeKey);
+ let [attribute, value] = lazy.ShortcutUtils.getKeyAttribute(chromeKey);
keyElement.setAttribute(attribute, value);
if (attribute == "keycode") {
keyElement.setAttribute("event", "keydown");
diff --git a/toolkit/components/extensions/ExtensionStorage.jsm b/toolkit/components/extensions/ExtensionStorage.jsm
index e48bd30832db..0c45119cc4c4 100644
--- a/toolkit/components/extensions/ExtensionStorage.jsm
+++ b/toolkit/components/extensions/ExtensionStorage.jsm
@@ -18,11 +18,9 @@ ChromeUtils.defineModuleGetter(
"ExtensionUtils",
"resource://gre/modules/ExtensionUtils.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm");
function isStructuredCloneHolder(value) {
diff --git a/toolkit/components/extensions/ExtensionStorageIDB.jsm b/toolkit/components/extensions/ExtensionStorageIDB.jsm
index edd72d07d6f9..3f5175e0aafe 100644
--- a/toolkit/components/extensions/ExtensionStorageIDB.jsm
+++ b/toolkit/components/extensions/ExtensionStorageIDB.jsm
@@ -10,8 +10,8 @@ let ExtensionStorageIDB;
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { IndexedDB } = ChromeUtils.import(
- "resource://gre/modules/IndexedDB.jsm"
+const { IndexedDB } = ChromeUtils.importESModule(
+ "resource://gre/modules/IndexedDB.sys.mjs"
);
const lazy = {};
diff --git a/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm b/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
index d0d80cb241d2..e2ee27d2457e 100644
--- a/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
+++ b/toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
@@ -35,7 +35,9 @@ const FXA_OAUTH_OPTIONS = {
// Default is 5sec, which seems a bit aggressive on the open internet
const KINTO_REQUEST_TIMEOUT = 30000;
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/toolkit/components/extensions/ExtensionTestCommon.jsm b/toolkit/components/extensions/ExtensionTestCommon.jsm
index 7937661fdcd3..47b7f45b7b51 100644
--- a/toolkit/components/extensions/ExtensionTestCommon.jsm
+++ b/toolkit/components/extensions/ExtensionTestCommon.jsm
@@ -53,11 +53,9 @@ ChromeUtils.defineModuleGetter(
"ExtensionPermissions",
"resource://gre/modules/ExtensionPermissions.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(lazy, "OS", "resource://gre/modules/osfile.jsm");
XPCOMUtils.defineLazyGetter(
diff --git a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm b/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
index 35e7c6e09b7d..d7accc897a31 100644
--- a/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
+++ b/toolkit/components/extensions/ExtensionXPCShellUtils.jsm
@@ -31,11 +31,9 @@ ChromeUtils.defineModuleGetter(
"ExtensionTestCommon",
"resource://testing-common/ExtensionTestCommon.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"Management",
diff --git a/toolkit/components/extensions/FindContent.jsm b/toolkit/components/extensions/FindContent.jsm
index 811e70f9ac11..4de2a9f1f54a 100644
--- a/toolkit/components/extensions/FindContent.jsm
+++ b/toolkit/components/extensions/FindContent.jsm
@@ -11,22 +11,15 @@ const lazy = {};
/* exported FindContent */
-ChromeUtils.defineModuleGetter(
- lazy,
- "FinderIterator",
- "resource://gre/modules/FinderIterator.jsm"
-);
-
-ChromeUtils.defineModuleGetter(
- lazy,
- "FinderHighlighter",
- "resource://gre/modules/FinderHighlighter.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ Finder: "resource://gre/modules/Finder.sys.mjs",
+ FinderHighlighter: "resource://gre/modules/FinderHighlighter.sys.mjs",
+ FinderIterator: "resource://gre/modules/FinderIterator.sys.mjs",
+});
class FindContent {
constructor(docShell) {
- const { Finder } = ChromeUtils.import("resource://gre/modules/Finder.jsm");
- this.finder = new Finder(docShell);
+ this.finder = new lazy.Finder(docShell);
}
get iterator() {
diff --git a/toolkit/components/extensions/NativeManifests.jsm b/toolkit/components/extensions/NativeManifests.jsm
index 66521d6d7dff..8a5df926cd2c 100644
--- a/toolkit/components/extensions/NativeManifests.jsm
+++ b/toolkit/components/extensions/NativeManifests.jsm
@@ -16,10 +16,13 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
OS: "resource://gre/modules/osfile.jsm",
Schemas: "resource://gre/modules/Schemas.jsm",
- WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
});
const DASHED = AppConstants.platform === "linux";
diff --git a/toolkit/components/extensions/Schemas.jsm b/toolkit/components/extensions/Schemas.jsm
index 780a6b0202ba..0442a2f51686 100644
--- a/toolkit/components/extensions/Schemas.jsm
+++ b/toolkit/components/extensions/Schemas.jsm
@@ -29,11 +29,9 @@ ChromeUtils.defineModuleGetter(
"NetUtil",
"resource://gre/modules/NetUtil.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "ShortcutUtils",
- "resource://gre/modules/ShortcutUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+});
XPCOMUtils.defineLazyServiceGetter(
lazy,
"contentPolicyService",
diff --git a/toolkit/components/extensions/parent/ext-downloads.js b/toolkit/components/extensions/parent/ext-downloads.js
index f755efd22e9a..e910a0d91810 100644
--- a/toolkit/components/extensions/parent/ext-downloads.js
+++ b/toolkit/components/extensions/parent/ext-downloads.js
@@ -15,11 +15,9 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/DownloadPaths.jsm"
);
ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
"DownloadLastDir",
diff --git a/toolkit/components/extensions/storage/ExtensionStorageComponents.jsm b/toolkit/components/extensions/storage/ExtensionStorageComponents.jsm
index 534df82f1e85..b695706dee10 100644
--- a/toolkit/components/extensions/storage/ExtensionStorageComponents.jsm
+++ b/toolkit/components/extensions/storage/ExtensionStorageComponents.jsm
@@ -10,9 +10,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
});
const EXPORTED_SYMBOLS = ["StorageSyncService"];
diff --git a/toolkit/components/extensions/test/xpcshell/head.js b/toolkit/components/extensions/test/xpcshell/head.js
index 55013bd2a2ab..c26d751ec2b0 100644
--- a/toolkit/components/extensions/test/xpcshell/head.js
+++ b/toolkit/components/extensions/test/xpcshell/head.js
@@ -24,14 +24,16 @@ var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.import(
"resource://testing-common/AddonTestUtils.jsm"
);
-// eslint-disable-next-line no-unused-vars
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
ContentTask: "resource://testing-common/ContentTask.jsm",
Extension: "resource://gre/modules/Extension.jsm",
ExtensionData: "resource://gre/modules/Extension.jsm",
ExtensionParent: "resource://gre/modules/ExtensionParent.jsm",
ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
MessageChannel: "resource://testing-common/MessageChannel.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
PromiseTestUtils: "resource://testing-common/PromiseTestUtils.jsm",
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_MessageManagerProxy.js b/toolkit/components/extensions/test/xpcshell/test_ext_MessageManagerProxy.js
index 20ffb71d18e5..07b688b4069b 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_MessageManagerProxy.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_MessageManagerProxy.js
@@ -5,8 +5,8 @@
const { MessageManagerProxy } = ChromeUtils.import(
"resource://gre/modules/MessageManagerProxy.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
class TestMessageManagerProxy extends MessageManagerProxy {
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_extensionPreferencesManager.js b/toolkit/components/extensions/test/xpcshell/test_ext_extensionPreferencesManager.js
index 19e046e12d2b..f8dbcb7a74c9 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_extensionPreferencesManager.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_extensionPreferencesManager.js
@@ -17,8 +17,8 @@ ChromeUtils.defineModuleGetter(
"Preferences",
"resource://gre/modules/Preferences.jsm"
);
-var { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+var { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const {
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_l10n.js b/toolkit/components/extensions/test/xpcshell/test_ext_l10n.js
index d5ee8461ae92..75081a64f9e8 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_l10n.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_l10n.js
@@ -1,7 +1,7 @@
"use strict";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
diff --git a/toolkit/components/extensions/test/xpcshell/test_native_manifests.js b/toolkit/components/extensions/test/xpcshell/test_native_manifests.js
index 7cd003590970..5de4dbb2b892 100644
--- a/toolkit/components/extensions/test/xpcshell/test_native_manifests.js
+++ b/toolkit/components/extensions/test/xpcshell/test_native_manifests.js
@@ -6,8 +6,8 @@ const { AsyncShutdown } = ChromeUtils.import(
const { NativeManifests } = ChromeUtils.import(
"resource://gre/modules/NativeManifests.jsm"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { Schemas } = ChromeUtils.import("resource://gre/modules/Schemas.jsm");
const { Subprocess } = ChromeUtils.import(
diff --git a/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js b/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js
index 8ebc12561f7c..e584f142fa06 100644
--- a/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js
+++ b/toolkit/components/extensions/test/xpcshell/test_proxy_failover.js
@@ -20,8 +20,8 @@ XPCOMUtils.defineLazyGetter(this, "directFailoverDisabled", () => {
);
});
-const { ServiceRequest } = ChromeUtils.import(
- "resource://gre/modules/ServiceRequest.jsm"
+const { ServiceRequest } = ChromeUtils.importESModule(
+ "resource://gre/modules/ServiceRequest.sys.mjs"
);
// Prevent the request from reaching out to the network.
diff --git a/toolkit/components/extensions/test/xpcshell/test_webRequest_ancestors.js b/toolkit/components/extensions/test/xpcshell/test_webRequest_ancestors.js
index 7c083c78052e..2dda1e5e68f1 100644
--- a/toolkit/components/extensions/test/xpcshell/test_webRequest_ancestors.js
+++ b/toolkit/components/extensions/test/xpcshell/test_webRequest_ancestors.js
@@ -3,8 +3,8 @@
var { WebRequest } = ChromeUtils.import(
"resource://gre/modules/WebRequest.jsm"
);
-var { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+var { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
var { ExtensionParent } = ChromeUtils.import(
"resource://gre/modules/ExtensionParent.jsm"
diff --git a/toolkit/components/formautofill/CreditCardRuleset.jsm b/toolkit/components/formautofill/CreditCardRuleset.jsm
index 118b5d40b319..2eca0a1cbd5b 100644
--- a/toolkit/components/formautofill/CreditCardRuleset.jsm
+++ b/toolkit/components/formautofill/CreditCardRuleset.jsm
@@ -30,20 +30,18 @@ const { fathom } = ChromeUtils.import(
"resource://gre/modules/third_party/fathom/fathom.jsm"
);
const { element: clickedElement, out, rule, ruleset, score, type } = fathom;
-const { CreditCard } = ChromeUtils.import(
- "resource://gre/modules/CreditCard.jsm"
+const { CreditCard } = ChromeUtils.importESModule(
+ "resource://gre/modules/CreditCard.sys.mjs"
);
-const { NETWORK_NAMES } = ChromeUtils.import(
- "resource://gre/modules/CreditCard.jsm"
+const { NETWORK_NAMES } = ChromeUtils.importESModule(
+ "resource://gre/modules/CreditCard.sys.mjs"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "FormLikeFactory",
- "resource://gre/modules/FormLikeFactory.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"FormAutofillUtils",
diff --git a/toolkit/components/formautofill/FormAutofillContent.jsm b/toolkit/components/formautofill/FormAutofillContent.jsm
index 23e1eecfc079..ced5bf9a4ea5 100644
--- a/toolkit/components/formautofill/FormAutofillContent.jsm
+++ b/toolkit/components/formautofill/FormAutofillContent.jsm
@@ -23,6 +23,10 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddressResult: "resource://autofill/ProfileAutoCompleteResult.jsm",
ComponentUtils: "resource://gre/modules/ComponentUtils.jsm",
@@ -31,7 +35,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
FormAutofill: "resource://autofill/FormAutofill.jsm",
FormAutofillHandler: "resource://autofill/FormAutofillHandler.jsm",
FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
- FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm",
InsecurePasswordUtils: "resource://gre/modules/InsecurePasswordUtils.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
diff --git a/toolkit/components/formautofill/FormAutofillHandler.jsm b/toolkit/components/formautofill/FormAutofillHandler.jsm
index 6080055c2337..b111002d7892 100644
--- a/toolkit/components/formautofill/FormAutofillHandler.jsm
+++ b/toolkit/components/formautofill/FormAutofillHandler.jsm
@@ -26,11 +26,14 @@ const { FormAutofillUtils } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+ FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- CreditCard: "resource://gre/modules/CreditCard.jsm",
CreditCardTelemetry: "resource://autofill/FormAutofillTelemetryUtils.jsm",
FormAutofillHeuristics: "resource://autofill/FormAutofillHeuristics.jsm",
- FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm",
});
const formFillController = Cc[
diff --git a/toolkit/components/formautofill/FormAutofillHeuristics.jsm b/toolkit/components/formautofill/FormAutofillHeuristics.jsm
index a195489142ba..c7cbc980b98f 100644
--- a/toolkit/components/formautofill/FormAutofillHeuristics.jsm
+++ b/toolkit/components/formautofill/FormAutofillHeuristics.jsm
@@ -20,8 +20,11 @@ const { FormAutofill } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- CreditCard: "resource://gre/modules/CreditCard.jsm",
creditCardRulesets: "resource://autofill/CreditCardRuleset.jsm",
FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
LabelUtils: "resource://autofill/FormAutofillUtils.jsm",
diff --git a/toolkit/components/formautofill/FormAutofillParent.jsm b/toolkit/components/formautofill/FormAutofillParent.jsm
index 514217e6dead..16e9fdf02e03 100644
--- a/toolkit/components/formautofill/FormAutofillParent.jsm
+++ b/toolkit/components/formautofill/FormAutofillParent.jsm
@@ -43,12 +43,15 @@ const { FormAutofillUtils } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
- CreditCard: "resource://gre/modules/CreditCard.jsm",
FormAutofillPreferences: "resource://autofill/FormAutofillPreferences.jsm",
FormAutofillPrompter: "resource://autofill/FormAutofillPrompter.jsm",
- OSKeyStore: "resource://gre/modules/OSKeyStore.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "log", () =>
diff --git a/toolkit/components/formautofill/FormAutofillPreferences.jsm b/toolkit/components/formautofill/FormAutofillPreferences.jsm
index a2051d3f6da6..b8d03e16c9cc 100644
--- a/toolkit/components/formautofill/FormAutofillPreferences.jsm
+++ b/toolkit/components/formautofill/FormAutofillPreferences.jsm
@@ -28,11 +28,9 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "OSKeyStore",
- "resource://gre/modules/OSKeyStore.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+});
const {
ENABLED_AUTOFILL_ADDRESSES_PREF,
diff --git a/toolkit/components/formautofill/FormAutofillStorageBase.jsm b/toolkit/components/formautofill/FormAutofillStorageBase.jsm
index 6b0e6a3c10e6..31db8b499972 100644
--- a/toolkit/components/formautofill/FormAutofillStorageBase.jsm
+++ b/toolkit/components/formautofill/FormAutofillStorageBase.jsm
@@ -139,11 +139,14 @@ const { FormAutofill } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- CreditCard: "resource://gre/modules/CreditCard.jsm",
FormAutofillNameUtils: "resource://autofill/FormAutofillNameUtils.jsm",
FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
- OSKeyStore: "resource://gre/modules/OSKeyStore.jsm",
PhoneNumber: "resource://autofill/phonenumberutils/PhoneNumber.jsm",
});
diff --git a/toolkit/components/formautofill/FormAutofillSync.jsm b/toolkit/components/formautofill/FormAutofillSync.jsm
index bc8044f1c6ad..6fd97c4afad2 100644
--- a/toolkit/components/formautofill/FormAutofillSync.jsm
+++ b/toolkit/components/formautofill/FormAutofillSync.jsm
@@ -28,9 +28,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
formAutofillStorage: "resource://autofill/FormAutofillStorage.jsm",
- Log: "resource://gre/modules/Log.jsm",
});
// A helper to sanitize address and creditcard records suitable for logging.
diff --git a/toolkit/components/formautofill/FormAutofillUtils.jsm b/toolkit/components/formautofill/FormAutofillUtils.jsm
index 281412805ac6..2a77b2092d92 100644
--- a/toolkit/components/formautofill/FormAutofillUtils.jsm
+++ b/toolkit/components/formautofill/FormAutofillUtils.jsm
@@ -70,9 +70,10 @@ const { FormAutofill } = ChromeUtils.import(
"resource://autofill/FormAutofill.jsm"
);
const lazy = {};
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- CreditCard: "resource://gre/modules/CreditCard.jsm",
- OSKeyStore: "resource://gre/modules/OSKeyStore.jsm",
+
+ChromeUtils.defineESModuleGetters(lazy, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
});
let AddressDataLoader = {
diff --git a/toolkit/components/formautofill/ProfileAutoCompleteResult.jsm b/toolkit/components/formautofill/ProfileAutoCompleteResult.jsm
index 322a4b61cd8b..5656326d6443 100644
--- a/toolkit/components/formautofill/ProfileAutoCompleteResult.jsm
+++ b/toolkit/components/formautofill/ProfileAutoCompleteResult.jsm
@@ -10,8 +10,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
);
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- CreditCard: "resource://gre/modules/CreditCard.jsm",
FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
});
diff --git a/toolkit/components/formautofill/android/FormAutofillStorage.jsm b/toolkit/components/formautofill/android/FormAutofillStorage.jsm
index 3be7f7668754..311de0023c7e 100644
--- a/toolkit/components/formautofill/android/FormAutofillStorage.jsm
+++ b/toolkit/components/formautofill/android/FormAutofillStorage.jsm
@@ -21,7 +21,9 @@ const {
CreditCardsBase,
AddressesBase,
} = ChromeUtils.import("resource://autofill/FormAutofillStorageBase.jsm");
-const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm");
+const { JSONFile } = ChromeUtils.importESModule(
+ "resource://gre/modules/JSONFile.sys.mjs"
+);
const lazy = {};
diff --git a/toolkit/components/formautofill/default/FormAutofillPrompter.jsm b/toolkit/components/formautofill/default/FormAutofillPrompter.jsm
index a9780ae39fe1..c2b57f056201 100644
--- a/toolkit/components/formautofill/default/FormAutofillPrompter.jsm
+++ b/toolkit/components/formautofill/default/FormAutofillPrompter.jsm
@@ -26,8 +26,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- CreditCard: "resource://gre/modules/CreditCard.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "log", () =>
diff --git a/toolkit/components/formautofill/default/FormAutofillStorage.jsm b/toolkit/components/formautofill/default/FormAutofillStorage.jsm
index 98fe98822aa7..120c3e609ed3 100644
--- a/toolkit/components/formautofill/default/FormAutofillStorage.jsm
+++ b/toolkit/components/formautofill/default/FormAutofillStorage.jsm
@@ -28,11 +28,14 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- CreditCard: "resource://gre/modules/CreditCard.jsm",
FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
- JSONFile: "resource://gre/modules/JSONFile.jsm",
- OSKeyStore: "resource://gre/modules/OSKeyStore.jsm",
});
const PROFILE_JSON_FILE_NAME = "autofill-profiles.json";
diff --git a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js
index 6a94cb732b6c..0f94f671b839 100644
--- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js
+++ b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_configure_homepage.js
@@ -3,8 +3,8 @@
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const HOMEPAGE_PREF = "browser.startup.homepage";
diff --git a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js
index 986409096c11..53e7b21718f3 100644
--- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js
+++ b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/head.js
@@ -7,8 +7,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
-const { JsonSchema } = ChromeUtils.import(
- "resource://gre/modules/JsonSchema.jsm"
+const { JsonSchema } = ChromeUtils.importESModule(
+ "resource://gre/modules/JsonSchema.sys.mjs"
);
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js b/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js
index e39d3528ea11..e2f038eda843 100644
--- a/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js
+++ b/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js
@@ -7,8 +7,8 @@ const { ASRouterTriggerListeners } = ChromeUtils.import(
const { CFRMessageProvider } = ChromeUtils.import(
"resource://activity-stream/lib/CFRMessageProvider.jsm"
);
-const { JsonSchema } = ChromeUtils.import(
- "resource://gre/modules/JsonSchema.jsm"
+const { JsonSchema } = ChromeUtils.importESModule(
+ "resource://gre/modules/JsonSchema.sys.mjs"
);
XPCOMUtils.defineLazyGetter(this, "fetchTriggerActionSchema", async () => {
diff --git a/toolkit/components/narrate/NarrateControls.jsm b/toolkit/components/narrate/NarrateControls.jsm
index 57d5b090158f..4bbf67895810 100644
--- a/toolkit/components/narrate/NarrateControls.jsm
+++ b/toolkit/components/narrate/NarrateControls.jsm
@@ -10,8 +10,8 @@ const { VoiceSelect } = ChromeUtils.import(
const { Narrator } = ChromeUtils.import(
"resource://gre/modules/narrate/Narrator.jsm"
);
-const { AsyncPrefs } = ChromeUtils.import(
- "resource://gre/modules/AsyncPrefs.jsm"
+const { AsyncPrefs } = ChromeUtils.importESModule(
+ "resource://gre/modules/AsyncPrefs.sys.mjs"
);
var EXPORTED_SYMBOLS = ["NarrateControls"];
diff --git a/toolkit/components/nimbus/lib/ExperimentManager.jsm b/toolkit/components/nimbus/lib/ExperimentManager.jsm
index 88fa5e6eaa69..88cc456690a0 100644
--- a/toolkit/components/nimbus/lib/ExperimentManager.jsm
+++ b/toolkit/components/nimbus/lib/ExperimentManager.jsm
@@ -12,6 +12,10 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FirstStartup: "resource://gre/modules/FirstStartup.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
ExperimentStore: "resource://nimbus/lib/ExperimentStore.jsm",
@@ -20,7 +24,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
Sampling: "resource://gre/modules/components-utils/Sampling.jsm",
TelemetryEvents: "resource://normandy/lib/TelemetryEvents.jsm",
TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
- FirstStartup: "resource://gre/modules/FirstStartup.jsm",
PrefUtils: "resource://normandy/lib/PrefUtils.jsm",
});
diff --git a/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm b/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm
index 154f917e8f61..293e2a297b00 100644
--- a/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm
+++ b/toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm
@@ -15,6 +15,10 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
@@ -22,7 +26,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
CleanupManager: "resource://normandy/lib/CleanupManager.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
- JsonSchema: "resource://gre/modules/JsonSchema.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "log", () => {
diff --git a/toolkit/components/nimbus/lib/SharedDataMap.jsm b/toolkit/components/nimbus/lib/SharedDataMap.jsm
index c0dbf5323cf0..417f2fa5dd8e 100644
--- a/toolkit/components/nimbus/lib/SharedDataMap.jsm
+++ b/toolkit/components/nimbus/lib/SharedDataMap.jsm
@@ -10,20 +10,14 @@ const { EventEmitter } = ChromeUtils.import(
"resource://gre/modules/EventEmitter.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
const IS_MAIN_PROCESS =
Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT;
-ChromeUtils.defineModuleGetter(
- lazy,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/toolkit/components/nimbus/test/NimbusTestUtils.jsm b/toolkit/components/nimbus/test/NimbusTestUtils.jsm
index b4972a765c99..148695847780 100644
--- a/toolkit/components/nimbus/test/NimbusTestUtils.jsm
+++ b/toolkit/components/nimbus/test/NimbusTestUtils.jsm
@@ -18,6 +18,10 @@ const { FileTestUtils } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
_ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
@@ -27,7 +31,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
"resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm",
sinon: "resource://testing-common/Sinon.jsm",
FeatureManifest: "resource://nimbus/FeatureManifest.js",
- JsonSchema: "resource://gre/modules/JsonSchema.jsm",
});
const { SYNC_DATA_PREF_BRANCH, SYNC_DEFAULTS_PREF_BRANCH } = ExperimentStore;
diff --git a/toolkit/components/nimbus/test/browser/browser_experimentstore_load.js b/toolkit/components/nimbus/test/browser/browser_experimentstore_load.js
index d9131d7dc8cb..92993a97719c 100644
--- a/toolkit/components/nimbus/test/browser/browser_experimentstore_load.js
+++ b/toolkit/components/nimbus/test/browser/browser_experimentstore_load.js
@@ -12,11 +12,9 @@ const { ExperimentFakes } = ChromeUtils.import(
const { ExperimentFeatures } = ChromeUtils.import(
"resource://nimbus/ExperimentAPI.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
function getPath() {
const profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile).path;
diff --git a/toolkit/components/nimbus/test/browser/browser_experimentstore_load_single_feature.js b/toolkit/components/nimbus/test/browser/browser_experimentstore_load_single_feature.js
index ff30e0827525..7a7dc4fe478c 100644
--- a/toolkit/components/nimbus/test/browser/browser_experimentstore_load_single_feature.js
+++ b/toolkit/components/nimbus/test/browser/browser_experimentstore_load_single_feature.js
@@ -12,11 +12,9 @@ const { ExperimentFakes } = ChromeUtils.import(
const { NimbusFeatures, ExperimentAPI } = ChromeUtils.import(
"resource://nimbus/ExperimentAPI.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
const SINGLE_FEATURE_RECIPE = {
...ExperimentFakes.experiment(),
diff --git a/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js b/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js
index e6ac6efb5050..7c4de4ec42ef 100644
--- a/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js
+++ b/toolkit/components/nimbus/test/unit/test_ExperimentAPI_NimbusFeatures.js
@@ -5,8 +5,8 @@ const {
_ExperimentFeature: ExperimentFeature,
} = ChromeUtils.import("resource://nimbus/ExperimentAPI.jsm");
-const { JsonSchema } = ChromeUtils.import(
- "resource://gre/modules/JsonSchema.jsm"
+const { JsonSchema } = ChromeUtils.importESModule(
+ "resource://gre/modules/JsonSchema.sys.mjs"
);
Cu.importGlobalProperties(["fetch"]);
diff --git a/toolkit/components/nimbus/test/unit/test_ExperimentManager_context.js b/toolkit/components/nimbus/test/unit/test_ExperimentManager_context.js
index c94ba534cc96..b7ac49e90558 100644
--- a/toolkit/components/nimbus/test/unit/test_ExperimentManager_context.js
+++ b/toolkit/components/nimbus/test/unit/test_ExperimentManager_context.js
@@ -4,8 +4,8 @@ const { ExperimentFakes } = ChromeUtils.import(
"resource://testing-common/NimbusTestUtils.jsm"
);
-const { FirstStartup } = ChromeUtils.import(
- "resource://gre/modules/FirstStartup.jsm"
+const { FirstStartup } = ChromeUtils.importESModule(
+ "resource://gre/modules/FirstStartup.sys.mjs"
);
add_task(async function test_createTargetingContext() {
diff --git a/toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js b/toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js
index fde09eff9df1..cee62260fc8a 100644
--- a/toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js
+++ b/toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js
@@ -3,8 +3,8 @@
const { ExperimentFakes } = ChromeUtils.import(
"resource://testing-common/NimbusTestUtils.jsm"
);
-const { FirstStartup } = ChromeUtils.import(
- "resource://gre/modules/FirstStartup.jsm"
+const { FirstStartup } = ChromeUtils.importESModule(
+ "resource://gre/modules/FirstStartup.sys.mjs"
);
const { NimbusFeatures } = ChromeUtils.import(
"resource://nimbus/ExperimentAPI.jsm"
diff --git a/toolkit/components/normandy/Normandy.jsm b/toolkit/components/normandy/Normandy.jsm
index 0a4c64a83441..a95752ce3db5 100644
--- a/toolkit/components/normandy/Normandy.jsm
+++ b/toolkit/components/normandy/Normandy.jsm
@@ -3,12 +3,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
diff --git a/toolkit/components/normandy/NormandyMigrations.jsm b/toolkit/components/normandy/NormandyMigrations.jsm
index 00f1abac02d4..a8a5d28f19aa 100644
--- a/toolkit/components/normandy/NormandyMigrations.jsm
+++ b/toolkit/components/normandy/NormandyMigrations.jsm
@@ -3,7 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { AddonStudies } = ChromeUtils.import(
"resource://normandy/lib/AddonStudies.jsm"
diff --git a/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm b/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm
index 7f754e70a653..764e20e666ef 100644
--- a/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm
+++ b/toolkit/components/normandy/actions/BranchedAddonStudyAction.jsm
@@ -20,6 +20,10 @@ const { BaseStudyAction } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
ActionSchemas: "resource://normandy/actions/schemas/index.js",
AddonManager: "resource://gre/modules/AddonManager.jsm",
@@ -28,7 +32,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
NormandyApi: "resource://normandy/lib/NormandyApi.jsm",
NormandyUtils: "resource://normandy/lib/NormandyUtils.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
Sampling: "resource://gre/modules/components-utils/Sampling.jsm",
TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
TelemetryEvents: "resource://normandy/lib/TelemetryEvents.jsm",
diff --git a/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm b/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm
index dd82c17c22b7..a5d84d35af98 100644
--- a/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm
+++ b/toolkit/components/normandy/actions/ShowHeartbeatAction.jsm
@@ -41,11 +41,9 @@ ChromeUtils.defineModuleGetter(
"Storage",
"resource://normandy/lib/Storage.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"NormandyUtils",
diff --git a/toolkit/components/normandy/lib/AddonRollouts.jsm b/toolkit/components/normandy/lib/AddonRollouts.jsm
index ca426124ace7..ca947a087688 100644
--- a/toolkit/components/normandy/lib/AddonRollouts.jsm
+++ b/toolkit/components/normandy/lib/AddonRollouts.jsm
@@ -6,11 +6,9 @@
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "IndexedDB",
- "resource://gre/modules/IndexedDB.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"TelemetryEnvironment",
diff --git a/toolkit/components/normandy/lib/AddonStudies.jsm b/toolkit/components/normandy/lib/AddonStudies.jsm
index 782c91c2aaca..3514a690c0e9 100644
--- a/toolkit/components/normandy/lib/AddonStudies.jsm
+++ b/toolkit/components/normandy/lib/AddonStudies.jsm
@@ -50,11 +50,9 @@ const { LogManager } = ChromeUtils.import(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "IndexedDB",
- "resource://gre/modules/IndexedDB.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"AddonManager",
diff --git a/toolkit/components/normandy/lib/LogManager.jsm b/toolkit/components/normandy/lib/LogManager.jsm
index f57f7e2e2792..44f89f4c3c0a 100644
--- a/toolkit/components/normandy/lib/LogManager.jsm
+++ b/toolkit/components/normandy/lib/LogManager.jsm
@@ -4,7 +4,9 @@
"use strict";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
var EXPORTED_SYMBOLS = ["LogManager"];
diff --git a/toolkit/components/normandy/lib/NormandyAddonManager.jsm b/toolkit/components/normandy/lib/NormandyAddonManager.jsm
index a105a278d489..4173d2e1a93d 100644
--- a/toolkit/components/normandy/lib/NormandyAddonManager.jsm
+++ b/toolkit/components/normandy/lib/NormandyAddonManager.jsm
@@ -10,9 +10,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
});
var EXPORTED_SYMBOLS = ["NormandyAddonManager"];
diff --git a/toolkit/components/normandy/lib/PreferenceExperiments.jsm b/toolkit/components/normandy/lib/PreferenceExperiments.jsm
index bb938cbb7613..d4ff52f260e7 100644
--- a/toolkit/components/normandy/lib/PreferenceExperiments.jsm
+++ b/toolkit/components/normandy/lib/PreferenceExperiments.jsm
@@ -89,11 +89,9 @@ const { LogManager } = ChromeUtils.import(
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"TelemetryEnvironment",
diff --git a/toolkit/components/normandy/lib/PreferenceRollouts.jsm b/toolkit/components/normandy/lib/PreferenceRollouts.jsm
index 2dbce51451f7..670a5b4e0507 100644
--- a/toolkit/components/normandy/lib/PreferenceRollouts.jsm
+++ b/toolkit/components/normandy/lib/PreferenceRollouts.jsm
@@ -8,11 +8,9 @@ const { LogManager } = ChromeUtils.import(
"resource://normandy/lib/LogManager.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "IndexedDB",
- "resource://gre/modules/IndexedDB.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"TelemetryEnvironment",
diff --git a/toolkit/components/normandy/lib/RecipeRunner.jsm b/toolkit/components/normandy/lib/RecipeRunner.jsm
index 8397f8295085..2d27d9c2c68e 100644
--- a/toolkit/components/normandy/lib/RecipeRunner.jsm
+++ b/toolkit/components/normandy/lib/RecipeRunner.jsm
@@ -10,8 +10,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const { LogManager } = ChromeUtils.import(
"resource://normandy/lib/LogManager.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const lazy = {};
diff --git a/toolkit/components/normandy/lib/Storage.jsm b/toolkit/components/normandy/lib/Storage.jsm
index e00f85214806..fb8d5f475b93 100644
--- a/toolkit/components/normandy/lib/Storage.jsm
+++ b/toolkit/components/normandy/lib/Storage.jsm
@@ -10,11 +10,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
var EXPORTED_SYMBOLS = ["Storage"];
diff --git a/toolkit/components/normandy/test/browser/browser_AddonRollouts.js b/toolkit/components/normandy/test/browser/browser_AddonRollouts.js
index 060128605604..6d59f7510cee 100644
--- a/toolkit/components/normandy/test/browser/browser_AddonRollouts.js
+++ b/toolkit/components/normandy/test/browser/browser_AddonRollouts.js
@@ -1,7 +1,7 @@
"use strict";
-const { IndexedDB } = ChromeUtils.import(
- "resource://gre/modules/IndexedDB.jsm"
+const { IndexedDB } = ChromeUtils.importESModule(
+ "resource://gre/modules/IndexedDB.sys.mjs"
);
const { TelemetryEnvironment } = ChromeUtils.import(
"resource://gre/modules/TelemetryEnvironment.jsm"
diff --git a/toolkit/components/normandy/test/browser/browser_AddonStudies.js b/toolkit/components/normandy/test/browser/browser_AddonStudies.js
index 5cfc5a907624..e696b86e364a 100644
--- a/toolkit/components/normandy/test/browser/browser_AddonStudies.js
+++ b/toolkit/components/normandy/test/browser/browser_AddonStudies.js
@@ -1,7 +1,7 @@
"use strict";
-const { IndexedDB } = ChromeUtils.import(
- "resource://gre/modules/IndexedDB.jsm"
+const { IndexedDB } = ChromeUtils.importESModule(
+ "resource://gre/modules/IndexedDB.sys.mjs"
);
const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
diff --git a/toolkit/components/normandy/test/browser/browser_LogManager.js b/toolkit/components/normandy/test/browser/browser_LogManager.js
index 630064707a26..cde9549f8c7f 100644
--- a/toolkit/components/normandy/test/browser/browser_LogManager.js
+++ b/toolkit/components/normandy/test/browser/browser_LogManager.js
@@ -1,6 +1,8 @@
"use strict";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { LogManager } = ChromeUtils.import(
"resource://normandy/lib/LogManager.jsm"
);
diff --git a/toolkit/components/normandy/test/browser/browser_NormandyAddonManager.js b/toolkit/components/normandy/test/browser/browser_NormandyAddonManager.js
index 3e111561e02a..769a47cfbe75 100644
--- a/toolkit/components/normandy/test/browser/browser_NormandyAddonManager.js
+++ b/toolkit/components/normandy/test/browser/browser_NormandyAddonManager.js
@@ -1,7 +1,7 @@
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { NormandyAddonManager } = ChromeUtils.import(
"resource://normandy/lib/NormandyAddonManager.jsm"
diff --git a/toolkit/components/normandy/test/browser/browser_PreferenceRollouts.js b/toolkit/components/normandy/test/browser/browser_PreferenceRollouts.js
index ca355c6f51e4..c92037b9665e 100644
--- a/toolkit/components/normandy/test/browser/browser_PreferenceRollouts.js
+++ b/toolkit/components/normandy/test/browser/browser_PreferenceRollouts.js
@@ -1,7 +1,7 @@
"use strict";
-const { IndexedDB } = ChromeUtils.import(
- "resource://gre/modules/IndexedDB.jsm"
+const { IndexedDB } = ChromeUtils.importESModule(
+ "resource://gre/modules/IndexedDB.sys.mjs"
);
const { TelemetryEnvironment } = ChromeUtils.import(
"resource://gre/modules/TelemetryEnvironment.jsm"
diff --git a/toolkit/components/normandy/test/browser/browser_about_studies.js b/toolkit/components/normandy/test/browser/browser_about_studies.js
index 537b479ad6e5..f2dea7b78ecf 100644
--- a/toolkit/components/normandy/test/browser/browser_about_studies.js
+++ b/toolkit/components/normandy/test/browser/browser_about_studies.js
@@ -15,8 +15,8 @@ const { ExperimentManager } = ChromeUtils.import(
const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
"resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { NormandyTestUtils } = ChromeUtils.import(
"resource://testing-common/NormandyTestUtils.jsm"
diff --git a/toolkit/components/normandy/test/unit/test_Normandy.js b/toolkit/components/normandy/test/unit/test_Normandy.js
index 7792e2727cc7..131061b4946f 100644
--- a/toolkit/components/normandy/test/unit/test_Normandy.js
+++ b/toolkit/components/normandy/test/unit/test_Normandy.js
@@ -7,8 +7,8 @@ const { Normandy } = ChromeUtils.import("resource://normandy/Normandy.jsm");
const { NormandyMigrations } = ChromeUtils.import(
"resource://normandy/NormandyMigrations.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
ChromeUtils.defineModuleGetter(
this,
diff --git a/toolkit/components/normandy/test/unit/test_NormandyApi.js b/toolkit/components/normandy/test/unit/test_NormandyApi.js
index a07c9eeaabae..790cc0c316bb 100644
--- a/toolkit/components/normandy/test/unit/test_NormandyApi.js
+++ b/toolkit/components/normandy/test/unit/test_NormandyApi.js
@@ -1,8 +1,8 @@
/* globals sinon */
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
/* import-globals-from utils.js */
diff --git a/toolkit/components/normandy/test/unit/test_addon_unenroll.js b/toolkit/components/normandy/test/unit/test_addon_unenroll.js
index 26f714260f15..aa9f4d4332bd 100644
--- a/toolkit/components/normandy/test/unit/test_addon_unenroll.js
+++ b/toolkit/components/normandy/test/unit/test_addon_unenroll.js
@@ -19,8 +19,8 @@ const { AddonManager } = ChromeUtils.import(
const { AddonStudies } = ChromeUtils.import(
"resource://normandy/lib/AddonStudies.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
/* import-globals-from utils.js */
diff --git a/toolkit/components/osfile/modules/osfile_async_front.jsm b/toolkit/components/osfile/modules/osfile_async_front.jsm
index f3470188c253..c1d50217414b 100644
--- a/toolkit/components/osfile/modules/osfile_async_front.jsm
+++ b/toolkit/components/osfile/modules/osfile_async_front.jsm
@@ -54,11 +54,9 @@ var Path = ChromeUtils.import("resource://gre/modules/osfile/ospath.jsm");
const lazy = {};
// The library of promises.
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
// The implementation of communications
const { BasePromiseWorker } = ChromeUtils.import(
diff --git a/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js b/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js
index ab8ce128e5a3..0a1fe938d480 100644
--- a/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js
+++ b/toolkit/components/osfile/tests/mochi/main_test_osfile_async.js
@@ -5,8 +5,8 @@ const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
// The following are used to compare against a well-tested reference
// implementation of file I/O.
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
var myok = ok;
diff --git a/toolkit/components/osfile/tests/xpcshell/head.js b/toolkit/components/osfile/tests/xpcshell/head.js
index 6223c7045b73..8d162b976794 100644
--- a/toolkit/components/osfile/tests/xpcshell/head.js
+++ b/toolkit/components/osfile/tests/xpcshell/head.js
@@ -11,11 +11,9 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
// CommonJS loader, so we do not want OS.File to be loaded eagerly for
// all the tests in this directory.
ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
"NetUtil",
diff --git a/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js b/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js
index b94f243dffbf..41b57414e042 100644
--- a/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js
+++ b/toolkit/components/osfile/tests/xpcshell/test_file_URL_conversion.js
@@ -4,8 +4,8 @@
function run_test() {
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
- const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+ const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
let isWindows = "@mozilla.org/windows-registry-key;1" in Cc;
diff --git a/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js b/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js
index d87be22c12fa..0c82e542f664 100644
--- a/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js
+++ b/toolkit/components/osfile/tests/xpcshell/test_osfile_async_copy.js
@@ -1,8 +1,8 @@
"use strict";
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
diff --git a/toolkit/components/osfile/tests/xpcshell/test_shutdown.js b/toolkit/components/osfile/tests/xpcshell/test_shutdown.js
index 8e9f16395acb..9e8c696481b2 100644
--- a/toolkit/components/osfile/tests/xpcshell/test_shutdown.js
+++ b/toolkit/components/osfile/tests/xpcshell/test_shutdown.js
@@ -1,5 +1,5 @@
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
add_task(function init() {
diff --git a/toolkit/components/passwordmgr/LoginCSVImport.jsm b/toolkit/components/passwordmgr/LoginCSVImport.jsm
index 20c94b183b63..d54ce58e4f4f 100644
--- a/toolkit/components/passwordmgr/LoginCSVImport.jsm
+++ b/toolkit/components/passwordmgr/LoginCSVImport.jsm
@@ -20,9 +20,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ ResponsivenessMonitor: "resource://gre/modules/ResponsivenessMonitor.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
- ResponsivenessMonitor: "resource://gre/modules/ResponsivenessMonitor.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "d3", () => {
diff --git a/toolkit/components/passwordmgr/LoginFormFactory.jsm b/toolkit/components/passwordmgr/LoginFormFactory.jsm
index 4eb95b0142ca..ce8483c6fc21 100644
--- a/toolkit/components/passwordmgr/LoginFormFactory.jsm
+++ b/toolkit/components/passwordmgr/LoginFormFactory.jsm
@@ -17,8 +17,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm",
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
});
diff --git a/toolkit/components/passwordmgr/LoginHelper.jsm b/toolkit/components/passwordmgr/LoginHelper.jsm
index 1de41f5fc0b3..d467a84d9138 100644
--- a/toolkit/components/passwordmgr/LoginHelper.jsm
+++ b/toolkit/components/passwordmgr/LoginHelper.jsm
@@ -18,11 +18,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "OSKeyStore",
- "resource://gre/modules/OSKeyStore.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+});
/**
* A helper class to deal with CSV import rows.
diff --git a/toolkit/components/passwordmgr/LoginManagerChild.jsm b/toolkit/components/passwordmgr/LoginManagerChild.jsm
index bad3abcfc64c..e3307cdd3ebd 100644
--- a/toolkit/components/passwordmgr/LoginManagerChild.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerChild.jsm
@@ -36,15 +36,18 @@ const { AppConstants } = ChromeUtils.import(
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
-const { CreditCard } = ChromeUtils.import(
- "resource://gre/modules/CreditCard.jsm"
+const { CreditCard } = ChromeUtils.importESModule(
+ "resource://gre/modules/CreditCard.sys.mjs"
);
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
DeferredTask: "resource://gre/modules/DeferredTask.jsm",
- FormLikeFactory: "resource://gre/modules/FormLikeFactory.jsm",
LoginFormFactory: "resource://gre/modules/LoginFormFactory.jsm",
LoginRecipesContent: "resource://gre/modules/LoginRecipes.jsm",
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
diff --git a/toolkit/components/passwordmgr/LoginStore.jsm b/toolkit/components/passwordmgr/LoginStore.jsm
index 8005ad0bd0ee..ce207adb4286 100644
--- a/toolkit/components/passwordmgr/LoginStore.jsm
+++ b/toolkit/components/passwordmgr/LoginStore.jsm
@@ -42,7 +42,9 @@ const EXPORTED_SYMBOLS = ["LoginStore"];
// Globals
-const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm");
+const { JSONFile } = ChromeUtils.importESModule(
+ "resource://gre/modules/JSONFile.sys.mjs"
+);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/toolkit/components/passwordmgr/test/unit/head.js b/toolkit/components/passwordmgr/test/unit/head.js
index 7b4095a1bc05..5d9b4b8292ab 100644
--- a/toolkit/components/passwordmgr/test/unit/head.js
+++ b/toolkit/components/passwordmgr/test/unit/head.js
@@ -30,9 +30,12 @@ const { MockDocument } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
DownloadPaths: "resource://gre/modules/DownloadPaths.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
});
const LoginInfo = Components.Constructor(
diff --git a/toolkit/components/pdfjs/content/PdfStreamConverter.jsm b/toolkit/components/pdfjs/content/PdfStreamConverter.jsm
index d7d82e9be479..44a098746673 100644
--- a/toolkit/components/pdfjs/content/PdfStreamConverter.jsm
+++ b/toolkit/components/pdfjs/content/PdfStreamConverter.jsm
@@ -34,11 +34,9 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "AsyncPrefs",
- "resource://gre/modules/AsyncPrefs.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ AsyncPrefs: "resource://gre/modules/AsyncPrefs.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"NetUtil",
diff --git a/toolkit/components/pdfjs/content/PdfjsParent.jsm b/toolkit/components/pdfjs/content/PdfjsParent.jsm
index 1617bbdee431..e6f6766e1f2c 100644
--- a/toolkit/components/pdfjs/content/PdfjsParent.jsm
+++ b/toolkit/components/pdfjs/content/PdfjsParent.jsm
@@ -23,11 +23,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "SetClipboardSearchString",
- "resource://gre/modules/Finder.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ SetClipboardSearchString: "resource://gre/modules/Finder.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
index ecf76e15938f..8b2a3094c5c9 100644
--- a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
+++ b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
@@ -17,9 +17,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
});
-const { Rect, Point } = ChromeUtils.import(
- "resource://gre/modules/Geometry.jsm"
-);
+import { Rect, Point } from "resource://gre/modules/Geometry.sys.mjs";
const PLAYER_URI = "chrome://global/content/pictureinpicture/player.xhtml";
var PLAYER_FEATURES =
diff --git a/toolkit/components/pictureinpicture/content/player.js b/toolkit/components/pictureinpicture/content/player.js
index a0e68ef39e4b..9de62bbab5ee 100644
--- a/toolkit/components/pictureinpicture/content/player.js
+++ b/toolkit/components/pictureinpicture/content/player.js
@@ -5,8 +5,8 @@
const { PictureInPicture } = ChromeUtils.importESModule(
"resource://gre/modules/PictureInPicture.sys.mjs"
);
-const { ShortcutUtils } = ChromeUtils.import(
- "resource://gre/modules/ShortcutUtils.jsm"
+const { ShortcutUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/ShortcutUtils.sys.mjs"
);
const { DeferredTask } = ChromeUtils.import(
"resource://gre/modules/DeferredTask.jsm"
diff --git a/toolkit/components/pictureinpicture/tests/head.js b/toolkit/components/pictureinpicture/tests/head.js
index 5f1c8bf77bd5..7ba80382df4e 100644
--- a/toolkit/components/pictureinpicture/tests/head.js
+++ b/toolkit/components/pictureinpicture/tests/head.js
@@ -488,7 +488,9 @@ async function getToggleClientRect(
) {
let args = { videoID, toggleID: toggleStyles.rootID };
return ContentTask.spawn(browser, args, async args => {
- const { Rect } = ChromeUtils.import("resource://gre/modules/Geometry.jsm");
+ const { Rect } = ChromeUtils.importESModule(
+ "resource://gre/modules/Geometry.sys.mjs"
+ );
let { videoID, toggleID } = args;
let video = content.document.getElementById(videoID);
diff --git a/toolkit/components/places/BookmarkHTMLUtils.sys.mjs b/toolkit/components/places/BookmarkHTMLUtils.sys.mjs
index dfa6df65b79b..3310bd079d33 100644
--- a/toolkit/components/places/BookmarkHTMLUtils.sys.mjs
+++ b/toolkit/components/places/BookmarkHTMLUtils.sys.mjs
@@ -57,9 +57,7 @@
*/
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
-);
+import { FileUtils } from "resource://gre/modules/FileUtils.sys.mjs";
import { PlacesUtils } from "resource://gre/modules/PlacesUtils.sys.mjs";
const lazy = {};
diff --git a/toolkit/components/places/PlacesDBUtils.sys.mjs b/toolkit/components/places/PlacesDBUtils.sys.mjs
index 14ff75f92bd9..dc171b741117 100644
--- a/toolkit/components/places/PlacesDBUtils.sys.mjs
+++ b/toolkit/components/places/PlacesDBUtils.sys.mjs
@@ -13,17 +13,12 @@ const CORRUPT_DB_RETAIN_DAYS = 14;
// Seconds between maintenance runs.
const MAINTENANCE_INTERVAL_SECONDS = 7 * 86400;
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
PlacesPreviews: "resource://gre/modules/PlacesPreviews.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- Sqlite: "resource://gre/modules/Sqlite.jsm",
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
});
export var PlacesDBUtils = {
diff --git a/toolkit/components/places/PlacesSyncUtils.sys.mjs b/toolkit/components/places/PlacesSyncUtils.sys.mjs
index 5ba65c9ad4cf..950500603178 100644
--- a/toolkit/components/places/PlacesSyncUtils.sys.mjs
+++ b/toolkit/components/places/PlacesSyncUtils.sys.mjs
@@ -6,8 +6,8 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
-ChromeUtils.defineModuleGetter(lazy, "Log", "resource://gre/modules/Log.jsm");
ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
diff --git a/toolkit/components/places/PlacesUtils.sys.mjs b/toolkit/components/places/PlacesUtils.sys.mjs
index 2604f7d08216..08759c03adfc 100644
--- a/toolkit/components/places/PlacesUtils.sys.mjs
+++ b/toolkit/components/places/PlacesUtils.sys.mjs
@@ -6,9 +6,7 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
-);
+import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs";
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
@@ -17,11 +15,11 @@ ChromeUtils.defineESModuleGetters(lazy, {
Bookmarks: "resource://gre/modules/Bookmarks.sys.mjs",
History: "resource://gre/modules/History.sys.mjs",
PlacesSyncUtils: "resource://gre/modules/PlacesSyncUtils.sys.mjs",
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
NetUtil: "resource://gre/modules/NetUtil.jsm",
- Sqlite: "resource://gre/modules/Sqlite.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "MOZ_ACTION_REGEX", () => {
diff --git a/toolkit/components/places/SyncedBookmarksMirror.sys.mjs b/toolkit/components/places/SyncedBookmarksMirror.sys.mjs
index 5d6bc404d57d..108c9c2c526a 100644
--- a/toolkit/components/places/SyncedBookmarksMirror.sys.mjs
+++ b/toolkit/components/places/SyncedBookmarksMirror.sys.mjs
@@ -52,13 +52,13 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
PlacesSyncUtils: "resource://gre/modules/PlacesSyncUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Async: "resource://services-common/async.js",
- Log: "resource://gre/modules/Log.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "MirrorLog", () =>
diff --git a/toolkit/components/places/tests/head_common.js b/toolkit/components/places/tests/head_common.js
index 1beb2ebdcf42..9960be07c493 100644
--- a/toolkit/components/places/tests/head_common.js
+++ b/toolkit/components/places/tests/head_common.js
@@ -33,18 +33,18 @@ var { PlacesSyncUtils } = ChromeUtils.importESModule(
ChromeUtils.defineESModuleGetters(this, {
BookmarkHTMLUtils: "resource://gre/modules/BookmarkHTMLUtils.sys.mjs",
BookmarkJSONUtils: "resource://gre/modules/BookmarkJSONUtils.sys.mjs",
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs",
PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
PlacesTransactions: "resource://gre/modules/PlacesTransactions.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
- FileUtils: "resource://gre/modules/FileUtils.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
- Sqlite: "resource://gre/modules/Sqlite.jsm",
TestUtils: "resource://testing-common/TestUtils.jsm",
});
diff --git a/toolkit/components/places/tests/history/test_removeVisitsByFilter.js b/toolkit/components/places/tests/history/test_removeVisitsByFilter.js
index eb2edadce068..f9722775fe4c 100644
--- a/toolkit/components/places/tests/history/test_removeVisitsByFilter.js
+++ b/toolkit/components/places/tests/history/test_removeVisitsByFilter.js
@@ -5,8 +5,8 @@
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
add_task(async function test_removeVisitsByFilter() {
diff --git a/toolkit/components/places/tests/sync/head_sync.js b/toolkit/components/places/tests/sync/head_sync.js
index e379f2709cb5..7e12dc873f4a 100644
--- a/toolkit/components/places/tests/sync/head_sync.js
+++ b/toolkit/components/places/tests/sync/head_sync.js
@@ -14,7 +14,7 @@
var { CanonicalJSON } = ChromeUtils.import(
"resource://gre/modules/CanonicalJSON.jsm"
);
-var { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+var { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs");
var { ObjectUtils } = ChromeUtils.import(
"resource://gre/modules/ObjectUtils.jsm"
);
diff --git a/toolkit/components/promiseworker/PromiseWorker.jsm b/toolkit/components/promiseworker/PromiseWorker.jsm
index ff0d7232529c..1fbafd9f3b58 100644
--- a/toolkit/components/promiseworker/PromiseWorker.jsm
+++ b/toolkit/components/promiseworker/PromiseWorker.jsm
@@ -21,11 +21,9 @@ var EXPORTED_SYMBOLS = ["BasePromiseWorker"];
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
/**
* An implementation of queues (FIFO).
diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm
index d82217037deb..c0e898ae86cc 100644
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -15,11 +15,9 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "AsyncPrefs",
- "resource://gre/modules/AsyncPrefs.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ AsyncPrefs: "resource://gre/modules/AsyncPrefs.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"NarrateControls",
diff --git a/toolkit/components/reader/test/head.js b/toolkit/components/reader/test/head.js
index f760ab72c0fc..bd4f124fd209 100644
--- a/toolkit/components/reader/test/head.js
+++ b/toolkit/components/reader/test/head.js
@@ -1,8 +1,6 @@
-ChromeUtils.defineModuleGetter(
- this,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
/* exported promiseTabLoadEvent, is_element_visible, is_element_hidden */
diff --git a/toolkit/components/remotepagemanager/MessagePort.jsm b/toolkit/components/remotepagemanager/MessagePort.jsm
index 943b1818b25f..5de2b78a3337 100644
--- a/toolkit/components/remotepagemanager/MessagePort.jsm
+++ b/toolkit/components/remotepagemanager/MessagePort.jsm
@@ -8,11 +8,9 @@ var EXPORTED_SYMBOLS = ["MessagePort", "MessageListener"];
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
class MessageListener {
constructor() {
diff --git a/toolkit/components/satchel/FormHistory.jsm b/toolkit/components/satchel/FormHistory.jsm
index d11fbab1c08d..0510c9664de0 100644
--- a/toolkit/components/satchel/FormHistory.jsm
+++ b/toolkit/components/satchel/FormHistory.jsm
@@ -94,11 +94,9 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "Sqlite",
- "resource://gre/modules/Sqlite.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
+});
const DB_SCHEMA_VERSION = 5;
const DAY_IN_MS = 86400000; // 1 day in milliseconds
diff --git a/toolkit/components/satchel/FormHistoryChild.jsm b/toolkit/components/satchel/FormHistoryChild.jsm
index 49547945f8e2..783a5751d5d9 100644
--- a/toolkit/components/satchel/FormHistoryChild.jsm
+++ b/toolkit/components/satchel/FormHistoryChild.jsm
@@ -12,11 +12,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "CreditCard",
- "resource://gre/modules/CreditCard.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"PrivateBrowsingUtils",
diff --git a/toolkit/components/satchel/test/unit/head_satchel.js b/toolkit/components/satchel/test/unit/head_satchel.js
index 5f42509b0250..ededd7c29c4b 100644
--- a/toolkit/components/satchel/test/unit/head_satchel.js
+++ b/toolkit/components/satchel/test/unit/head_satchel.js
@@ -15,10 +15,14 @@ const PR_HOURS = 60 * 60 * 1000000;
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
+
+ChromeUtils.defineESModuleGetters(this, {
+ Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
FormHistory: "resource://gre/modules/FormHistory.jsm",
FormHistoryTestUtils: "resource://testing-common/FormHistoryTestUtils.jsm",
- Sqlite: "resource://gre/modules/Sqlite.jsm",
});
do_get_profile();
diff --git a/toolkit/components/satchel/test/unit/test_history_api.js b/toolkit/components/satchel/test/unit/test_history_api.js
index cd97cc063169..bb1501af6b54 100644
--- a/toolkit/components/satchel/test/unit/test_history_api.js
+++ b/toolkit/components/satchel/test/unit/test_history_api.js
@@ -5,8 +5,8 @@
var testnum = 0;
var dbConnection; // used for deleted table tests
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
function countDeletedEntries(expected) {
diff --git a/toolkit/components/search/SearchService.sys.mjs b/toolkit/components/search/SearchService.sys.mjs
index 08310f7149ee..8a5251e84088 100644
--- a/toolkit/components/search/SearchService.sys.mjs
+++ b/toolkit/components/search/SearchService.sys.mjs
@@ -6,9 +6,8 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
-);
+import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs";
+
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/search/SearchSuggestionController.sys.mjs b/toolkit/components/search/SearchSuggestionController.sys.mjs
index 5d636881c536..8b50d35a05b0 100644
--- a/toolkit/components/search/SearchSuggestionController.sys.mjs
+++ b/toolkit/components/search/SearchSuggestionController.sys.mjs
@@ -7,13 +7,10 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
-});
-
const DEFAULT_FORM_HISTORY_PARAM = "searchbar-history";
const HTTP_OK = 200;
const BROWSER_SUGGEST_PREF = "browser.search.suggest.enabled";
diff --git a/toolkit/components/search/tests/xpcshell/head_search.js b/toolkit/components/search/tests/xpcshell/head_search.js
index 4e5b54e3a83b..2c379e838412 100644
--- a/toolkit/components/search/tests/xpcshell/head_search.js
+++ b/toolkit/components/search/tests/xpcshell/head_search.js
@@ -6,6 +6,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
);
ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
SearchService: "resource://gre/modules/SearchService.sys.mjs",
@@ -16,8 +18,6 @@ ChromeUtils.defineESModuleGetters(this, {
XPCOMUtils.defineLazyModuleGetters(this, {
clearTimeout: "resource://gre/modules/Timer.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
diff --git a/toolkit/components/search/tests/xpcshell/test_engine_selector_remote_settings.js b/toolkit/components/search/tests/xpcshell/test_engine_selector_remote_settings.js
index d2e700ef30e9..336ffb1ee5d2 100644
--- a/toolkit/components/search/tests/xpcshell/test_engine_selector_remote_settings.js
+++ b/toolkit/components/search/tests/xpcshell/test_engine_selector_remote_settings.js
@@ -4,13 +4,10 @@
"use strict";
ChromeUtils.defineESModuleGetters(this, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
});
-XPCOMUtils.defineLazyModuleGetters(this, {
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
-});
-
const TEST_CONFIG = [
{
engineName: "aol",
diff --git a/toolkit/components/search/tests/xpcshell/test_searchSuggest.js b/toolkit/components/search/tests/xpcshell/test_searchSuggest.js
index 0d352c94a389..ceb4685e9ddb 100644
--- a/toolkit/components/search/tests/xpcshell/test_searchSuggest.js
+++ b/toolkit/components/search/tests/xpcshell/test_searchSuggest.js
@@ -17,8 +17,8 @@ const { FormHistory } = ChromeUtils.import(
const { SearchSuggestionController } = ChromeUtils.importESModule(
"resource://gre/modules/SearchSuggestionController.sys.mjs"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
diff --git a/toolkit/components/telemetry/app/ClientID.jsm b/toolkit/components/telemetry/app/ClientID.jsm
index 120c89b0f365..f14b3ef6d56b 100644
--- a/toolkit/components/telemetry/app/ClientID.jsm
+++ b/toolkit/components/telemetry/app/ClientID.jsm
@@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["ClientID"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetryArchive.jsm b/toolkit/components/telemetry/app/TelemetryArchive.jsm
index 69a5eb2c4596..27ebe2fed9f9 100644
--- a/toolkit/components/telemetry/app/TelemetryArchive.jsm
+++ b/toolkit/components/telemetry/app/TelemetryArchive.jsm
@@ -6,7 +6,9 @@
var EXPORTED_SYMBOLS = ["TelemetryArchive"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetryControllerBase.jsm b/toolkit/components/telemetry/app/TelemetryControllerBase.jsm
index af25918d6780..ec400bb306bc 100644
--- a/toolkit/components/telemetry/app/TelemetryControllerBase.jsm
+++ b/toolkit/components/telemetry/app/TelemetryControllerBase.jsm
@@ -10,7 +10,9 @@ var EXPORTED_SYMBOLS = ["TelemetryControllerBase"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const LOGGER_NAME = "Toolkit.Telemetry";
const LOGGER_PREFIX = "TelemetryController::";
diff --git a/toolkit/components/telemetry/app/TelemetryControllerParent.jsm b/toolkit/components/telemetry/app/TelemetryControllerParent.jsm
index 9595ba65be33..00daa446ab9d 100644
--- a/toolkit/components/telemetry/app/TelemetryControllerParent.jsm
+++ b/toolkit/components/telemetry/app/TelemetryControllerParent.jsm
@@ -11,8 +11,8 @@ const { AppConstants } = ChromeUtils.import(
const { AsyncShutdown } = ChromeUtils.import(
"resource://gre/modules/AsyncShutdown.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { DeferredTask } = ChromeUtils.import(
"resource://gre/modules/DeferredTask.jsm"
diff --git a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm b/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
index e8e432f46d70..b11d3409be69 100644
--- a/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/app/TelemetryEnvironment.jsm
@@ -6,7 +6,9 @@
var EXPORTED_SYMBOLS = ["TelemetryEnvironment", "Policy"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
@@ -16,8 +18,8 @@ const { ObjectUtils } = ChromeUtils.import(
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { UpdateUtils } = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+const { UpdateUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
);
const Utils = TelemetryUtils;
@@ -33,16 +35,10 @@ ChromeUtils.defineModuleGetter(
"AttributionCode",
"resource:///modules/AttributionCode.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "ProfileAge",
- "resource://gre/modules/ProfileAge.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "WindowsRegistry",
- "resource://gre/modules/WindowsRegistry.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
+});
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm b/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm
index 13e4e4190ea0..bc2c2ee8e3c3 100644
--- a/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm
+++ b/toolkit/components/telemetry/app/TelemetryReportingPolicy.jsm
@@ -6,7 +6,9 @@
var EXPORTED_SYMBOLS = ["TelemetryReportingPolicy", "Policy"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { clearTimeout, setTimeout } = ChromeUtils.import(
"resource://gre/modules/Timer.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetryScheduler.jsm b/toolkit/components/telemetry/app/TelemetryScheduler.jsm
index 06ab136f7ece..12490df709f5 100644
--- a/toolkit/components/telemetry/app/TelemetryScheduler.jsm
+++ b/toolkit/components/telemetry/app/TelemetryScheduler.jsm
@@ -6,7 +6,9 @@
var EXPORTED_SYMBOLS = ["TelemetryScheduler", "Policy"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { TelemetrySession } = ChromeUtils.import(
"resource://gre/modules/TelemetrySession.jsm"
);
diff --git a/toolkit/components/telemetry/app/TelemetrySend.jsm b/toolkit/components/telemetry/app/TelemetrySend.jsm
index c913bca0f991..a4f20d1c61b4 100644
--- a/toolkit/components/telemetry/app/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/app/TelemetrySend.jsm
@@ -25,12 +25,14 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const { ClientID } = ChromeUtils.import("resource://gre/modules/ClientID.jsm");
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
);
-const { ServiceRequest } = ChromeUtils.import(
- "resource://gre/modules/ServiceRequest.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
+);
+const { ServiceRequest } = ChromeUtils.importESModule(
+ "resource://gre/modules/ServiceRequest.sys.mjs"
);
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
diff --git a/toolkit/components/telemetry/app/TelemetryStorage.jsm b/toolkit/components/telemetry/app/TelemetryStorage.jsm
index f5796c06cc4e..f3712da2246d 100644
--- a/toolkit/components/telemetry/app/TelemetryStorage.jsm
+++ b/toolkit/components/telemetry/app/TelemetryStorage.jsm
@@ -10,7 +10,9 @@ var EXPORTED_SYMBOLS = ["TelemetryStorage", "Policy"];
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/toolkit/components/telemetry/app/TelemetryUtils.jsm b/toolkit/components/telemetry/app/TelemetryUtils.jsm
index e1e0aef3d4fa..30130db2c93e 100644
--- a/toolkit/components/telemetry/app/TelemetryUtils.jsm
+++ b/toolkit/components/telemetry/app/TelemetryUtils.jsm
@@ -10,11 +10,9 @@ const { TelemetryControllerBase } = ChromeUtils.import(
"resource://gre/modules/TelemetryControllerBase.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;
diff --git a/toolkit/components/telemetry/pings/CoveragePing.jsm b/toolkit/components/telemetry/pings/CoveragePing.jsm
index a91d39a277a6..6866e888a5c0 100644
--- a/toolkit/components/telemetry/pings/CoveragePing.jsm
+++ b/toolkit/components/telemetry/pings/CoveragePing.jsm
@@ -3,7 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const lazy = {};
@@ -12,21 +14,11 @@ ChromeUtils.defineModuleGetter(
"CommonUtils",
"resource://services-common/utils.js"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "ServiceRequest",
- "resource://gre/modules/ServiceRequest.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+ ServiceRequest: "resource://gre/modules/ServiceRequest.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
var EXPORTED_SYMBOLS = ["CoveragePing"];
diff --git a/toolkit/components/telemetry/pings/EventPing.jsm b/toolkit/components/telemetry/pings/EventPing.jsm
index 8641c26fd846..79180cfc1008 100644
--- a/toolkit/components/telemetry/pings/EventPing.jsm
+++ b/toolkit/components/telemetry/pings/EventPing.jsm
@@ -20,10 +20,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
TelemetrySession: "resource://gre/modules/TelemetrySession.jsm",
TelemetryController: "resource://gre/modules/TelemetryController.jsm",
- Log: "resource://gre/modules/Log.jsm",
});
ChromeUtils.defineModuleGetter(
diff --git a/toolkit/components/telemetry/pings/HealthPing.jsm b/toolkit/components/telemetry/pings/HealthPing.jsm
index 088046b759dc..22c748ac0afa 100644
--- a/toolkit/components/telemetry/pings/HealthPing.jsm
+++ b/toolkit/components/telemetry/pings/HealthPing.jsm
@@ -34,7 +34,9 @@ ChromeUtils.defineModuleGetter(
"clearTimeout",
"resource://gre/modules/Timer.jsm"
);
-ChromeUtils.defineModuleGetter(lazy, "Log", "resource://gre/modules/Log.jsm");
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
const Utils = TelemetryUtils;
diff --git a/toolkit/components/telemetry/pings/ModulesPing.jsm b/toolkit/components/telemetry/pings/ModulesPing.jsm
index 704e5836f6b9..73c81e6c9690 100644
--- a/toolkit/components/telemetry/pings/ModulesPing.jsm
+++ b/toolkit/components/telemetry/pings/ModulesPing.jsm
@@ -7,7 +7,9 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/toolkit/components/telemetry/pings/PrioPing.jsm b/toolkit/components/telemetry/pings/PrioPing.jsm
index 71dc092c2680..0bfc5f7f7e32 100644
--- a/toolkit/components/telemetry/pings/PrioPing.jsm
+++ b/toolkit/components/telemetry/pings/PrioPing.jsm
@@ -17,9 +17,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
TelemetryController: "resource://gre/modules/TelemetryController.jsm",
- Log: "resource://gre/modules/Log.jsm",
});
const { TelemetryUtils } = ChromeUtils.import(
diff --git a/toolkit/components/telemetry/pings/TelemetrySession.jsm b/toolkit/components/telemetry/pings/TelemetrySession.jsm
index 3b2304dd601c..9ba14a1a4060 100644
--- a/toolkit/components/telemetry/pings/TelemetrySession.jsm
+++ b/toolkit/components/telemetry/pings/TelemetrySession.jsm
@@ -5,7 +5,9 @@
"use strict";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm b/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm
index 2e7eedc26d5b..027857853ef5 100644
--- a/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm
+++ b/toolkit/components/telemetry/pings/UntrustedModulesPing.jsm
@@ -13,7 +13,9 @@
var EXPORTED_SYMBOLS = ["TelemetryUntrustedModulesPing"];
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/toolkit/components/telemetry/pings/UpdatePing.jsm b/toolkit/components/telemetry/pings/UpdatePing.jsm
index 25d5a9aea0f7..d0359c2d9fe1 100644
--- a/toolkit/components/telemetry/pings/UpdatePing.jsm
+++ b/toolkit/components/telemetry/pings/UpdatePing.jsm
@@ -5,7 +5,9 @@
"use strict";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
diff --git a/toolkit/components/telemetry/tests/unit/head.js b/toolkit/components/telemetry/tests/unit/head.js
index c141a5986759..f2be1209a319 100644
--- a/toolkit/components/telemetry/tests/unit/head.js
+++ b/toolkit/components/telemetry/tests/unit/head.js
@@ -8,18 +8,21 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ Log: "resource://gre/modules/Log.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
TelemetryScheduler: "resource://gre/modules/TelemetryScheduler.jsm",
TelemetryController: "resource://gre/modules/TelemetryController.jsm",
TelemetryUtils: "resource://gre/modules/TelemetryUtils.jsm",
AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
- Log: "resource://gre/modules/Log.jsm",
HttpServer: "resource://testing-common/httpd.js",
NetUtil: "resource://gre/modules/NetUtil.jsm",
OS: "resource://gre/modules/osfile.jsm",
Preferences: "resource://gre/modules/Preferences.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
TelemetrySend: "resource://gre/modules/TelemetrySend.jsm",
TelemetryStorage: "resource://gre/modules/TelemetryStorage.jsm",
});
diff --git a/toolkit/components/telemetry/tests/unit/test_PingSender.js b/toolkit/components/telemetry/tests/unit/test_PingSender.js
index 45eca48360b9..2859f872ac51 100644
--- a/toolkit/components/telemetry/tests/unit/test_PingSender.js
+++ b/toolkit/components/telemetry/tests/unit/test_PingSender.js
@@ -7,8 +7,8 @@
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { TelemetrySend } = ChromeUtils.import(
"resource://gre/modules/TelemetrySend.jsm"
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js b/toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js
index d063a3585632..8257c27878f7 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js
@@ -9,8 +9,8 @@
const { TelemetryReportingPolicy } = ChromeUtils.import(
"resource://gre/modules/TelemetryReportingPolicy.jsm"
);
-const { UpdateUtils } = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+const { UpdateUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
);
const TEST_CHANNEL = "TestChannelABC";
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryUtils.js b/toolkit/components/telemetry/tests/unit/test_TelemetryUtils.js
index 060ce8ef73f6..a40a2ba9b3dc 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryUtils.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryUtils.js
@@ -7,8 +7,8 @@ const { Preferences } = ChromeUtils.import(
const { TelemetryUtils } = ChromeUtils.import(
"resource://gre/modules/TelemetryUtils.jsm"
);
-const { UpdateUtils } = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+const { UpdateUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
);
add_task(async function testUpdateChannelOverride() {
diff --git a/toolkit/components/telemetry/tests/unit/test_UninstallPing.js b/toolkit/components/telemetry/tests/unit/test_UninstallPing.js
index 756ad38da6fa..d81302e262f0 100644
--- a/toolkit/components/telemetry/tests/unit/test_UninstallPing.js
+++ b/toolkit/components/telemetry/tests/unit/test_UninstallPing.js
@@ -7,8 +7,8 @@ const { TelemetryStorage } = ChromeUtils.import(
"resource://gre/modules/TelemetryStorage.jsm"
);
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const gFakeInstallPathHash = "0123456789ABCDEF";
diff --git a/toolkit/components/terminator/TerminatorTelemetry.jsm b/toolkit/components/terminator/TerminatorTelemetry.jsm
index fa8a745e5776..b771ad341e60 100644
--- a/toolkit/components/terminator/TerminatorTelemetry.jsm
+++ b/toolkit/components/terminator/TerminatorTelemetry.jsm
@@ -19,11 +19,9 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/Timer.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
function nsTerminatorTelemetry() {
this._wasNotified = false;
diff --git a/toolkit/components/thumbnails/PageThumbUtils.jsm b/toolkit/components/thumbnails/PageThumbUtils.jsm
index c6022c251446..fe5df93348a8 100644
--- a/toolkit/components/thumbnails/PageThumbUtils.jsm
+++ b/toolkit/components/thumbnails/PageThumbUtils.jsm
@@ -11,11 +11,9 @@ var EXPORTED_SYMBOLS = ["PageThumbUtils"];
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "BrowserUtils",
- "resource://gre/modules/BrowserUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+});
var PageThumbUtils = {
// The default thumbnail size for images
diff --git a/toolkit/components/thumbnails/test/head.js b/toolkit/components/thumbnails/test/head.js
index f5ca5e993117..55037b44d6f4 100644
--- a/toolkit/components/thumbnails/test/head.js
+++ b/toolkit/components/thumbnails/test/head.js
@@ -2,13 +2,13 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
BackgroundPageThumbs: "resource://gre/modules/BackgroundPageThumbs.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
- NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
PageThumbs: "resource://gre/modules/PageThumbs.jsm",
PageThumbsStorage: "resource://gre/modules/PageThumbs.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
diff --git a/toolkit/components/urlformatter/URLFormatter.jsm b/toolkit/components/urlformatter/URLFormatter.jsm
index 036a5a2ec0b2..4e37cdab3d1e 100644
--- a/toolkit/components/urlformatter/URLFormatter.jsm
+++ b/toolkit/components/urlformatter/URLFormatter.jsm
@@ -25,14 +25,9 @@ const PREF_APP_DISTRIBUTION_VERSION = "distribution.version";
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
-
ChromeUtils.defineESModuleGetters(lazy, {
Region: "resource://gre/modules/Region.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
});
function nsURLFormatterService() {
diff --git a/toolkit/components/utils/ClientEnvironment.jsm b/toolkit/components/utils/ClientEnvironment.jsm
index 88120d64606d..e358e6bae505 100644
--- a/toolkit/components/utils/ClientEnvironment.jsm
+++ b/toolkit/components/utils/ClientEnvironment.jsm
@@ -15,7 +15,9 @@ ChromeUtils.defineModuleGetter(lazy, "ShellService", "resource:///modules/ShellS
ChromeUtils.defineModuleGetter(lazy, "AddonManager", "resource://gre/modules/AddonManager.jsm");
ChromeUtils.defineModuleGetter(lazy, "TelemetryArchive", "resource://gre/modules/TelemetryArchive.jsm");
ChromeUtils.defineModuleGetter(lazy, "TelemetryController", "resource://gre/modules/TelemetryController.jsm");
-ChromeUtils.defineModuleGetter(lazy, "UpdateUtils", "resource://gre/modules/UpdateUtils.jsm");
+ChromeUtils.defineESModuleGetters(lazy, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs"
+});
ChromeUtils.defineModuleGetter(lazy, "AttributionCode", "resource:///modules/AttributionCode.jsm");
ChromeUtils.defineModuleGetter(lazy, "WindowsVersionInfo", "resource://gre/modules/components-utils/WindowsVersionInfo.jsm");
ChromeUtils.defineModuleGetter(lazy, "NormandyUtils", "resource://normandy/lib/NormandyUtils.jsm");
diff --git a/toolkit/components/viewsource/test/browser/head.js b/toolkit/components/viewsource/test/browser/head.js
index d14b450b7431..40b227466777 100644
--- a/toolkit/components/viewsource/test/browser/head.js
+++ b/toolkit/components/viewsource/test/browser/head.js
@@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-var { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+var { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
diff --git a/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js b/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js
index aa6cf613797c..b764b281b439 100644
--- a/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js
+++ b/toolkit/components/xulstore/tests/xpcshell/test_XULStore_migration_profile_change.js
@@ -3,8 +3,8 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
add_task(
diff --git a/toolkit/content/aboutAbout.js b/toolkit/content/aboutAbout.js
index 013aaec74489..d4a1a9c5e340 100644
--- a/toolkit/content/aboutAbout.js
+++ b/toolkit/content/aboutAbout.js
@@ -2,8 +2,8 @@
* 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 { AboutPagesUtils } = ChromeUtils.import(
- "resource://gre/modules/AboutPagesUtils.jsm"
+const { AboutPagesUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/AboutPagesUtils.sys.mjs"
);
var gContainer;
diff --git a/toolkit/content/aboutNetworking.js b/toolkit/content/aboutNetworking.js
index 7d110bda5870..1c3261b89689 100644
--- a/toolkit/content/aboutNetworking.js
+++ b/toolkit/content/aboutNetworking.js
@@ -4,8 +4,9 @@
"use strict";
-const FileUtils = ChromeUtils.import("resource://gre/modules/FileUtils.jsm")
- .FileUtils;
+const FileUtils = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+).FileUtils;
const gEnv = Cc["@mozilla.org/process/environment;1"].getService(
Ci.nsIEnvironment
);
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index d7c062b9819d..1b1f100c07ad 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -4,11 +4,11 @@
"use strict";
-const { Troubleshoot } = ChromeUtils.import(
- "resource://gre/modules/Troubleshoot.jsm"
+const { Troubleshoot } = ChromeUtils.importESModule(
+ "resource://gre/modules/Troubleshoot.sys.mjs"
);
-const { ResetProfile } = ChromeUtils.import(
- "resource://gre/modules/ResetProfile.jsm"
+const { ResetProfile } = ChromeUtils.importESModule(
+ "resource://gre/modules/ResetProfile.sys.mjs"
);
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
@@ -27,12 +27,8 @@ ChromeUtils.defineModuleGetter(
);
ChromeUtils.defineESModuleGetters(this, {
PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs",
+ ProcessType: "resource://gre/modules/ProcessType.sys.mjs",
});
-ChromeUtils.defineModuleGetter(
- this,
- "ProcessType",
- "resource://gre/modules/ProcessType.jsm"
-);
window.addEventListener("load", function onload(event) {
try {
diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js
index 8d4262bf2c23..34ce44c92fce 100644
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -4,8 +4,8 @@
"use strict";
-const { BrowserUtils } = ChromeUtils.import(
- "resource://gre/modules/BrowserUtils.jsm"
+const { BrowserUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/BrowserUtils.sys.mjs"
);
const { TelemetryTimestamps } = ChromeUtils.import(
"resource://gre/modules/TelemetryTimestamps.jsm"
diff --git a/toolkit/content/aboutwebrtc/aboutWebrtc.js b/toolkit/content/aboutwebrtc/aboutWebrtc.js
index db14b5a8c484..707cf537d569 100644
--- a/toolkit/content/aboutwebrtc/aboutWebrtc.js
+++ b/toolkit/content/aboutwebrtc/aboutWebrtc.js
@@ -7,11 +7,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-ChromeUtils.defineModuleGetter(
- this,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
XPCOMUtils.defineLazyServiceGetter(
this,
"FilePicker",
diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js
index c6bbf434b576..8ab181a5a260 100644
--- a/toolkit/content/contentAreaUtils.js
+++ b/toolkit/content/contentAreaUtils.js
@@ -9,12 +9,15 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
+ChromeUtils.defineESModuleGetters(this, {
+ BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
- BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
Downloads: "resource://gre/modules/Downloads.jsm",
DownloadPaths: "resource://gre/modules/DownloadPaths.jsm",
DownloadLastDir: "resource://gre/modules/DownloadLastDir.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
Deprecated: "resource://gre/modules/Deprecated.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
diff --git a/toolkit/content/tests/browser/browser_save_folder_standalone_image.js b/toolkit/content/tests/browser/browser_save_folder_standalone_image.js
index 00820251d56b..c3c035ea3844 100644
--- a/toolkit/content/tests/browser/browser_save_folder_standalone_image.js
+++ b/toolkit/content/tests/browser/browser_save_folder_standalone_image.js
@@ -49,8 +49,8 @@ MockFilePicker.init(window);
const { DownloadLastDir } = ChromeUtils.import(
"resource://gre/modules/DownloadLastDir.jsm"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
add_task(async function() {
diff --git a/toolkit/content/widgets/browser-custom-element.js b/toolkit/content/widgets/browser-custom-element.js
index e57c9bbfed6b..9108be6c98ae 100644
--- a/toolkit/content/widgets/browser-custom-element.js
+++ b/toolkit/content/widgets/browser-custom-element.js
@@ -11,8 +11,8 @@
"resource://gre/modules/AppConstants.jsm"
);
- const { BrowserUtils } = ChromeUtils.import(
- "resource://gre/modules/BrowserUtils.jsm"
+ const { BrowserUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/BrowserUtils.sys.mjs"
);
const { XPCOMUtils } = ChromeUtils.importESModule(
@@ -482,8 +482,9 @@
get finder() {
if (this.isRemoteBrowser) {
if (!this._remoteFinder) {
- let jsm = "resource://gre/modules/FinderParent.jsm";
- let { FinderParent } = ChromeUtils.import(jsm);
+ let { FinderParent } = ChromeUtils.importESModule(
+ "resource://gre/modules/FinderParent.sys.mjs"
+ );
this._remoteFinder = new FinderParent(this);
}
return this._remoteFinder;
@@ -493,8 +494,8 @@
return null;
}
- let { Finder } = ChromeUtils.import(
- "resource://gre/modules/Finder.jsm"
+ let { Finder } = ChromeUtils.importESModule(
+ "resource://gre/modules/Finder.sys.mjs"
);
this._finder = new Finder(this.docShell);
}
diff --git a/toolkit/content/widgets/editor.js b/toolkit/content/widgets/editor.js
index 4f4f49452813..91b3415a0643 100644
--- a/toolkit/content/widgets/editor.js
+++ b/toolkit/content/widgets/editor.js
@@ -50,8 +50,8 @@
return null;
}
- let { Finder } = ChromeUtils.import(
- "resource://gre/modules/Finder.jsm"
+ let { Finder } = ChromeUtils.importESModule(
+ "resource://gre/modules/Finder.sys.mjs"
);
this._finder = new Finder(this.docShell);
}
diff --git a/toolkit/content/widgets/findbar.js b/toolkit/content/widgets/findbar.js
index 2afcc84721e5..d291d8b0d027 100644
--- a/toolkit/content/widgets/findbar.js
+++ b/toolkit/content/widgets/findbar.js
@@ -1135,8 +1135,8 @@
);
}
- let { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+ let { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
this._startFindDeferred = PromiseUtils.defer();
let startFindPromise = this._startFindDeferred.promise;
diff --git a/toolkit/content/widgets/menu.js b/toolkit/content/widgets/menu.js
index f74168d1edaf..0ac0edc7ec97 100644
--- a/toolkit/content/widgets/menu.js
+++ b/toolkit/content/widgets/menu.js
@@ -8,11 +8,9 @@
// leaking to window scope.
{
let imports = {};
- ChromeUtils.defineModuleGetter(
- imports,
- "ShortcutUtils",
- "resource://gre/modules/ShortcutUtils.jsm"
- );
+ ChromeUtils.defineESModuleGetters(imports, {
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+ });
const MozMenuItemBaseMixin = Base => {
class MozMenuItemBase extends MozElements.BaseTextMixin(Base) {
diff --git a/toolkit/content/widgets/moz-input-box.js b/toolkit/content/widgets/moz-input-box.js
index 596d8f187605..40051b48850b 100644
--- a/toolkit/content/widgets/moz-input-box.js
+++ b/toolkit/content/widgets/moz-input-box.js
@@ -187,8 +187,8 @@
this._spellCheckInitialized = true;
try {
- const { InlineSpellChecker } = ChromeUtils.import(
- "resource://gre/modules/InlineSpellChecker.jsm"
+ const { InlineSpellChecker } = ChromeUtils.importESModule(
+ "resource://gre/modules/InlineSpellChecker.sys.mjs"
);
this.InlineSpellCheckerUI = new InlineSpellChecker(
this._input.editor
diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
index 9d9d231cfc9c..464b9d59144c 100644
--- a/toolkit/content/widgets/tabbox.js
+++ b/toolkit/content/widgets/tabbox.js
@@ -12,11 +12,9 @@
);
let imports = {};
- ChromeUtils.defineModuleGetter(
- imports,
- "ShortcutUtils",
- "resource://gre/modules/ShortcutUtils.jsm"
- );
+ ChromeUtils.defineESModuleGetters(imports, {
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+ });
class MozTabbox extends MozXULElement {
constructor() {
diff --git a/toolkit/crashreporter/CrashSubmit.jsm b/toolkit/crashreporter/CrashSubmit.jsm
index fe42d9f8771f..430e83fb871b 100644
--- a/toolkit/crashreporter/CrashSubmit.jsm
+++ b/toolkit/crashreporter/CrashSubmit.jsm
@@ -2,8 +2,8 @@
* 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 { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const lazy = {};
diff --git a/toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js b/toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js
index 3d4bfe89e94c..e8efafbf3c1b 100644
--- a/toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js
+++ b/toolkit/crashreporter/test/unit/test_crash_AsyncShutdown.js
@@ -11,8 +11,8 @@ function setup_crash() {
const { AsyncShutdown } = ChromeUtils.import(
"resource://gre/modules/AsyncShutdown.jsm"
);
- const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+ const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
Services.prefs.setBoolPref("toolkit.asyncshutdown.testing", true);
@@ -46,8 +46,8 @@ function after_crash(mdump, extra) {
function setup_osfile_crash_noerror() {
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
- const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+ const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
Services.prefs.setIntPref("toolkit.asyncshutdown.crash_timeout", 1);
@@ -83,8 +83,8 @@ function after_osfile_crash_noerror(mdump, extra) {
function setup_osfile_crash_exn() {
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
- const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+ const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
Services.prefs.setIntPref("toolkit.asyncshutdown.crash_timeout", 1);
diff --git a/toolkit/modules/ActorManagerParent.jsm b/toolkit/modules/ActorManagerParent.jsm
index 031b4dd650d0..78518085a11a 100644
--- a/toolkit/modules/ActorManagerParent.jsm
+++ b/toolkit/modules/ActorManagerParent.jsm
@@ -27,10 +27,10 @@ const { AppConstants } = ChromeUtils.import(
let JSPROCESSACTORS = {
AsyncPrefs: {
parent: {
- moduleURI: "resource://gre/modules/AsyncPrefs.jsm",
+ esModuleURI: "resource://gre/modules/AsyncPrefs.sys.mjs",
},
child: {
- moduleURI: "resource://gre/modules/AsyncPrefs.jsm",
+ esModuleURI: "resource://gre/modules/AsyncPrefs.sys.mjs",
},
},
diff --git a/toolkit/modules/AsanReporter.sys.mjs b/toolkit/modules/AsanReporter.sys.mjs
index 0a677fa83270..e7859199e457 100644
--- a/toolkit/modules/AsanReporter.sys.mjs
+++ b/toolkit/modules/AsanReporter.sys.mjs
@@ -3,16 +3,14 @@
* 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/. */
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const lazy = {};
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- Log: "resource://gre/modules/Log.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+ Log: "resource://gre/modules/Log.sys.mjs",
});
// Define our prefs
diff --git a/toolkit/modules/DeferredTask.jsm b/toolkit/modules/DeferredTask.jsm
index ce68738ec5c1..ec4d0b7fe87d 100644
--- a/toolkit/modules/DeferredTask.jsm
+++ b/toolkit/modules/DeferredTask.jsm
@@ -84,11 +84,9 @@ const lazy = {};
// Globals
-ChromeUtils.defineModuleGetter(
- lazy,
- "PromiseUtils",
- "resource://gre/modules/PromiseUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
const Timer = Components.Constructor(
"@mozilla.org/timer;1",
diff --git a/toolkit/modules/Finder.sys.mjs b/toolkit/modules/Finder.sys.mjs
index d684f91cbc1d..16bc4b666995 100644
--- a/toolkit/modules/Finder.sys.mjs
+++ b/toolkit/modules/Finder.sys.mjs
@@ -5,7 +5,7 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-const { Rect } = ChromeUtils.import("resource://gre/modules/Geometry.jsm");
+import { Rect } from "resource://gre/modules/Geometry.sys.mjs";
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
@@ -13,11 +13,9 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "FinderIterator",
- "resource://gre/modules/FinderIterator.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FinderIterator: "resource://gre/modules/FinderIterator.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
@@ -181,8 +179,8 @@ Finder.prototype = {
return this._highlighter;
}
- const { FinderHighlighter } = ChromeUtils.import(
- "resource://gre/modules/FinderHighlighter.jsm"
+ const { FinderHighlighter } = ChromeUtils.importESModule(
+ "resource://gre/modules/FinderHighlighter.sys.mjs"
);
return (this._highlighter = new FinderHighlighter(this));
},
diff --git a/toolkit/modules/FinderHighlighter.sys.mjs b/toolkit/modules/FinderHighlighter.sys.mjs
index 85d089fa4fad..536c45b77966 100644
--- a/toolkit/modules/FinderHighlighter.sys.mjs
+++ b/toolkit/modules/FinderHighlighter.sys.mjs
@@ -6,16 +6,10 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "Color",
- "resource://gre/modules/Color.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "Rect",
- "resource://gre/modules/Geometry.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ Color: "resource://gre/modules/Color.sys.mjs",
+ Rect: "resource://gre/modules/Geometry.sys.mjs",
+});
XPCOMUtils.defineLazyGetter(lazy, "kDebug", () => {
const kDebugPref = "findbar.modalHighlight.debug";
return (
diff --git a/toolkit/modules/FinderIterator.sys.mjs b/toolkit/modules/FinderIterator.sys.mjs
index 3e6c0ec507e4..c894b37f589d 100644
--- a/toolkit/modules/FinderIterator.sys.mjs
+++ b/toolkit/modules/FinderIterator.sys.mjs
@@ -8,12 +8,10 @@ const { clearTimeout, setTimeout } = ChromeUtils.import(
const lazy = {};
-ChromeUtils.defineModuleGetter(lazy, "NLP", "resource://gre/modules/NLP.jsm");
-ChromeUtils.defineModuleGetter(
- lazy,
- "Rect",
- "resource://gre/modules/Geometry.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ NLP: "resource://gre/modules/NLP.sys.mjs",
+ Rect: "resource://gre/modules/Geometry.sys.mjs",
+});
const kDebug = false;
const kIterationSizeMax = 100;
diff --git a/toolkit/modules/FinderParent.sys.mjs b/toolkit/modules/FinderParent.sys.mjs
index 58c96eb0b5f2..3c18a1bab87e 100644
--- a/toolkit/modules/FinderParent.sys.mjs
+++ b/toolkit/modules/FinderParent.sys.mjs
@@ -12,17 +12,10 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "GetClipboardSearchString",
- "resource://gre/modules/Finder.jsm"
-);
-
-ChromeUtils.defineModuleGetter(
- lazy,
- "Rect",
- "resource://gre/modules/Geometry.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ GetClipboardSearchString: "resource://gre/modules/Finder.sys.mjs",
+ Rect: "resource://gre/modules/Geometry.sys.mjs",
+});
const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing";
diff --git a/toolkit/modules/GMPInstallManager.sys.mjs b/toolkit/modules/GMPInstallManager.sys.mjs
index 9a320cc8f64e..a4cb2948b73c 100644
--- a/toolkit/modules/GMPInstallManager.sys.mjs
+++ b/toolkit/modules/GMPInstallManager.sys.mjs
@@ -5,40 +5,28 @@
// 1 day default
const DEFAULT_SECONDS_BETWEEN_CHECKS = 60 * 60 * 24;
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
-);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { GMPPrefs, GMPUtils, GMP_PLUGIN_IDS, WIDEVINE_ID } = ChromeUtils.import(
- "resource://gre/modules/GMPUtils.jsm"
-);
+import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs";
+
+import { Log } from "resource://gre/modules/Log.sys.mjs";
+import {
+ GMPPrefs,
+ GMPUtils,
+ GMP_PLUGIN_IDS,
+ WIDEVINE_ID,
+} from "resource://gre/modules/GMPUtils.sys.mjs";
+
const { ProductAddonChecker } = ChromeUtils.import(
"resource://gre/modules/addons/ProductAddonChecker.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "CertUtils",
- "resource://gre/modules/CertUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
-
-ChromeUtils.defineModuleGetter(
- lazy,
- "ServiceRequest",
- "resource://gre/modules/ServiceRequest.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ CertUtils: "resource://gre/modules/CertUtils.sys.mjs",
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ ServiceRequest: "resource://gre/modules/ServiceRequest.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
function getScopedLogger(prefix) {
// `PARENT_LOGGER_ID.` being passed here effectively links this logger
diff --git a/toolkit/modules/GMPUtils.sys.mjs b/toolkit/modules/GMPUtils.sys.mjs
index 54b5128679e9..a9c4c5488e4d 100644
--- a/toolkit/modules/GMPUtils.sys.mjs
+++ b/toolkit/modules/GMPUtils.sys.mjs
@@ -6,11 +6,9 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
// GMP IDs
export const OPEN_H264_ID = "gmp-gmpopenh264";
diff --git a/toolkit/modules/InlineSpellCheckerContent.sys.mjs b/toolkit/modules/InlineSpellCheckerContent.sys.mjs
index cf2c5ef0bf49..b236d76dff7d 100644
--- a/toolkit/modules/InlineSpellCheckerContent.sys.mjs
+++ b/toolkit/modules/InlineSpellCheckerContent.sys.mjs
@@ -3,9 +3,10 @@
* 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 { InlineSpellChecker, SpellCheckHelper } = ChromeUtils.import(
- "resource://gre/modules/InlineSpellChecker.jsm"
-);
+import {
+ InlineSpellChecker,
+ SpellCheckHelper,
+} from "resource://gre/modules/InlineSpellChecker.sys.mjs";
export var InlineSpellCheckerContent = {
_spellChecker: null,
diff --git a/toolkit/modules/JSONFile.sys.mjs b/toolkit/modules/JSONFile.sys.mjs
index 4d4f2f7243f5..06d1617943c1 100644
--- a/toolkit/modules/JSONFile.sys.mjs
+++ b/toolkit/modules/JSONFile.sys.mjs
@@ -37,11 +37,9 @@ ChromeUtils.defineModuleGetter(
"DeferredTask",
"resource://gre/modules/DeferredTask.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"NetUtil",
diff --git a/toolkit/modules/Log.sys.mjs b/toolkit/modules/Log.sys.mjs
index f8740d04a27a..2185f4b11fd7 100644
--- a/toolkit/modules/Log.sys.mjs
+++ b/toolkit/modules/Log.sys.mjs
@@ -2,11 +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/. */
-// TODO: Bug 1792404 - this needs to stay using `importESModule` until the bug
-// is fixed, otherwise browser_startup_content*.js will fail.
-const { XPCOMUtils } = ChromeUtils.importESModule(
- "resource://gre/modules/XPCOMUtils.sys.mjs"
-);
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const INTERNAL_FIELDS = new Set(["_level", "_message", "_time", "_namespace"]);
diff --git a/toolkit/modules/NewTabUtils.sys.mjs b/toolkit/modules/NewTabUtils.sys.mjs
index 6bf34f61f9f7..924f982fb8d0 100644
--- a/toolkit/modules/NewTabUtils.sys.mjs
+++ b/toolkit/modules/NewTabUtils.sys.mjs
@@ -21,6 +21,7 @@ try {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
+ BinarySearch: "resource://gre/modules/BinarySearch.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});
@@ -30,12 +31,6 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/PageThumbs.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "BinarySearch",
- "resource://gre/modules/BinarySearch.jsm"
-);
-
ChromeUtils.defineModuleGetter(
lazy,
"pktApi",
diff --git a/toolkit/modules/OSKeyStore.sys.mjs b/toolkit/modules/OSKeyStore.sys.mjs
index eda7c0e88512..68701090e331 100644
--- a/toolkit/modules/OSKeyStore.sys.mjs
+++ b/toolkit/modules/OSKeyStore.sys.mjs
@@ -12,11 +12,9 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
XPCOMUtils.defineLazyServiceGetter(
lazy,
"nativeOSKeyStore",
diff --git a/toolkit/modules/OsEnvironment.sys.mjs b/toolkit/modules/OsEnvironment.sys.mjs
index 870d64d04b26..1a5da682428b 100644
--- a/toolkit/modules/OsEnvironment.sys.mjs
+++ b/toolkit/modules/OsEnvironment.sys.mjs
@@ -11,8 +11,11 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
- WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
WindowsVersionInfo:
"resource://gre/modules/components-utils/WindowsVersionInfo.jsm",
});
diff --git a/toolkit/modules/PopupNotifications.sys.mjs b/toolkit/modules/PopupNotifications.sys.mjs
index 6e2094d6adbf..44a13049a3e2 100644
--- a/toolkit/modules/PopupNotifications.sys.mjs
+++ b/toolkit/modules/PopupNotifications.sys.mjs
@@ -5,9 +5,7 @@
const { PrivateBrowsingUtils } = ChromeUtils.import(
"resource://gre/modules/PrivateBrowsingUtils.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
-);
+import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs";
const NOTIFICATION_EVENT_DISMISSED = "dismissed";
const NOTIFICATION_EVENT_REMOVED = "removed";
diff --git a/toolkit/modules/ProfileAge.sys.mjs b/toolkit/modules/ProfileAge.sys.mjs
index 10c738dfbda9..ea824f5a9187 100644
--- a/toolkit/modules/ProfileAge.sys.mjs
+++ b/toolkit/modules/ProfileAge.sys.mjs
@@ -2,7 +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 { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+import { Log } from "resource://gre/modules/Log.sys.mjs";
const FILE_TIMES = "times.json";
diff --git a/toolkit/modules/Sqlite.sys.mjs b/toolkit/modules/Sqlite.sys.mjs
index ca73ffc88c51..07c131471a58 100644
--- a/toolkit/modules/Sqlite.sys.mjs
+++ b/toolkit/modules/Sqlite.sys.mjs
@@ -8,11 +8,14 @@ const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ Log: "resource://gre/modules/Log.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
- Log: "resource://gre/modules/Log.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
});
XPCOMUtils.defineLazyServiceGetter(
diff --git a/toolkit/modules/Troubleshoot.sys.mjs b/toolkit/modules/Troubleshoot.sys.mjs
index aa77f26c8632..e7fb812ae0fd 100644
--- a/toolkit/modules/Troubleshoot.sys.mjs
+++ b/toolkit/modules/Troubleshoot.sys.mjs
@@ -232,8 +232,8 @@ var dataProviders = {
}
if (AppConstants.MOZ_UPDATER) {
- data.updateChannel = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+ data.updateChannel = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
).UpdateUtils.UpdateChannel;
}
diff --git a/toolkit/modules/UpdateUtils.sys.mjs b/toolkit/modules/UpdateUtils.sys.mjs
index 20f06115faa8..ea56fd99577c 100644
--- a/toolkit/modules/UpdateUtils.sys.mjs
+++ b/toolkit/modules/UpdateUtils.sys.mjs
@@ -10,9 +10,12 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
ctypes: "resource://gre/modules/ctypes.jsm",
- WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
WindowsVersionInfo:
"resource://gre/modules/components-utils/WindowsVersionInfo.jsm",
});
diff --git a/toolkit/modules/tests/browser/browser_AsyncPrefs.js b/toolkit/modules/tests/browser/browser_AsyncPrefs.js
index 0e150ff31382..96eadc4b2e3b 100644
--- a/toolkit/modules/tests/browser/browser_AsyncPrefs.js
+++ b/toolkit/modules/tests/browser/browser_AsyncPrefs.js
@@ -23,8 +23,8 @@ Services.prefs
.setIntPref("some-int-pref", 0);
async function runTest() {
- let { AsyncPrefs } = ChromeUtils.import(
- "resource://gre/modules/AsyncPrefs.jsm"
+ let { AsyncPrefs } = ChromeUtils.importESModule(
+ "resource://gre/modules/AsyncPrefs.sys.mjs"
);
const kInChildProcess =
Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT;
diff --git a/toolkit/modules/tests/browser/browser_BrowserUtils.js b/toolkit/modules/tests/browser/browser_BrowserUtils.js
index 17353c88bea5..da28c07b69bb 100644
--- a/toolkit/modules/tests/browser/browser_BrowserUtils.js
+++ b/toolkit/modules/tests/browser/browser_BrowserUtils.js
@@ -8,8 +8,8 @@ add_task(async function test_getSelectionDetails_input() {
await BrowserTestUtils.withNewTab({ gBrowser, url }, async browser => {
await SpecialPowers.spawn(browser, [], () => {
function checkSelection({ id, text, linkURL }) {
- const { SelectionUtils } = ChromeUtils.import(
- "resource://gre/modules/SelectionUtils.jsm"
+ const { SelectionUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/SelectionUtils.sys.mjs"
);
content.document.getElementById(id).select();
// It seems that when running as a test, the previous line will set
diff --git a/toolkit/modules/tests/browser/browser_CreditCard.js b/toolkit/modules/tests/browser/browser_CreditCard.js
index 8a6f599cd233..d0564031b207 100644
--- a/toolkit/modules/tests/browser/browser_CreditCard.js
+++ b/toolkit/modules/tests/browser/browser_CreditCard.js
@@ -3,11 +3,11 @@
"use strict";
-const { CreditCard } = ChromeUtils.import(
- "resource://gre/modules/CreditCard.jsm"
+const { CreditCard } = ChromeUtils.importESModule(
+ "resource://gre/modules/CreditCard.sys.mjs"
);
-const { OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+const { OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
);
const { OSKeyStoreTestUtils } = ChromeUtils.import(
"resource://testing-common/OSKeyStoreTestUtils.jsm"
diff --git a/toolkit/modules/tests/browser/browser_Geometry.js b/toolkit/modules/tests/browser/browser_Geometry.js
index 172d56ff06f6..220d4a22ef53 100644
--- a/toolkit/modules/tests/browser/browser_Geometry.js
+++ b/toolkit/modules/tests/browser/browser_Geometry.js
@@ -2,8 +2,8 @@
* 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 { Point, Rect } = ChromeUtils.import(
- "resource://gre/modules/Geometry.jsm"
+const { Point, Rect } = ChromeUtils.importESModule(
+ "resource://gre/modules/Geometry.sys.mjs"
);
function test() {
diff --git a/toolkit/modules/tests/browser/browser_InlineSpellChecker.js b/toolkit/modules/tests/browser/browser_InlineSpellChecker.js
index 1370b713c906..650a03c43e35 100644
--- a/toolkit/modules/tests/browser/browser_InlineSpellChecker.js
+++ b/toolkit/modules/tests/browser/browser_InlineSpellChecker.js
@@ -2,8 +2,8 @@ var InlineSpellChecker;
var SpellCheckHelper;
function test() {
- let tempScope = ChromeUtils.import(
- "resource://gre/modules/InlineSpellChecker.jsm"
+ let tempScope = ChromeUtils.importESModule(
+ "resource://gre/modules/InlineSpellChecker.sys.mjs"
);
InlineSpellChecker = tempScope.InlineSpellChecker;
SpellCheckHelper = tempScope.SpellCheckHelper;
diff --git a/toolkit/modules/tests/browser/browser_Troubleshoot.js b/toolkit/modules/tests/browser/browser_Troubleshoot.js
index 1d713497bddc..65128ed0a769 100644
--- a/toolkit/modules/tests/browser/browser_Troubleshoot.js
+++ b/toolkit/modules/tests/browser/browser_Troubleshoot.js
@@ -9,8 +9,8 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { Troubleshoot } = ChromeUtils.import(
- "resource://gre/modules/Troubleshoot.jsm"
+const { Troubleshoot } = ChromeUtils.importESModule(
+ "resource://gre/modules/Troubleshoot.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
diff --git a/toolkit/modules/tests/modules/OSKeyStoreTestUtils.jsm b/toolkit/modules/tests/modules/OSKeyStoreTestUtils.jsm
index 2dc99d16eed2..88691fef9f9f 100644
--- a/toolkit/modules/tests/modules/OSKeyStoreTestUtils.jsm
+++ b/toolkit/modules/tests/modules/OSKeyStoreTestUtils.jsm
@@ -5,18 +5,16 @@
var EXPORTED_SYMBOLS = ["OSKeyStoreTestUtils"];
-const { OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+const { OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
);
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
const { TestUtils } = ChromeUtils.import(
"resource://testing-common/TestUtils.jsm"
);
diff --git a/toolkit/modules/tests/xpcshell/head.js b/toolkit/modules/tests/xpcshell/head.js
index 4a8ba576f3fd..c9b2aa8e3bfa 100644
--- a/toolkit/modules/tests/xpcshell/head.js
+++ b/toolkit/modules/tests/xpcshell/head.js
@@ -1,5 +1,5 @@
-var { NewTabUtils } = ChromeUtils.import(
- "resource://gre/modules/NewTabUtils.jsm"
+var { NewTabUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/NewTabUtils.sys.mjs"
);
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
diff --git a/toolkit/modules/tests/xpcshell/test_AllowedAppSources.js b/toolkit/modules/tests/xpcshell/test_AllowedAppSources.js
index 55d332f92487..8a3b00fba922 100644
--- a/toolkit/modules/tests/xpcshell/test_AllowedAppSources.js
+++ b/toolkit/modules/tests/xpcshell/test_AllowedAppSources.js
@@ -3,8 +3,8 @@
*/
"use strict";
-const { OsEnvironment } = ChromeUtils.import(
- "resource://gre/modules/OsEnvironment.jsm"
+const { OsEnvironment } = ChromeUtils.importESModule(
+ "resource://gre/modules/OsEnvironment.sys.mjs"
);
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
diff --git a/toolkit/modules/tests/xpcshell/test_BinarySearch.js b/toolkit/modules/tests/xpcshell/test_BinarySearch.js
index c750373da0de..13b5c4ed7aa8 100644
--- a/toolkit/modules/tests/xpcshell/test_BinarySearch.js
+++ b/toolkit/modules/tests/xpcshell/test_BinarySearch.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-const { BinarySearch } = ChromeUtils.import(
- "resource://gre/modules/BinarySearch.jsm"
+const { BinarySearch } = ChromeUtils.importESModule(
+ "resource://gre/modules/BinarySearch.sys.mjs"
);
function run_test() {
diff --git a/toolkit/modules/tests/xpcshell/test_BrowserUtils.js b/toolkit/modules/tests/xpcshell/test_BrowserUtils.js
index 561e27fa10c3..52f142ce2fff 100644
--- a/toolkit/modules/tests/xpcshell/test_BrowserUtils.js
+++ b/toolkit/modules/tests/xpcshell/test_BrowserUtils.js
@@ -5,8 +5,8 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { BrowserUtils } = ChromeUtils.import(
- "resource://gre/modules/BrowserUtils.jsm"
+const { BrowserUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/BrowserUtils.sys.mjs"
);
const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
diff --git a/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js b/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js
index aab80c2b19ee..53fe88397e39 100644
--- a/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js
+++ b/toolkit/modules/tests/xpcshell/test_BrowserUtils_urlFormatting.js
@@ -3,8 +3,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
let tempFile = new FileUtils.File(PathUtils.tempDir);
@@ -133,8 +133,8 @@ const TESTS = [
},
];
-const { BrowserUtils } = ChromeUtils.import(
- "resource://gre/modules/BrowserUtils.jsm"
+const { BrowserUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/BrowserUtils.sys.mjs"
);
add_task(async function test_checkStringFormatting() {
diff --git a/toolkit/modules/tests/xpcshell/test_Color.js b/toolkit/modules/tests/xpcshell/test_Color.js
index eb96876c29cc..f99de7072e63 100644
--- a/toolkit/modules/tests/xpcshell/test_Color.js
+++ b/toolkit/modules/tests/xpcshell/test_Color.js
@@ -1,6 +1,8 @@
"use strict";
-const { Color } = ChromeUtils.import("resource://gre/modules/Color.jsm");
+const { Color } = ChromeUtils.importESModule(
+ "resource://gre/modules/Color.sys.mjs"
+);
function run_test() {
testRelativeLuminance();
diff --git a/toolkit/modules/tests/xpcshell/test_CreditCard.js b/toolkit/modules/tests/xpcshell/test_CreditCard.js
index 26a913f81dd3..90cf67b2f44f 100644
--- a/toolkit/modules/tests/xpcshell/test_CreditCard.js
+++ b/toolkit/modules/tests/xpcshell/test_CreditCard.js
@@ -3,8 +3,8 @@
"use strict";
-const { CreditCard } = ChromeUtils.import(
- "resource://gre/modules/CreditCard.jsm"
+const { CreditCard } = ChromeUtils.importESModule(
+ "resource://gre/modules/CreditCard.sys.mjs"
);
add_task(function isValidNumber() {
diff --git a/toolkit/modules/tests/xpcshell/test_FileUtils.js b/toolkit/modules/tests/xpcshell/test_FileUtils.js
index d4bff39106fe..26224e2971e9 100644
--- a/toolkit/modules/tests/xpcshell/test_FileUtils.js
+++ b/toolkit/modules/tests/xpcshell/test_FileUtils.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
function do_check_throws(f, result, stack) {
diff --git a/toolkit/modules/tests/xpcshell/test_FinderIterator.js b/toolkit/modules/tests/xpcshell/test_FinderIterator.js
index 7cc06f04c154..3916e19a026f 100644
--- a/toolkit/modules/tests/xpcshell/test_FinderIterator.js
+++ b/toolkit/modules/tests/xpcshell/test_FinderIterator.js
@@ -1,5 +1,5 @@
-const { FinderIterator } = ChromeUtils.import(
- "resource://gre/modules/FinderIterator.jsm"
+const { FinderIterator } = ChromeUtils.importESModule(
+ "resource://gre/modules/FinderIterator.sys.mjs"
);
let finderIterator = new FinderIterator();
diff --git a/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js b/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
index a6fa0d8c6206..5cf01f325027 100644
--- a/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
+++ b/toolkit/modules/tests/xpcshell/test_GMPInstallManager.js
@@ -5,12 +5,12 @@
const URL_HOST = "http://localhost";
const PR_USEC_PER_MSEC = 1000;
-const { GMPExtractor, GMPInstallManager } = ChromeUtils.import(
- "resource://gre/modules/GMPInstallManager.jsm"
+const { GMPExtractor, GMPInstallManager } = ChromeUtils.importESModule(
+ "resource://gre/modules/GMPInstallManager.sys.mjs"
);
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
const { Preferences } = ChromeUtils.import(
@@ -19,11 +19,11 @@ const { Preferences } = ChromeUtils.import(
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
);
-const { UpdateUtils } = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+const { UpdateUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
);
-const { GMPPrefs, OPEN_H264_ID } = ChromeUtils.import(
- "resource://gre/modules/GMPUtils.jsm"
+const { GMPPrefs, OPEN_H264_ID } = ChromeUtils.importESModule(
+ "resource://gre/modules/GMPUtils.sys.mjs"
);
const { ProductAddonCheckerTestUtils } = ChromeUtils.import(
"resource://gre/modules/addons/ProductAddonChecker.jsm"
diff --git a/toolkit/modules/tests/xpcshell/test_Http.js b/toolkit/modules/tests/xpcshell/test_Http.js
index 1757a8d679e1..4cd64653f410 100644
--- a/toolkit/modules/tests/xpcshell/test_Http.js
+++ b/toolkit/modules/tests/xpcshell/test_Http.js
@@ -1,7 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-const { httpRequest } = ChromeUtils.import("resource://gre/modules/Http.jsm");
+const { httpRequest } = ChromeUtils.importESModule(
+ "resource://gre/modules/Http.sys.mjs"
+);
const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
const BinaryInputStream = Components.Constructor(
diff --git a/toolkit/modules/tests/xpcshell/test_IgnoreList.js b/toolkit/modules/tests/xpcshell/test_IgnoreList.js
index 0bb9e902233e..7caae9fb7500 100644
--- a/toolkit/modules/tests/xpcshell/test_IgnoreList.js
+++ b/toolkit/modules/tests/xpcshell/test_IgnoreList.js
@@ -5,10 +5,10 @@
ChromeUtils.defineESModuleGetters(this, {
IgnoreLists: "resource://gre/modules/IgnoreLists.sys.mjs",
+ PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
- PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
sinon: "resource://testing-common/Sinon.jsm",
diff --git a/toolkit/modules/tests/xpcshell/test_Integration.js b/toolkit/modules/tests/xpcshell/test_Integration.js
index 5400cbc477b1..e1cb40ddfd53 100644
--- a/toolkit/modules/tests/xpcshell/test_Integration.js
+++ b/toolkit/modules/tests/xpcshell/test_Integration.js
@@ -6,8 +6,8 @@
*/
"use strict";
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
const TestIntegration = {
diff --git a/toolkit/modules/tests/xpcshell/test_JSONFile.js b/toolkit/modules/tests/xpcshell/test_JSONFile.js
index 35d5746b3928..870c1ee3a3a9 100644
--- a/toolkit/modules/tests/xpcshell/test_JSONFile.js
+++ b/toolkit/modules/tests/xpcshell/test_JSONFile.js
@@ -10,11 +10,9 @@ ChromeUtils.defineModuleGetter(
"AsyncShutdown",
"resource://gre/modules/AsyncShutdown.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
"FileTestUtils",
diff --git a/toolkit/modules/tests/xpcshell/test_JsonSchema.js b/toolkit/modules/tests/xpcshell/test_JsonSchema.js
index 090af52d9dde..b3a09049ac45 100644
--- a/toolkit/modules/tests/xpcshell/test_JsonSchema.js
+++ b/toolkit/modules/tests/xpcshell/test_JsonSchema.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
-const { JsonSchema } = ChromeUtils.import(
- "resource://gre/modules/JsonSchema.jsm"
+const { JsonSchema } = ChromeUtils.importESModule(
+ "resource://gre/modules/JsonSchema.sys.mjs"
);
add_task(function test_basicSchema() {
diff --git a/toolkit/modules/tests/xpcshell/test_Log.js b/toolkit/modules/tests/xpcshell/test_Log.js
index c2e9d5bd8c1c..9320283890a6 100644
--- a/toolkit/modules/tests/xpcshell/test_Log.js
+++ b/toolkit/modules/tests/xpcshell/test_Log.js
@@ -3,7 +3,9 @@
/* eslint-disable block-spacing */
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
registerCleanupFunction(() => {
diff --git a/toolkit/modules/tests/xpcshell/test_Log_nsIStackFrame.js b/toolkit/modules/tests/xpcshell/test_Log_nsIStackFrame.js
index be5f1c4b2dd6..b7fdd511e10e 100644
--- a/toolkit/modules/tests/xpcshell/test_Log_nsIStackFrame.js
+++ b/toolkit/modules/tests/xpcshell/test_Log_nsIStackFrame.js
@@ -1,38 +1,40 @@
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
function foo() {
- return bar(); // line 4
+ return bar(); // line 6
}
function bar() {
- return baz(); // line 8
+ return baz(); // line 10
}
function baz() {
- return Log.stackTrace(Components.stack.caller); // line 12
+ return Log.stackTrace(Components.stack.caller); // line 14
}
function start() {
- return next(); // line 16
+ return next(); // line 18
}
function next() {
- return finish(); // line 20
+ return finish(); // line 22
}
function finish() {
- return Log.stackTrace(); // line 24
+ return Log.stackTrace(); // line 26
}
function run_test() {
- const stackFrameTrace = foo(); // line 28
+ const stackFrameTrace = foo(); // line 30
print(`Got trace for nsIStackFrame case: ${stackFrameTrace}`);
- const fooPos = stackFrameTrace.search(/foo@.*test_Log_nsIStackFrame.js:4/);
- const barPos = stackFrameTrace.search(/bar@.*test_Log_nsIStackFrame.js:8/);
+ const fooPos = stackFrameTrace.search(/foo@.*test_Log_nsIStackFrame.js:6/);
+ const barPos = stackFrameTrace.search(/bar@.*test_Log_nsIStackFrame.js:10/);
const runTestPos = stackFrameTrace.search(
- /run_test@.*test_Log_nsIStackFrame.js:28/
+ /run_test@.*test_Log_nsIStackFrame.js:30/
);
print(`String positions: ${runTestPos} ${barPos} ${fooPos}`);
@@ -44,10 +46,10 @@ function run_test() {
print(`Got trace for empty argument case: ${emptyArgTrace}`);
- const startPos = emptyArgTrace.search(/start@.*test_Log_nsIStackFrame.js:16/);
- const nextPos = emptyArgTrace.search(/next@.*test_Log_nsIStackFrame.js:20/);
+ const startPos = emptyArgTrace.search(/start@.*test_Log_nsIStackFrame.js:18/);
+ const nextPos = emptyArgTrace.search(/next@.*test_Log_nsIStackFrame.js:22/);
const finishPos = emptyArgTrace.search(
- /finish@.*test_Log_nsIStackFrame.js:24/
+ /finish@.*test_Log_nsIStackFrame.js:26/
);
print(`String positions: ${finishPos} ${nextPos} ${startPos}`);
diff --git a/toolkit/modules/tests/xpcshell/test_Log_stackTrace.js b/toolkit/modules/tests/xpcshell/test_Log_stackTrace.js
index bdbd06057073..973cb9350b80 100644
--- a/toolkit/modules/tests/xpcshell/test_Log_stackTrace.js
+++ b/toolkit/modules/tests/xpcshell/test_Log_stackTrace.js
@@ -10,7 +10,9 @@ function baz(v) {
} // line 9
print("Make sure lazy constructor calling/assignment works");
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
function run_test() {
print(
diff --git a/toolkit/modules/tests/xpcshell/test_PermissionsUtils.js b/toolkit/modules/tests/xpcshell/test_PermissionsUtils.js
index a80eaa805486..adf148ad6612 100644
--- a/toolkit/modules/tests/xpcshell/test_PermissionsUtils.js
+++ b/toolkit/modules/tests/xpcshell/test_PermissionsUtils.js
@@ -10,8 +10,8 @@
const PREF_ROOT = "testpermissions.";
const TEST_PERM = "test-permission";
-const { PermissionsUtils } = ChromeUtils.import(
- "resource://gre/modules/PermissionsUtils.jsm"
+const { PermissionsUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PermissionsUtils.sys.mjs"
);
const { PermissionTestUtils } = ChromeUtils.import(
"resource://testing-common/PermissionTestUtils.jsm"
diff --git a/toolkit/modules/tests/xpcshell/test_ProfileAge.js b/toolkit/modules/tests/xpcshell/test_ProfileAge.js
index 359386672713..e2d3ddda68d2 100644
--- a/toolkit/modules/tests/xpcshell/test_ProfileAge.js
+++ b/toolkit/modules/tests/xpcshell/test_ProfileAge.js
@@ -1,5 +1,5 @@
-const { ProfileAge } = ChromeUtils.import(
- "resource://gre/modules/ProfileAge.jsm"
+const { ProfileAge } = ChromeUtils.importESModule(
+ "resource://gre/modules/ProfileAge.sys.mjs"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
diff --git a/toolkit/modules/tests/xpcshell/test_PromiseUtils.js b/toolkit/modules/tests/xpcshell/test_PromiseUtils.js
index c7702a3c03fc..fdd57549c33b 100644
--- a/toolkit/modules/tests/xpcshell/test_PromiseUtils.js
+++ b/toolkit/modules/tests/xpcshell/test_PromiseUtils.js
@@ -4,8 +4,8 @@
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const { PromiseTestUtils } = ChromeUtils.import(
diff --git a/toolkit/modules/tests/xpcshell/test_UpdateUtils_updatechannel.js b/toolkit/modules/tests/xpcshell/test_UpdateUtils_updatechannel.js
index 0a41eb09b2ec..35a35de2c8a9 100644
--- a/toolkit/modules/tests/xpcshell/test_UpdateUtils_updatechannel.js
+++ b/toolkit/modules/tests/xpcshell/test_UpdateUtils_updatechannel.js
@@ -6,8 +6,8 @@
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
-const { UpdateUtils } = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+const { UpdateUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
);
const PREF_APP_UPDATE_CHANNEL = "app.update.channel";
diff --git a/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js b/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
index 22c51296750e..4898aada323e 100644
--- a/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
+++ b/toolkit/modules/tests/xpcshell/test_UpdateUtils_url.js
@@ -3,8 +3,8 @@
* 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 { UpdateUtils } = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+const { UpdateUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
);
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
@@ -14,11 +14,9 @@ const { getAppInfo, updateAppInfo } = ChromeUtils.import(
);
const { ctypes } = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
-ChromeUtils.defineModuleGetter(
- this,
- "WindowsRegistry",
- "resource://gre/modules/WindowsRegistry.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
+});
const PREF_APP_UPDATE_CHANNEL = "app.update.channel";
const PREF_APP_PARTNER_BRANCH = "app.partner.";
diff --git a/toolkit/modules/tests/xpcshell/test_firstStartup.js b/toolkit/modules/tests/xpcshell/test_firstStartup.js
index 5bd73db6ef09..afa8fa58a8e5 100644
--- a/toolkit/modules/tests/xpcshell/test_firstStartup.js
+++ b/toolkit/modules/tests/xpcshell/test_firstStartup.js
@@ -3,8 +3,8 @@
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { FirstStartup } = ChromeUtils.import(
- "resource://gre/modules/FirstStartup.jsm"
+const { FirstStartup } = ChromeUtils.importESModule(
+ "resource://gre/modules/FirstStartup.sys.mjs"
);
const { updateAppInfo } = ChromeUtils.import(
"resource://testing-common/AppInfo.jsm"
diff --git a/toolkit/modules/tests/xpcshell/test_osKeyStore.js b/toolkit/modules/tests/xpcshell/test_osKeyStore.js
index 865e86bac793..273fe1a5ca8e 100644
--- a/toolkit/modules/tests/xpcshell/test_osKeyStore.js
+++ b/toolkit/modules/tests/xpcshell/test_osKeyStore.js
@@ -21,8 +21,8 @@ add_task(async function os_key_store_setup() {
let OSKeyStore;
add_task(async function setup() {
- ({ OSKeyStore } = ChromeUtils.import(
- "resource://gre/modules/OSKeyStore.jsm"
+ ({ OSKeyStore } = ChromeUtils.importESModule(
+ "resource://gre/modules/OSKeyStore.sys.mjs"
));
});
diff --git a/toolkit/modules/tests/xpcshell/test_propertyListsUtils.js b/toolkit/modules/tests/xpcshell/test_propertyListsUtils.js
index 98637273c5d5..78da2f5c9f85 100644
--- a/toolkit/modules/tests/xpcshell/test_propertyListsUtils.js
+++ b/toolkit/modules/tests/xpcshell/test_propertyListsUtils.js
@@ -3,8 +3,8 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-const { PropertyListUtils } = ChromeUtils.import(
- "resource://gre/modules/PropertyListUtils.jsm"
+const { PropertyListUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PropertyListUtils.sys.mjs"
);
function checkValue(aPropertyListObject, aType, aValue) {
diff --git a/toolkit/modules/tests/xpcshell/test_readCertPrefs.js b/toolkit/modules/tests/xpcshell/test_readCertPrefs.js
index 0a030f9dd73b..655b085cc764 100644
--- a/toolkit/modules/tests/xpcshell/test_readCertPrefs.js
+++ b/toolkit/modules/tests/xpcshell/test_readCertPrefs.js
@@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-const { CertUtils } = ChromeUtils.import(
- "resource://gre/modules/CertUtils.jsm"
+const { CertUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/CertUtils.sys.mjs"
);
const PREF_PREFIX = "certutils.certs.";
diff --git a/toolkit/modules/tests/xpcshell/test_servicerequest_xhr.js b/toolkit/modules/tests/xpcshell/test_servicerequest_xhr.js
index fc70646d4954..8d7955e1eea3 100644
--- a/toolkit/modules/tests/xpcshell/test_servicerequest_xhr.js
+++ b/toolkit/modules/tests/xpcshell/test_servicerequest_xhr.js
@@ -3,8 +3,8 @@
"use strict";
-const { ServiceRequest } = ChromeUtils.import(
- "resource://gre/modules/ServiceRequest.jsm"
+const { ServiceRequest } = ChromeUtils.importESModule(
+ "resource://gre/modules/ServiceRequest.sys.mjs"
);
add_task(async function test_tls_conservative() {
diff --git a/toolkit/modules/tests/xpcshell/test_sqlite.js b/toolkit/modules/tests/xpcshell/test_sqlite.js
index fe638369ded1..25b6e2181a7e 100644
--- a/toolkit/modules/tests/xpcshell/test_sqlite.js
+++ b/toolkit/modules/tests/xpcshell/test_sqlite.js
@@ -2,13 +2,15 @@
const PROFILE_DIR = do_get_profile().path;
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+);
+const { Sqlite } = ChromeUtils.importESModule(
+ "resource://gre/modules/Sqlite.sys.mjs"
);
-const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
const { TelemetryTestUtils } = ChromeUtils.import(
"resource://testing-common/TelemetryTestUtils.jsm"
);
diff --git a/toolkit/modules/tests/xpcshell/test_sqlite_shutdown.js b/toolkit/modules/tests/xpcshell/test_sqlite_shutdown.js
index 04951c4cbe1f..b6e97a30fe87 100644
--- a/toolkit/modules/tests/xpcshell/test_sqlite_shutdown.js
+++ b/toolkit/modules/tests/xpcshell/test_sqlite_shutdown.js
@@ -5,7 +5,9 @@
do_get_profile();
-const { Sqlite } = ChromeUtils.import("resource://gre/modules/Sqlite.jsm");
+const { Sqlite } = ChromeUtils.importESModule(
+ "resource://gre/modules/Sqlite.sys.mjs"
+);
const { AsyncShutdown } = ChromeUtils.import(
"resource://gre/modules/AsyncShutdown.jsm"
);
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
index 384a659ae69b..1b8a7ead51b0 100644
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
@@ -22,8 +22,8 @@ XPCOMUtils.defineLazyServiceGetter(
Ci.nsIApplicationReputationService
);
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
Integration.downloads.defineModuleGetter(
lazy,
@@ -127,8 +127,8 @@ const { DownloadUtils } = ChromeUtils.import(
const { Downloads } = ChromeUtils.import(
"resource://gre/modules/Downloads.jsm"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
/* ctor
diff --git a/toolkit/mozapps/downloads/tests/browser/browser_unknownContentType_delayedbutton.js b/toolkit/mozapps/downloads/tests/browser/browser_unknownContentType_delayedbutton.js
index 030f26c0b618..06caf4da521a 100644
--- a/toolkit/mozapps/downloads/tests/browser/browser_unknownContentType_delayedbutton.js
+++ b/toolkit/mozapps/downloads/tests/browser/browser_unknownContentType_delayedbutton.js
@@ -2,8 +2,8 @@
* 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 { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const UCT_URI = "chrome://mozapps/content/downloads/unknownContentType.xhtml";
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
index 33c5c3acb356..fbb73746db33 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -79,8 +79,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
var { AsyncShutdown } = ChromeUtils.import(
"resource://gre/modules/AsyncShutdown.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const lazy = {};
@@ -119,7 +119,9 @@ var EXPORTED_SYMBOLS = [
const CATEGORY_PROVIDER_MODULE = "addon-provider-module";
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
// Configure a logger at the parent 'addons' level to format
// messages for all the modules under addons.*
const PARENT_LOGGER_ID = "addons";
diff --git a/toolkit/mozapps/extensions/amInstallTrigger.jsm b/toolkit/mozapps/extensions/amInstallTrigger.jsm
index 4349e38c94c8..0e8d274246f3 100644
--- a/toolkit/mozapps/extensions/amInstallTrigger.jsm
+++ b/toolkit/mozapps/extensions/amInstallTrigger.jsm
@@ -7,7 +7,9 @@
const { Preferences } = ChromeUtils.import(
"resource://gre/modules/Preferences.jsm"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
diff --git a/toolkit/mozapps/extensions/content/shortcuts.js b/toolkit/mozapps/extensions/content/shortcuts.js
index d118dfbcda9b..9b319cc4eaa1 100644
--- a/toolkit/mozapps/extensions/content/shortcuts.js
+++ b/toolkit/mozapps/extensions/content/shortcuts.js
@@ -9,8 +9,11 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
+ChromeUtils.defineESModuleGetters(this, {
+ ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(this, {
- ShortcutUtils: "resource://gre/modules/ShortcutUtils.jsm",
ExtensionShortcutKeyMap: "resource://gre/modules/ExtensionShortcuts.jsm",
});
diff --git a/toolkit/mozapps/extensions/internal/AddonRepository.jsm b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
index 191740242124..1d020d056d6c 100644
--- a/toolkit/mozapps/extensions/internal/AddonRepository.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
@@ -10,12 +10,15 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ ServiceRequest: "resource://gre/modules/ServiceRequest.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
DeferredTask: "resource://gre/modules/DeferredTask.jsm",
- ServiceRequest: "resource://gre/modules/ServiceRequest.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
Preferences: "resource://gre/modules/Preferences.jsm",
});
@@ -72,7 +75,9 @@ const BLANK_DB = function() {
};
};
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const LOGGER_ID = "addons.repository";
// Create a new logger for use by the Addons Repository
diff --git a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm b/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
index 2d5880a20e8b..ca134261b8c2 100644
--- a/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonTestUtils.jsm
@@ -17,8 +17,8 @@ const { AddonManager, AddonManagerPrivate, AMTelemetry } = ChromeUtils.import(
const { AsyncShutdown } = ChromeUtils.import(
"resource://gre/modules/AsyncShutdown.jsm"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { XPCOMUtils } = ChromeUtils.importESModule(
diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
index 3033a7c5d1ba..1d667ab69351 100644
--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
@@ -31,23 +31,19 @@ ChromeUtils.defineModuleGetter(
"Blocklist",
"resource://gre/modules/Blocklist.jsm"
);
-ChromeUtils.defineModuleGetter(
- lazy,
- "CertUtils",
- "resource://gre/modules/CertUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "ServiceRequest",
- "resource://gre/modules/ServiceRequest.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ CertUtils: "resource://gre/modules/CertUtils.sys.mjs",
+ ServiceRequest: "resource://gre/modules/ServiceRequest.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
lazy,
"AddonSettings",
"resource://gre/modules/addons/AddonSettings.jsm"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const LOGGER_ID = "addons.update-checker";
// Create a new logger for use by the Addons Update Checker
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.sys.mjs b/toolkit/mozapps/extensions/internal/GMPProvider.sys.mjs
index b0aa2f6a040f..ca78698b5189 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.sys.mjs
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.sys.mjs
@@ -10,19 +10,23 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ GMPInstallManager: "resource://gre/modules/GMPInstallManager.sys.mjs",
+ Log: "resource://gre/modules/Log.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
- Log: "resource://gre/modules/Log.jsm",
- GMPInstallManager: "resource://gre/modules/GMPInstallManager.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
});
-// These symbols are, unfortunately, accessed via the module global from
-// tests, and therefore cannot be lexical definitions.
-var { GMPPrefs, GMPUtils, OPEN_H264_ID, WIDEVINE_ID } = ChromeUtils.import(
- "resource://gre/modules/GMPUtils.jsm"
-);
+import {
+ GMPPrefs,
+ GMPUtils,
+ OPEN_H264_ID,
+ WIDEVINE_ID,
+} from "resource://gre/modules/GMPUtils.sys.mjs";
const SEC_IN_A_DAY = 24 * 60 * 60;
// How long to wait after a user enabled EME before attempting to download CDMs.
diff --git a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
index 66e6045a124e..169dd6951b5f 100644
--- a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm
@@ -6,18 +6,17 @@
var EXPORTED_SYMBOLS = ["ProductAddonChecker", "ProductAddonCheckerTestUtils"];
-const { XPCOMUtils } = ChromeUtils.importESModule(
- "resource://gre/modules/XPCOMUtils.sys.mjs"
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
);
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
-const { CertUtils } = ChromeUtils.import(
- "resource://gre/modules/CertUtils.jsm"
+const { CertUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/CertUtils.sys.mjs"
);
const lazy = {};
-XPCOMUtils.defineLazyModuleGetters(lazy, {
- ServiceRequest: "resource://gre/modules/ServiceRequest.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+ ServiceRequest: "resource://gre/modules/ServiceRequest.sys.mjs",
});
// This will inherit settings from the "addons" logger.
diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
index ae514dfea6ba..be13907ce6cf 100644
--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
@@ -20,8 +20,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const lazy = {};
@@ -30,6 +30,10 @@ XPCOMUtils.defineLazyServiceGetters(lazy, {
ThirdPartyUtil: ["@mozilla.org/thirdpartyutil;1", "mozIThirdPartyUtil"],
});
+ChromeUtils.defineESModuleGetters(lazy, {
+ PermissionsUtils: "resource://gre/modules/PermissionsUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
@@ -38,8 +42,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
DeferredTask: "resource://gre/modules/DeferredTask.jsm",
ExtensionData: "resource://gre/modules/Extension.jsm",
ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm",
- PermissionsUtils: "resource://gre/modules/PermissionsUtils.jsm",
-
Blocklist: "resource://gre/modules/Blocklist.jsm",
UpdateChecker: "resource://gre/modules/addons/XPIInstall.jsm",
XPIInstall: "resource://gre/modules/addons/XPIInstall.jsm",
@@ -65,7 +67,9 @@ XPCOMUtils.defineLazyGetter(lazy, "BuiltInThemes", () => {
const { nsIBlocklistService } = Ci;
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const LOGGER_ID = "addons.xpi-utils";
const nsIFile = Components.Constructor(
diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
index 9b704409da16..114299fd1a88 100644
--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
@@ -35,16 +35,18 @@ const { AddonManager, AddonManagerPrivate } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ CertUtils: "resource://gre/modules/CertUtils.sys.mjs",
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
AddonSettings: "resource://gre/modules/addons/AddonSettings.jsm",
- CertUtils: "resource://gre/modules/CertUtils.jsm",
ExtensionData: "resource://gre/modules/Extension.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
NetUtil: "resource://gre/modules/NetUtil.jsm",
ProductAddonChecker: "resource://gre/modules/addons/ProductAddonChecker.jsm",
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
-
AddonInternal: "resource://gre/modules/addons/XPIDatabase.jsm",
XPIDatabase: "resource://gre/modules/addons/XPIDatabase.jsm",
XPIInternal: "resource://gre/modules/addons/XPIProvider.jsm",
@@ -169,7 +171,9 @@ const MSG_JAR_FLUSH = "Extension:FlushJarCache";
*/
var gIDTest = /^(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\}|[a-z0-9-\._]*\@[a-z0-9-\._]+)$/i;
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const LOGGER_ID = "addons.xpi";
// Create a new logger for use by all objects in this Addons XPI Provider module
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 3b2cd6180c27..dc35227d4aaa 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -31,6 +31,11 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonSettings: "resource://gre/modules/addons/AddonSettings.jsm",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
@@ -39,10 +44,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
ExtensionData: "resource://gre/modules/Extension.jsm",
Langpack: "resource://gre/modules/Extension.jsm",
SitePermission: "resource://gre/modules/Extension.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
- JSONFile: "resource://gre/modules/JSONFile.jsm",
TelemetrySession: "resource://gre/modules/TelemetrySession.jsm",
-
XPIDatabase: "resource://gre/modules/addons/XPIDatabase.jsm",
XPIDatabaseReconcile: "resource://gre/modules/addons/XPIDatabase.jsm",
XPIInstall: "resource://gre/modules/addons/XPIInstall.jsm",
@@ -187,7 +189,9 @@ const ALL_XPI_TYPES = new Set([
*/
var gIDTest = /^(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\}|[a-z0-9-\._]*\@[a-z0-9-\._]+)$/i;
-const { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+const { Log } = ChromeUtils.importESModule(
+ "resource://gre/modules/Log.sys.mjs"
+);
const LOGGER_ID = "addons.xpi";
// Create a new logger for use by all objects in this Addons XPI Provider module
diff --git a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
index 6d7efc4e0f9d..f5113b21783b 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -4,17 +4,17 @@
"use strict";
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-const { GMPInstallManager } = ChromeUtils.import(
- "resource://gre/modules/GMPInstallManager.jsm"
+const { GMPInstallManager } = ChromeUtils.importESModule(
+ "resource://gre/modules/GMPInstallManager.sys.mjs"
);
-const { GMPPrefs, GMP_PLUGIN_IDS, WIDEVINE_ID } = ChromeUtils.import(
- "resource://gre/modules/GMPUtils.jsm"
+const { GMPPrefs, GMP_PLUGIN_IDS, WIDEVINE_ID } = ChromeUtils.importESModule(
+ "resource://gre/modules/GMPUtils.sys.mjs"
);
const TEST_DATE = new Date(2013, 0, 1, 12);
diff --git a/toolkit/mozapps/extensions/test/browser/head.js b/toolkit/mozapps/extensions/test/browser/head.js
index 17c5389286ae..2210d1eb57cb 100644
--- a/toolkit/mozapps/extensions/test/browser/head.js
+++ b/toolkit/mozapps/extensions/test/browser/head.js
@@ -13,7 +13,7 @@ const { TelemetryTestUtils } = ChromeUtils.import(
let { AddonManager, AddonManagerPrivate } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
);
-let { Log } = ChromeUtils.import("resource://gre/modules/Log.jsm");
+let { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs");
var pathParts = gTestPath.split("/");
// Drop the test filename
@@ -1463,8 +1463,8 @@ function waitAppMenuNotificationShown(
accept = false,
win = window
) {
- const { AppMenuNotifications } = ChromeUtils.import(
- "resource://gre/modules/AppMenuNotifications.jsm"
+ const { AppMenuNotifications } = ChromeUtils.importESModule(
+ "resource://gre/modules/AppMenuNotifications.sys.mjs"
);
return new Promise(resolve => {
let { document, PanelUI } = win;
diff --git a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
index 07f1ada20d5a..f03beefc4330 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
@@ -36,7 +36,9 @@ const { AddonManager, AddonManagerPrivate } = ChromeUtils.import(
var { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+);
var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_aom_startup.js b/toolkit/mozapps/extensions/test/xpcshell/test_aom_startup.js
index 92a4ab1c031a..1d0e1a09cf43 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_aom_startup.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_aom_startup.js
@@ -1,6 +1,8 @@
"use strict";
-const { JSONFile } = ChromeUtils.import("resource://gre/modules/JSONFile.jsm");
+const { JSONFile } = ChromeUtils.importESModule(
+ "resource://gre/modules/JSONFile.sys.mjs"
+);
const aomStartup = Cc["@mozilla.org/addons/addon-manager-startup;1"].getService(
Ci.amIAddonManagerStartup
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js b/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js
index afd11c4f9d35..751bc2def056 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_gmpProvider.js
@@ -6,17 +6,17 @@
const { GMPTestUtils } = ChromeUtils.importESModule(
"resource://gre/modules/addons/GMPProvider.sys.mjs"
);
-const { GMPInstallManager } = ChromeUtils.import(
- "resource://gre/modules/GMPInstallManager.jsm"
+const { GMPInstallManager } = ChromeUtils.importESModule(
+ "resource://gre/modules/GMPInstallManager.sys.mjs"
);
const {
GMPPrefs,
GMP_PLUGIN_IDS,
OPEN_H264_ID,
WIDEVINE_ID,
-} = ChromeUtils.import("resource://gre/modules/GMPUtils.jsm");
-const { UpdateUtils } = ChromeUtils.import(
- "resource://gre/modules/UpdateUtils.jsm"
+} = ChromeUtils.importESModule("resource://gre/modules/GMPUtils.sys.mjs");
+const { UpdateUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/UpdateUtils.sys.mjs"
);
XPCOMUtils.defineLazyGetter(
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_permissions_prefs.js b/toolkit/mozapps/extensions/test/xpcshell/test_permissions_prefs.js
index bce31a66a14b..d7bcaa038cf4 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_permissions_prefs.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_permissions_prefs.js
@@ -8,8 +8,8 @@
const PREF_XPI_WHITELIST_PERMISSIONS = "xpinstall.whitelist.add";
const PREF_XPI_BLACKLIST_PERMISSIONS = "xpinstall.blacklist.add";
-const { PermissionsTestUtils } = ChromeUtils.import(
- "resource://gre/modules/PermissionsUtils.jsm"
+const { PermissionsTestUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PermissionsUtils.sys.mjs"
);
function newPrincipal(uri) {
diff --git a/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm b/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm
index 2807e2d16cef..a0172a07deb3 100644
--- a/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm
+++ b/toolkit/mozapps/update/BackgroundTask_backgroundupdate.jsm
@@ -24,12 +24,15 @@ const { AppConstants } = ChromeUtils.import(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AppUpdater: "resource:///modules/AppUpdater.jsm",
BackgroundTasksUtils: "resource://gre/modules/BackgroundTasksUtils.jsm",
ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
});
XPCOMUtils.defineLazyServiceGetter(
diff --git a/toolkit/mozapps/update/BackgroundUpdate.jsm b/toolkit/mozapps/update/BackgroundUpdate.jsm
index 37e98bcaceb4..d553c4779039 100644
--- a/toolkit/mozapps/update/BackgroundUpdate.jsm
+++ b/toolkit/mozapps/update/BackgroundUpdate.jsm
@@ -19,14 +19,17 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
BackgroundTasksUtils: "resource://gre/modules/BackgroundTasksUtils.jsm",
- FileUtils: "resource://gre/modules/FileUtils.jsm",
- JSONFile: "resource://gre/modules/JSONFile.jsm",
TaskScheduler: "resource://gre/modules/TaskScheduler.jsm",
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "log", () => {
diff --git a/toolkit/mozapps/update/UpdateListener.jsm b/toolkit/mozapps/update/UpdateListener.jsm
index f5305cbaf42c..b8058eab349d 100644
--- a/toolkit/mozapps/update/UpdateListener.jsm
+++ b/toolkit/mozapps/update/UpdateListener.jsm
@@ -18,11 +18,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "AppMenuNotifications",
- "resource://gre/modules/AppMenuNotifications.jsm"
-);
+ChromeUtils.defineESModuleGetters(lazy, {
+ AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
+});
XPCOMUtils.defineLazyServiceGetter(
lazy,
diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm
index d9851965220d..d969d9e8d079 100644
--- a/toolkit/mozapps/update/UpdateService.jsm
+++ b/toolkit/mozapps/update/UpdateService.jsm
@@ -18,8 +18,8 @@ const {
BitsUnknownError,
BitsVerificationError,
} = ChromeUtils.import("resource://gre/modules/Bits.jsm");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
@@ -27,15 +27,18 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+ CertUtils: "resource://gre/modules/CertUtils.sys.mjs",
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+ WindowsRegistry: "resource://gre/modules/WindowsRegistry.sys.mjs",
+});
+
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
- CertUtils: "resource://gre/modules/CertUtils.jsm",
ctypes: "resource://gre/modules/ctypes.jsm",
DeferredTask: "resource://gre/modules/DeferredTask.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
- UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",
- WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
});
XPCOMUtils.defineLazyServiceGetter(
diff --git a/toolkit/mozapps/update/UpdateServiceStub.jsm b/toolkit/mozapps/update/UpdateServiceStub.jsm
index 04d983ded3d0..e72051179ae9 100644
--- a/toolkit/mozapps/update/UpdateServiceStub.jsm
+++ b/toolkit/mozapps/update/UpdateServiceStub.jsm
@@ -6,8 +6,8 @@
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
diff --git a/toolkit/mozapps/update/tests/browser/browser_aboutPrefs_backgroundUpdateSetting.js b/toolkit/mozapps/update/tests/browser/browser_aboutPrefs_backgroundUpdateSetting.js
index f084fc5f8427..cd57efe98597 100644
--- a/toolkit/mozapps/update/tests/browser/browser_aboutPrefs_backgroundUpdateSetting.js
+++ b/toolkit/mozapps/update/tests/browser/browser_aboutPrefs_backgroundUpdateSetting.js
@@ -8,11 +8,9 @@
* This file tests the background update UI in about:preferences.
*/
-ChromeUtils.defineModuleGetter(
- this,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
const BACKGROUND_UPDATE_PREF = "app.update.background.enabled";
diff --git a/toolkit/mozapps/update/tests/browser/head.js b/toolkit/mozapps/update/tests/browser/head.js
index 88983e36bd7b..02dee20328a1 100644
--- a/toolkit/mozapps/update/tests/browser/head.js
+++ b/toolkit/mozapps/update/tests/browser/head.js
@@ -7,11 +7,9 @@ const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "AppMenuNotifications",
- "resource://gre/modules/AppMenuNotifications.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
+});
ChromeUtils.defineModuleGetter(
this,
"DownloadUtils",
diff --git a/toolkit/mozapps/update/tests/data/shared.js b/toolkit/mozapps/update/tests/data/shared.js
index 4dd68d25a8b2..a6ba02282b9e 100644
--- a/toolkit/mozapps/update/tests/data/shared.js
+++ b/toolkit/mozapps/update/tests/data/shared.js
@@ -8,8 +8,8 @@
/* global AppConstants, DATA_URI_SPEC, LOG_FUNCTION */
/* global Services, URL_HOST, TestUtils */
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
@@ -20,11 +20,9 @@ ChromeUtils.defineModuleGetter(
"ctypes",
"resource://gre/modules/ctypes.jsm"
);
-ChromeUtils.defineModuleGetter(
- this,
- "UpdateUtils",
- "resource://gre/modules/UpdateUtils.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+ UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
+});
const PREF_APP_UPDATE_AUTO = "app.update.auto";
const PREF_APP_UPDATE_BACKGROUNDERRORS = "app.update.backgroundErrors";
diff --git a/toolkit/mozapps/update/tests/unit_aus_update/languagePackUpdates.js b/toolkit/mozapps/update/tests/unit_aus_update/languagePackUpdates.js
index 476d91610a45..c8dd539792d4 100644
--- a/toolkit/mozapps/update/tests/unit_aus_update/languagePackUpdates.js
+++ b/toolkit/mozapps/update/tests/unit_aus_update/languagePackUpdates.js
@@ -7,8 +7,8 @@ const { getAppInfo } = ChromeUtils.import(
const { XPIInstall } = ChromeUtils.import(
"resource://gre/modules/addons/XPIInstall.jsm"
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
const { TelemetryTestUtils } = ChromeUtils.import(
diff --git a/toolkit/mozapps/update/tests/unit_base_updater/marSuccessPartialWhileBackgroundTaskRunning.js b/toolkit/mozapps/update/tests/unit_base_updater/marSuccessPartialWhileBackgroundTaskRunning.js
index 3a073076eddf..5992d7106fff 100644
--- a/toolkit/mozapps/update/tests/unit_base_updater/marSuccessPartialWhileBackgroundTaskRunning.js
+++ b/toolkit/mozapps/update/tests/unit_base_updater/marSuccessPartialWhileBackgroundTaskRunning.js
@@ -15,8 +15,8 @@ const do_backgroundtask = BackgroundTasksTestUtils.do_backgroundtask.bind(
BackgroundTasksTestUtils
);
-const { PromiseUtils } = ChromeUtils.import(
- "resource://gre/modules/PromiseUtils.jsm"
+const { PromiseUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/PromiseUtils.sys.mjs"
);
async function run_test() {
diff --git a/toolkit/profile/xpcshell/head.js b/toolkit/profile/xpcshell/head.js
index 12bcbe4a35c9..b844181cdb85 100644
--- a/toolkit/profile/xpcshell/head.js
+++ b/toolkit/profile/xpcshell/head.js
@@ -2,8 +2,8 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
diff --git a/tools/profiler/tests/xpcshell/test_feature_mainthreadio.js b/tools/profiler/tests/xpcshell/test_feature_mainthreadio.js
index 73d73e4a8791..ad6c11257450 100644
--- a/tools/profiler/tests/xpcshell/test_feature_mainthreadio.js
+++ b/tools/profiler/tests/xpcshell/test_feature_mainthreadio.js
@@ -2,8 +2,8 @@
* 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 { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
/**
diff --git a/uriloader/exthandler/ExtHandlerService.jsm b/uriloader/exthandler/ExtHandlerService.jsm
index f9c9a47f5a7a..75d8f39f8257 100644
--- a/uriloader/exthandler/ExtHandlerService.jsm
+++ b/uriloader/exthandler/ExtHandlerService.jsm
@@ -23,18 +23,12 @@ const TOPIC_PDFJS_HANDLER_CHANGED = "pdfjs:handlerChanged";
const lazy = {};
-ChromeUtils.defineModuleGetter(
- lazy,
- "FileUtils",
- "resource://gre/modules/FileUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
- lazy,
- "JSONFile",
- "resource://gre/modules/JSONFile.jsm"
-);
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+ChromeUtils.defineESModuleGetters(lazy, {
+ FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
+ JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
+});
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
Integration.downloads.defineModuleGetter(
diff --git a/uriloader/exthandler/tests/mochitest/head.js b/uriloader/exthandler/tests/mochitest/head.js
index 7116404497c3..ddc54849e2b8 100644
--- a/uriloader/exthandler/tests/mochitest/head.js
+++ b/uriloader/exthandler/tests/mochitest/head.js
@@ -1,4 +1,6 @@
-var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+);
var { HandlerServiceTestUtils } = ChromeUtils.import(
"resource://testing-common/HandlerServiceTestUtils.jsm"
);
diff --git a/uriloader/exthandler/tests/unit/head.js b/uriloader/exthandler/tests/unit/head.js
index 5dfa169e0e70..518aff8e5a84 100644
--- a/uriloader/exthandler/tests/unit/head.js
+++ b/uriloader/exthandler/tests/unit/head.js
@@ -11,7 +11,9 @@
var { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
);
-var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
+var { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
+);
var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
var { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
diff --git a/uriloader/exthandler/tests/unit/test_downloads_improvements_migration.js b/uriloader/exthandler/tests/unit/test_downloads_improvements_migration.js
index 13d5f125d51d..1383ddae7ff4 100644
--- a/uriloader/exthandler/tests/unit/test_downloads_improvements_migration.js
+++ b/uriloader/exthandler/tests/unit/test_downloads_improvements_migration.js
@@ -8,8 +8,8 @@ const handlerSvc = Cc["@mozilla.org/uriloader/handler-service;1"].getService(
const mimeSvc = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService);
-const { Integration } = ChromeUtils.import(
- "resource://gre/modules/Integration.jsm"
+const { Integration } = ChromeUtils.importESModule(
+ "resource://gre/modules/Integration.sys.mjs"
);
/* global DownloadIntegration */
diff --git a/widget/tests/browser/browser_test_clipboardcache.js b/widget/tests/browser/browser_test_clipboardcache.js
index 8364d485074c..925d5ec2d182 100644
--- a/widget/tests/browser/browser_test_clipboardcache.js
+++ b/widget/tests/browser/browser_test_clipboardcache.js
@@ -46,8 +46,8 @@ function getClipboardCacheFDCount() {
// handles, so if FILE_FLAG_DELETE_ON_CLOSE does the thing it promises, the
// file is actually removed when the handle is closed.
- let { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+ let { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
// Path from nsAnonymousTemporaryFile.cpp, GetTempDir.
dir = FileUtils.getFile("TmpD", ["mozilla-temp-files"]);
diff --git a/xpcom/tests/unit/test_bug745466.js b/xpcom/tests/unit/test_bug745466.js
index 1123dbec6dec..a655bf45b4fa 100644
--- a/xpcom/tests/unit/test_bug745466.js
+++ b/xpcom/tests/unit/test_bug745466.js
@@ -1,5 +1,5 @@
-const { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
function run_test() {
diff --git a/xpcom/tests/unit/test_mac_xattrs.js b/xpcom/tests/unit/test_mac_xattrs.js
index 0f725b88939a..b387358d74b7 100644
--- a/xpcom/tests/unit/test_mac_xattrs.js
+++ b/xpcom/tests/unit/test_mac_xattrs.js
@@ -4,8 +4,8 @@
* 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 { FileUtils } = ChromeUtils.import(
- "resource://gre/modules/FileUtils.jsm"
+const { FileUtils } = ChromeUtils.importESModule(
+ "resource://gre/modules/FileUtils.sys.mjs"
);
const ATTR = "bogus.attr";