Skip to content

Commit f4ce4f5

Browse files
committed
Bug 1885041 - Expand disallowing JSM based imports via ESLint to everything except for devtools. r=arai,omc-reviewers,aminomancer,zombie
Differential Revision: https://phabricator.services.mozilla.com/D204441
1 parent dd30d85 commit f4ce4f5

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.eslintrc.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2202,17 +2202,22 @@ module.exports = {
22022202
},
22032203
},
22042204
{
2205-
files: ["*.html", "*.xhtml", "*.xml"],
2205+
files: ["**"],
22062206
excludedFiles: [
2207+
// Devtools code, see bug 1525652.
2208+
"devtools/**",
22072209
// Tests specific to JSM
22082210
"dom/encoding/test/test_stringencoding.xhtml",
22092211
"dom/url/tests/test_bug883784.xhtml",
22102212
"dom/url/tests/test_url.xhtml",
22112213
"dom/url/tests/test_worker_url.xhtml",
22122214
"dom/workers/test/test_chromeWorkerJSM.xhtml",
2215+
"js/xpconnect/tests/browser/browser_import_mapped_jsm.js",
22132216
"js/xpconnect/tests/chrome/test_chrometoSource.xhtml",
22142217
"js/xpconnect/tests/chrome/test_expandosharing.xhtml",
22152218
"js/xpconnect/tests/chrome/test_xrayic.xhtml",
2219+
// Code that can't be cleaned until we're ready to remove the old loader.
2220+
"js/xpconnect/loader/XPCOMUtils.sys.mjs",
22162221
],
22172222
rules: {
22182223
"mozilla/reject-chromeutils-import": "error",

browser/components/asrouter/tests/browser/head.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ ChromeUtils.defineESModuleGetters(this, {
1111
"resource:///modules/asrouter/FeatureCalloutMessages.sys.mjs",
1212

1313
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
14-
});
15-
XPCOMUtils.defineLazyModuleGetters(this, {
16-
QueryCache: "resource:///modules/asrouter/ASRouterTargeting.jsm",
14+
QueryCache: "resource:///modules/asrouter/ASRouterTargeting.sys.mjs",
1715
});
1816
const { FxAccounts } = ChromeUtils.importESModule(
1917
"resource://gre/modules/FxAccounts.sys.mjs"

browser/components/extensions/test/browser/browser_ext_optionsPage_modals.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
/* vim: set sts=2 sw=2 et tw=80: */
33
"use strict";
44

5-
ChromeUtils.defineModuleGetter(
6-
this,
7-
"PromptTestUtils",
8-
"resource://testing-common/PromptTestUtils.jsm"
5+
const { PromptTestUtils } = ChromeUtils.importESModule(
6+
"resource://testing-common/PromptTestUtils.sys.mjs"
97
);
108

119
async function waitForExtensionModalPrompt(extension) {

browser/components/newtab/test/xpcshell/test_HighlightsFeed.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ const {
2323
BOOKMARKS_RESTORE_SUCCESS_EVENT,
2424
BOOKMARKS_RESTORE_FAILED_EVENT,
2525
SECTION_ID,
26-
} = ChromeUtils.import("resource://activity-stream/lib/HighlightsFeed.jsm");
26+
} = ChromeUtils.importESModule(
27+
"resource://activity-stream/lib/HighlightsFeed.sys.mjs"
28+
);
2729

2830
const FAKE_LINKS = new Array(20)
2931
.fill(null)

0 commit comments

Comments
 (0)