Bug 1793395 - [devtools] Use absolute URLs for all custom loader's require. r=Honza

Differential Revision: https://phabricator.services.mozilla.com/D158488

devtools/client/aboutdebugging/test/browser/head.js

@@ -397,7 +397,7 @@ async function openProfilerDialog(client, doc) {
 function getThisFirefoxString(aboutDebuggingWindow) {
   const loader = aboutDebuggingWindow.getBrowserLoaderForWindow();
   const { l10n } = loader.require(
-    "devtools/client/aboutdebugging/src/modules/l10n"
+    "resource://devtools/client/aboutdebugging/src/modules/l10n.js"
   );
   return l10n.getString("about-debugging-this-firefox-runtime-name");
 }

devtools/client/framework/browser-toolbox/Launcher.sys.mjs

@@ -134,10 +134,10 @@ export class BrowserToolboxLauncher extends EventEmitter {
     // invisible to the debugger (unlike the usual loader settings).
     this.#loader = useDistinctSystemPrincipalLoader(this);
     const { DevToolsServer } = this.#loader.require(
-      "devtools/server/devtools-server"
+      "resource://devtools/server/devtools-server.js"
     );
     const { SocketListener } = this.#loader.require(
-      "devtools/shared/security/socket"
+      "resource://devtools/shared/security/socket.js"
     );
     this.#devToolsServer = DevToolsServer;
     dumpn("Created a separate loader instance for the DevToolsServer.");

devtools/client/framework/browser-toolbox/window.js

@@ -9,7 +9,7 @@ var { loader, require, DevToolsLoader } = ChromeUtils.import(
 );
 
 // Require this module to setup core modules
-loader.require("devtools/client/framework/devtools-browser");
+loader.require("resource://devtools/client/framework/devtools-browser.js");
 
 var { gDevTools } = require("resource://devtools/client/framework/devtools.js");
 var { Toolbox } = require("resource://devtools/client/framework/toolbox.js");
@@ -264,10 +264,10 @@ function installTestingServer() {
     invisibleToDebugger: true,
   });
   const { DevToolsServer } = testLoader.require(
-    "devtools/server/devtools-server"
+    "resource://devtools/server/devtools-server.js"
   );
   const { SocketListener } = testLoader.require(
-    "devtools/shared/security/socket"
+    "resource://devtools/shared/security/socket.js"
   );
 
   DevToolsServer.init();

devtools/client/framework/test/allocations/head.js

@@ -19,7 +19,7 @@ let tracker;
     invisibleToDebugger: true,
   });
   const { allocationTracker } = loader.require(
-    "chrome://mochitests/content/browser/devtools/shared/test-helpers/allocation-tracker"
+    "chrome://mochitests/content/browser/devtools/shared/test-helpers/allocation-tracker.js"
   );
   tracker = allocationTracker({ watchDevToolsGlobals: true });
 }
@@ -93,7 +93,7 @@ async function startRecordingAllocations({
           invisibleToDebugger: true,
         });
         const { allocationTracker } = loader.require(
-          "chrome://mochitests/content/browser/devtools/shared/test-helpers/allocation-tracker"
+          "chrome://mochitests/content/browser/devtools/shared/test-helpers/allocation-tracker.js"
         );
         // We watch all globals in the content process, (instead of only DevTools global in parent process)
         // because we may easily leak web page objects, which aren't in DevTools global.

devtools/client/framework/test/browser_target_from_url.js

