Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-01 11:27:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1819019 - Update consumers of services/common to import ES modules directly. r=markh,webdriver-reviewers,extension-reviewers,jdescottes

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D171055
This commit is contained in:
Mark Banner 2023-02-28 10:11:55 +00:00
parent c60ae74d84
commit 55bba8e918
91 changed files with 212 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/base/content/test/general/browser_remoteWebNavigation_postdata.js
View File

@ -12,8 +12,8 @@ function makeInputStream(aString) {
add_task(async function test_remoteWebNavigation_postdata() {
let { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
let { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
let { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
let server = new HttpServer();

4
browser/base/content/test/protectionsUI/browser_protectionsUI_report_breakage.js
View File

@ -21,7 +21,9 @@ const CB_PREF = "network.cookie.cookieBehavior";
const PREF_REPORT_BREAKAGE_URL = "browser.contentblocking.reportBreakage.url";
let { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
let { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
let { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
let { Preferences } = ChromeUtils.importESModule(
"resource://gre/modules/Preferences.sys.mjs"
);

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

@ -21,8 +21,8 @@ XPCOMUtils.defineLazyServiceGetter(
"nsINativeDNSResolverOverride"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
const { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
const EXAMPLE_URL = "https://example.com/";

4
browser/components/translation/BingTranslator.jsm
View File

@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["BingTranslator"];
const { PromiseUtils } = ChromeUtils.importESModule(
"resource://gre/modules/PromiseUtils.sys.mjs"
);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Async } = ChromeUtils.importESModule(
"resource://services-common/async.sys.mjs"
);
const { httpRequest } = ChromeUtils.importESModule(
"resource://gre/modules/Http.sys.mjs"
);

4
browser/components/translation/TranslationDocument.jsm
View File

@ -6,7 +6,9 @@
var EXPORTED_SYMBOLS = ["TranslationDocument"];
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Async } = ChromeUtils.importESModule(
"resource://services-common/async.sys.mjs"
);
/**
* This class represents a document that is being translated,

4
browser/components/translation/YandexTranslator.jsm
View File

@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["YandexTranslator"];
const { PromiseUtils } = ChromeUtils.importESModule(
"resource://gre/modules/PromiseUtils.sys.mjs"
);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Async } = ChromeUtils.importESModule(
"resource://services-common/async.sys.mjs"
);
const { httpRequest } = ChromeUtils.importESModule(
"resource://gre/modules/Http.sys.mjs"
);

2
remote/cdp/observers/NetworkObserver.sys.mjs
View File

@ -7,6 +7,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
CommonUtils: "resource://services-common/utils.sys.mjs",
EventEmitter: "resource://gre/modules/EventEmitter.sys.mjs",
ChannelEventSinkFactory:
@ -14,7 +15,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
CommonUtils: "resource://services-common/utils.js",
NetUtil: "resource://gre/modules/NetUtil.jsm",
});

4
security/manager/tools/genRootCAHashes.js
View File

@ -16,8 +16,8 @@ const { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"
);
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
const { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
const FILENAME_OUTPUT = "RootHashes.inc";

9
services/common/hawkclient.sys.mjs
View File

@ -22,12 +22,9 @@
* multiple HAWK services should instantiate one HawkClient per service.
*/
const { HAWKAuthenticatedRESTRequest } = ChromeUtils.import(
"resource://services-common/hawkrequest.js"
);
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
import { HAWKAuthenticatedRESTRequest } from "resource://services-common/hawkrequest.sys.mjs";
import { Observers } from "resource://services-common/observers.sys.mjs";
import { Log } from "resource://gre/modules/Log.sys.mjs";
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";

8
services/common/hawkrequest.sys.mjs
View File

@ -4,12 +4,8 @@
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { RESTRequest } from "resource://services-common/rest.sys.mjs";
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { Credentials } from "resource://gre/modules/Credentials.sys.mjs";
const lazy = {};

4
services/common/rest.sys.mjs
View File

@ -6,9 +6,7 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
import { Log } from "resource://gre/modules/Log.sys.mjs";
import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs";
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
const lazy = {};

16
services/common/tests/unit/head_helpers.js
View File

@ -5,7 +5,9 @@
/* import-globals-from head_global.js */
var { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs");
var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
var { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
var {
HTTP_400,
HTTP_401,
@ -33,8 +35,8 @@ var {
HttpError,
HttpServer,
} = ChromeUtils.import("resource://testing-common/httpd.js");
var { getTestLogger, initTestLogging } = ChromeUtils.import(
"resource://testing-common/services/common/logging.js"
var { getTestLogger, initTestLogging } = ChromeUtils.importESModule(
"resource://testing-common/services/common/logging.sys.mjs"
);
var { MockRegistrar } = ChromeUtils.importESModule(
"resource://testing-common/MockRegistrar.sys.mjs"
@ -236,8 +238,8 @@ function getUptakeTelemetrySnapshot(component, source) {
}
function checkUptakeTelemetry(snapshot1, snapshot2, expectedIncrements) {
const { UptakeTelemetry } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
const { UptakeTelemetry } = ChromeUtils.importESModule(
"resource://services-common/uptake-telemetry.sys.mjs"
);
const STATUSES = Object.values(UptakeTelemetry.STATUS);
for (const status of STATUSES) {
@ -249,8 +251,8 @@ function checkUptakeTelemetry(snapshot1, snapshot2, expectedIncrements) {
}
async function withFakeChannel(channel, f) {
const { Policy } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
const { Policy } = ChromeUtils.importESModule(
"resource://services-common/uptake-telemetry.sys.mjs"
);
let oldGetChannel = Policy.getChannel;
Policy.getChannel = () => channel;

4
services/common/tests/unit/head_http.js
View File

@ -3,7 +3,9 @@
/* import-globals-from head_global.js */
var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
var { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
function basic_auth_header(user, password) {
return "Basic " + btoa(user + ":" + CommonUtils.encodeUTF8(password));

4
services/common/tests/unit/test_async_chain.js
View File

@ -1,7 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Async } = ChromeUtils.importESModule(
"resource://services-common/async.sys.mjs"
);
function run_test() {
_("Chain a few async methods, making sure the 'this' object is correct.");

4
services/common/tests/unit/test_async_foreach.js
View File

@ -1,7 +1,9 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Async } = ChromeUtils.importESModule(
"resource://services-common/async.sys.mjs"
);
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
function makeArray(length) {

4
services/common/tests/unit/test_hawkclient.js
View File

@ -3,8 +3,8 @@
"use strict";
const { HawkClient } = ChromeUtils.import(
"resource://services-common/hawkclient.js"
const { HawkClient } = ChromeUtils.importESModule(
"resource://services-common/hawkclient.sys.mjs"
);
const SECOND_MS = 1000;

8
services/common/tests/unit/test_hawkrequest.js
View File

@ -6,8 +6,12 @@
const {
HAWKAuthenticatedRESTRequest,
deriveHawkCredentials,
} = ChromeUtils.import("resource://services-common/hawkrequest.js");
const { Async } = ChromeUtils.import("resource://services-common/async.js");
} = ChromeUtils.importESModule(
"resource://services-common/hawkrequest.sys.mjs"
);
const { Async } = ChromeUtils.importESModule(
"resource://services-common/async.sys.mjs"
);
// https://github.com/mozilla/fxa-auth-server/wiki/onepw-protocol#wiki-use-session-certificatesign-etc
var SESSION_KEYS = {

4
services/common/tests/unit/test_kinto.js
View File

@ -4,8 +4,8 @@
const { Kinto } = ChromeUtils.import(
"resource://services-common/kinto-offline-client.js"
);
const { FirefoxAdapter } = ChromeUtils.import(
"resource://services-common/kinto-storage-adapter.js"
const { FirefoxAdapter } = ChromeUtils.importESModule(
"resource://services-common/kinto-storage-adapter.sys.mjs"
);
var server;

4
services/common/tests/unit/test_logmanager.js
View File

@ -4,8 +4,8 @@
// NOTE: The sync test_errorhandler_* tests have quite good coverage for
// other aspects of this.
const { LogManager } = ChromeUtils.import(
"resource://services-common/logmanager.js"
const { LogManager } = ChromeUtils.importESModule(
"resource://services-common/logmanager.sys.mjs"
);
const { FileUtils } = ChromeUtils.importESModule(
"resource://gre/modules/FileUtils.sys.mjs"

4
services/common/tests/unit/test_observers.js
View File

@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
const { Observers } = ChromeUtils.importESModule(
"resource://services-common/observers.sys.mjs"
);
var gSubject = {};

4
services/common/tests/unit/test_restrequest.js
View File

@ -3,8 +3,8 @@
"use strict";
const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
const { RESTRequest } = ChromeUtils.importESModule(
"resource://services-common/rest.sys.mjs"
);
function run_test() {

4
services/common/tests/unit/test_storage_adapter.js
View File

@ -4,8 +4,8 @@
const { Sqlite } = ChromeUtils.importESModule(
"resource://gre/modules/Sqlite.sys.mjs"
);
const { FirefoxAdapter } = ChromeUtils.import(
"resource://services-common/kinto-storage-adapter.js"
const { FirefoxAdapter } = ChromeUtils.importESModule(
"resource://services-common/kinto-storage-adapter.sys.mjs"
);
// set up what we need to make storage adapters

4
services/common/tests/unit/test_storage_adapter_shutdown.js
View File

@ -5,8 +5,8 @@ const { AsyncShutdown } = ChromeUtils.importESModule(
"resource://gre/modules/AsyncShutdown.sys.mjs"
);
const { FirefoxAdapter } = ChromeUtils.import(
"resource://services-common/kinto-storage-adapter.js"
const { FirefoxAdapter } = ChromeUtils.importESModule(
"resource://services-common/kinto-storage-adapter.sys.mjs"
);
add_task(async function test_sqlite_shutdown() {

4
services/common/tests/unit/test_tokenauthenticatedrequest.js
View File

@ -4,8 +4,8 @@
const { CryptoUtils } = ChromeUtils.importESModule(
"resource://services-crypto/utils.sys.mjs"
);
const { TokenAuthenticatedRESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
const { TokenAuthenticatedRESTRequest } = ChromeUtils.importESModule(
"resource://services-common/rest.sys.mjs"
);
function run_test() {

4
services/common/tests/unit/test_tokenserverclient.js
View File

@ -5,7 +5,9 @@ const {
TokenServerClient,
TokenServerClientError,
TokenServerClientServerError,
} = ChromeUtils.import("resource://services-common/tokenserverclient.js");
} = ChromeUtils.importESModule(
"resource://services-common/tokenserverclient.sys.mjs"
);
initTestLogging("Trace");

8
services/common/tests/unit/test_uptake_telemetry.js
View File

@ -1,15 +1,15 @@
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"
);
const { UptakeTelemetry } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
const { UptakeTelemetry } = ChromeUtils.importESModule(
"resource://services-common/uptake-telemetry.sys.mjs"
);
const COMPONENT = "remotesettings";
async function withFakeClientID(uuid, f) {
const { Policy } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
const { Policy } = ChromeUtils.importESModule(
"resource://services-common/uptake-telemetry.sys.mjs"
);
let oldGetClientID = Policy.getClientID;
Policy._clientIDHash = null;

8
services/common/tokenserverclient.sys.mjs
View File

@ -4,12 +4,8 @@
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
);
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
import { RESTRequest } from "resource://services-common/rest.sys.mjs";
import { Observers } from "resource://services-common/observers.sys.mjs";
const PREF_LOG_LEVEL = "services.common.log.logger.tokenserverclient";

9
services/crypto/modules/utils.sys.mjs
View File

@ -2,12 +2,9 @@
* 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 { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { Observers } from "resource://services-common/observers.sys.mjs";
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};

4
services/fxaccounts/Credentials.sys.mjs
View File

@ -13,9 +13,7 @@ import { Log } from "resource://gre/modules/Log.sys.mjs";
import { CryptoUtils } from "resource://services-crypto/utils.sys.mjs";
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
const PROTOCOL_VERSION = "identity.mozilla.com/picl/v1/";
const PBKDF2_ROUNDS = 1000;

13
services/fxaccounts/FxAccountsClient.sys.mjs
View File

@ -2,15 +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/. */
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
const { HawkClient } = ChromeUtils.import(
"resource://services-common/hawkclient.js"
);
const { deriveHawkCredentials } = ChromeUtils.import(
"resource://services-common/hawkrequest.js"
);
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { HawkClient } from "resource://services-common/hawkclient.sys.mjs";
import { deriveHawkCredentials } from "resource://services-common/hawkrequest.sys.mjs";
import { CryptoUtils } from "resource://services-crypto/utils.sys.mjs";
const {

4
services/fxaccounts/FxAccountsCommands.sys.mjs
View File

@ -16,9 +16,7 @@ ChromeUtils.defineModuleGetter(
);
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
import { Observers } from "resource://services-common/observers.sys.mjs";
ChromeUtils.defineESModuleGetters(lazy, {
BulkKeyBundle: "resource://services-sync/keys.sys.mjs",

4
services/fxaccounts/FxAccountsCommon.js
View File

@ -11,8 +11,8 @@ const { Preferences } = ChromeUtils.importESModule(
const { Log } = ChromeUtils.importESModule(
"resource://gre/modules/Log.sys.mjs"
);
const { LogManager } = ChromeUtils.import(
"resource://services-common/logmanager.js"
const { LogManager } = ChromeUtils.importESModule(
"resource://services-common/logmanager.sys.mjs"
);
// loglevel should be one of "Fatal", "Error", "Warn", "Info", "Config",

5
services/fxaccounts/FxAccountsConfig.sys.mjs
View File

@ -2,9 +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 { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
);
import { RESTRequest } from "resource://services-common/rest.sys.mjs";
const { log } = ChromeUtils.import(
"resource://gre/modules/FxAccountsCommon.js"
);

8
services/fxaccounts/FxAccountsDevice.sys.mjs
View File

@ -22,11 +22,9 @@ const { DEVICE_TYPE_DESKTOP } = ChromeUtils.import(
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"CommonUtils",
"resource://services-common/utils.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
CommonUtils: "resource://services-common/utils.sys.mjs",
});
const PREF_LOCAL_DEVICE_NAME = PREF_ACCOUNT_ROOT + "device.name";
XPCOMUtils.defineLazyPreferenceGetter(

4
services/fxaccounts/FxAccountsKeys.sys.mjs
View File

@ -4,9 +4,7 @@
import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs";
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { CryptoUtils } from "resource://services-crypto/utils.sys.mjs";

2
services/fxaccounts/FxAccountsPairing.sys.mjs
View File

@ -19,7 +19,7 @@ import {
const fxAccounts = getFxAccountsSingleton();
import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs";
ChromeUtils.import("resource://services-common/utils.js");
ChromeUtils.importESModule("resource://services-common/utils.sys.mjs");
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
FxAccountsPairingChannel:

4
services/fxaccounts/FxAccountsProfileClient.sys.mjs
View File

@ -23,9 +23,7 @@ const {
import { getFxAccountsSingleton } from "resource://gre/modules/FxAccounts.sys.mjs";
const fxAccounts = getFxAccountsSingleton();
const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
);
import { RESTRequest } from "resource://services-common/rest.sys.mjs";
/**
* Create a new FxAccountsProfileClient to be able to fetch Firefox Account profile information.

3
services/fxaccounts/FxAccountsPush.sys.mjs
View File

@ -2,7 +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 { Async } = ChromeUtils.import("resource://services-common/async.js");
import { Async } from "resource://services-common/async.sys.mjs";
const {
FXA_PUSH_SCOPE_ACCOUNT_UPDATE,
ONLOGOUT_NOTIFICATION,

4
services/fxaccounts/FxAccountsTelemetry.sys.mjs
View File

@ -13,12 +13,10 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
CryptoUtils: "resource://services-crypto/utils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
// We use this observers module because we leverage its support for richer
// "subject" data.
Observers: "resource://services-common/observers.js",
Observers: "resource://services-common/observers.sys.mjs",
});
const { PREF_ACCOUNT_ROOT, log } = ChromeUtils.import(

4
services/fxaccounts/tests/xpcshell/head.js
View File

@ -42,8 +42,8 @@ const MOCK_ACCOUNT_KEYS = {
(function initFxAccountsTestingInfrastructure() {
do_get_profile();
let { initTestLogging } = ChromeUtils.import(
"resource://testing-common/services/common/logging.js"
let { initTestLogging } = ChromeUtils.importESModule(
"resource://testing-common/services/common/logging.sys.mjs"
);
initTestLogging("Trace");

2
services/settings/Database.sys.mjs
View File

@ -8,12 +8,12 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
CommonUtils: "resource://services-common/utils.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
IDBHelpers: "resource://services-settings/IDBHelpers.jsm",
Utils: "resource://services-settings/Utils.jsm",
CommonUtils: "resource://services-common/utils.js",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);

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

@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
Database: "resource://services-settings/Database.sys.mjs",
RemoteSettingsWorker:
"resource://services-settings/RemoteSettingsWorker.sys.mjs",
UptakeTelemetry: "resource://services-common/uptake-telemetry.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@ -22,7 +23,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
KintoHttpClient: "resource://services-common/kinto-http-client.js",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
SharedUtils: "resource://services-settings/SharedUtils.jsm",
UptakeTelemetry: "resource://services-common/uptake-telemetry.js",
Utils: "resource://services-settings/Utils.jsm",
});

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

@ -12,10 +12,10 @@ ChromeUtils.defineESModuleGetters(lazy, {
RemoteSettingsClient:
"resource://services-settings/RemoteSettingsClient.sys.mjs",
SyncHistory: "resource://services-settings/SyncHistory.sys.mjs",
UptakeTelemetry: "resource://services-common/uptake-telemetry.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
UptakeTelemetry: "resource://services-common/uptake-telemetry.js",
pushBroadcastService: "resource://gre/modules/PushBroadcastService.jsm",
Utils: "resource://services-settings/Utils.jsm",

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

@ -3,8 +3,8 @@
const { RemoteSettings } = ChromeUtils.importESModule(
"resource://services-settings/remote-settings.sys.mjs"
);
const { UptakeTelemetry } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
const { UptakeTelemetry } = ChromeUtils.importESModule(
"resource://services-common/uptake-telemetry.sys.mjs"
);
const { Downloader } = ChromeUtils.importESModule(
"resource://services-settings/Attachments.sys.mjs"

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

@ -14,8 +14,8 @@ 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(
"resource://services-common/uptake-telemetry.js"
const { UptakeTelemetry, Policy } = ChromeUtils.importESModule(
"resource://services-common/uptake-telemetry.sys.mjs"
);
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"

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

@ -7,8 +7,8 @@ const { setTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
const { UptakeTelemetry, Policy } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
const { UptakeTelemetry, Policy } = ChromeUtils.importESModule(
"resource://services-common/uptake-telemetry.sys.mjs"
);
const { RemoteSettingsClient } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsClient.sys.mjs"

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

@ -7,8 +7,8 @@ const { RemoteSettings } = ChromeUtils.importESModule(
const { RemoteSettingsClient } = ChromeUtils.importESModule(
"resource://services-settings/RemoteSettingsClient.sys.mjs"
);
const { UptakeTelemetry, Policy } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
const { UptakeTelemetry, Policy } = ChromeUtils.importESModule(
"resource://services-common/uptake-telemetry.sys.mjs"
);
const { TelemetryTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TelemetryTestUtils.sys.mjs"

4
services/sync/modules-testing/fxa_utils.sys.mjs
View File

@ -7,9 +7,7 @@ import { Log } from "resource://gre/modules/Log.sys.mjs";
import { Weave } from "resource://services-sync/main.sys.mjs";
import { SyncAuthManager } from "resource://services-sync/sync_auth.sys.mjs";
const { TokenServerClient } = ChromeUtils.import(
"resource://services-common/tokenserverclient.js"
);
import { TokenServerClient } from "resource://services-common/tokenserverclient.sys.mjs";
import { configureFxAccountIdentity } from "resource://testing-common/services/sync/utils.sys.mjs";
// Create a new sync_auth object and initialize it with a

9
services/sync/modules-testing/utils.sys.mjs
View File

@ -2,14 +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/. */
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { Assert } from "resource://testing-common/Assert.sys.mjs";
const { initTestLogging } = ChromeUtils.import(
"resource://testing-common/services/common/logging.js"
);
import { initTestLogging } from "resource://testing-common/services/common/logging.sys.mjs";
import {
FakeCryptoService,
FakeFilesystemService,

8
services/sync/modules/collection_validator.sys.mjs
View File

@ -4,11 +4,9 @@
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"Async",
"resource://services-common/async.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
Async: "resource://services-common/async.sys.mjs",
});
export class CollectionProblemData {
constructor() {

6
services/sync/modules/doctor.sys.mjs
View File

@ -9,10 +9,8 @@
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
import { Async } from "resource://services-common/async.sys.mjs";
import { Observers } from "resource://services-common/observers.sys.mjs";
import { Service } from "resource://services-sync/service.sys.mjs";
import { Resource } from "resource://services-sync/resource.sys.mjs";
import { Svc } from "resource://services-sync/util.sys.mjs";

7
services/sync/modules/engines.sys.mjs
View File

@ -7,10 +7,9 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { JSONFile } from "resource://gre/modules/JSONFile.sys.mjs";
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
import { Async } from "resource://services-common/async.sys.mjs";
import { Observers } from "resource://services-common/observers.sys.mjs";
const {
DEFAULT_DOWNLOAD_BATCH_SIZE,
DEFAULT_GUID_FETCH_BATCH_SIZE,

8
services/sync/modules/engines/bookmarks.sys.mjs
View File

@ -4,7 +4,8 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
import { Async } from "resource://services-common/async.sys.mjs";
const { SCORE_INCREMENT_XLARGE } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
@ -20,6 +21,7 @@ import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Observers: "resource://services-common/observers.sys.mjs",
PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs",
PlacesDBUtils: "resource://gre/modules/PlacesDBUtils.sys.mjs",
PlacesSyncUtils: "resource://gre/modules/PlacesSyncUtils.sys.mjs",
@ -28,10 +30,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
SyncedBookmarksMirror: "resource://gre/modules/SyncedBookmarksMirror.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Observers: "resource://services-common/observers.js",
});
const PLACES_MAINTENANCE_INTERVAL_SECONDS = 4 * 60 * 60; // 4 hours.
const FOLDER_SORTINDEX = 1000000;

3
services/sync/modules/engines/clients.sys.mjs
View File

@ -20,7 +20,8 @@
* commands.json, update it, and write it back out.
*/
const { Async } = ChromeUtils.import("resource://services-common/async.js");
import { Async } from "resource://services-common/async.sys.mjs";
const {
DEVICE_TYPE_DESKTOP,
DEVICE_TYPE_MOBILE,

2
services/sync/modules/engines/extension-storage.sys.mjs
View File

@ -14,6 +14,7 @@ import { SyncEngine, Tracker } from "resource://services-sync/engines.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Observers: "resource://services-common/observers.sys.mjs",
Svc: "resource://services-sync/util.sys.mjs",
});
@ -21,7 +22,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
extensionStorageSync: "resource://gre/modules/ExtensionStorageSync.jsm",
extensionStorageSyncKinto:
"resource://gre/modules/ExtensionStorageSyncKinto.jsm",
Observers: "resource://services-common/observers.js",
SCORE_INCREMENT_MEDIUM: "resource://services-sync/constants.js",
MULTI_DEVICE_THRESHOLD: "resource://services-sync/constants.js",
});

2
services/sync/modules/engines/forms.sys.mjs
View File

@ -19,7 +19,7 @@ import {
CollectionValidator,
} from "resource://services-sync/collection_validator.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
import { Async } from "resource://services-common/async.sys.mjs";
import { Log } from "resource://gre/modules/Log.sys.mjs";
const lazy = {};

7
services/sync/modules/engines/history.sys.mjs
View File

@ -5,10 +5,9 @@
const HISTORY_TTL = 5184000; // 60 days in milliseconds
const THIRTY_DAYS_IN_MS = 2592000000; // 30 days in milliseconds
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { Async } from "resource://services-common/async.sys.mjs";
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
const {
MAX_HISTORY_DOWNLOAD,
MAX_HISTORY_UPLOAD,

2
services/sync/modules/engines/passwords.sys.mjs
View File

@ -18,7 +18,7 @@ import {
} from "resource://services-sync/engines.sys.mjs";
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
import { Async } from "resource://services-common/async.sys.mjs";
const SYNCABLE_LOGIN_FIELDS = [
// `nsILoginInfo` fields.

4
services/sync/modules/engines/prefs.sys.mjs
View File

@ -39,9 +39,7 @@ import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { SCORE_INCREMENT_XLARGE } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
const lazy = {};

6
services/sync/modules/engines/tabs.sys.mjs
View File

@ -12,10 +12,8 @@ import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { SCORE_INCREMENT_SMALL, STATUS_OK, URI_LENGTH_MAX } = ChromeUtils.import(
"resource://services-sync/constants.js"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { Async } from "resource://services-common/async.sys.mjs";
import {
SyncRecord,

5
services/sync/modules/keys.sys.mjs
View File

@ -2,9 +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 { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { Log } from "resource://gre/modules/Log.sys.mjs";
import { Weave } from "resource://services-sync/main.sys.mjs";

6
services/sync/modules/policies.sys.mjs
View File

@ -39,10 +39,8 @@ import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { logManager } = ChromeUtils.import(
"resource://gre/modules/FxAccountsCommon.js"
);
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { Async } from "resource://services-common/async.sys.mjs";
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
const lazy = {};

6
services/sync/modules/record.sys.mjs
View File

@ -16,10 +16,8 @@ import { Weave } from "resource://services-sync/main.sys.mjs";
import { Resource } from "resource://services-sync/resource.sys.mjs";
import { Utils } from "resource://services-sync/util.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { Async } from "resource://services-common/async.sys.mjs";
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { CryptoUtils } from "resource://services-crypto/utils.sys.mjs";
/**

8
services/sync/modules/resource.sys.mjs
View File

@ -6,12 +6,8 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { Observers } from "resource://services-common/observers.sys.mjs";
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { Utils } from "resource://services-sync/util.sys.mjs";
import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs";

7
services/sync/modules/service.sys.mjs
View File

@ -9,10 +9,9 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { Async } from "resource://services-common/async.sys.mjs";
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
const {
CLIENT_NOT_CONFIGURED,
CREDENTIALS_CHANGED,

8
services/sync/modules/stages/declined.sys.mjs
View File

@ -9,12 +9,8 @@
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { Observers } from "resource://services-common/observers.sys.mjs";
export var DeclinedEngines = function(service) {
this._log = Log.repository.getLogger("Sync.Declined");

3
services/sync/modules/stages/enginesync.sys.mjs
View File

@ -20,7 +20,8 @@ const {
} = ChromeUtils.import("resource://services-sync/constants.js");
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
import { Async } from "resource://services-common/async.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Doctor: "resource://services-sync/doctor.sys.mjs",

6
services/sync/modules/sync_auth.sys.mjs
View File

@ -5,10 +5,8 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
import { Log } from "resource://gre/modules/Log.sys.mjs";
const { Async } = ChromeUtils.import("resource://services-common/async.js");
const { TokenServerClient } = ChromeUtils.import(
"resource://services-common/tokenserverclient.js"
);
import { Async } from "resource://services-common/async.sys.mjs";
import { TokenServerClient } from "resource://services-common/tokenserverclient.sys.mjs";
import { CryptoUtils } from "resource://services-crypto/utils.sys.mjs";
import { Svc, Utils } from "resource://services-sync/util.sys.mjs";

4
services/sync/modules/telemetry.sys.mjs
View File

@ -19,8 +19,10 @@ import { Log } from "resource://gre/modules/Log.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Async: "resource://services-common/async.sys.mjs",
AuthenticationError: "resource://services-sync/sync_auth.sys.mjs",
FxAccounts: "resource://gre/modules/FxAccounts.sys.mjs",
Observers: "resource://services-common/observers.sys.mjs",
Resource: "resource://services-sync/resource.sys.mjs",
Status: "resource://services-sync/status.sys.mjs",
Svc: "resource://services-sync/util.sys.mjs",
@ -31,9 +33,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Async: "resource://services-common/async.js",
ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",
Observers: "resource://services-common/observers.js",
});
XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {

9
services/sync/modules/util.sys.mjs
View File

@ -2,12 +2,9 @@
* 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 { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { Observers } from "resource://services-common/observers.sys.mjs";
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { CryptoUtils } from "resource://services-crypto/utils.sys.mjs";
const {

8
services/sync/tests/unit/head_helpers.js
View File

@ -13,8 +13,12 @@
var { AddonTestUtils, MockAsyncShutdown } = ChromeUtils.import(
"resource://testing-common/AddonTestUtils.jsm"
);
var { Async } = ChromeUtils.import("resource://services-common/async.js");
var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
var { Async } = ChromeUtils.importESModule(
"resource://services-common/async.sys.mjs"
);
var { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
var { PlacesTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/PlacesTestUtils.sys.mjs"
);

4
services/sync/tests/unit/head_http_server.js
View File

@ -6,7 +6,9 @@ var Cm = Components.manager;
// Shared logging for all HTTP server functions.
var { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs");
var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
var { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
var { TestUtils } = ChromeUtils.importESModule(
"resource://testing-common/TestUtils.sys.mjs"
);

4
services/sync/tests/unit/test_declined.js
View File

@ -10,8 +10,8 @@ const { EngineSynchronizer } = ChromeUtils.importESModule(
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"
);
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
const { Observers } = ChromeUtils.importESModule(
"resource://services-common/observers.sys.mjs"
);
function PetrolEngine() {}

4
services/sync/tests/unit/test_engine.js
View File

@ -4,8 +4,8 @@
const { PromiseUtils } = ChromeUtils.importESModule(
"resource://gre/modules/PromiseUtils.sys.mjs"
);
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
const { Observers } = ChromeUtils.importESModule(
"resource://services-common/observers.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"

4
services/sync/tests/unit/test_fxa_node_reassignment.js
View File

@ -7,8 +7,8 @@ _("Test that node reassignment happens correctly using the FxA identity mgr.");
// reassignment - it comes from the token server - so we need to ensure the
// Fxa cluster manager grabs a new token.
const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
const { RESTRequest } = ChromeUtils.importESModule(
"resource://services-common/rest.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"

4
services/sync/tests/unit/test_httpd_sync_server.js
View File

@ -55,8 +55,8 @@ add_test(function test_url_parsing() {
run_next_test();
});
const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
const { RESTRequest } = ChromeUtils.importESModule(
"resource://services-common/rest.sys.mjs"
);
function localRequest(server, path) {
_("localRequest: " + path);

4
services/sync/tests/unit/test_node_reassignment.js
View File

@ -6,8 +6,8 @@ _(
"requests."
);
const { RESTRequest } = ChromeUtils.import(
"resource://services-common/rest.js"
const { RESTRequest } = ChromeUtils.importESModule(
"resource://services-common/rest.sys.mjs"
);
const { Service } = ChromeUtils.importESModule(
"resource://services-sync/service.sys.mjs"

4
services/sync/tests/unit/test_resource.js
View File

@ -1,8 +1,8 @@
/* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
const { Observers } = ChromeUtils.importESModule(
"resource://services-common/observers.sys.mjs"
);
const { Resource } = ChromeUtils.importESModule(
"resource://services-sync/resource.sys.mjs"

11
services/sync/tests/unit/test_sync_auth_manager.js
View File

@ -12,8 +12,8 @@ const {
} = ChromeUtils.importESModule(
"resource://testing-common/services/sync/fxa_utils.sys.mjs"
);
const { HawkClient } = ChromeUtils.import(
"resource://services-common/hawkclient.js"
const { HawkClient } = ChromeUtils.importESModule(
"resource://services-common/hawkclient.sys.mjs"
);
const { FxAccounts } = ChromeUtils.importESModule(
"resource://gre/modules/FxAccounts.sys.mjs"
@ -32,8 +32,11 @@ const { Service } = ChromeUtils.importESModule(
const { Status } = ChromeUtils.importESModule(
"resource://services-sync/status.sys.mjs"
);
const { TokenServerClient, TokenServerClientServerError } = ChromeUtils.import(
"resource://services-common/tokenserverclient.js"
const {
TokenServerClient,
TokenServerClientServerError,
} = ChromeUtils.importESModule(
"resource://services-common/tokenserverclient.sys.mjs"
);
const { AccountState } = ChromeUtils.importESModule(
"resource://gre/modules/FxAccounts.sys.mjs"

11
services/sync/tps/extensions/tps/resource/modules/bookmarkValidator.sys.mjs
View File

@ -9,20 +9,13 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
);
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
import { Utils } from "resource://services-sync/util.sys.mjs";
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"Async",
"resource://services-common/async.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
Async: "resource://services-common/async.sys.mjs",
PlacesSyncUtils: "resource://gre/modules/PlacesSyncUtils.sys.mjs",
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
});

4
services/sync/tps/extensions/tps/resource/tps.jsm
View File

@ -39,12 +39,14 @@ ChromeUtils.defineESModuleGetters(lazy, {
Addon: "resource://tps/modules/addons.sys.mjs",
AddonValidator: "resource://services-sync/engines/addons.sys.mjs",
Address: "resource://tps/modules/formautofill.sys.mjs",
Async: "resource://services-common/async.sys.mjs",
Authentication: "resource://tps/auth/fxaccounts.sys.mjs",
Bookmark: "resource://tps/modules/bookmarks.sys.mjs",
BookmarkFolder: "resource://tps/modules/bookmarks.sys.mjs",
BookmarkValidator: "resource://tps/modules/bookmarkValidator.sys.mjs",
BrowserTabs: "resource://tps/modules/tabs.sys.mjs",
BrowserWindows: "resource://tps/modules/windows.sys.mjs",
CommonUtils: "resource://services-common/utils.sys.mjs",
CreditCard: "resource://tps/modules/formautofill.sys.mjs",
DumpAddresses: "resource://tps/modules/formautofill.sys.mjs",
DumpBookmarks: "resource://tps/modules/bookmarks.sys.mjs",
@ -71,8 +73,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
Async: "resource://services-common/async.js",
CommonUtils: "resource://services-common/utils.js",
extensionStorageSync: "resource://gre/modules/ExtensionStorageSync.jsm",
WEAVE_VERSION: "resource://services-sync/constants.js",
});

6
toolkit/components/extensions/ExtensionStorageSyncKinto.jsm
View File

@ -50,18 +50,18 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
BulkKeyBundle: "resource://services-sync/keys.sys.mjs",
CollectionKeyManager: "resource://services-sync/record.sys.mjs",
CommonUtils: "resource://services-common/utils.sys.mjs",
CryptoUtils: "resource://services-crypto/utils.sys.mjs",
FirefoxAdapter: "resource://services-common/kinto-storage-adapter.sys.mjs",
Observers: "resource://services-common/observers.sys.mjs",
Utils: "resource://services-sync/util.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.jsm",
CommonUtils: "resource://services-common/utils.js",
ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
KintoHttpClient: "resource://services-common/kinto-http-client.js",
Kinto: "resource://services-common/kinto-offline-client.js",
FirefoxAdapter: "resource://services-common/kinto-storage-adapter.js",
Observers: "resource://services-common/observers.js",
});
XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {

8
toolkit/components/extensions/child/ext-identity.js
View File

@ -8,11 +8,9 @@
var { Constructor: CC } = Components;
ChromeUtils.defineModuleGetter(
this,
"CommonUtils",
"resource://services-common/utils.js"
);
ChromeUtils.defineESModuleGetters(this, {
CommonUtils: "resource://services-common/utils.sys.mjs",
});
XPCOMUtils.defineLazyPreferenceGetter(
this,
"redirectDomain",

8
toolkit/components/extensions/test/xpcshell/test_ext_storage_sync_kinto.js
View File

@ -9,8 +9,8 @@ Services.prefs.setBoolPref("webextensions.storage.sync.kinto", true);
do_get_profile(); // so we can use FxAccounts
const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
const { CommonUtils } = ChromeUtils.import(
"resource://services-common/utils.js"
const { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
const {
ExtensionStorageSyncKinto: ExtensionStorageSync,
@ -660,8 +660,8 @@ add_task(async function test_setup() {
add_task(async function test_single_initialization() {
// Check if we're calling openConnection too often.
const { FirefoxAdapter } = ChromeUtils.import(
"resource://services-common/kinto-storage-adapter.js"
const { FirefoxAdapter } = ChromeUtils.importESModule(
"resource://services-common/kinto-storage-adapter.sys.mjs"
);
const origOpenConnection = FirefoxAdapter.openConnection;
let callCount = 0;

4
toolkit/components/normandy/lib/Uptake.jsm
View File

@ -4,8 +4,8 @@
"use strict";
const { UptakeTelemetry } = ChromeUtils.import(
"resource://services-common/uptake-telemetry.js"
const { UptakeTelemetry } = ChromeUtils.importESModule(
"resource://services-common/uptake-telemetry.sys.mjs"
);
var EXPORTED_SYMBOLS = ["Uptake"];

5
toolkit/components/places/SyncedBookmarksMirror.sys.mjs
View File

@ -52,15 +52,12 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Async: "resource://services-common/async.sys.mjs",
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",
});
XPCOMUtils.defineLazyGetter(lazy, "MirrorLog", () =>
lazy.Log.repository.getLogger("Sync.Engine.Bookmarks.Mirror")
);

4
toolkit/components/places/tests/sync/head_sync.js
View File

@ -24,7 +24,9 @@ var { PlacesSyncUtils } = ChromeUtils.importESModule(
var { SyncedBookmarksMirror } = ChromeUtils.importESModule(
"resource://gre/modules/SyncedBookmarksMirror.sys.mjs"
);
var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
var { CommonUtils } = ChromeUtils.importESModule(
"resource://services-common/utils.sys.mjs"
);
var { FileTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/FileTestUtils.sys.mjs"
);

8
toolkit/components/telemetry/app/ClientID.sys.mjs
View File

@ -13,11 +13,9 @@ const CANARY_CLIENT_ID = "c0ffeec0-ffee-c0ff-eec0-ffeec0ffeec0";
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"CommonUtils",
"resource://services-common/utils.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
CommonUtils: "resource://services-common/utils.sys.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "CryptoHash", () => {
return Components.Constructor(

4
toolkit/components/telemetry/app/TelemetryReportingPolicy.sys.mjs
View File

@ -5,9 +5,7 @@
import { Log } from "resource://gre/modules/Log.sys.mjs";
import { clearTimeout, setTimeout } from "resource://gre/modules/Timer.sys.mjs";
const { Observers } = ChromeUtils.import(
"resource://services-common/observers.js"
);
import { Observers } from "resource://services-common/observers.sys.mjs";
import { TelemetryUtils } from "resource://gre/modules/TelemetryUtils.sys.mjs";
const lazy = {};

6
toolkit/components/telemetry/pings/CoveragePing.sys.mjs
View File

@ -6,12 +6,8 @@ import { Log } from "resource://gre/modules/Log.sys.mjs";
const lazy = {};
ChromeUtils.defineModuleGetter(
lazy,
"CommonUtils",
"resource://services-common/utils.js"
);
ChromeUtils.defineESModuleGetters(lazy, {
CommonUtils: "resource://services-common/utils.sys.mjs",
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
ServiceRequest: "resource://gre/modules/ServiceRequest.sys.mjs",
UpdateUtils: "resource://gre/modules/UpdateUtils.sys.mjs",

4
toolkit/modules/tests/xpcshell/test_sqlite.js
View File

@ -93,8 +93,8 @@ async function getDummyTempDatabase(name, extraOptions = {}) {
}
add_task(async function test_setup() {
const { initTestLogging } = ChromeUtils.import(
"resource://testing-common/services/common/logging.js"
const { initTestLogging } = ChromeUtils.importESModule(
"resource://testing-common/services/common/logging.sys.mjs"
);
initTestLogging("Trace");
});