Skip to content

Commit 55bba8e

Browse files
Standard8Standard8
committed
Bug 1819019 - Update consumers of services/common to import ES modules directly. r=markh,webdriver-reviewers,extension-reviewers,jdescottes
Differential Revision: https://phabricator.services.mozilla.com/D171055
1 parent c60ae74 commit 55bba8e

File tree

91 files changed

+212
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+212
-266
lines changed

‎browser/base/content/test/general/browser_remoteWebNavigation_postdata.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ function makeInputStream(aString) {
1212

1313
add_task(async function test_remoteWebNavigation_postdata() {
1414
let { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
15-
let { CommonUtils } = ChromeUtils.import(
16-
"resource://services-common/utils.js"
15+
let { CommonUtils } = ChromeUtils.importESModule(
16+
"resource://services-common/utils.sys.mjs"
1717
);
1818

1919
let server = new HttpServer();

‎browser/base/content/test/protectionsUI/browser_protectionsUI_report_breakage.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ const CB_PREF = "network.cookie.cookieBehavior";
2121
const PREF_REPORT_BREAKAGE_URL = "browser.contentblocking.reportBreakage.url";
2222

2323
let { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
24-
let { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
24+
let { CommonUtils } = ChromeUtils.importESModule(
25+
"resource://services-common/utils.sys.mjs"
26+
);
2527
let { Preferences } = ChromeUtils.importESModule(
2628
"resource://gre/modules/Preferences.sys.mjs"
2729
);

‎browser/components/doh/test/browser/head.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ XPCOMUtils.defineLazyServiceGetter(
2121
"nsINativeDNSResolverOverride"
2222
);
2323

24-
const { CommonUtils } = ChromeUtils.import(
25-
"resource://services-common/utils.js"
24+
const { CommonUtils } = ChromeUtils.importESModule(
25+
"resource://services-common/utils.sys.mjs"
2626
);
2727

2828
const EXAMPLE_URL = "https://example.com/";

‎browser/components/translation/BingTranslator.jsm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["BingTranslator"];
99
const { PromiseUtils } = ChromeUtils.importESModule(
1010
"resource://gre/modules/PromiseUtils.sys.mjs"
1111
);
12-
const { Async } = ChromeUtils.import("resource://services-common/async.js");
12+
const { Async } = ChromeUtils.importESModule(
13+
"resource://services-common/async.sys.mjs"
14+
);
1315
const { httpRequest } = ChromeUtils.importESModule(
1416
"resource://gre/modules/Http.sys.mjs"
1517
);

‎browser/components/translation/TranslationDocument.jsm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
var EXPORTED_SYMBOLS = ["TranslationDocument"];
88

9-
const { Async } = ChromeUtils.import("resource://services-common/async.js");
9+
const { Async } = ChromeUtils.importESModule(
10+
"resource://services-common/async.sys.mjs"
11+
);
1012

1113
/**
1214
* This class represents a document that is being translated,

‎browser/components/translation/YandexTranslator.jsm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ var EXPORTED_SYMBOLS = ["YandexTranslator"];
99
const { PromiseUtils } = ChromeUtils.importESModule(
1010
"resource://gre/modules/PromiseUtils.sys.mjs"
1111
);
12-
const { Async } = ChromeUtils.import("resource://services-common/async.js");
12+
const { Async } = ChromeUtils.importESModule(
13+
"resource://services-common/async.sys.mjs"
14+
);
1315
const { httpRequest } = ChromeUtils.importESModule(
1416
"resource://gre/modules/Http.sys.mjs"
1517
);

‎remote/cdp/observers/NetworkObserver.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
77
const lazy = {};
88

99
ChromeUtils.defineESModuleGetters(lazy, {
10+
CommonUtils: "resource://services-common/utils.sys.mjs",
1011
EventEmitter: "resource://gre/modules/EventEmitter.sys.mjs",
1112

1213
ChannelEventSinkFactory:
1314
"chrome://remote/content/cdp/observers/ChannelEventSink.sys.mjs",
1415
});
1516

1617
XPCOMUtils.defineLazyModuleGetters(lazy, {
17-
CommonUtils: "resource://services-common/utils.js",
1818
NetUtil: "resource://gre/modules/NetUtil.jsm",
1919
});
2020

‎security/manager/tools/genRootCAHashes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ const { FileUtils } = ChromeUtils.importESModule(
1616
"resource://gre/modules/FileUtils.sys.mjs"
1717
);
1818
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
19-
const { CommonUtils } = ChromeUtils.import(
20-
"resource://services-common/utils.js"
19+
const { CommonUtils } = ChromeUtils.importESModule(
20+
"resource://services-common/utils.sys.mjs"
2121
);
2222

2323
const FILENAME_OUTPUT = "RootHashes.inc";

‎services/common/hawkclient.sys.mjs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@
2222
* multiple HAWK services should instantiate one HawkClient per service.
2323
*/
2424

25-
const { HAWKAuthenticatedRESTRequest } = ChromeUtils.import(
26-
"resource://services-common/hawkrequest.js"
27-
);
28-
const { Observers } = ChromeUtils.import(
29-
"resource://services-common/observers.js"
30-
);
25+
import { HAWKAuthenticatedRESTRequest } from "resource://services-common/hawkrequest.sys.mjs";
26+
27+
import { Observers } from "resource://services-common/observers.sys.mjs";
3128
import { Log } from "resource://gre/modules/Log.sys.mjs";
3229
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
3330

‎services/common/hawkrequest.sys.mjs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44

55
import { Log } from "resource://gre/modules/Log.sys.mjs";
66

7-
const { RESTRequest } = ChromeUtils.import(
8-
"resource://services-common/rest.js"
9-
);
10-
const { CommonUtils } = ChromeUtils.import(
11-
"resource://services-common/utils.js"
12-
);
7+
import { RESTRequest } from "resource://services-common/rest.sys.mjs";
8+
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
139
import { Credentials } from "resource://gre/modules/Credentials.sys.mjs";
1410

1511
const lazy = {};

‎services/common/rest.sys.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
66
import { Log } from "resource://gre/modules/Log.sys.mjs";
77
import { PromiseUtils } from "resource://gre/modules/PromiseUtils.sys.mjs";
88

9-
const { CommonUtils } = ChromeUtils.import(
10-
"resource://services-common/utils.js"
11-
);
9+
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
1210

1311
const lazy = {};
1412

‎services/common/tests/unit/head_helpers.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
/* import-globals-from head_global.js */
66

77
var { Log } = ChromeUtils.importESModule("resource://gre/modules/Log.sys.mjs");
8-
var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
8+
var { CommonUtils } = ChromeUtils.importESModule(
9+
"resource://services-common/utils.sys.mjs"
10+
);
911
var {
1012
HTTP_400,
1113
HTTP_401,
@@ -33,8 +35,8 @@ var {
3335
HttpError,
3436
HttpServer,
3537
} = ChromeUtils.import("resource://testing-common/httpd.js");
36-
var { getTestLogger, initTestLogging } = ChromeUtils.import(
37-
"resource://testing-common/services/common/logging.js"
38+
var { getTestLogger, initTestLogging } = ChromeUtils.importESModule(
39+
"resource://testing-common/services/common/logging.sys.mjs"
3840
);
3941
var { MockRegistrar } = ChromeUtils.importESModule(
4042
"resource://testing-common/MockRegistrar.sys.mjs"
@@ -236,8 +238,8 @@ function getUptakeTelemetrySnapshot(component, source) {
236238
}
237239

238240
function checkUptakeTelemetry(snapshot1, snapshot2, expectedIncrements) {
239-
const { UptakeTelemetry } = ChromeUtils.import(
240-
"resource://services-common/uptake-telemetry.js"
241+
const { UptakeTelemetry } = ChromeUtils.importESModule(
242+
"resource://services-common/uptake-telemetry.sys.mjs"
241243
);
242244
const STATUSES = Object.values(UptakeTelemetry.STATUS);
243245
for (const status of STATUSES) {
@@ -249,8 +251,8 @@ function checkUptakeTelemetry(snapshot1, snapshot2, expectedIncrements) {
249251
}
250252

251253
async function withFakeChannel(channel, f) {
252-
const { Policy } = ChromeUtils.import(
253-
"resource://services-common/uptake-telemetry.js"
254+
const { Policy } = ChromeUtils.importESModule(
255+
"resource://services-common/uptake-telemetry.sys.mjs"
254256
);
255257
let oldGetChannel = Policy.getChannel;
256258
Policy.getChannel = () => channel;

‎services/common/tests/unit/head_http.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
/* import-globals-from head_global.js */
55

6-
var { CommonUtils } = ChromeUtils.import("resource://services-common/utils.js");
6+
var { CommonUtils } = ChromeUtils.importESModule(
7+
"resource://services-common/utils.sys.mjs"
8+
);
79

810
function basic_auth_header(user, password) {
911
return "Basic " + btoa(user + ":" + CommonUtils.encodeUTF8(password));

‎services/common/tests/unit/test_async_chain.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/* Any copyright is dedicated to the Public Domain.
22
* http://creativecommons.org/publicdomain/zero/1.0/ */
33

4-
const { Async } = ChromeUtils.import("resource://services-common/async.js");
4+
const { Async } = ChromeUtils.importESModule(
5+
"resource://services-common/async.sys.mjs"
6+
);
57

68
function run_test() {
79
_("Chain a few async methods, making sure the 'this' object is correct.");

‎services/common/tests/unit/test_async_foreach.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/* Any copyright is dedicated to the Public Domain.
22
* http://creativecommons.org/publicdomain/zero/1.0/ */
33

4-
const { Async } = ChromeUtils.import("resource://services-common/async.js");
4+
const { Async } = ChromeUtils.importESModule(
5+
"resource://services-common/async.sys.mjs"
6+
);
57
const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
68

79
function makeArray(length) {

‎services/common/tests/unit/test_hawkclient.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
"use strict";
55

6-
const { HawkClient } = ChromeUtils.import(
7-
"resource://services-common/hawkclient.js"
6+
const { HawkClient } = ChromeUtils.importESModule(
7+
"resource://services-common/hawkclient.sys.mjs"
88
);
99

1010
const SECOND_MS = 1000;

‎services/common/tests/unit/test_hawkrequest.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66
const {
77
HAWKAuthenticatedRESTRequest,
88
deriveHawkCredentials,
9-
} = ChromeUtils.import("resource://services-common/hawkrequest.js");
10-
const { Async } = ChromeUtils.import("resource://services-common/async.js");
9+
} = ChromeUtils.importESModule(
10+
"resource://services-common/hawkrequest.sys.mjs"
11+
);
12+
const { Async } = ChromeUtils.importESModule(
13+
"resource://services-common/async.sys.mjs"
14+
);
1115

1216
// https://github.com/mozilla/fxa-auth-server/wiki/onepw-protocol#wiki-use-session-certificatesign-etc
1317
var SESSION_KEYS = {

‎services/common/tests/unit/test_kinto.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
const { Kinto } = ChromeUtils.import(
55
"resource://services-common/kinto-offline-client.js"
66
);
7-
const { FirefoxAdapter } = ChromeUtils.import(
8-
"resource://services-common/kinto-storage-adapter.js"
7+
const { FirefoxAdapter } = ChromeUtils.importESModule(
8+
"resource://services-common/kinto-storage-adapter.sys.mjs"
99
);
1010

1111
var server;

‎services/common/tests/unit/test_logmanager.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// NOTE: The sync test_errorhandler_* tests have quite good coverage for
55
// other aspects of this.
66

7-
const { LogManager } = ChromeUtils.import(
8-
"resource://services-common/logmanager.js"
7+
const { LogManager } = ChromeUtils.importESModule(
8+
"resource://services-common/logmanager.sys.mjs"
99
);
1010
const { FileUtils } = ChromeUtils.importESModule(
1111
"resource://gre/modules/FileUtils.sys.mjs"

‎services/common/tests/unit/test_observers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* Any copyright is dedicated to the Public Domain.
22
* http://creativecommons.org/publicdomain/zero/1.0/ */
33

4-
const { Observers } = ChromeUtils.import(
5-
"resource://services-common/observers.js"
4+
const { Observers } = ChromeUtils.importESModule(
5+
"resource://services-common/observers.sys.mjs"
66
);
77

88
var gSubject = {};

‎services/common/tests/unit/test_restrequest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
"use strict";
55

6-
const { RESTRequest } = ChromeUtils.import(
7-
"resource://services-common/rest.js"
6+
const { RESTRequest } = ChromeUtils.importESModule(
7+
"resource://services-common/rest.sys.mjs"
88
);
99

1010
function run_test() {

‎services/common/tests/unit/test_storage_adapter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
const { Sqlite } = ChromeUtils.importESModule(
55
"resource://gre/modules/Sqlite.sys.mjs"
66
);
7-
const { FirefoxAdapter } = ChromeUtils.import(
8-
"resource://services-common/kinto-storage-adapter.js"
7+
const { FirefoxAdapter } = ChromeUtils.importESModule(
8+
"resource://services-common/kinto-storage-adapter.sys.mjs"
99
);
1010

1111
// set up what we need to make storage adapters

‎services/common/tests/unit/test_storage_adapter_shutdown.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ const { AsyncShutdown } = ChromeUtils.importESModule(
55
"resource://gre/modules/AsyncShutdown.sys.mjs"
66
);
77

8-
const { FirefoxAdapter } = ChromeUtils.import(
9-
"resource://services-common/kinto-storage-adapter.js"
8+
const { FirefoxAdapter } = ChromeUtils.importESModule(
9+
"resource://services-common/kinto-storage-adapter.sys.mjs"
1010
);
1111

1212
add_task(async function test_sqlite_shutdown() {

‎services/common/tests/unit/test_tokenauthenticatedrequest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
const { CryptoUtils } = ChromeUtils.importESModule(
55
"resource://services-crypto/utils.sys.mjs"
66
);
7-
const { TokenAuthenticatedRESTRequest } = ChromeUtils.import(
8-
"resource://services-common/rest.js"
7+
const { TokenAuthenticatedRESTRequest } = ChromeUtils.importESModule(
8+
"resource://services-common/rest.sys.mjs"
99
);
1010

1111
function run_test() {

‎services/common/tests/unit/test_tokenserverclient.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ const {
55
TokenServerClient,
66
TokenServerClientError,
77
TokenServerClientServerError,
8-
} = ChromeUtils.import("resource://services-common/tokenserverclient.js");
8+
} = ChromeUtils.importESModule(
9+
"resource://services-common/tokenserverclient.sys.mjs"
10+
);
911

1012
initTestLogging("Trace");
1113

‎services/common/tests/unit/test_uptake_telemetry.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
const { TelemetryTestUtils } = ChromeUtils.importESModule(
22
"resource://testing-common/TelemetryTestUtils.sys.mjs"
33
);
4-
const { UptakeTelemetry } = ChromeUtils.import(
5-
"resource://services-common/uptake-telemetry.js"
4+
const { UptakeTelemetry } = ChromeUtils.importESModule(
5+
"resource://services-common/uptake-telemetry.sys.mjs"
66
);
77

88
const COMPONENT = "remotesettings";
99

1010
async function withFakeClientID(uuid, f) {
11-
const { Policy } = ChromeUtils.import(
12-
"resource://services-common/uptake-telemetry.js"
11+
const { Policy } = ChromeUtils.importESModule(
12+
"resource://services-common/uptake-telemetry.sys.mjs"
1313
);
1414
let oldGetClientID = Policy.getClientID;
1515
Policy._clientIDHash = null;

‎services/common/tokenserverclient.sys.mjs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44

55
import { Log } from "resource://gre/modules/Log.sys.mjs";
66

7-
const { RESTRequest } = ChromeUtils.import(
8-
"resource://services-common/rest.js"
9-
);
10-
const { Observers } = ChromeUtils.import(
11-
"resource://services-common/observers.js"
12-
);
7+
import { RESTRequest } from "resource://services-common/rest.sys.mjs";
8+
import { Observers } from "resource://services-common/observers.sys.mjs";
139

1410
const PREF_LOG_LEVEL = "services.common.log.logger.tokenserverclient";
1511

‎services/crypto/modules/utils.sys.mjs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
const { Observers } = ChromeUtils.import(
6-
"resource://services-common/observers.js"
7-
);
8-
const { CommonUtils } = ChromeUtils.import(
9-
"resource://services-common/utils.js"
10-
);
5+
import { Observers } from "resource://services-common/observers.sys.mjs";
6+
7+
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
118
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
129

1310
const lazy = {};

‎services/fxaccounts/Credentials.sys.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ import { Log } from "resource://gre/modules/Log.sys.mjs";
1313

1414
import { CryptoUtils } from "resource://services-crypto/utils.sys.mjs";
1515

16-
const { CommonUtils } = ChromeUtils.import(
17-
"resource://services-common/utils.js"
18-
);
16+
import { CommonUtils } from "resource://services-common/utils.sys.mjs";
1917

2018
const PROTOCOL_VERSION = "identity.mozilla.com/picl/v1/";
2119
const PBKDF2_ROUNDS = 1000;

0 commit comments

Comments
 (0)