Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1816934 - Update consumers of services/settings to import ES modules directly. r=leplatrem,extension-reviewers,settings-reviewers,credential-management-reviewers,sgalich,mconley,robwu

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D169934
This commit is contained in:
Mark Banner 2023-02-17 09:01:43 +00:00
parent 86398abef6
commit aec4c1293b
98 changed files with 255 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
@ -89,7 +90,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
PluralForm: "resource://gre/modules/PluralForm.jsm",
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
PublicSuffixList: "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSecuritySettings:
"resource://gre/modules/psm/RemoteSecuritySettings.jsm",

8
browser/components/aboutlogins/LoginBreaches.sys.mjs
View File

@ -11,10 +11,14 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
RemoteSettingsClient:
"resource://services-settings/RemoteSettingsClient.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
});
export const LoginBreaches = {

4
browser/components/aboutlogins/tests/browser/head.js
View File

@ -4,8 +4,8 @@
let { LoginBreaches } = ChromeUtils.importESModule(
"resource:///modules/LoginBreaches.sys.mjs"
);
let { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
let { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
let { _AboutLogins } = ChromeUtils.importESModule(
"resource:///actors/AboutLoginsParent.sys.mjs"

4
browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js
View File

@ -4,8 +4,8 @@
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
// Initializing BrowserGlue requires a profile on Windows.

5
browser/components/doh/DoHConfig.sys.mjs
View File

@ -8,9 +8,8 @@
* sourced from either Remote Settings or pref values, with Remote Settings
* being preferred.
*/
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
);
import { RemoteSettings } from "resource://services-settings/remote-settings.sys.mjs";
const lazy = {};

7
browser/components/doh/DoHTestUtils.sys.mjs
View File

@ -4,13 +4,8 @@
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
});

2
browser/components/doh/test/browser/head.js
View File

@ -7,11 +7,11 @@ ChromeUtils.defineESModuleGetters(this, {
Preferences: "resource://gre/modules/Preferences.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
RegionTestUtils: "resource://testing-common/RegionTestUtils.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
});
XPCOMUtils.defineLazyServiceGetter(

2
browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_home.js
View File

@ -7,12 +7,12 @@ const { AddonTestUtils } = ChromeUtils.import(
);
ChromeUtils.defineESModuleGetters(this, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
HomePage: "resource:///modules/HomePage.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
sinon: "resource://testing-common/Sinon.jsm",
});

2
browser/components/extensions/test/xpcshell/test_ext_chrome_settings_overrides_update.js
View File

@ -8,12 +8,12 @@ const { AddonTestUtils } = ChromeUtils.import(
ChromeUtils.defineESModuleGetters(this, {
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
HomePage: "resource:///modules/HomePage.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
sinon: "resource://testing-common/Sinon.jsm",
});

4
browser/components/extensions/test/xpcshell/test_ext_settings_overrides_defaults.js
View File

@ -15,8 +15,8 @@ const { SearchUtils } = ChromeUtils.importESModule(
"resource://gre/modules/SearchUtils.sys.mjs"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");

4
browser/components/ion/content/ion.js
View File

@ -15,8 +15,8 @@ const { AddonManager } = ChromeUtils.import(
"resource://gre/modules/AddonManager.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { TelemetryController } = ChromeUtils.importESModule(

14
browser/components/newtab/lib/ASRouter.jsm
View File

@ -11,6 +11,12 @@ const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Downloader: "resource://services-settings/Attachments.sys.mjs",
MacAttribution: "resource:///modules/MacAttribution.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
SnippetsTestMessageProvider:
"resource://activity-stream/lib/SnippetsTestMessageProvider.jsm",
@ -28,7 +34,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
ASRouterTriggerListeners:
"resource://activity-stream/lib/ASRouterTriggerListeners.jsm",
KintoHttpClient: "resource://services-common/kinto-http-client.js",
Downloader: "resource://services-settings/Attachments.jsm",
RemoteImages: "resource://activity-stream/lib/RemoteImages.jsm",
RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
@ -39,9 +44,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
Utils: "resource://services-settings/Utils.jsm",
});
ChromeUtils.defineESModuleGetters(lazy, {
MacAttribution: "resource:///modules/MacAttribution.sys.mjs",
});
XPCOMUtils.defineLazyServiceGetters(lazy, {
BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"],
});
@ -55,8 +57,8 @@ const { CFRMessageProvider } = ChromeUtils.import(
const { OnboardingMessageProvider } = ChromeUtils.import(
"resource://activity-stream/lib/OnboardingMessageProvider.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { CFRPageActions } = ChromeUtils.import(
"resource://activity-stream/lib/CFRPageActions.jsm"

6
browser/components/newtab/lib/DiscoveryStreamFeed.jsm
View File

@ -7,12 +7,8 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineModuleGetter(
lazy,
"pktApi",

4
browser/components/newtab/lib/FaviconFeed.jsm
View File

@ -9,8 +9,8 @@ const { actionTypes: at } = ChromeUtils.importESModule(
const { getDomain } = ChromeUtils.import(
"resource://activity-stream/lib/TippyTopProvider.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const lazy = {};

13
browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm
View File

@ -5,11 +5,10 @@
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
@ -17,10 +16,6 @@ ChromeUtils.defineModuleGetter(
"resource://services-settings/Utils.jsm"
);
ChromeUtils.defineESModuleGetters(lazy, {
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
});
const { BasePromiseWorker } = ChromeUtils.import(
"resource://gre/modules/PromiseWorker.jsm"
);

12
browser/components/newtab/lib/RemoteImages.jsm
View File

@ -9,17 +9,15 @@ const { JSONFile } = ChromeUtils.importESModule(
const { PromiseUtils } = ChromeUtils.importESModule(
"resource://gre/modules/PromiseUtils.sys.mjs"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"Downloader",
"resource://services-settings/Attachments.jsm"
);
ChromeUtils.defineESModuleGetters(lazy, {
Downloader: "resource://services-settings/Attachments.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,

4
browser/components/newtab/lib/SiteClassifier.jsm
View File

@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
// Returns whether the passed in params match the criteria.

6
browser/components/newtab/lib/TopSitesFeed.jsm
View File

@ -53,6 +53,7 @@ ChromeUtils.defineModuleGetter(
ChromeUtils.defineESModuleGetters(lazy, {
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
ChromeUtils.defineModuleGetter(
lazy,
@ -64,11 +65,6 @@ ChromeUtils.defineModuleGetter(
"PageThumbs",
"resource://gre/modules/PageThumbs.jsm"
);
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
XPCOMUtils.defineLazyGetter(lazy, "log", () => {
const { Logger } = ChromeUtils.import(

4
browser/components/newtab/test/browser/browser_asrouter_bug1761522.js
View File

@ -13,8 +13,8 @@ const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
const { RemoteL10n } = ChromeUtils.import(
"resource://activity-stream/lib/RemoteL10n.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
// This pref is used to override the Remote Settings server URL in tests.

4
browser/components/newtab/test/browser/browser_asrouter_experimentsAPILoader.js
View File

@ -1,5 +1,5 @@
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { ASRouter } = ChromeUtils.import(
"resource://activity-stream/lib/ASRouter.jsm"

4
browser/components/newtab/test/browser/browser_asrouter_group_frequency.js
View File

@ -1,8 +1,8 @@
const { ASRouter } = ChromeUtils.import(
"resource://activity-stream/lib/ASRouter.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { CFRMessageProvider } = ChromeUtils.import(
"resource://activity-stream/lib/CFRMessageProvider.jsm"

4
browser/components/newtab/test/browser/browser_asrouter_group_userprefs.js
View File

@ -1,8 +1,8 @@
const { ASRouter } = ChromeUtils.import(
"resource://activity-stream/lib/ASRouter.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { CFRMessageProvider } = ChromeUtils.import(
"resource://activity-stream/lib/CFRMessageProvider.jsm"

4
browser/components/newtab/test/browser/browser_asrouter_momentspagehub.js
View File

@ -4,8 +4,8 @@ const { PanelTestProvider } = ChromeUtils.import(
const { MomentsPageHub } = ChromeUtils.import(
"resource://activity-stream/lib/MomentsPageHub.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { ASRouter } = ChromeUtils.import(
"resource://activity-stream/lib/ASRouter.jsm"

8
browser/components/newtab/test/browser/browser_asrouter_remoteimages.js
View File

@ -9,8 +9,8 @@ const { ASRouter } = ChromeUtils.import(
const { BrowserUtils } = ChromeUtils.importESModule(
"resource://gre/modules/BrowserUtils.sys.mjs"
);
const { Downloader } = ChromeUtils.import(
"resource://services-settings/Attachments.jsm"
const { Downloader } = ChromeUtils.importESModule(
"resource://services-settings/Attachments.sys.mjs"
);
const { ExperimentFakes } = ChromeUtils.import(
"resource://testing-common/NimbusTestUtils.jsm"
@ -26,8 +26,8 @@ const {
const { RemoteImagesTestUtils, RemoteSettingsServer } = ChromeUtils.import(
"resource://testing-common/RemoteImagesTestUtils.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
"resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"

8
browser/components/preferences/dialogs/browserLanguages.js
View File

@ -17,11 +17,9 @@ ChromeUtils.defineModuleGetter(
"AddonRepository",
"resource://gre/modules/addons/AddonRepository.jsm"
);
ChromeUtils.defineModuleGetter(
this,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineESModuleGetters(this, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
ChromeUtils.defineModuleGetter(
this,
"SelectionChangedMenulist",

5
browser/components/search/SearchSERPTelemetry.sys.mjs
View File

@ -8,13 +8,10 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
});
// The various histograms and scalars that we report to.
const SEARCH_CONTENT_SCALAR_BASE = "browser.search.content.";
const SEARCH_WITH_ADS_SCALAR_BASE = "browser.search.withads.";

6
browser/components/urlbar/private/RemoteSettingsClient.sys.mjs
View File

@ -2,7 +2,6 @@
* 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";
import { BaseFeature } from "resource:///modules/urlbar/private/BaseFeature.sys.mjs";
const lazy = {};
@ -10,14 +9,11 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
EventEmitter: "resource://gre/modules/EventEmitter.sys.mjs",
QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
TaskQueue: "resource:///modules/UrlbarUtils.sys.mjs",
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
});
const RS_COLLECTION = "quicksuggest";
// Categories that should show "Firefox Suggest" instead of "Sponsored"

6
browser/modules/test/unit/test_HomePage.js
View File

@ -8,10 +8,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
ChromeUtils.defineESModuleGetters(this, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
HomePage: "resource:///modules/HomePage.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
// RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});

2
browser/modules/test/unit/test_HomePage_ignore.js
View File

@ -9,12 +9,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
);
ChromeUtils.defineESModuleGetters(this, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
HomePage: "resource:///modules/HomePage.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
sinon: "resource://testing-common/Sinon.jsm",
});

4
devtools/client/inspector/shared/compatibility-user-settings.js
View File

@ -4,8 +4,8 @@
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const TARGET_BROWSER_ID = [

4
devtools/client/shared/devices.js
View File

@ -9,8 +9,8 @@ const L10N = new LocalizationHelper(
"devtools/client/locales/device.properties"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
loader.lazyRequireGetter(

4
netwerk/dns/PublicSuffixList.jsm
View File

@ -3,8 +3,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const FileUtils = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"

8
netwerk/url-classifier/UrlClassifierExceptionListService.jsm
View File

@ -6,11 +6,9 @@ function UrlClassifierExceptionListService() {}
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
const COLLECTION_NAME = "url-classifier-skip-urls";

4
security/manager/ssl/RemoteSecuritySettings.jsm
View File

@ -5,8 +5,8 @@
const EXPORTED_SYMBOLS = ["RemoteSecuritySettings"];
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { XPCOMUtils } = ChromeUtils.importESModule(

4
security/manager/ssl/tests/unit/test_blocklist_onecrl.js
View File

@ -3,8 +3,8 @@
do_get_profile();
const { Utils } = ChromeUtils.import("resource://services-settings/Utils.jsm");
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { RemoteSecuritySettings } = ChromeUtils.import(
"resource://gre/modules/psm/RemoteSecuritySettings.jsm"

7
services/settings/Attachments.sys.mjs
View File

@ -5,8 +5,13 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettingsWorker:
"resource://services-settings/RemoteSettingsWorker.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettingsWorker: "resource://services-settings/RemoteSettingsWorker.jsm",
Utils: "resource://services-settings/Utils.jsm",
});

12
services/settings/RemoteSettingsClient.sys.mjs
View File

@ -5,20 +5,22 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
const { Downloader } = ChromeUtils.import(
"resource://services-settings/Attachments.jsm"
);
import { Downloader } from "resource://services-settings/Attachments.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Database: "resource://services-settings/Database.sys.mjs",
RemoteSettingsWorker:
"resource://services-settings/RemoteSettingsWorker.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
ClientEnvironmentBase:
"resource://gre/modules/components-utils/ClientEnvironment.jsm",
Database: "resource://services-settings/Database.jsm",
IDBHelpers: "resource://services-settings/IDBHelpers.jsm",
KintoHttpClient: "resource://services-common/kinto-http-client.js",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
RemoteSettingsWorker: "resource://services-settings/RemoteSettingsWorker.jsm",
SharedUtils: "resource://services-settings/SharedUtils.jsm",
UptakeTelemetry: "resource://services-common/uptake-telemetry.js",
Utils: "resource://services-settings/Utils.jsm",

8
services/settings/RemoteSettingsComponents.sys.mjs
View File

@ -4,11 +4,9 @@
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
export var RemoteSettingsTimer = function() {};
RemoteSettingsTimer.prototype = {

4
services/settings/RemoteSettingsWorker.js
View File

@ -129,7 +129,7 @@ const Agent = {
/**
* Wrap worker invocations in order to return the `callbackId` along
* the result. This will allow to transform the worker invocations
* into promises in `RemoteSettingsWorker.jsm`.
* into promises in `RemoteSettingsWorker.sys.mjs`.
*/
self.onmessage = event => {
const { callbackId, method, args = [] } = event.data;
@ -157,7 +157,7 @@ let gPendingTransactions = new Set();
*/
async function importDumpIDB(bucket, collection, records, timestamp) {
// Open the DB. It will exist since if we are running this, it means
// we already tried to read the timestamp in `remote-settings.js`
// we already tried to read the timestamp in `remote-settings.sys.mjs`
const db = await IDBHelpers.openIDB(false /* do not allow upgrades */);
// try...finally to ensure we always close the db.

4
services/settings/docs/index.rst
View File

@ -4,7 +4,7 @@
Remote Settings
===============
The `remote-settings.js <https://searchfox.org/mozilla-central/source/services/settings/remote-settings.js>`_ module offers the ability to fetch remote settings that are kept in sync with Mozilla servers.
The :searchfox:`remote-settings.sys.mjs <services/settings/remote-settings.sys.mjs>` module offers the ability to fetch remote settings that are kept in sync with Mozilla servers.
Usage
@ -14,7 +14,7 @@ The ``get()`` method returns the list of entries for a specific key. Each entry
.. code-block:: js
const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js");
const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.sys.mjs");
const data = await RemoteSettings("a-key").get();

11
services/settings/remote-settings.sys.mjs
View File

@ -9,13 +9,18 @@ import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Database: "resource://services-settings/Database.sys.mjs",
RemoteSettingsClient:
"resource://services-settings/RemoteSettingsClient.sys.mjs",
SyncHistory: "resource://services-settings/SyncHistory.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
UptakeTelemetry: "resource://services-common/uptake-telemetry.js",
pushBroadcastService: "resource://gre/modules/PushBroadcastService.jsm",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
SyncHistory: "resource://services-settings/SyncHistory.jsm",
Database: "resource://services-settings/Database.jsm",
Utils: "resource://services-settings/Utils.jsm",
FilterExpressions:
"resource://gre/modules/components-utils/FilterExpressions.jsm",
});

8
services/settings/test/unit/test_attachments_downloader.js
View File

@ -1,13 +1,13 @@
/* import-globals-from ../../../common/tests/unit/head_helpers.js */
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { UptakeTelemetry } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
);
const { Downloader } = ChromeUtils.import(
"resource://services-settings/Attachments.jsm"
const { Downloader } = ChromeUtils.importESModule(
"resource://services-settings/Attachments.sys.mjs"
);
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"

4
services/settings/test/unit/test_remote_settings.js
View File

@ -10,8 +10,8 @@ const { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { Utils } = ChromeUtils.import("resource://services-settings/Utils.jsm");
const { UptakeTelemetry, Policy } = ChromeUtils.import(

4
services/settings/test/unit/test_remote_settings_jexl_filters.js
View File

@ -1,5 +1,5 @@
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
let client;

8
services/settings/test/unit/test_remote_settings_offline.js
View File

@ -1,8 +1,8 @@
const { RemoteSettingsClient } = ChromeUtils.import(
"resource://services-settings/RemoteSettingsClient.jsm"
const { RemoteSettingsClient } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsClient.sys.mjs"
);
const { RemoteSettingsWorker } = ChromeUtils.import(
"resource://services-settings/RemoteSettingsWorker.jsm"
const { RemoteSettingsWorker } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsWorker.sys.mjs"
);
const { SharedUtils } = ChromeUtils.import(
"resource://services-settings/SharedUtils.jsm"

12
services/settings/test/unit/test_remote_settings_poll.js
View File

@ -10,20 +10,22 @@ const { setTimeout } = ChromeUtils.importESModule(
const { UptakeTelemetry, Policy } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
);
const { RemoteSettingsClient } = ChromeUtils.import(
"resource://services-settings/RemoteSettingsClient.jsm"
const { RemoteSettingsClient } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsClient.sys.mjs"
);
const { pushBroadcastService } = ChromeUtils.import(
"resource://gre/modules/PushBroadcastService.jsm"
);
const { SyncHistory } = ChromeUtils.import(
"resource://services-settings/SyncHistory.jsm"
const { SyncHistory } = ChromeUtils.importESModule(
"resource://services-settings/SyncHistory.sys.mjs"
);
const {
RemoteSettings,
remoteSettingsBroadcastHandler,
BROADCAST_ID,
} = ChromeUtils.import("resource://services-settings/remote-settings.js");
} = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { Utils } = ChromeUtils.import("resource://services-settings/Utils.jsm");
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"

12
services/settings/test/unit/test_remote_settings_recover_broken.js
View File

@ -1,13 +1,13 @@
/* import-globals-from ../../../common/tests/unit/head_helpers.js */
const { SyncHistory } = ChromeUtils.import(
"resource://services-settings/SyncHistory.jsm"
const { SyncHistory } = ChromeUtils.importESModule(
"resource://services-settings/SyncHistory.sys.mjs"
);
const { RemoteSettingsClient } = ChromeUtils.import(
"resource://services-settings/RemoteSettingsClient.jsm"
const { RemoteSettingsClient } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsClient.sys.mjs"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { Utils } = ChromeUtils.import("resource://services-settings/Utils.jsm");

8
services/settings/test/unit/test_remote_settings_signatures.js
View File

@ -1,11 +1,11 @@
/* import-globals-from ../../../common/tests/unit/head_helpers.js */
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { RemoteSettingsClient } = ChromeUtils.import(
"resource://services-settings/RemoteSettingsClient.jsm"
const { RemoteSettingsClient } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsClient.sys.mjs"
);
const { UptakeTelemetry, Policy } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"

4
services/settings/test/unit/test_remote_settings_sync_history.js
View File

@ -1,7 +1,7 @@
"use strict";
const { SyncHistory } = ChromeUtils.import(
"resource://services-settings/SyncHistory.jsm"
const { SyncHistory } = ChromeUtils.importESModule(
"resource://services-settings/SyncHistory.sys.mjs"
);
async function clear_state() {

12
services/settings/test/unit/test_remote_settings_worker.js
View File

@ -7,14 +7,14 @@ const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
const { RemoteSettingsWorker } = ChromeUtils.import(
"resource://services-settings/RemoteSettingsWorker.jsm"
const { RemoteSettingsWorker } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsWorker.sys.mjs"
);
const { RemoteSettingsClient } = ChromeUtils.import(
"resource://services-settings/RemoteSettingsClient.jsm"
const { RemoteSettingsClient } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsClient.sys.mjs"
);
const { Database } = ChromeUtils.import(
"resource://services-settings/Database.jsm"
const { Database } = ChromeUtils.importESModule(
"resource://services-settings/Database.sys.mjs"
);
XPCOMUtils.defineLazyGlobalGetters(this, ["indexedDB"]);

12
services/settings/test/unit/test_shutdown_handling.js
View File

@ -7,14 +7,14 @@ const { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);
const { Database } = ChromeUtils.import(
"resource://services-settings/Database.jsm"
const { Database } = ChromeUtils.importESModule(
"resource://services-settings/Database.sys.mjs"
);
const { RemoteSettingsWorker } = ChromeUtils.import(
"resource://services-settings/RemoteSettingsWorker.jsm"
const { RemoteSettingsWorker } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsWorker.sys.mjs"
);
const { RemoteSettingsClient } = ChromeUtils.import(
"resource://services-settings/RemoteSettingsClient.jsm"
const { RemoteSettingsClient } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsClient.sys.mjs"
);
add_task(async function test_shutdown_abort_after_start() {

8
toolkit/components/antitracking/PartitioningExceptionListService.jsm
View File

@ -6,11 +6,9 @@
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
const COLLECTION_NAME = "partitioning-exempt-urls";
const PREF_NAME = "privacy.restrict3rdpartystorage.skip_list";

8
toolkit/components/antitracking/URLDecorationAnnotationsService.jsm
View File

@ -6,11 +6,9 @@ function URLDecorationAnnotationsService() {}
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
const COLLECTION_NAME = "anti-tracking-url-decoration";
const PREF_NAME = "privacy.restrict3rdpartystorage.url_decorations";

8
toolkit/components/antitracking/URLQueryStrippingListService.jsm
View File

@ -4,14 +4,10 @@
"use strict";
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
const COLLECTION_NAME = "query-stripping";

4
toolkit/components/antitracking/test/browser/browser_storageAccessWithDynamicFpi.js
View File

@ -5,8 +5,8 @@
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
XPCOMUtils.defineLazyServiceGetter(

4
toolkit/components/antitracking/test/browser/browser_urlDecorationStripping.js
View File

@ -5,8 +5,8 @@
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"

4
toolkit/components/antitracking/test/browser/browser_urlDecorationStripping_alwaysPartition.js
View File

@ -7,8 +7,8 @@
const trackerBlocked = Ci.nsIWebProgressListener.STATE_COOKIES_BLOCKED_TRACKER;
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"

4
toolkit/components/antitracking/test/browser/browser_urlQueryStrippingListService.js
View File

@ -5,8 +5,8 @@
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
XPCOMUtils.defineLazyServiceGetter(

4
toolkit/components/antitracking/test/xpcshell/test_ExceptionListService.js
View File

@ -7,8 +7,8 @@
/* Unit tests for the nsIPartitioningExceptionListService implementation. */
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const COLLECTION_NAME = "partitioning-exempt-urls";

5
toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs
View File

@ -63,14 +63,15 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
IndexedDB: "resource://gre/modules/IndexedDB.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
RemoteSettingsClient:
"resource://services-settings/RemoteSettingsClient.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
ClientEnvironmentBase:
"resource://gre/modules/components-utils/ClientEnvironment.jsm",
ExtensionUtils: "resource://gre/modules/ExtensionUtils.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
ToastNotification: "resource://activity-stream/lib/ToastNotification.jsm",
Utils: "resource://services-settings/Utils.jsm",
});

5
toolkit/components/cookiebanners/CookieBannerListService.jsm
View File

@ -13,10 +13,7 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
ChromeUtils.defineESModuleGetters(lazy, {
JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
XPCOMUtils.defineLazyPreferenceGetter(

4
toolkit/components/cookiebanners/test/unit/test_cookiebannerlistservice.js
View File

@ -3,8 +3,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
let { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");

5
toolkit/components/nimbus/ExperimentAPI.jsm
View File

@ -19,10 +19,13 @@ const { AppConstants } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
ExperimentStore: "resource://nimbus/lib/ExperimentStore.jsm",
ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
FeatureManifest: "resource://nimbus/FeatureManifest.js",
});

2
toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm
View File

@ -17,13 +17,13 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
CleanupManager: "resource://normandy/lib/CleanupManager.jsm",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
});

4
toolkit/components/nimbus/test/browser/browser_remotesettings_experiment_enroll.js
View File

@ -1,7 +1,7 @@
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
"resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"

4
toolkit/components/nimbus/test/browser/browser_remotesettingsexperimentloader_force_enrollment.js
View File

@ -3,8 +3,8 @@
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
"resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"

4
toolkit/components/nimbus/test/browser/browser_remotesettingsexperimentloader_remote_defaults.js
View File

@ -3,8 +3,8 @@
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const {
_ExperimentFeature: ExperimentFeature,

5
toolkit/components/normandy/lib/RecipeRunner.jsm
View File

@ -24,12 +24,14 @@ XPCOMUtils.defineLazyServiceGetter(
);
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
RemoteSettingsClient:
"resource://services-settings/RemoteSettingsClient.sys.mjs",
clearTimeout: "resource://gre/modules/Timer.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
Storage: "resource://normandy/lib/Storage.jsm",
FilterExpressions:
"resource://gre/modules/components-utils/FilterExpressions.jsm",
@ -41,7 +43,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
Uptake: "resource://normandy/lib/Uptake.jsm",
ActionsManager: "resource://normandy/lib/ActionsManager.jsm",
BaseAction: "resource://normandy/actions/BaseAction.jsm",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
});
var EXPORTED_SYMBOLS = ["RecipeRunner"];

4
toolkit/components/normandy/test/browser/browser_RecipeRunner.js
View File

@ -25,8 +25,8 @@ const { ActionsManager } = ChromeUtils.import(
);
const { Uptake } = ChromeUtils.import("resource://normandy/lib/Uptake.jsm");
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
add_task(async function getFilterContext() {

4
toolkit/components/passwordmgr/LoginRecipes.jsm
View File

@ -36,8 +36,8 @@ XPCOMUtils.defineLazyGetter(lazy, "log", () =>
lazy.LoginHelper.createLogger("LoginRecipes")
);
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
/**

5
toolkit/components/passwordmgr/LoginRelatedRealms.jsm
View File

@ -10,9 +10,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
});
XPCOMUtils.defineLazyGetter(lazy, "log", () => {

5
toolkit/components/passwordmgr/PasswordRulesManager.jsm
View File

@ -10,11 +10,14 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
LoginHelper: "resource://gre/modules/LoginHelper.jsm",
PasswordGenerator: "resource://gre/modules/PasswordGenerator.jsm",
PasswordRulesParser: "resource://gre/modules/PasswordRulesParser.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
});
XPCOMUtils.defineLazyGetter(lazy, "log", () => {

8
toolkit/components/passwordmgr/test/LoginTestUtils.jsm
View File

@ -9,14 +9,10 @@
const EXPORTED_SYMBOLS = ["LoginTestUtils"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
let { Assert: AssertCls } = ChromeUtils.importESModule(

4
toolkit/components/passwordmgr/test/unit/test_PasswordRulesManager_generatePassword.js
View File

@ -12,8 +12,8 @@ const { PasswordRulesManagerParent } = ChromeUtils.import(
const { PasswordRulesParser } = ChromeUtils.import(
"resource://gre/modules/PasswordRulesParser.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"

4
toolkit/components/passwordmgr/test/unit/test_findRelatedRealms.js
View File

@ -6,8 +6,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
const { LoginRelatedRealmsParent } = ChromeUtils.import(
"resource://gre/modules/LoginRelatedRealms.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const REMOTE_SETTINGS_COLLECTION = "websites-with-shared-credential-backends";

4
toolkit/components/passwordmgr/test/unit/test_remote_recipes.js
View File

@ -8,8 +8,8 @@
"use strict";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const REMOTE_SETTINGS_COLLECTION = "password-recipes";

5
toolkit/components/search/SearchEngineSelector.sys.mjs
View File

@ -7,13 +7,10 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
});
const USER_LOCALE = "$USER_LOCALE";
const USER_REGION = "$USER_REGION";

2
toolkit/components/search/SearchService.sys.mjs
View File

@ -18,6 +18,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
OpenSearchEngine: "resource://gre/modules/OpenSearchEngine.sys.mjs",
PolicySearchEngine: "resource://gre/modules/PolicySearchEngine.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SearchEngine: "resource://gre/modules/SearchEngine.sys.mjs",
SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
SearchSettings: "resource://gre/modules/SearchSettings.sys.mjs",
@ -28,7 +29,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
});

2
toolkit/components/search/tests/SearchTestUtils.sys.mjs
View File

@ -5,6 +5,7 @@ import { MockRegistrar } from "resource://testing-common/MockRegistrar.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
});
@ -12,7 +13,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
ExtensionTestUtils: "resource://testing-common/ExtensionXPCShellUtils.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
sinon: "resource://testing-common/Sinon.jsm",
});

5
toolkit/components/search/tests/xpcshell/head_search.js
View File

@ -9,6 +9,9 @@ ChromeUtils.defineESModuleGetters(this, {
FileUtils: "resource://gre/modules/FileUtils.sys.mjs",
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
RemoteSettingsClient:
"resource://services-settings/RemoteSettingsClient.sys.mjs",
SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
SearchService: "resource://gre/modules/SearchService.sys.mjs",
SearchSettings: "resource://gre/modules/SearchSettings.sys.mjs",
@ -20,8 +23,6 @@ ChromeUtils.defineESModuleGetters(this, {
});
XPCOMUtils.defineLazyModuleGetters(this, {
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});

2
toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
View File

@ -12,6 +12,7 @@ const { AppConstants } = ChromeUtils.importESModule(
ChromeUtils.defineESModuleGetters(this, {
Region: "resource://gre/modules/Region.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
SearchEngine: "resource://gre/modules/SearchEngine.sys.mjs",
SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
@ -22,7 +23,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
sinon: "resource://testing-common/Sinon.jsm",
});

6
toolkit/components/search/tests/xpcshell/searchconfigs/test_selector_db_out_of_date.js
View File

@ -4,13 +4,11 @@
"use strict";
ChromeUtils.defineESModuleGetters(this, {
RemoteSettingsWorker:
"resource://services-settings/RemoteSettingsWorker.sys.mjs",
SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
RemoteSettingsWorker: "resource://services-settings/RemoteSettingsWorker.jsm",
});
do_get_profile();
add_task(async function test_selector_db_out_of_date() {

4
toolkit/components/translations/actors/TranslationsParent.sys.mjs
View File

@ -23,8 +23,8 @@ const lazy = {};
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "console", () => {

8
toolkit/components/url-classifier/UrlClassifierRemoteSettingsService.jsm
View File

@ -3,11 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
});
const COLLECTION_NAME = "tracking-protection-lists";

4
toolkit/components/url-classifier/tests/unit/test_exceptionListService.js
View File

@ -6,8 +6,8 @@
/* Unit tests for the nsIUrlClassifierExceptionListService implementation. */
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const COLLECTION_NAME = "url-classifier-skip-urls";

4
toolkit/components/url-classifier/tests/unit/test_rsListService.js
View File

@ -6,8 +6,8 @@
/* Unit tests for the nsIUrlClassifierRemoteSettingsService implementation. */
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { SBRS_UPDATE_MINIMUM_DELAY } = ChromeUtils.import(
"resource://gre/modules/UrlClassifierRemoteSettingsService.jsm"

9
toolkit/modules/IgnoreLists.sys.mjs
View File

@ -2,13 +2,12 @@
* 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 = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
RemoteSettingsClient:
"resource://services-settings/RemoteSettingsClient.sys.mjs",
});
const SETTINGS_IGNORELIST_KEY = "hijack-blocklists";

4
toolkit/modules/Region.sys.mjs
View File

@ -6,9 +6,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
);
import { RemoteSettings } from "resource://services-settings/remote-settings.sys.mjs";
const lazy = {};

5
toolkit/modules/tests/xpcshell/test_IgnoreList.js
View File

@ -10,11 +10,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
ChromeUtils.defineESModuleGetters(this, {
IgnoreLists: "resource://gre/modules/IgnoreLists.sys.mjs",
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
RemoteSettingsClient:
"resource://services-settings/RemoteSettingsClient.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(this, {
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSettingsClient: "resource://services-settings/RemoteSettingsClient.jsm",
sinon: "resource://testing-common/Sinon.jsm",
});

4
toolkit/mozapps/extensions/AddonManager.jsm
View File

@ -88,20 +88,20 @@ const { PromiseUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
TelemetryTimestamps: "resource://gre/modules/TelemetryTimestamps.sys.mjs",
isGatedPermissionType:
"resource://gre/modules/addons/siteperms-addon-utils.sys.mjs",
isKnownPublicSuffix:
"resource://gre/modules/addons/siteperms-addon-utils.sys.mjs",
isPrincipalInSitePermissionsBlocklist:
"resource://gre/modules/addons/siteperms-addon-utils.sys.mjs",
TelemetryTimestamps: "resource://gre/modules/TelemetryTimestamps.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonRepository: "resource://gre/modules/addons/AddonRepository.jsm",
AbuseReporter: "resource://gre/modules/AbuseReporter.jsm",
Extension: "resource://gre/modules/Extension.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
});
XPCOMUtils.defineLazyPreferenceGetter(

14
toolkit/mozapps/extensions/Blocklist.jsm
View File

@ -27,16 +27,10 @@ ChromeUtils.defineModuleGetter(
"AddonManagerPrivate",
"resource://gre/modules/AddonManager.jsm"
);
ChromeUtils.defineModuleGetter(
lazy,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineModuleGetter(
lazy,
"jexlFilterFunc",
"resource://services-settings/remote-settings.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
jexlFilterFunc: "resource://services-settings/remote-settings.sys.mjs",
});
const CascadeFilter = Components.Constructor(
"@mozilla.org/cascade-filter;1",

8
toolkit/mozapps/extensions/test/xpcshell/head_addons.js
View File

@ -80,14 +80,10 @@ ChromeUtils.defineESModuleGetters(this, {
MockRegistrar: "resource://testing-common/MockRegistrar.sys.mjs",
MockRegistry: "resource://testing-common/MockRegistry.sys.mjs",
PromiseTestUtils: "resource://testing-common/PromiseTestUtils.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
TestUtils: "resource://testing-common/TestUtils.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
});
ChromeUtils.defineModuleGetter(
this,
"RemoteSettings",
"resource://services-settings/remote-settings.js"
);
XPCOMUtils.defineLazyServiceGetter(
this,

4
toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_clients.js
View File

@ -4,8 +4,8 @@ const { BlocklistPrivate } = ChromeUtils.import(
const { Utils: RemoteSettingsUtils } = ChromeUtils.import(
"resource://services-settings/Utils.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const IS_ANDROID = AppConstants.platform == "android";

2
toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_mlbf_dump.js
View File

@ -92,7 +92,7 @@ add_task(async function verify_dump_first_run() {
// If this fails:
// - "dump_fallback" means that the MLBF attachment is out of sync with the
// collection data.
// - undefined could mean that the implementation of Attachments.jsm changed.
// - undefined could mean that the implementation of Attachments.sys.mjs changed.
Assert.equal(
downloadResult._source,
"dump_match",

4
toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_mlbf_fetch.js
View File

@ -9,8 +9,8 @@
Services.prefs.setBoolPref("extensions.blocklist.useMLBF", true);
const { Downloader } = ChromeUtils.import(
"resource://services-settings/Attachments.jsm"
const { Downloader } = ChromeUtils.importESModule(
"resource://services-settings/Attachments.sys.mjs"
);
const ExtensionBlocklistMLBF = getExtensionBlocklistMLBF();

4
toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_mlbf_telemetry.js
View File

@ -7,8 +7,8 @@ Services.prefs.setBoolPref("extensions.blocklist.useMLBF", true);
createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
const { Downloader } = ChromeUtils.import(
"resource://services-settings/Attachments.jsm"
const { Downloader } = ChromeUtils.importESModule(
"resource://services-settings/Attachments.sys.mjs"
);
const { TelemetryController } = ChromeUtils.importESModule(

4
toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_statechange_telemetry.js
View File

@ -11,8 +11,8 @@ createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "42.0", "42.0");
// apply to add-ons with a privileged signature.
AddonTestUtils.usePrivilegedSignatures = false;
const { Downloader } = ChromeUtils.import(
"resource://services-settings/Attachments.jsm"
const { Downloader } = ChromeUtils.importESModule(
"resource://services-settings/Attachments.sys.mjs"
);
const { TelemetryController } = ChromeUtils.importESModule(

4
toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_targetapp_filter.js
View File

@ -1,8 +1,8 @@
const { BlocklistPrivate } = ChromeUtils.import(
"resource://gre/modules/Blocklist.jsm"
);
const { RemoteSettings } = ChromeUtils.import(
"resource://services-settings/remote-settings.js"
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const APP_ID = "xpcshell@tests.mozilla.org";