nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1790468 - [remote] Convert /remote/components JSM modules to ESM r=webdriver-reviewers,whimboo

Browse source 
Depends on D158293

Differential Revision: https://phabricator.services.mozilla.com/D158294
This commit is contained in:
Julian Descottes 2022-09-30 11:08:07 +00:00
parent d1f7dbe55e
commit b24d46c99d
15 changed files with 27 additions and 47 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
remote/cdp/targets/MainProcessTarget.jsm
View file

@ -16,10 +16,13 @@ const { Target } = ChromeUtils.import(
const lazy = {}; const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
RemoteAgent: "chrome://remote/content/components/RemoteAgent.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
MainProcessSession: MainProcessSession:
"chrome://remote/content/cdp/sessions/MainProcessSession.jsm", "chrome://remote/content/cdp/sessions/MainProcessSession.jsm",
RemoteAgent: "chrome://remote/content/components/RemoteAgent.jsm",
}); });
/** /**

2
remote/cdp/targets/TabTarget.jsm
View file

@ -17,11 +17,11 @@ const { Target } = ChromeUtils.import(
const lazy = {}; const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
RemoteAgent: "chrome://remote/content/components/RemoteAgent.sys.mjs",
TabManager: "chrome://remote/content/shared/TabManager.sys.mjs", TabManager: "chrome://remote/content/shared/TabManager.sys.mjs",
}); });
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteAgent: "chrome://remote/content/components/RemoteAgent.jsm",
TabSession: "chrome://remote/content/cdp/sessions/TabSession.jsm", TabSession: "chrome://remote/content/cdp/sessions/TabSession.jsm",
}); });

4
remote/cdp/test/browser/head.js
View file

@ -5,8 +5,8 @@
const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
const { RemoteAgent } = ChromeUtils.import( const { RemoteAgent } = ChromeUtils.importESModule(
"chrome://remote/content/components/RemoteAgent.jsm" "chrome://remote/content/components/RemoteAgent.sys.mjs"
); );
const { RemoteAgentError } = ChromeUtils.import( const { RemoteAgentError } = ChromeUtils.import(
"chrome://remote/content/cdp/Error.jsm" "chrome://remote/content/cdp/Error.jsm"

12
remote/components/Marionette.jsm → remote/components/Marionette.sys.mjs
View file

@ -2,13 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict"; import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
var EXPORTED_SYMBOLS = ["Marionette", "MarionetteFactory"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const lazy = {}; const lazy = {};
@ -311,7 +305,7 @@ class MarionetteContentProcess {
} }
} }
var Marionette; export var Marionette;
if (isRemote) { if (isRemote) {
Marionette = new MarionetteContentProcess(); Marionette = new MarionetteContentProcess();
} else { } else {
@ -319,6 +313,6 @@ if (isRemote) {
} }
// This is used by the XPCOM codepath which expects a constructor // This is used by the XPCOM codepath which expects a constructor
const MarionetteFactory = function() { export const MarionetteFactory = function() {
return Marionette; return Marionette;
}; };

12
remote/components/RemoteAgent.jsm → remote/components/RemoteAgent.sys.mjs
View file

@ -2,13 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict"; import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
var EXPORTED_SYMBOLS = ["RemoteAgent", "RemoteAgentFactory"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const lazy = {}; const lazy = {};
@ -508,7 +502,7 @@ class RemoteAgentContentProcess {
} }
} }
var RemoteAgent; export var RemoteAgent;
if (isRemote) { if (isRemote) {
RemoteAgent = new RemoteAgentContentProcess(); RemoteAgent = new RemoteAgentContentProcess();
} else { } else {
@ -516,6 +510,6 @@ if (isRemote) {
} }
// This is used by the XPCOM codepath which expects a constructor // This is used by the XPCOM codepath which expects a constructor
var RemoteAgentFactory = function() { export var RemoteAgentFactory = function() {
return RemoteAgent; return RemoteAgent;
}; };

4
remote/components/components.conf
View file

@ -11,7 +11,7 @@ Classes = [
"command-line-handler": "m-remote", "command-line-handler": "m-remote",
"profile-after-change": "RemoteAgent", "profile-after-change": "RemoteAgent",
}, },
"jsm": "chrome://remote/content/components/RemoteAgent.jsm", 'esModule': "chrome://remote/content/components/RemoteAgent.sys.mjs",
"constructor": "RemoteAgentFactory", "constructor": "RemoteAgentFactory",
}, },
@ -23,7 +23,7 @@ Classes = [
"command-line-handler": "m-marionette", "command-line-handler": "m-marionette",
"profile-after-change": "Marionette", "profile-after-change": "Marionette",
}, },
"jsm": "chrome://remote/content/components/Marionette.jsm", 'esModule': "chrome://remote/content/components/Marionette.sys.mjs",
"constructor": "MarionetteFactory", "constructor": "MarionetteFactory",
}, },
] ]

2
remote/components/moz.build
View file

@ -11,7 +11,7 @@ XPIDL_SOURCES += [
XPCOM_MANIFESTS += ["components.conf"] XPCOM_MANIFESTS += ["components.conf"]
with Files("Marionette.jsm"): with Files("Marionette.sys.mjs"):
BUG_COMPONENT = ("Testing", "Marionette") BUG_COMPONENT = ("Testing", "Marionette")
with Files("nsIMarionette.idl"): with Files("nsIMarionette.idl"):
BUG_COMPONENT = ("Testing", "Marionette") BUG_COMPONENT = ("Testing", "Marionette")

4
remote/jar.mn
View file

@ -4,8 +4,8 @@
remote.jar: remote.jar:
% content remote %content/ % content remote %content/
content/components/Marionette.jsm (components/Marionette.jsm) content/components/Marionette.sys.mjs (components/Marionette.sys.mjs)
content/components/RemoteAgent.jsm (components/RemoteAgent.jsm) content/components/RemoteAgent.sys.mjs (components/RemoteAgent.sys.mjs)
# transport layer (http / websocket) # transport layer (http / websocket)
content/server/HTTPD.jsm (../netwerk/test/httpserver/httpd.js) content/server/HTTPD.jsm (../netwerk/test/httpserver/httpd.js)

4
remote/marionette/driver.js
View file

@ -22,8 +22,10 @@ ChromeUtils.defineESModuleGetters(lazy, {
error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs", error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs",
EventPromise: "chrome://remote/content/shared/Sync.sys.mjs", EventPromise: "chrome://remote/content/shared/Sync.sys.mjs",
Log: "chrome://remote/content/shared/Log.sys.mjs", Log: "chrome://remote/content/shared/Log.sys.mjs",
Marionette: "chrome://remote/content/components/Marionette.sys.mjs",
pprint: "chrome://remote/content/shared/Format.sys.mjs", pprint: "chrome://remote/content/shared/Format.sys.mjs",
print: "chrome://remote/content/shared/PDF.sys.mjs", print: "chrome://remote/content/shared/PDF.sys.mjs",
RemoteAgent: "chrome://remote/content/components/RemoteAgent.sys.mjs",
TabManager: "chrome://remote/content/shared/TabManager.sys.mjs", TabManager: "chrome://remote/content/shared/TabManager.sys.mjs",
Timeouts: "chrome://remote/content/shared/webdriver/Capabilities.sys.mjs", Timeouts: "chrome://remote/content/shared/webdriver/Capabilities.sys.mjs",
UnhandledPromptBehavior: UnhandledPromptBehavior:
@ -52,7 +54,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm", "chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
IdlePromise: "chrome://remote/content/marionette/sync.js", IdlePromise: "chrome://remote/content/marionette/sync.js",
l10n: "chrome://remote/content/marionette/l10n.js", l10n: "chrome://remote/content/marionette/l10n.js",
Marionette: "chrome://remote/content/components/Marionette.jsm",
MarionettePrefs: "chrome://remote/content/marionette/prefs.js", MarionettePrefs: "chrome://remote/content/marionette/prefs.js",
modal: "chrome://remote/content/marionette/modal.js", modal: "chrome://remote/content/marionette/modal.js",
navigate: "chrome://remote/content/marionette/navigate.js", navigate: "chrome://remote/content/marionette/navigate.js",
@ -60,7 +61,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
reftest: "chrome://remote/content/marionette/reftest.js", reftest: "chrome://remote/content/marionette/reftest.js",
registerCommandsActor: registerCommandsActor:
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm", "chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",
RemoteAgent: "chrome://remote/content/components/RemoteAgent.jsm",
TimedPromise: "chrome://remote/content/marionette/sync.js", TimedPromise: "chrome://remote/content/marionette/sync.js",
unregisterCommandsActor: unregisterCommandsActor:
"chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm", "chrome://remote/content/marionette/actors/MarionetteCommandsParent.jsm",

5
remote/server/WebSocketHandshake.jsm
View file

@ -19,10 +19,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, { ChromeUtils.defineESModuleGetters(lazy, {
executeSoon: "chrome://remote/content/shared/Sync.sys.mjs", executeSoon: "chrome://remote/content/shared/Sync.sys.mjs",
Log: "chrome://remote/content/shared/Log.sys.mjs", Log: "chrome://remote/content/shared/Log.sys.mjs",
}); RemoteAgent: "chrome://remote/content/components/RemoteAgent.sys.mjs",
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteAgent: "chrome://remote/content/components/RemoteAgent.jsm",
}); });
XPCOMUtils.defineLazyGetter(lazy, "logger", () => lazy.Log.get()); XPCOMUtils.defineLazyGetter(lazy, "logger", () => lazy.Log.get());

3
remote/shared/webdriver/Capabilities.sys.mjs
View file

@ -11,12 +11,11 @@ ChromeUtils.defineESModuleGetters(lazy, {
assert: "chrome://remote/content/shared/webdriver/Assert.sys.mjs", assert: "chrome://remote/content/shared/webdriver/Assert.sys.mjs",
error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs", error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs",
pprint: "chrome://remote/content/shared/Format.sys.mjs", pprint: "chrome://remote/content/shared/Format.sys.mjs",
RemoteAgent: "chrome://remote/content/components/RemoteAgent.sys.mjs",
}); });
XPCOMUtils.defineLazyModuleGetters(lazy, { XPCOMUtils.defineLazyModuleGetters(lazy, {
Preferences: "resource://gre/modules/Preferences.jsm", Preferences: "resource://gre/modules/Preferences.jsm",
RemoteAgent: "chrome://remote/content/components/RemoteAgent.jsm",
}); });
XPCOMUtils.defineLazyGetter(lazy, "remoteAgent", () => { XPCOMUtils.defineLazyGetter(lazy, "remoteAgent", () => {

5
remote/webdriver-bidi/WebDriverBiDiConnection.jsm
View file

@ -20,10 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
assert: "chrome://remote/content/shared/webdriver/Assert.sys.mjs", assert: "chrome://remote/content/shared/webdriver/Assert.sys.mjs",
error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs", error: "chrome://remote/content/shared/webdriver/Errors.sys.mjs",
Log: "chrome://remote/content/shared/Log.sys.mjs", Log: "chrome://remote/content/shared/Log.sys.mjs",
}); RemoteAgent: "chrome://remote/content/components/RemoteAgent.sys.mjs",
XPCOMUtils.defineLazyModuleGetters(lazy, {
RemoteAgent: "chrome://remote/content/components/RemoteAgent.jsm",
}); });
XPCOMUtils.defineLazyGetter(lazy, "logger", () => XPCOMUtils.defineLazyGetter(lazy, "logger", () =>

4
testing/marionette/harness/marionette_harness/tests/unit/test_cli_arguments.py
View file

@ -27,8 +27,8 @@ class TestCommandLineArguments(MarionetteTestCase):
with self.marionette.using_context("chrome"): with self.marionette.using_context("chrome"):
bidi_enabled = self.marionette.execute_script( bidi_enabled = self.marionette.execute_script(
""" """
const { RemoteAgent } = ChromeUtils.import( const { RemoteAgent } = ChromeUtils.importESModule(
"chrome://remote/content/components/RemoteAgent.jsm" "chrome://remote/content/components/RemoteAgent.sys.mjs"
); );
return !!RemoteAgent.webDriverBiDi; return !!RemoteAgent.webDriverBiDi;
""" """

4
toolkit/modules/Troubleshoot.sys.mjs
View file

@ -991,8 +991,8 @@ if (AppConstants.MOZ_SANDBOX) {
if (AppConstants.ENABLE_WEBDRIVER) { if (AppConstants.ENABLE_WEBDRIVER) {
dataProviders.remoteAgent = function remoteAgent(done) { dataProviders.remoteAgent = function remoteAgent(done) {
const { RemoteAgent } = ChromeUtils.import( const { RemoteAgent } = ChromeUtils.importESModule(
"chrome://remote/content/components/RemoteAgent.jsm" "chrome://remote/content/components/RemoteAgent.sys.mjs"
); );
const { running, scheme, host, port } = RemoteAgent; const { running, scheme, host, port } = RemoteAgent;
let url = ""; let url = "";

4
tools/esmify/map.json
View file

@ -123,10 +123,6 @@
"remote/cdp/targets/Target.jsm", "remote/cdp/targets/Target.jsm",
"chrome://remote/content/cdp/targets/TargetList.jsm": "chrome://remote/content/cdp/targets/TargetList.jsm":
"remote/cdp/targets/TargetList.jsm", "remote/cdp/targets/TargetList.jsm",
"chrome://remote/content/components/Marionette.jsm":
"remote/components/Marionette.jsm",
"chrome://remote/content/components/RemoteAgent.jsm":
"remote/components/RemoteAgent.jsm",
"chrome://remote/content/marionette/PerTestCoverageUtils.jsm": "chrome://remote/content/marionette/PerTestCoverageUtils.jsm":
"tools/code-coverage/PerTestCoverageUtils.jsm", "tools/code-coverage/PerTestCoverageUtils.jsm",
"chrome://remote/content/marionette/accessibility.js": "chrome://remote/content/marionette/accessibility.js":