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

Bug 1793575 - [devtools] Convert jsdebugger.jsm to jsdebugger.sys.mjs. r=Honza,webdriver-reviewers,whimboo

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D158571
This commit is contained in:
Alexandre Poirot 2022-10-06 14:21:22 +00:00
parent ed051e8a4c
commit 76aed8f004
48 changed files with 80 additions and 85 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
browser/base/content/test/static/browser_all_files_referenced.js
View file

@ -363,7 +363,7 @@ if (!isDevtools) {
// resource://devtools/shared/worker/loader.js,
// resource://devtools/shared/loader/builtin-modules.js
if (!AppConstants.ENABLE_WEBDRIVER) {
whitelist.add("resource://gre/modules/jsdebugger.jsm");
whitelist.add("resource://gre/modules/jsdebugger.sys.mjs");
}
}

4
devtools/client/memory/test/xpcshell/head.js
View file

@ -17,8 +17,8 @@ var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
var { expectState } = require("resource://devtools/server/actors/common.js");
var HeapSnapshotFileUtils = require("resource://devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js");
var HeapAnalysesClient = require("resource://devtools/shared/heapsnapshot/HeapAnalysesClient.js");
var { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
var { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
var Store = require("resource://devtools/client/memory/store.js");
var { L10N } = require("resource://devtools/client/memory/utils.js");

4
devtools/docs/user/debugger-api/tutorial-allocation-log-tree/index.rst
View file

@ -34,8 +34,8 @@ This page shows how to use the :doc:`Debugger API <../index>` to show how many o
// This defines the 'Debugger' constructor in this
// Scratchpad; it doesn't actually start debugging anything.
const { addDebuggerToGlobal } = ChromeUtils.import(
'resource://gre/modules/jsdebugger.jsm'
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
'resource://gre/modules/jsdebugger.sys.mjs'
);
addDebuggerToGlobal(window);

4
devtools/docs/user/debugger-api/tutorial-breakpoint/index.rst
View file

@ -40,8 +40,8 @@ This tutorial was tested against Firefox 58 Beta and Nightly. It does not work i
.. code-block:: javascript
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
const { console } = ChromeUtils.import(
"resource://gre/modules/Console.jsm"

4
devtools/platform/IJSDebugger.idl
View file

@ -6,8 +6,8 @@
/**
* Do not use this interface. Instead, write:
* const { addDebuggerToGlobal } = ChromeUtils.import(
* "resource://gre/modules/jsdebugger.jsm"
* const { addDebuggerToGlobal } = ChromeUtils.importESModule(
* "resource://gre/modules/jsdebugger.sys.mjs"
* );
* addDebuggerToGlobal(global);
*/

13
devtools/platform/jsdebugger.jsm → devtools/platform/jsdebugger.sys.mjs
View file

@ -3,14 +3,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/. */
"use strict";
var EXPORTED_SYMBOLS = ["addDebuggerToGlobal", "addSandboxedDebuggerToGlobal"];
/*
* This is the js module for Debugger. Import it like so:
* const { addDebuggerToGlobal } = ChromeUtils.import(
* "resource://gre/modules/jsdebugger.jsm"
* const { addDebuggerToGlobal } = ChromeUtils.importESModule(
* "resource://gre/modules/jsdebugger.sys.mjs"
* );
* addDebuggerToGlobal(globalThis);
*
@ -23,14 +19,15 @@ var EXPORTED_SYMBOLS = ["addDebuggerToGlobal", "addSandboxedDebuggerToGlobal"];
*/
const init = Cc["@mozilla.org/jsdebugger;1"].createInstance(Ci.IJSDebugger);
function addDebuggerToGlobal(global) {
export function addDebuggerToGlobal(global) {
init.addClass(global);
initPromiseDebugging(global);
}
// Defines the Debugger in a sandbox global in a separate compartment. This
// ensures the debugger and debuggee are in different compartments.
function addSandboxedDebuggerToGlobal(global) {
export function addSandboxedDebuggerToGlobal(global) {
const sb = Cu.Sandbox(global, { freshCompartment: true });
addDebuggerToGlobal(sb);
global.Debugger = sb.Debugger;

2
devtools/platform/moz.build
View file

@ -23,7 +23,7 @@ XPCOM_MANIFESTS += [
]
EXTRA_JS_MODULES += [
"jsdebugger.jsm",
"jsdebugger.sys.mjs",
]
# The /devtools/moz.build opted in to treatment of devtools as a browser

4
devtools/platform/tests/xpcshell/test_nativewrappers.js
View file

@ -1,8 +1,8 @@
"use strict";
function run_test() {
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);

2
devtools/server/actors/webconsole.js
View file

@ -215,7 +215,7 @@ const WebConsoleActor = ActorClassWithSpec(webconsoleSpec, {
/**
* Debugger instance.
*
* @see jsdebugger.jsm
* @see jsdebugger.sys.mjs
*/
dbg: null,

2
devtools/server/tests/chrome/test_Debugger.Script.prototype.global.html
View file

@ -16,7 +16,7 @@ Debugger.Script.prototype.global should return innerize globals, not WindowProxi
<script>
"use strict";
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addDebuggerToGlobal(globalThis);
window.onload = function() {

2
devtools/server/tests/chrome/test_Debugger.Source.prototype.elementAttribute.html
View file

@ -17,7 +17,7 @@ element to which code is attached (if any), and how.
<script>
"use strict";
const {addSandboxedDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addSandboxedDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addSandboxedDebuggerToGlobal(globalThis);
window.onload = function() {

2
devtools/server/tests/chrome/test_Debugger.Source.prototype.introductionScript.html
View file

@ -17,7 +17,7 @@ behave when 'eval' is called with no scripted frames active at all.
<script>
"use strict";
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addDebuggerToGlobal(globalThis);
window.onload = function() {

2
devtools/server/tests/chrome/test_Debugger.Source.prototype.introductionType.html
View file

@ -18,7 +18,7 @@ JavaScrip appearing in an inline event handler attribute.
<script>
"use strict";
const {addSandboxedDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addSandboxedDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addSandboxedDebuggerToGlobal(globalThis);
let dbg;

2
devtools/server/tests/chrome/test_executeInGlobal-outerized_this.html
View file

@ -18,7 +18,7 @@ object.
<script>
"use strict";
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addDebuggerToGlobal(globalThis);
window.onload = function() {

2
devtools/server/tests/chrome/test_makeGlobalObjectReference.html
View file

@ -17,7 +17,7 @@ Debugger.prototype.makeGlobalObjectReference should dereference WindowProxy
<script>
"use strict";
const {addSandboxedDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addSandboxedDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addSandboxedDebuggerToGlobal(globalThis);
window.onload = function() {

2
devtools/server/tests/chrome/test_unsafeDereference.html
View file

@ -18,7 +18,7 @@ xray wrapper.
<script>
"use strict";
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addDebuggerToGlobal(globalThis);
window.onload = function() {

4
devtools/server/tests/xpcshell/head_dbg.js
View file

@ -57,8 +57,8 @@ const {
CommandsFactory,
} = require("resource://devtools/shared/commands/commands-factory.js");
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
const { AddonTestUtils } = ChromeUtils.import(

4
devtools/server/tests/xpcshell/test_getyoungestframe.js
View file

@ -4,8 +4,8 @@ function run_test() {
registerCleanupFunction(() => {
Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
});
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(globalThis);
const xpcInspector = Cc["@mozilla.org/jsinspector;1"].getService(

4
devtools/server/tests/xpcshell/test_nativewrappers.js
View file

@ -4,8 +4,8 @@ function run_test() {
registerCleanupFunction(() => {
Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
});
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(globalThis);
const g = createTestGlobal("test1");

4
devtools/server/tests/xpcshell/test_safe-getter.js
View file

@ -4,8 +4,8 @@ function run_test() {
registerCleanupFunction(() => {
Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
});
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(globalThis);
const g = createTestGlobal("test", {

4
devtools/shared/heapsnapshot/tests/xpcshell/head_heapsnapshot.js
View file

@ -16,8 +16,8 @@ const { require } = ChromeUtils.import(
);
const { Match } = ChromeUtils.importESModule("resource://test/Match.sys.mjs");
const { Census } = ChromeUtils.importESModule("resource://test/Census.sys.mjs");
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
const DevToolsUtils = require("devtools/shared/DevToolsUtils");

4
devtools/shared/heapsnapshot/tests/xpcshell/test_ReadHeapSnapshot.js
View file

@ -4,8 +4,8 @@
// Test that we can read core dumps into HeapSnapshot instances.
/* eslint-disable strict */
if (typeof Debugger != "function") {
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(globalThis);
}

4
devtools/shared/heapsnapshot/tests/xpcshell/test_ReadHeapSnapshot_with_allocations.js
View file

@ -6,8 +6,8 @@
// into a HeapSnapshot.
if (typeof Debugger != "function") {
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(globalThis);
}

4
devtools/shared/heapsnapshot/tests/xpcshell/test_SaveHeapSnapshot.js
View file

@ -4,8 +4,8 @@
// Test the ChromeUtils interface.
// eslint-disable-next-line
if (typeof Debugger != "function") {
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(globalThis);
}

8
devtools/shared/loader/builtin-modules.js
View file

@ -154,8 +154,8 @@ defineLazyGetter(exports.modules, "Debugger", () => {
if (global.Debugger) {
return global.Debugger;
}
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(global);
return global.Debugger;
@ -170,8 +170,8 @@ defineLazyGetter(exports.modules, "ChromeDebugger", () => {
freshCompartment: true,
});
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(debuggerSandbox);
return debuggerSandbox.Debugger;

4
devtools/shared/loader/worker-loader.js
View file

@ -390,8 +390,8 @@ var {
});
Cu.evalInSandbox(
`
const { addDebuggerToGlobal } = ChromeUtils.import(
'resource://gre/modules/jsdebugger.jsm'
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
'resource://gre/modules/jsdebugger.sys.mjs'
);
addDebuggerToGlobal(globalThis);
`,

4
devtools/shared/test-helpers/allocation-tracker.js
View file

@ -40,8 +40,8 @@ const MemoryReporter = Cc["@mozilla.org/memory-reporter-manager;1"].getService(
);
const global = Cu.getGlobalForObject(this);
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(global);

4
devtools/shared/tests/xpcshell/test_invisible_loader.js
View file

@ -3,8 +3,8 @@
"use strict";
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(globalThis);

4
devtools/shared/webconsole/test/xpcshell/test_js_property_provider.js
View file

@ -6,8 +6,8 @@ const {
FallibleJSPropertyProvider: JSPropertyProvider,
} = require("devtools/shared/webconsole/js-property-provider");
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(globalThis);

2
dom/base/test/chrome/test_bug1346936.html
View file

@ -25,7 +25,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1346936
/** Test for Bug 1346936 **/
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addDebuggerToGlobal(globalThis);
window.onload = function() {

2
dom/base/test/chrome/test_bug765993.html
View file

@ -25,7 +25,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=765993
/** Test for Bug 765993 **/
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addDebuggerToGlobal(globalThis);
window.onload = function() {

2
dom/base/test/jsmodules/iframe_extractIntroType.html
View file

@ -4,7 +4,7 @@
<script>
// Hook up the debugger statement to extract the calling script's
// introductionType and set it in a property on the parent global.
const {addSandboxedDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addSandboxedDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addSandboxedDebuggerToGlobal(globalThis);
var dbg = new Debugger;
dbg.addDebuggee(parent);

2
dom/promise/tests/test_on_new_promise.html
View file

@ -25,7 +25,7 @@ Debugger.prototype.onNewPromise.
"[object Promise]",
"We should have the native DOM promise implementation.");
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
var dbgGlobal = new Cu.Sandbox(document.nodePrincipal,
{freshCompartment: true});
addDebuggerToGlobal(dbgGlobal);

2
dom/promise/tests/test_on_promise_settled.html
View file

@ -27,7 +27,7 @@ Debugger.prototype.onPromiseResolved.
"[object Promise]",
"We should have the native DOM promise implementation.");
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
var dbgGlobal = new Cu.Sandbox(document.nodePrincipal,
{freshCompartment: true});
addDebuggerToGlobal(dbgGlobal);

2
dom/promise/tests/test_on_promise_settled_duplicates.html
View file

@ -26,7 +26,7 @@ Bug 1084065 - Test that Debugger.prototype.onPromiseResolved doesn't get dupes.
"[object Promise]",
"We should have the native DOM promise implementation.");
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
var dbgGlobal = new Cu.Sandbox(document.nodePrincipal,
{freshCompartment: true});
addDebuggerToGlobal(dbgGlobal);

4
dom/streams/test/xpcshell/head.js
View file

@ -1,7 +1,7 @@
"use strict";
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
const SYSTEM_PRINCIPAL = Cc["@mozilla.org/systemprincipal;1"].createInstance(

4
js/src/doc/Debugger/Tutorial-Alloc-Log-Tree.md
View file

@ -20,8 +20,8 @@ them.
```js
// This simply defines the 'Debugger' constructor in this
// Scratchpad; it doesn't actually start debugging anything.
const { addDebuggerToGlobal } = ChromeUtils.import(
'resource://gre/modules/jsdebugger.jsm'
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
'resource://gre/modules/jsdebugger.sys.mjs'
);
addDebuggerToGlobal(window);

4
js/src/doc/Debugger/Tutorial-Breakpoint.md
View file

@ -44,8 +44,8 @@ This tutorial was tested against Firefox 58 Beta and Nightly. It does not work i
5. Click on the Scratchpad panel and enter the following code:
```js
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
const { console } = ChromeUtils.import(
"resource://gre/modules/Console.jsm"

4
js/src/doc/Debugger/Tutorial-Debugger-Statement.md
View file

@ -31,8 +31,8 @@ page whenever it executes a JavaScript `debugger;` statement.
```js
// This simply defines 'Debugger' in this Scratchpad;
// it doesn't actually start debugging anything.
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(window);

2
js/xpconnect/tests/chrome/test_evalInSandbox.xhtml
View file

@ -177,7 +177,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=533596
outerSB.sop = this;
Cu.evalInSandbox('checkExplicitVersions();', outerSB);
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addDebuggerToGlobal(globalThis);
try {

4
js/xpconnect/tests/chrome/test_onGarbageCollection.html
View file

@ -24,8 +24,8 @@
}
);
Cu.evalInSandbox(`
const { addDebuggerToGlobal } = ChromeUtils.import(
'resource://gre/modules/jsdebugger.jsm'
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
'resource://gre/modules/jsdebugger.sys.mjs'
);
addDebuggerToGlobal(globalThis);
`, sandbox

2
js/xpconnect/tests/unit/head_ongc.js
View file

@ -1,4 +1,4 @@
var {addDebuggerToGlobal, addSandboxedDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
var {addDebuggerToGlobal, addSandboxedDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
const testingFunctions = Cu.getJSTestingFunctions();
const systemPrincipal = Cc["@mozilla.org/systemprincipal;1"].createInstance(Ci.nsIPrincipal);

4
js/xpconnect/tests/unit/test_import_devtools_loader.js
View file

@ -2,8 +2,8 @@
* http://creativecommons.org/publicdomain/zero/1.0/ */
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
addDebuggerToGlobal(this);

2
js/xpconnect/tests/unit/test_xray_SavedFrame-02.js
View file

@ -1,7 +1,7 @@
// Test calling SavedFrame getters across wrappers from privileged and
// un-privileged globals.
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addDebuggerToGlobal(globalThis);
const lowP = Services.scriptSecurityManager.createNullPrincipal({});

2
js/xpconnect/tests/unit/test_xray_SavedFrame.js
View file

@ -1,7 +1,7 @@
// Bug 1117242: Test calling SavedFrame getters from globals that don't subsume
// that frame's principals.
const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm");
const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
addDebuggerToGlobal(globalThis);
const lowP = Services.scriptSecurityManager.createNullPrincipal({});

4
remote/cdp/domains/content/Runtime.sys.mjs
View file

@ -4,9 +4,7 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
);
import { addDebuggerToGlobal } from "resource://gre/modules/jsdebugger.sys.mjs";
import { ContentProcessDomain } from "chrome://remote/content/cdp/domains/ContentProcessDomain.sys.mjs";

4
remote/webdriver-bidi/Realm.sys.mjs
View file

@ -5,8 +5,8 @@
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
XPCOMUtils.defineLazyModuleGetters(lazy, {
addDebuggerToGlobal: "resource://gre/modules/jsdebugger.jsm",
ChromeUtils.defineESModuleGetters(lazy, {
addDebuggerToGlobal: "resource://gre/modules/jsdebugger.sys.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "dbg", () => {

4
testing/modules/CoverageUtils.jsm
View file

@ -7,8 +7,8 @@
var EXPORTED_SYMBOLS = ["CoverageCollector"];
/* globals Debugger */
const { addDebuggerToGlobal } = ChromeUtils.import(
"resource://gre/modules/jsdebugger.jsm"
const { addDebuggerToGlobal } = ChromeUtils.importESModule(
"resource://gre/modules/jsdebugger.sys.mjs"
);
// eslint-disable-next-line mozilla/reject-globalThis-modification
addDebuggerToGlobal(globalThis);