Bug 1820880 - Convert toolkit/mozapps/update to import ES modules directly. r=Standard8,settings-reviewers,application-update-reviewers,bytesized
Depends on D172120 Differential Revision: https://phabricator.services.mozilla.com/D172121
This commit is contained in:
@@ -12,11 +12,11 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
|
||||
);
|
||||
|
||||
ChromeUtils.defineESModuleGetters(this, {
|
||||
AppUpdater: "resource://gre/modules/AppUpdater.sys.mjs",
|
||||
UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
AppUpdater: "resource://gre/modules/AppUpdater.jsm",
|
||||
DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
|
||||
});
|
||||
|
||||
|
||||
@@ -110,13 +110,13 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
|
||||
});
|
||||
|
||||
if (AppConstants.MOZ_UPDATER) {
|
||||
XPCOMUtils.defineLazyModuleGetters(lazy, {
|
||||
UpdateListener: "resource://gre/modules/UpdateListener.jsm",
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
UpdateListener: "resource://gre/modules/UpdateListener.sys.mjs",
|
||||
});
|
||||
}
|
||||
if (AppConstants.MOZ_UPDATE_AGENT) {
|
||||
XPCOMUtils.defineLazyModuleGetters(lazy, {
|
||||
BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm",
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.sys.mjs",
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
/* import-globals-from /browser/base/content/aboutDialog-appUpdater.js */
|
||||
/* global MozXULElement */
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm",
|
||||
ChromeUtils.defineESModuleGetters(this, {
|
||||
BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.sys.mjs",
|
||||
});
|
||||
|
||||
// Constants & Enumeration Values
|
||||
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
const lazy = {};
|
||||
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
AppUpdater: "resource://gre/modules/AppUpdater.sys.mjs",
|
||||
NLP: "resource://gre/modules/NLP.sys.mjs",
|
||||
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
|
||||
ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
|
||||
@@ -21,7 +22,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetters(lazy, {
|
||||
AppUpdater: "resource://gre/modules/AppUpdater.jsm",
|
||||
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
|
||||
Sanitizer: "resource:///modules/Sanitizer.jsm",
|
||||
});
|
||||
|
||||
@@ -11,11 +11,12 @@ requestLongerTimeout(3);
|
||||
|
||||
ChromeUtils.defineESModuleGetters(this, {
|
||||
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
|
||||
UpdateService: "resource://gre/modules/UpdateService.sys.mjs",
|
||||
|
||||
UrlbarProviderQuickActions:
|
||||
"resource:///modules/UrlbarProviderQuickActions.sys.mjs",
|
||||
});
|
||||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
UpdateService: "resource://gre/modules/UpdateService.jsm",
|
||||
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user