Skip to content

Commit 5b05e0a

Browse files
committed
Bug 1836173 - Convert AboutWelcomeDefaults to an ESM. r=emcminn,omc-reviewers
Differential Revision: https://phabricator.services.mozilla.com/D200567
1 parent 1afb2a6 commit 5b05e0a

File tree

7 files changed

+16
-20
lines changed

7 files changed

+16
-20
lines changed

browser/components/aboutwelcome/actors/AboutWelcomeChild.sys.mjs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
77
const lazy = {};
88

99
ChromeUtils.defineESModuleGetters(lazy, {
10+
AboutWelcomeDefaults:
11+
"resource:///modules/aboutwelcome/AboutWelcomeDefaults.sys.mjs",
1012
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
1113
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
1214
});
1315

14-
XPCOMUtils.defineLazyModuleGetters(lazy, {
15-
AboutWelcomeDefaults:
16-
"resource:///modules/aboutwelcome/AboutWelcomeDefaults.jsm",
17-
});
18-
1916
ChromeUtils.defineLazyGetter(lazy, "log", () => {
2017
const { Logger } = ChromeUtils.importESModule(
2118
"resource://messaging-system/lib/Logger.sys.mjs"

browser/components/aboutwelcome/actors/AboutWelcomeParent.sys.mjs

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

5-
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
6-
75
const lazy = {};
86

97
ChromeUtils.defineESModuleGetters(lazy, {
8+
AboutWelcomeDefaults:
9+
"resource:///modules/aboutwelcome/AboutWelcomeDefaults.sys.mjs",
1010
AboutWelcomeTelemetry:
1111
"resource:///modules/aboutwelcome/AboutWelcomeTelemetry.sys.mjs",
1212
AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
@@ -20,11 +20,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
2020
"resource://messaging-system/lib/SpecialMessageActions.sys.mjs",
2121
});
2222

23-
XPCOMUtils.defineLazyModuleGetters(lazy, {
24-
AboutWelcomeDefaults:
25-
"resource:///modules/aboutwelcome/AboutWelcomeDefaults.jsm",
26-
});
27-
2823
ChromeUtils.defineLazyGetter(lazy, "log", () => {
2924
const { Logger } = ChromeUtils.importESModule(
3025
"resource://messaging-system/lib/Logger.sys.mjs"

browser/components/aboutwelcome/modules/AboutWelcomeDefaults.jsm renamed to browser/components/aboutwelcome/modules/AboutWelcomeDefaults.sys.mjs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
/* This Source Code Form is subject to the terms of the Mozilla Public
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4-
"use strict";
54

6-
const EXPORTED_SYMBOLS = ["AboutWelcomeDefaults"];
5+
// We use importESModule here instead of static import so that
6+
// the Karma test environment won't choke on this module. This
7+
// is because the Karma test environment already stubs out
8+
// AppConstants, and overrides importESModule to be a no-op (which
9+
// can't be done for a static import statement).
710

11+
// eslint-disable-next-line mozilla/use-static-import
812
const { AppConstants } = ChromeUtils.importESModule(
913
"resource://gre/modules/AppConstants.sys.mjs"
1014
);
@@ -891,7 +895,7 @@ async function prepareContentForReact(content) {
891895
return prepareMobileDownload(content);
892896
}
893897

894-
const AboutWelcomeDefaults = {
898+
export const AboutWelcomeDefaults = {
895899
prepareContentForReact,
896900
getDefaults,
897901
getAttributionContent,

browser/components/aboutwelcome/moz.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FINAL_TARGET_FILES.actors += [
1919
JAR_MANIFESTS += ["jar.mn"]
2020

2121
EXTRA_JS_MODULES.aboutwelcome += [
22-
"modules/AboutWelcomeDefaults.jsm",
22+
"modules/AboutWelcomeDefaults.sys.mjs",
2323
"modules/AboutWelcomeTelemetry.sys.mjs",
2424
"modules/AWScreenUtils.sys.mjs",
2525
]

browser/components/aboutwelcome/tests/unit/MultiStageAWProton.test.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AboutWelcomeDefaults } from "modules/AboutWelcomeDefaults.jsm";
1+
import { AboutWelcomeDefaults } from "modules/AboutWelcomeDefaults.sys.mjs";
22
import { MultiStageProtonScreen } from "content-src/components/MultiStageProtonScreen";
33
import { AWScreenUtils } from "modules/AWScreenUtils.sys.mjs";
44
import React from "react";

browser/components/aboutwelcome/tests/unit/MultiStageAboutWelcome.test.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import { Themes } from "content-src/components/Themes";
1010
import React from "react";
1111
import { shallow, mount } from "enzyme";
12-
import { AboutWelcomeDefaults } from "modules/AboutWelcomeDefaults.jsm";
12+
import { AboutWelcomeDefaults } from "modules/AboutWelcomeDefaults.sys.mjs";
1313
import { AboutWelcomeUtils } from "content-src/lib/aboutwelcome-utils";
1414

1515
describe("MultiStageAboutWelcome module", () => {

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

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

55
"use strict";
66

7-
const { AboutWelcomeDefaults } = ChromeUtils.import(
8-
"resource:///modules/aboutwelcome/AboutWelcomeDefaults.jsm"
7+
const { AboutWelcomeDefaults } = ChromeUtils.importESModule(
8+
"resource:///modules/aboutwelcome/AboutWelcomeDefaults.sys.mjs"
99
);
1010
const { sinon } = ChromeUtils.importESModule(
1111
"resource://testing-common/Sinon.sys.mjs"

0 commit comments

Comments
 (0)