corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1820880 - Convert toolkit/mozapps/update to import ES modules directly. r=Standard8,settings-reviewers,application-update-reviewers,bytesized

Browse Source 
Depends on D172120

Differential Revision: https://phabricator.services.mozilla.com/D172121
This commit is contained in:
Leila Kaltouma
2023-03-13 11:22:07 +00:00
parent b960320049
commit 19d3d0a258
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/aboutDialog-appUpdater.js
View File

@@ -12,11 +12,11 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
); );
ChromeUtils.defineESModuleGetters(this, { ChromeUtils.defineESModuleGetters(this, {
AppUpdater: "resource://gre/modules/AppUpdater.sys.mjs",
UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs", UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",
}); });
XPCOMUtils.defineLazyModuleGetters(this, { XPCOMUtils.defineLazyModuleGetters(this, {
AppUpdater: "resource://gre/modules/AppUpdater.jsm",
DownloadUtils: "resource://gre/modules/DownloadUtils.jsm", DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
}); });

8
browser/components/BrowserGlue.sys.mjs
View File

@@ -110,13 +110,13 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
}); });
if (AppConstants.MOZ_UPDATER) { if (AppConstants.MOZ_UPDATER) {
XPCOMUtils.defineLazyModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
UpdateListener: "resource://gre/modules/UpdateListener.jsm", UpdateListener: "resource://gre/modules/UpdateListener.sys.mjs",
}); });
} }
if (AppConstants.MOZ_UPDATE_AGENT) { if (AppConstants.MOZ_UPDATE_AGENT) {
XPCOMUtils.defineLazyModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm", BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.sys.mjs",
}); });
} }

4
browser/components/preferences/main.js
View File

@@ -8,8 +8,8 @@
/* import-globals-from /browser/base/content/aboutDialog-appUpdater.js */ /* import-globals-from /browser/base/content/aboutDialog-appUpdater.js */
/* global MozXULElement */ /* global MozXULElement */
XPCOMUtils.defineLazyModuleGetters(this, { ChromeUtils.defineESModuleGetters(this, {
BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm", BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.sys.mjs",
}); });
// Constants & Enumeration Values // Constants & Enumeration Values

2
browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
View File

@@ -12,6 +12,7 @@ import {
const lazy = {}; const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
AppUpdater: "resource://gre/modules/AppUpdater.sys.mjs",
NLP: "resource://gre/modules/NLP.sys.mjs", NLP: "resource://gre/modules/NLP.sys.mjs",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs", ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
@@ -21,7 +22,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
}); });
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
AppUpdater: "resource://gre/modules/AppUpdater.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm",
}); });

3
browser/components/urlbar/tests/browser/browser_quickactions.js
View File

@@ -11,11 +11,12 @@ requestLongerTimeout(3);
ChromeUtils.defineESModuleGetters(this, { ChromeUtils.defineESModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.sys.mjs", AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
UpdateService: "resource://gre/modules/UpdateService.sys.mjs",
UrlbarProviderQuickActions: UrlbarProviderQuickActions:
"resource:///modules/UrlbarProviderQuickActions.sys.mjs", "resource:///modules/UrlbarProviderQuickActions.sys.mjs",
}); });
XPCOMUtils.defineLazyModuleGetters(this, { XPCOMUtils.defineLazyModuleGetters(this, {
UpdateService: "resource://gre/modules/UpdateService.jsm",
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
}); });