@@ -80,8 +80,12 @@ add_task(async function() {
 async function setupDevToolsServer(webSocket) {
   info("Create a separate loader instance for the DevToolsServer.");
   const loader = new DevToolsLoader();
-  const { DevToolsServer } = loader.require("devtools/server/devtools-server");
-  const { SocketListener } = loader.require("devtools/shared/security/socket");
+  const { DevToolsServer } = loader.require(
+    "resource://devtools/server/devtools-server.js"
+  );
+  const { SocketListener } = loader.require(
+    "resource://devtools/shared/security/socket.js"
+  );
 
   DevToolsServer.init();
   DevToolsServer.registerAllActors();

devtools/client/responsive/test/browser/head.js

@@ -708,7 +708,7 @@ function testViewportDimensions(ui, w, h) {
 
 async function changeUserAgentInput(ui, value) {
   const { Simulate } = ui.toolWindow.require(
-    "devtools/client/shared/vendor/react-dom-test-utils"
+    "resource://devtools/client/shared/vendor/react-dom-test-utils.js"
   );
   const { document, store } = ui.toolWindow;
   const browser = ui.getViewportBrowser();
@@ -734,7 +734,7 @@ async function changeUserAgentInput(ui, value) {
  */
 function addDeviceInModal(ui, device) {
   const { Simulate } = ui.toolWindow.require(
-    "devtools/client/shared/vendor/react-dom-test-utils"
+    "resource://devtools/client/shared/vendor/react-dom-test-utils.js"
   );
   const { document, store } = ui.toolWindow;
 
@@ -777,7 +777,7 @@ function addDeviceInModal(ui, device) {
 
 async function editDeviceInModal(ui, device, newDevice) {
   const { Simulate } = ui.toolWindow.require(
-    "devtools/client/shared/vendor/react-dom-test-utils"
+    "resource://devtools/client/shared/vendor/react-dom-test-utils.js"
   );
   const { document, store } = ui.toolWindow;
 

devtools/client/shared/test/shared-head.js

@@ -39,7 +39,7 @@ if (DEBUG_ALLOCATIONS) {
   });
 
   const { allocationTracker } = loader.require(
-    "devtools/shared/test-helpers/allocation-tracker"
+    "resource://devtools/shared/test-helpers/allocation-tracker.js"
   );
   const tracker = allocationTracker({ watchAllGlobals: true });
   registerCleanupFunction(() => {

devtools/client/webconsole/webconsole-ui.js

@@ -605,7 +605,7 @@ class WebConsoleUI {
     const WebConsoleWrapper = BrowserLoader({
       baseURI: "resource://devtools/client/webconsole/",
       window: this.window,
-    }).require("devtools/client/webconsole/webconsole-wrapper");
+    }).require("resource://devtools/client/webconsole/webconsole-wrapper.js");
 
     this.wrapper = new WebConsoleWrapper(
       this.outputNode,

devtools/server/actors/watcher/SessionDataHelpers.jsm

@@ -47,8 +47,9 @@ if (typeof module == "object") {
     const { loader } = ChromeUtils.import(
       "resource://devtools/shared/loader/Loader.jsm"
     );
-    return loader.require("devtools/server/actors/utils/event-breakpoints")
-      .validateEventBreakpoint;
+    return loader.require(
+      "resource://devtools/server/actors/utils/event-breakpoints.js"
+    ).validateEventBreakpoint;
   });
 }
 

devtools/server/connectors/js-window-actor/DevToolsFrameChild.sys.mjs

@@ -322,11 +322,11 @@ export class DevToolsFrameChild extends JSWindowActorChild {
         : Loader;
     }
     const { DevToolsServer } = this.loader.require(
-      "devtools/server/devtools-server"
+      "resource://devtools/server/devtools-server.js"
     );
 
     const { WindowGlobalTargetActor } = this.loader.require(
-      "devtools/server/actors/targets/window-global"
+      "resource://devtools/server/actors/targets/window-global.js"
     );
 
     DevToolsServer.init();

devtools/server/connectors/js-window-actor/DevToolsWorkerChild.sys.mjs

@@ -21,7 +21,7 @@ XPCOMUtils.defineLazyGetter(lazy, "Loader", () =>
 );
 
 XPCOMUtils.defineLazyGetter(lazy, "DevToolsUtils", () =>
-  lazy.Loader.require("devtools/shared/DevToolsUtils")
+  lazy.Loader.require("resource://devtools/shared/DevToolsUtils.js")
 );
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   SessionDataHelpers:
@@ -267,7 +267,7 @@ export class DevToolsWorkerChild extends JSWindowActorChild {
 
   _createConnection(forwardingPrefix) {
     const { DevToolsServer } = lazy.Loader.require(
-      "devtools/server/devtools-server"
+      "resource://devtools/server/devtools-server.js"
     );
 
     DevToolsServer.init();
@@ -322,7 +322,7 @@ export class DevToolsWorkerChild extends JSWindowActorChild {
 
     // Create the actual worker target actor, in the worker thread.
     const { connectToWorker } = lazy.Loader.require(
-      "devtools/server/connectors/worker-connector"
+      "resource://devtools/server/connectors/worker-connector.js"
     );
 
     const onConnectToWorker = connectToWorker(

devtools/server/startup/content-process.sys.mjs

@@ -30,7 +30,9 @@ export function initContentProcessTarget(msg) {
   // using it in the same process.
   const loader = useDistinctSystemPrincipalLoader(loaderRequester);
 
-  const { DevToolsServer } = loader.require("devtools/server/devtools-server");
+  const { DevToolsServer } = loader.require(
+    "resource://devtools/server/devtools-server.js"
+  );
 
   DevToolsServer.init();
   // For browser content toolbox, we do need a regular root actor and all tab
@@ -44,7 +46,7 @@ export function initContentProcessTarget(msg) {
   conn.parentMessageManager = mm;
 
   const { ContentProcessTargetActor } = loader.require(
-    "devtools/server/actors/targets/content-process"
+    "resource://devtools/server/actors/targets/content-process.js"
   );
 
   const actor = new ContentProcessTargetActor(conn, {

devtools/server/startup/worker.js

@@ -48,9 +48,11 @@ this.rpc = function(method, ...params) {
 loadSubScript("resource://devtools/shared/loader/worker-loader.js");
 
 const { WorkerTargetActor } = worker.require(
-  "devtools/server/actors/targets/worker"
+  "resource://devtools/server/actors/targets/worker.js"
+);
+const { DevToolsServer } = worker.require(
+  "resource://devtools/server/devtools-server.js"
 );
-const { DevToolsServer } = worker.require("devtools/server/devtools-server");
 
 DevToolsServer.createRootActor = function() {
   throw new Error("Should never get here!");

devtools/server/tests/xpcshell/head_dbg.js

@@ -41,7 +41,7 @@ const {
   DevToolsServer,
 } = require("resource://devtools/server/devtools-server.js");
 const { DevToolsServer: WorkerDevToolsServer } = worker.require(
-  "devtools/server/devtools-server"
+  "resource://devtools/server/devtools-server.js"
 );
 const {
   DevToolsClient,

devtools/shared/commands/commands-factory.js

@@ -184,7 +184,7 @@ exports.CommandsFactory = {
       freshCompartment: true,
     });
     const { DevToolsServer: customDevToolsServer } = customLoader.require(
-      "devtools/server/devtools-server"
+      "resource://devtools/server/devtools-server.js"
     );
 
     customDevToolsServer.init();

devtools/shared/loader/Loader.jsm

@@ -139,7 +139,7 @@ function DevToolsLoader({
 
   // Fetch custom pseudo modules and globals
   const { modules, globals } = this.require(
-    "devtools/shared/loader/builtin-modules"
+    "resource://devtools/shared/loader/builtin-modules.js"
   );
 
   // Register custom pseudo modules to the current loader instance

devtools/shared/security/tests/xpcshell/test_devtools_socket_status.js

@@ -80,7 +80,9 @@ function checkSocketStatus(expectedExcludeFalse, expectedExcludeTrue) {
 async function setupDevToolsServer({ fromBrowserToolbox }) {
   info("Create a separate loader instance for the DevToolsServer.");
   const loader = new DevToolsLoader();
-  const { DevToolsServer } = loader.require("devtools/server/devtools-server");
+  const { DevToolsServer } = loader.require(
+    "resource://devtools/server/devtools-server.js"
+  );
 
   DevToolsServer.init();
   DevToolsServer.registerAllActors();

devtools/shared/test-helpers/browser_allocation_tracker.js

@@ -17,7 +17,7 @@ const { allocationTracker } = loader.require(
   "chrome://mochitests/content/browser/devtools/shared/test-helpers/allocation-tracker"
 );
 const TrackedObjects = loader.require(
-  "devtools/shared/test-helpers/tracked-objects.jsm"
+  "resource://devtools/shared/test-helpers/tracked-objects.jsm"
 );
 
 // This test record multiple times complete heap snapshot,

devtools/shared/tests/xpcshell/test_eventemitter_destroy.js

@@ -16,7 +16,7 @@ add_task(function() {
     const loader = new DevToolsLoader();
 
     const ref = Cu.getWeakReference(
-      loader.require("devtools/shared/event-emitter")
+      loader.require("resource://devtools/shared/event-emitter.js")
     );
 
     loader.destroy();

devtools/shared/tests/xpcshell/test_independent_loaders.js

@@ -12,8 +12,8 @@ function run_test() {
   const loader1 = new DevToolsLoader();
   const loader2 = new DevToolsLoader();
 
-  const indent1 = loader1.require("devtools/shared/indentation");
-  const indent2 = loader2.require("devtools/shared/indentation");
+  const indent1 = loader1.require("resource://devtools/shared/indentation.js");
+  const indent2 = loader2.require("resource://devtools/shared/indentation.js");
 
   Assert.ok(indent1 !== indent2);
 

devtools/shared/tests/xpcshell/test_invisible_loader.js

@@ -21,7 +21,7 @@ function visible_loader() {
   const loader = new DevToolsLoader({
     invisibleToDebugger: false,
   });
-  loader.require("devtools/shared/indentation");
+  loader.require("resource://devtools/shared/indentation.js");
 
   const dbg = new Debugger();
   const sandbox = loader.loader.sharedGlobalSandbox;
@@ -38,7 +38,7 @@ function invisible_loader() {
   const loader = new DevToolsLoader({
     invisibleToDebugger: true,
   });
-  loader.require("devtools/shared/indentation");
+  loader.require("resource://devtools/shared/indentation.js");
 
   const dbg = new Debugger();
   const sandbox = loader.loader.sharedGlobalSandbox;

devtools/shared/tests/xpcshell/test_require_lazy.js

@@ -25,7 +25,7 @@ function run_test() {
 
   // We have to init the loader by loading any module before
   // lazyRequireGetter is available
-  loader2.require("devtools/shared/DevToolsUtils");
+  loader2.require("resource://devtools/shared/DevToolsUtils.js");
 
   loader2.lazyRequireGetter(o2, name, path);
   Assert.ok(o2.asyncUtils !== asyncUtils);

devtools/startup/DevToolsStartup.sys.mjs

@@ -994,10 +994,10 @@ DevToolsStartup.prototype = {
       // settings).
       const serverLoader = useDistinctSystemPrincipalLoader(this);
       const { DevToolsServer: devToolsServer } = serverLoader.require(
-        "devtools/server/devtools-server"
+        "resource://devtools/server/devtools-server.js"
       );
       const { SocketListener } = serverLoader.require(
-        "devtools/shared/security/socket"
+        "resource://devtools/shared/security/socket.js"
       );
       devToolsServer.init();