Bug 1793396 - [devtools] Use absolute URLs in all usages of loader.lazyRequireGetter. r=Honza

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

devtools/client/aboutdebugging/aboutdebugging.js

@@ -47,19 +47,19 @@ const {
 loader.lazyRequireGetter(
   this,
   "adb",
-  "devtools/client/shared/remote-debugging/adb/adb",
+  "resource://devtools/client/shared/remote-debugging/adb/adb.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "adbAddon",
-  "devtools/client/shared/remote-debugging/adb/adb-addon",
+  "resource://devtools/client/shared/remote-debugging/adb/adb-addon.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "adbProcess",
-  "devtools/client/shared/remote-debugging/adb/adb-process",
+  "resource://devtools/client/shared/remote-debugging/adb/adb-process.js",
   true
 );
 

devtools/client/aboutdebugging/src/components/connect/ConnectPage.js

@@ -23,7 +23,7 @@ const Actions = require("resource://devtools/client/aboutdebugging/src/actions/i
 loader.lazyRequireGetter(
   this,
   "ADB_ADDON_STATES",
-  "devtools/client/shared/remote-debugging/adb/adb-addon",
+  "resource://devtools/client/shared/remote-debugging/adb/adb-addon.js",
   true
 );
 

devtools/client/aboutdebugging/src/components/sidebar/Sidebar.js

@@ -23,7 +23,7 @@ const Types = require("resource://devtools/client/aboutdebugging/src/types/index
 loader.lazyRequireGetter(
   this,
   "ADB_ADDON_STATES",
-  "devtools/client/shared/remote-debugging/adb/adb-addon",
+  "resource://devtools/client/shared/remote-debugging/adb/adb-addon.js",
   true
 );
 

devtools/client/aboutdebugging/src/modules/usb-runtimes.js

@@ -7,7 +7,7 @@
 loader.lazyRequireGetter(
   this,
   "adb",
-  "devtools/client/shared/remote-debugging/adb/adb",
+  "resource://devtools/client/shared/remote-debugging/adb/adb.js",
   true
 );
 

devtools/client/accessibility/accessibility-proxy.js

@@ -7,7 +7,7 @@
 loader.lazyRequireGetter(
   this,
   "CombinedProgress",
-  "devtools/client/accessibility/utils/audit",
+  "resource://devtools/client/accessibility/utils/audit.js",
   true
 );
 

devtools/client/accessibility/components/AccessibilityRow.js

@@ -52,11 +52,15 @@ const {
   L10N,
 } = require("resource://devtools/client/accessibility/utils/l10n.js");
 
-loader.lazyRequireGetter(this, "Menu", "devtools/client/framework/menu");
+loader.lazyRequireGetter(
+  this,
+  "Menu",
+  "resource://devtools/client/framework/menu.js"
+);
 loader.lazyRequireGetter(
   this,
   "MenuItem",
-  "devtools/client/framework/menu-item"
+  "resource://devtools/client/framework/menu-item.js"
 );
 
 const {

devtools/client/accessibility/components/Accessible.js

@@ -60,7 +60,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "openContentLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 

devtools/client/accessibility/panel.js

@@ -10,13 +10,13 @@ const Telemetry = require("resource://devtools/client/shared/telemetry.js");
 loader.lazyRequireGetter(
   this,
   "AccessibilityProxy",
-  "devtools/client/accessibility/accessibility-proxy",
+  "resource://devtools/client/accessibility/accessibility-proxy.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "Picker",
-  "devtools/client/accessibility/picker",
+  "resource://devtools/client/accessibility/picker.js",
   true
 );
 const {

devtools/client/debugger/panel.js

@@ -12,19 +12,19 @@ const {
 loader.lazyRequireGetter(
   this,
   "openContentLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "features",
-  "devtools/client/debugger/src/utils/prefs",
+  "resource://devtools/client/debugger/src/utils/prefs.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "registerStoreObserver",
-  "devtools/client/shared/redux/subscriber",
+  "resource://devtools/client/shared/redux/subscriber.js",
   true
 );
 

devtools/client/definitions.js

@@ -82,7 +82,7 @@ loader.lazyGetter(
 loader.lazyRequireGetter(
   this,
   "ResponsiveUIManager",
-  "devtools/client/responsive/manager"
+  "resource://devtools/client/responsive/manager.js"
 );
 
 const lazy = {};
@@ -94,12 +94,12 @@ ChromeUtils.defineModuleGetter(
 loader.lazyRequireGetter(
   this,
   "DevToolsExperimentalPrefs",
-  "devtools/client/devtools-experimental-prefs"
+  "resource://devtools/client/devtools-experimental-prefs.js"
 );
 loader.lazyRequireGetter(
   this,
   "captureAndSaveScreenshot",
-  "devtools/client/shared/screenshot",
+  "resource://devtools/client/shared/screenshot.js",
   true
 );
 

devtools/client/devtools-client.js

@@ -17,27 +17,31 @@ const {
 loader.lazyRequireGetter(
   this,
   "Authentication",
-  "devtools/shared/security/auth"
+  "resource://devtools/shared/security/auth.js"
 );
 loader.lazyRequireGetter(
   this,
   "DebuggerSocket",
-  "devtools/shared/security/socket",
+  "resource://devtools/shared/security/socket.js",
   true
 );
-loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
+loader.lazyRequireGetter(
+  this,
+  "EventEmitter",
+  "resource://devtools/shared/event-emitter.js"
+);
 
 loader.lazyRequireGetter(
   this,
   ["createRootFront", "Front"],
-  "devtools/shared/protocol",
+  "resource://devtools/shared/protocol.js",
   true
 );
 
 loader.lazyRequireGetter(
   this,
   "ObjectFront",
-  "devtools/client/fronts/object",
+  "resource://devtools/client/fronts/object.js",
   true
 );
 

devtools/client/devtools-experimental-prefs.js

@@ -7,7 +7,7 @@
 loader.lazyRequireGetter(
   this,
   "HTMLTooltip",
-  "devtools/client/shared/widgets/tooltip/HTMLTooltip",
+  "resource://devtools/client/shared/widgets/tooltip/HTMLTooltip.js",
   true
 );
 

devtools/client/dom/panel.js

@@ -7,7 +7,7 @@ const EventEmitter = require("resource://devtools/shared/event-emitter.js");
 loader.lazyRequireGetter(
   this,
   "openContentLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 

devtools/client/framework/browser-menus.js

@@ -20,16 +20,20 @@ const MENUS_L10N = new LocalizationHelper(
 loader.lazyRequireGetter(
   this,
   "gDevTools",
-  "devtools/client/framework/devtools",
+  "resource://devtools/client/framework/devtools.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "gDevToolsBrowser",
-  "devtools/client/framework/devtools-browser",
+  "resource://devtools/client/framework/devtools-browser.js",
   true
 );
-loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry");
+loader.lazyRequireGetter(
+  this,
+  "Telemetry",
+  "resource://devtools/client/shared/telemetry.js"
+);
 
 let telemetry = null;
 

devtools/client/framework/components/MeatballMenu.js

@@ -25,10 +25,15 @@ loader.lazyGetter(this, "MenuList", function() {
 loader.lazyRequireGetter(
   this,
   "openDocLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
+  true
+);
+loader.lazyRequireGetter(
+  this,
+  "assert",
+  "resource://devtools/shared/DevToolsUtils.js",
   true
 );
-loader.lazyRequireGetter(this, "assert", "devtools/shared/DevToolsUtils", true);
 
 const openDevToolsDocsLink = () => {
   openDocLink("https://firefox-source-docs.mozilla.org/devtools-user/");

devtools/client/framework/components/ToolboxToolbar.js

@@ -51,7 +51,7 @@ loader.lazyGetter(this, "ChromeDebugToolbar", () =>
 loader.lazyRequireGetter(
   this,
   "getUnicodeUrl",
-  "devtools/client/shared/unicode-url",
+  "resource://devtools/client/shared/unicode-url.js",
   true
 );
 

devtools/client/framework/devtools-browser.js

@@ -31,41 +31,41 @@ const {
 loader.lazyRequireGetter(
   this,
   "Toolbox",
-  "devtools/client/framework/toolbox",
+  "resource://devtools/client/framework/toolbox.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "DevToolsServer",
-  "devtools/server/devtools-server",
+  "resource://devtools/server/devtools-server.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "BrowserMenus",
-  "devtools/client/framework/browser-menus"
+  "resource://devtools/client/framework/browser-menus.js"
 );
 loader.lazyRequireGetter(
   this,
   "appendStyleSheet",
-  "devtools/client/shared/stylesheet-utils",
+  "resource://devtools/client/shared/stylesheet-utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "ResponsiveUIManager",
-  "devtools/client/responsive/manager"
+  "resource://devtools/client/responsive/manager.js"
 );
 loader.lazyRequireGetter(
   this,
   "toggleEnableDevToolsPopup",
-  "devtools/client/framework/enable-devtools-popup",
+  "resource://devtools/client/framework/enable-devtools-popup.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "CommandsFactory",
-  "devtools/shared/commands/commands-factory",
+  "resource://devtools/shared/commands/commands-factory.js",
   true
 );
 

devtools/client/framework/devtools.js

@@ -17,35 +17,39 @@ ChromeUtils.defineESModuleGetters(lazy, {
 loader.lazyRequireGetter(
   this,
   "TabDescriptorFactory",
-  "devtools/client/framework/tab-descriptor-factory",
+  "resource://devtools/client/framework/tab-descriptor-factory.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "CommandsFactory",
-  "devtools/shared/commands/commands-factory",
+  "resource://devtools/shared/commands/commands-factory.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "ToolboxHostManager",
-  "devtools/client/framework/toolbox-host-manager",
+  "resource://devtools/client/framework/toolbox-host-manager.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "BrowserConsoleManager",
-  "devtools/client/webconsole/browser-console-manager",
+  "resource://devtools/client/webconsole/browser-console-manager.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "Toolbox",
-  "devtools/client/framework/toolbox",
+  "resource://devtools/client/framework/toolbox.js",
   true
 );
 
-loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry");
+loader.lazyRequireGetter(
+  this,
+  "Telemetry",
+  "resource://devtools/client/shared/telemetry.js"
+);
 
 const {
   defaultTools: DefaultTools,

devtools/client/framework/selection.js

@@ -9,7 +9,7 @@ const EventEmitter = require("resource://devtools/shared/event-emitter.js");
 loader.lazyRequireGetter(
   this,
   "nodeConstants",
-  "devtools/shared/dom-node-constants"
+  "resource://devtools/shared/dom-node-constants.js"
 );
 
 /**

devtools/client/framework/tab-descriptor-factory.js

@@ -7,7 +7,7 @@
 loader.lazyRequireGetter(
   this,
   "CommandsFactory",
-  "devtools/shared/commands/commands-factory",
+  "resource://devtools/shared/commands/commands-factory.js",
   true
 );
 

devtools/client/framework/toolbox-host-manager.js

@@ -20,13 +20,13 @@ const ZOOM_VALUE_PREF = "devtools.toolbox.zoomValue";
 loader.lazyRequireGetter(
   this,
   "Toolbox",
-  "devtools/client/framework/toolbox",
+  "resource://devtools/client/framework/toolbox.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "Hosts",
-  "devtools/client/framework/toolbox-hosts",
+  "resource://devtools/client/framework/toolbox-hosts.js",
   true
 );
 

devtools/client/framework/toolbox-hosts.js

@@ -9,7 +9,7 @@ const EventEmitter = require("resource://devtools/shared/event-emitter.js");
 loader.lazyRequireGetter(
   this,
   "gDevToolsBrowser",
-  "devtools/client/framework/devtools-browser",
+  "resource://devtools/client/framework/devtools-browser.js",
   true
 );
 

devtools/client/framework/toolbox-options.js

@@ -16,7 +16,7 @@ const L10N = new LocalizationHelper(
 loader.lazyRequireGetter(
   this,
   "openDocLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 

devtools/client/framework/toolbox.js

@@ -65,25 +65,25 @@ const L10N = new MultiLocalizationHelper(
 loader.lazyRequireGetter(
   this,
   "registerStoreObserver",
-  "devtools/client/shared/redux/subscriber",
+  "resource://devtools/client/shared/redux/subscriber.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "createToolboxStore",
-  "devtools/client/framework/store",
+  "resource://devtools/client/framework/store.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   ["registerWalkerListeners"],
-  "devtools/client/framework/actions/index",
+  "resource://devtools/client/framework/actions/index.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   ["selectTarget"],
-  "devtools/shared/commands/target/actions/targets",
+  "resource://devtools/shared/commands/target/actions/targets.js",
   true
 );
 
@@ -93,86 +93,90 @@ ChromeUtils.defineModuleGetter(
   "AppConstants",
   "resource://gre/modules/AppConstants.jsm"
 );
-loader.lazyRequireGetter(this, "flags", "devtools/shared/flags");
+loader.lazyRequireGetter(this, "flags", "resource://devtools/shared/flags.js");
 loader.lazyRequireGetter(
   this,
   "KeyShortcuts",
-  "devtools/client/shared/key-shortcuts"
+  "resource://devtools/client/shared/key-shortcuts.js"
+);
+loader.lazyRequireGetter(
+  this,
+  "ZoomKeys",
+  "resource://devtools/client/shared/zoom-keys.js"
 );
-loader.lazyRequireGetter(this, "ZoomKeys", "devtools/client/shared/zoom-keys");
 loader.lazyRequireGetter(
   this,
   "ToolboxButtons",
-  "devtools/client/definitions",
+  "resource://devtools/client/definitions.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "SourceMapURLService",
-  "devtools/client/framework/source-map-url-service",
+  "resource://devtools/client/framework/source-map-url-service.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "BrowserConsoleManager",
-  "devtools/client/webconsole/browser-console-manager",
+  "resource://devtools/client/webconsole/browser-console-manager.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "viewSource",
-  "devtools/client/shared/view-source"
+  "resource://devtools/client/shared/view-source.js"
 );
 loader.lazyRequireGetter(
   this,
   "buildHarLog",
-  "devtools/client/netmonitor/src/har/har-builder-utils",
+  "resource://devtools/client/netmonitor/src/har/har-builder-utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "NetMonitorAPI",
-  "devtools/client/netmonitor/src/api",
+  "resource://devtools/client/netmonitor/src/api.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "sortPanelDefinitions",
-  "devtools/client/framework/toolbox-tabs-order-manager",
+  "resource://devtools/client/framework/toolbox-tabs-order-manager.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "createEditContextMenu",
-  "devtools/client/framework/toolbox-context-menu",
+  "resource://devtools/client/framework/toolbox-context-menu.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "getSelectedTarget",
-  "devtools/shared/commands/target/selectors/targets",
+  "resource://devtools/shared/commands/target/selectors/targets.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "remoteClientManager",
-  "devtools/client/shared/remote-debugging/remote-client-manager.js",
+  "resource://devtools/client/shared/remote-debugging/remote-client-manager.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "ResponsiveUIManager",
-  "devtools/client/responsive/manager"
+  "resource://devtools/client/responsive/manager.js"
 );
 loader.lazyRequireGetter(
   this,
   "DevToolsUtils",
-  "devtools/shared/DevToolsUtils"
+  "resource://devtools/shared/DevToolsUtils.js"
 );
 loader.lazyRequireGetter(
   this,
   "NodePicker",
-  "devtools/client/inspector/node-picker"
+  "resource://devtools/client/inspector/node-picker.js"
 );
 
 loader.lazyGetter(this, "domNodeConstants", () => {
@@ -182,27 +186,27 @@ loader.lazyGetter(this, "domNodeConstants", () => {
 loader.lazyRequireGetter(
   this,
   "NodeFront",
-  "devtools/client/fronts/node",
+  "resource://devtools/client/fronts/node.js",
   true
 );
 
 loader.lazyRequireGetter(
   this,
   "PICKER_TYPES",
-  "devtools/shared/picker-constants"
+  "resource://devtools/shared/picker-constants.js"
 );
 
 loader.lazyRequireGetter(
   this,
   "HarAutomation",
-  "devtools/client/netmonitor/src/har/har-automation",
+  "resource://devtools/client/netmonitor/src/har/har-automation.js",
   true
 );
 
 loader.lazyRequireGetter(
   this,
   "getThreadOptions",
-  "devtools/client/shared/thread-utils",
+  "resource://devtools/client/shared/thread-utils.js",
   true
 );
 

devtools/client/fronts/css-properties.js

@@ -15,19 +15,19 @@ const {
 loader.lazyRequireGetter(
   this,
   "cssColors",
-  "devtools/shared/css/color-db",
+  "resource://devtools/shared/css/color-db.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "CSS_PROPERTIES_DB",
-  "devtools/shared/css/properties-db",
+  "resource://devtools/shared/css/properties-db.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "CSS_TYPES",
-  "devtools/shared/css/constants",
+  "resource://devtools/shared/css/constants.js",
   true
 );
 

devtools/client/fronts/descriptors/tab.js

@@ -11,13 +11,13 @@ const DESCRIPTOR_TYPES = require("resource://devtools/client/fronts/descriptors/
 loader.lazyRequireGetter(
   this,
   "gDevTools",
-  "devtools/client/framework/devtools",
+  "resource://devtools/client/framework/devtools.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "WindowGlobalTargetFront",
-  "devtools/client/fronts/targets/window-global",
+  "resource://devtools/client/fronts/targets/window-global.js",
   true
 );
 const {

devtools/client/fronts/descriptors/webextension.js

@@ -17,7 +17,7 @@ const DESCRIPTOR_TYPES = require("resource://devtools/client/fronts/descriptors/
 loader.lazyRequireGetter(
   this,
   "WindowGlobalTargetFront",
-  "devtools/client/fronts/targets/window-global",
+  "resource://devtools/client/fronts/targets/window-global.js",
   true
 );
 

devtools/client/fronts/inspector.js

@@ -16,7 +16,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "captureScreenshot",
-  "devtools/client/shared/screenshot",
+  "resource://devtools/client/shared/screenshot.js",
   true
 );
 

devtools/client/fronts/inspector/rule-rewriter.js

@@ -23,7 +23,7 @@ const {
 loader.lazyRequireGetter(
   this,
   ["getIndentationFromPrefs", "getIndentationFromString"],
-  "devtools/shared/indentation",
+  "resource://devtools/shared/indentation.js",
   true
 );
 

devtools/client/fronts/memory.js

@@ -19,7 +19,7 @@ ChromeUtils.defineModuleGetter(
 loader.lazyRequireGetter(
   this,
   "HeapSnapshotFileUtils",
-  "devtools/shared/heapsnapshot/HeapSnapshotFileUtils"
+  "resource://devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js"
 );
 
 class MemoryFront extends FrontClassWithSpec(memorySpec) {

devtools/client/fronts/node.js

@@ -20,7 +20,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "nodeConstants",
-  "devtools/shared/dom-node-constants"
+  "resource://devtools/shared/dom-node-constants.js"
 );
 
 const { XPCOMUtils } = ChromeUtils.importESModule(

devtools/client/fronts/root.js

@@ -9,7 +9,12 @@ const {
   registerFront,
 } = require("resource://devtools/shared/protocol.js");
 
-loader.lazyRequireGetter(this, "getFront", "devtools/shared/protocol", true);
+loader.lazyRequireGetter(
+  this,
+  "getFront",
+  "resource://devtools/shared/protocol.js",
+  true
+);
 
 class RootFront extends FrontClassWithSpec(rootSpec) {
   constructor(client, targetFront, parentFront) {

devtools/client/fronts/style-rule.js

@@ -15,7 +15,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "RuleRewriter",
-  "devtools/client/fronts/inspector/rule-rewriter"
+  "resource://devtools/client/fronts/inspector/rule-rewriter.js"
 );
 
 /**

devtools/client/fronts/style-sheet.js

@@ -15,7 +15,7 @@ const {
 loader.lazyRequireGetter(
   this,
   ["getIndentationFromPrefs", "getIndentationFromString"],
-  "devtools/shared/indentation",
+  "resource://devtools/shared/indentation.js",
   true
 );
 

devtools/client/fronts/targets/target-mixin.js

@@ -4,11 +4,16 @@
 
 "use strict";
 
-loader.lazyRequireGetter(this, "getFront", "devtools/shared/protocol", true);
+loader.lazyRequireGetter(
+  this,
+  "getFront",
+  "resource://devtools/shared/protocol.js",
+  true
+);
 loader.lazyRequireGetter(
   this,
   "getThreadOptions",
-  "devtools/client/shared/thread-utils",
+  "resource://devtools/client/shared/thread-utils.js",
   true
 );
 

devtools/client/fronts/thread.js

@@ -15,14 +15,18 @@ const { threadSpec } = require("resource://devtools/shared/specs/thread.js");
 loader.lazyRequireGetter(
   this,
   "ObjectFront",
-  "devtools/client/fronts/object",
+  "resource://devtools/client/fronts/object.js",
   true
 );
-loader.lazyRequireGetter(this, "FrameFront", "devtools/client/fronts/frame");
+loader.lazyRequireGetter(
+  this,
+  "FrameFront",
+  "resource://devtools/client/fronts/frame.js"
+);
 loader.lazyRequireGetter(
   this,
   "SourceFront",
-  "devtools/client/fronts/source",
+  "resource://devtools/client/fronts/source.js",
   true
 );
 

devtools/client/fronts/watcher.js

@@ -12,19 +12,19 @@ const {
 loader.lazyRequireGetter(
   this,
   "WindowGlobalTargetFront",
-  "devtools/client/fronts/targets/window-global",
+  "resource://devtools/client/fronts/targets/window-global.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "ContentProcessTargetFront",
-  "devtools/client/fronts/targets/content-process",
+  "resource://devtools/client/fronts/targets/content-process.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "WorkerTargetFront",
-  "devtools/client/fronts/targets/worker",
+  "resource://devtools/client/fronts/targets/worker.js",
   true
 );
 

devtools/client/inspector/animation/reducers/animations.js

@@ -17,7 +17,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "TimeScale",
-  "devtools/client/inspector/animation/utils/timescale"
+  "resource://devtools/client/inspector/animation/utils/timescale.js"
 );
 
 const INITIAL_STATE = {

devtools/client/inspector/boxmodel/box-model.js

@@ -14,18 +14,18 @@ const {
 loader.lazyRequireGetter(
   this,
   "EditingSession",
-  "devtools/client/inspector/boxmodel/utils/editing-session"
+  "resource://devtools/client/inspector/boxmodel/utils/editing-session.js"
 );
 loader.lazyRequireGetter(
   this,
   "InplaceEditor",
-  "devtools/client/shared/inplace-editor",
+  "resource://devtools/client/shared/inplace-editor.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "RulePreviewTooltip",
-  "devtools/client/shared/widgets/tooltip/RulePreviewTooltip"
+  "resource://devtools/client/shared/widgets/tooltip/RulePreviewTooltip.js"
 );
 
 const NUMERIC = /^-?[\d\.]+$/;

devtools/client/inspector/boxmodel/components/ComputedProperty.js

@@ -14,7 +14,7 @@ const { LocalizationHelper } = require("resource://devtools/shared/l10n.js");
 loader.lazyRequireGetter(
   this,
   "getNodeRep",
-  "devtools/client/inspector/shared/node-reps"
+  "resource://devtools/client/inspector/shared/node-reps.js"
 );
 
 const {

devtools/client/inspector/breadcrumbs.js

@@ -11,7 +11,7 @@ const EventEmitter = require("resource://devtools/shared/event-emitter.js");
 loader.lazyRequireGetter(
   this,
   "KeyShortcuts",
-  "devtools/client/shared/key-shortcuts"
+  "resource://devtools/client/shared/key-shortcuts.js"
 );
 
 const MAX_LABEL_LENGTH = 40;

devtools/client/inspector/changes/ChangesContextMenu.js

@@ -8,7 +8,7 @@ const Menu = require("resource://devtools/client/framework/menu.js");
 loader.lazyRequireGetter(
   this,
   "MenuItem",
-  "devtools/client/framework/menu-item"
+  "resource://devtools/client/framework/menu-item.js"
 );
 
 const {

devtools/client/inspector/changes/ChangesView.js

@@ -15,12 +15,12 @@ const {
 loader.lazyRequireGetter(
   this,
   "ChangesContextMenu",
-  "devtools/client/inspector/changes/ChangesContextMenu"
+  "resource://devtools/client/inspector/changes/ChangesContextMenu.js"
 );
 loader.lazyRequireGetter(
   this,
   "clipboardHelper",
-  "devtools/shared/platform/clipboard"
+  "resource://devtools/shared/platform/clipboard.js"
 );
 
 const changesReducer = require("resource://devtools/client/inspector/changes/reducers/changes.js");

devtools/client/inspector/changes/selectors/changes.js

@@ -6,7 +6,7 @@
 loader.lazyRequireGetter(
   this,
   "getTabPrefs",
-  "devtools/shared/indentation",
+  "resource://devtools/shared/indentation.js",
   true
 );
 

devtools/client/inspector/compatibility/components/IssueItem.js

@@ -17,7 +17,7 @@ const Localized = createFactory(FluentReact.Localized);
 loader.lazyRequireGetter(
   this,
   "openDocLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 
@@ -35,7 +35,7 @@ const NodePane = createFactory(
 loader.lazyRequireGetter(
   this,
   "toSnakeCase",
-  "devtools/client/inspector/compatibility/utils/cases",
+  "resource://devtools/client/inspector/compatibility/utils/cases.js",
   true
 );
 

devtools/client/inspector/computed/computed.js

@@ -28,22 +28,22 @@ const TooltipsOverlay = require("resource://devtools/client/inspector/shared/too
 loader.lazyRequireGetter(
   this,
   "StyleInspectorMenu",
-  "devtools/client/inspector/shared/style-inspector-menu"
+  "resource://devtools/client/inspector/shared/style-inspector-menu.js"
 );
 loader.lazyRequireGetter(
   this,
   "KeyShortcuts",
-  "devtools/client/shared/key-shortcuts"
+  "resource://devtools/client/shared/key-shortcuts.js"
 );
 loader.lazyRequireGetter(
   this,
   "clipboardHelper",
-  "devtools/shared/platform/clipboard"
+  "resource://devtools/shared/platform/clipboard.js"
 );
 loader.lazyRequireGetter(
   this,
   "openContentLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 

devtools/client/inspector/extensions/components/ExpressionResultView.js

@@ -25,14 +25,14 @@ const {
 loader.lazyRequireGetter(
   this,
   "LongStringFront",
-  "devtools/client/fronts/string",
+  "resource://devtools/client/fronts/string.js",
   true
 );
 
 loader.lazyRequireGetter(
   this,
   "ObjectFront",
-  "devtools/client/fronts/object",
+  "resource://devtools/client/fronts/object.js",
   true
 );
 

devtools/client/inspector/flexbox/components/FlexContainer.js

@@ -16,7 +16,7 @@ const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-t
 loader.lazyRequireGetter(
   this,
   "getNodeRep",
-  "devtools/client/inspector/shared/node-reps"
+  "resource://devtools/client/inspector/shared/node-reps.js"
 );
 
 const Types = require("resource://devtools/client/inspector/flexbox/types.js");

devtools/client/inspector/flexbox/components/FlexItem.js

@@ -13,7 +13,7 @@ const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-t
 loader.lazyRequireGetter(
   this,
   "getNodeRep",
-  "devtools/client/inspector/shared/node-reps"
+  "resource://devtools/client/inspector/shared/node-reps.js"
 );
 
 const Types = require("resource://devtools/client/inspector/flexbox/types.js");

devtools/client/inspector/flexbox/components/FlexItemSelector.js

@@ -17,7 +17,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "getNodeRep",
-  "devtools/client/inspector/shared/node-reps"
+  "resource://devtools/client/inspector/shared/node-reps.js"
 );
 
 const Types = require("resource://devtools/client/inspector/flexbox/types.js");
@@ -25,7 +25,7 @@ const Types = require("resource://devtools/client/inspector/flexbox/types.js");
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 

devtools/client/inspector/flexbox/flexbox.js

@@ -17,10 +17,14 @@ const flexboxReducer = require("resource://devtools/client/inspector/flexbox/red
 loader.lazyRequireGetter(
   this,
   "parseURL",
-  "devtools/client/shared/source-utils",
+  "resource://devtools/client/shared/source-utils.js",
   true
 );
-loader.lazyRequireGetter(this, "asyncStorage", "devtools/shared/async-storage");
+loader.lazyRequireGetter(
+  this,
+  "asyncStorage",
+  "resource://devtools/shared/async-storage.js"
+);
 
 const FLEXBOX_COLOR = "#9400FF";
 

devtools/client/inspector/fonts/components/FontOrigin.js

@@ -13,7 +13,7 @@ const PropTypes = require("resource://devtools/client/shared/vendor/react-prop-t
 loader.lazyRequireGetter(
   this,
   "clipboardHelper",
-  "devtools/shared/platform/clipboard"
+  "resource://devtools/shared/platform/clipboard.js"
 );
 
 const {

devtools/client/inspector/grids/components/GridItem.js

@@ -25,7 +25,7 @@ loader.lazyGetter(this, "MODE", function() {
 loader.lazyRequireGetter(
   this,
   "translateNodeFrontToGrip",
-  "devtools/client/inspector/shared/utils",
+  "resource://devtools/client/inspector/shared/utils.js",
   true
 );
 

devtools/client/inspector/grids/grid-inspector.js

@@ -23,16 +23,20 @@ const {
 loader.lazyRequireGetter(
   this,
   "compareFragmentsGeometry",
-  "devtools/client/inspector/grids/utils/utils",
+  "resource://devtools/client/inspector/grids/utils/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "parseURL",
-  "devtools/client/shared/source-utils",
+  "resource://devtools/client/shared/source-utils.js",
   true
 );
-loader.lazyRequireGetter(this, "asyncStorage", "devtools/shared/async-storage");
+loader.lazyRequireGetter(
+  this,
+  "asyncStorage",
+  "resource://devtools/shared/async-storage.js"
+);
 
 const CSS_GRID_COUNT_HISTOGRAM_ID = "DEVTOOLS_NUMBER_OF_CSS_GRIDS_IN_A_PAGE";
 

devtools/client/inspector/inspector.js

@@ -18,53 +18,58 @@ const Promise = require("Promise");
 loader.lazyRequireGetter(
   this,
   "HTMLBreadcrumbs",
-  "devtools/client/inspector/breadcrumbs",
+  "resource://devtools/client/inspector/breadcrumbs.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "KeyShortcuts",
-  "devtools/client/shared/key-shortcuts"
+  "resource://devtools/client/shared/key-shortcuts.js"
 );
 loader.lazyRequireGetter(
   this,
   "InspectorSearch",
-  "devtools/client/inspector/inspector-search",
+  "resource://devtools/client/inspector/inspector-search.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "ToolSidebar",
-  "devtools/client/inspector/toolsidebar",
+  "resource://devtools/client/inspector/toolsidebar.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "MarkupView",
-  "devtools/client/inspector/markup/markup"
+  "resource://devtools/client/inspector/markup/markup.js"
 );
 loader.lazyRequireGetter(
   this,
   "HighlightersOverlay",
-  "devtools/client/inspector/shared/highlighters-overlay"
+  "resource://devtools/client/inspector/shared/highlighters-overlay.js"
 );
 loader.lazyRequireGetter(
   this,
   "ExtensionSidebar",
-  "devtools/client/inspector/extensions/extension-sidebar"
+  "resource://devtools/client/inspector/extensions/extension-sidebar.js"
 );
 loader.lazyRequireGetter(
   this,
   "PICKER_TYPES",
-  "devtools/shared/picker-constants"
+  "resource://devtools/shared/picker-constants.js"
 );
 loader.lazyRequireGetter(
   this,
   "captureAndSaveScreenshot",
-  "devtools/client/shared/screenshot",
+  "resource://devtools/client/shared/screenshot.js",
+  true
+);
+loader.lazyRequireGetter(
+  this,
+  "debounce",
+  "resource://devtools/shared/debounce.js",
   true
 );
-loader.lazyRequireGetter(this, "debounce", "devtools/shared/debounce", true);
 
 const {
   LocalizationHelper,

devtools/client/inspector/layout/layout.js

@@ -26,7 +26,7 @@ const INSPECTOR_L10N = new LocalizationHelper(
 loader.lazyRequireGetter(
   this,
   "SwatchColorPickerTooltip",
-  "devtools/client/shared/widgets/tooltip/SwatchColorPickerTooltip"
+  "resource://devtools/client/shared/widgets/tooltip/SwatchColorPickerTooltip.js"
 );
 
 class LayoutView {

devtools/client/inspector/markup/markup-context-menu.js

@@ -9,16 +9,20 @@ const {
 } = require("resource://devtools/shared/css/constants.js");
 const { LocalizationHelper } = require("resource://devtools/shared/l10n.js");
 
-loader.lazyRequireGetter(this, "Menu", "devtools/client/framework/menu");
+loader.lazyRequireGetter(
+  this,
+  "Menu",
+  "resource://devtools/client/framework/menu.js"
+);
 loader.lazyRequireGetter(
   this,
   "MenuItem",
-  "devtools/client/framework/menu-item"
+  "resource://devtools/client/framework/menu-item.js"
 );
 loader.lazyRequireGetter(
   this,
   "clipboardHelper",
-  "devtools/shared/platform/clipboard"
+  "resource://devtools/shared/platform/clipboard.js"
 );
 
 loader.lazyGetter(this, "TOOLBOX_L10N", function() {

devtools/client/inspector/markup/markup.js

@@ -25,57 +25,57 @@ const WalkerEventListener = require("resource://devtools/client/inspector/shared
 loader.lazyRequireGetter(
   this,
   ["createDOMMutationBreakpoint", "deleteDOMMutationBreakpoint"],
-  "devtools/client/framework/actions/index",
+  "resource://devtools/client/framework/actions/index.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "MarkupContextMenu",
-  "devtools/client/inspector/markup/markup-context-menu"
+  "resource://devtools/client/inspector/markup/markup-context-menu.js"
 );
 loader.lazyRequireGetter(
   this,
   "SlottedNodeContainer",
-  "devtools/client/inspector/markup/views/slotted-node-container"
+  "resource://devtools/client/inspector/markup/views/slotted-node-container.js"
 );
 loader.lazyRequireGetter(
   this,
   "getLongString",
-  "devtools/client/inspector/shared/utils",
+  "resource://devtools/client/inspector/shared/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "openContentLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "HTMLTooltip",
-  "devtools/client/shared/widgets/tooltip/HTMLTooltip",
+  "resource://devtools/client/shared/widgets/tooltip/HTMLTooltip.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "UndoStack",
-  "devtools/client/shared/undo",
+  "resource://devtools/client/shared/undo.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "clipboardHelper",
-  "devtools/shared/platform/clipboard"
+  "resource://devtools/shared/platform/clipboard.js"
 );
 loader.lazyRequireGetter(
   this,
   "beautify",
-  "devtools/shared/jsbeautify/beautify"
+  "resource://devtools/shared/jsbeautify/beautify.js"
 );
 loader.lazyRequireGetter(
   this,
   "getTabPrefs",
-  "devtools/shared/indentation",
+  "resource://devtools/shared/indentation.js",
   true
 );
 

devtools/client/inspector/markup/views/element-container.js

@@ -14,19 +14,19 @@ const { extend } = require("resource://devtools/shared/extend.js");
 loader.lazyRequireGetter(
   this,
   "EventTooltip",
-  "devtools/client/shared/widgets/tooltip/EventTooltipHelper",
+  "resource://devtools/client/shared/widgets/tooltip/EventTooltipHelper.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   ["setImageTooltip", "setBrokenImageTooltip"],
-  "devtools/client/shared/widgets/tooltip/ImageTooltipHelper",
+  "resource://devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "clipboardHelper",
-  "devtools/shared/platform/clipboard"
+  "resource://devtools/shared/platform/clipboard.js"
 );
 
 const PREVIEW_MAX_DIM_PREF = "devtools.inspector.imagePreviewTooltipSize";

devtools/client/inspector/markup/views/element-editor.js

@@ -24,7 +24,7 @@ loader.lazyRequireGetter(
     "getAutocompleteMaxWidth",
     "parseAttributeValues",
   ],
-  "devtools/client/inspector/markup/utils",
+  "resource://devtools/client/inspector/markup/utils.js",
   true
 );
 

devtools/client/inspector/markup/views/markup-container.js

@@ -13,7 +13,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "wrapMoveFocus",
-  "devtools/client/shared/focus",
+  "resource://devtools/client/shared/focus.js",
   true
 );
 

devtools/client/inspector/markup/views/text-editor.js

@@ -15,19 +15,19 @@ const TextNode = createFactory(
 loader.lazyRequireGetter(
   this,
   "getAutocompleteMaxWidth",
-  "devtools/client/inspector/markup/utils",
+  "resource://devtools/client/inspector/markup/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "getLongString",
-  "devtools/client/inspector/shared/utils",
+  "resource://devtools/client/inspector/shared/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "InplaceEditor",
-  "devtools/client/shared/inplace-editor",
+  "resource://devtools/client/shared/inplace-editor.js",
   true
 );
 

devtools/client/inspector/node-picker.js

@@ -4,7 +4,11 @@
 
 "use strict";
 
-loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
+loader.lazyRequireGetter(
+  this,
+  "EventEmitter",
+  "resource://devtools/shared/event-emitter.js"
+);
 
 /**
  * Client-side NodePicker module.

devtools/client/inspector/rules/models/element-style.js

@@ -13,19 +13,19 @@ const {
 loader.lazyRequireGetter(
   this,
   "promiseWarn",
-  "devtools/client/inspector/shared/utils",
+  "resource://devtools/client/inspector/shared/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   ["parseDeclarations", "parseNamedDeclarations", "parseSingleValue"],
-  "devtools/shared/css/parsing-utils",
+  "resource://devtools/shared/css/parsing-utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "isCssVariable",
-  "devtools/client/fronts/css-properties",
+  "resource://devtools/client/fronts/css-properties.js",
   true
 );
 

devtools/client/inspector/rules/models/rule.js

@@ -13,19 +13,19 @@ const TextProperty = require("resource://devtools/client/inspector/rules/models/
 loader.lazyRequireGetter(
   this,
   "getTargetBrowsers",
-  "devtools/client/inspector/shared/compatibility-user-settings",
+  "resource://devtools/client/inspector/shared/compatibility-user-settings.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "promiseWarn",
-  "devtools/client/inspector/shared/utils",
+  "resource://devtools/client/inspector/shared/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "parseNamedDeclarations",
-  "devtools/shared/css/parsing-utils",
+  "resource://devtools/shared/css/parsing-utils.js",
   true
 );
 

devtools/client/inspector/rules/models/text-property.js

@@ -12,14 +12,14 @@ const {
 loader.lazyRequireGetter(
   this,
   "escapeCSSComment",
-  "devtools/shared/css/parsing-utils",
+  "resource://devtools/shared/css/parsing-utils.js",
   true
 );
 
 loader.lazyRequireGetter(
   this,
   "getCSSVariables",
-  "devtools/client/inspector/rules/utils/utils",
+  "resource://devtools/client/inspector/rules/utils/utils.js",
   true
 );
 

devtools/client/inspector/rules/rules.js

@@ -28,45 +28,45 @@ const DOUBLESPACE = "  ";
 loader.lazyRequireGetter(
   this,
   ["flashElementOn", "flashElementOff"],
-  "devtools/client/inspector/markup/utils",
+  "resource://devtools/client/inspector/markup/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "ClassListPreviewer",
-  "devtools/client/inspector/rules/views/class-list-previewer"
+  "resource://devtools/client/inspector/rules/views/class-list-previewer.js"
 );
 loader.lazyRequireGetter(
   this,
   "getNodeInfo",
-  "devtools/client/inspector/rules/utils/utils",
+  "resource://devtools/client/inspector/rules/utils/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "getNodeCompatibilityInfo",
-  "devtools/client/inspector/rules/utils/utils",
+  "resource://devtools/client/inspector/rules/utils/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "StyleInspectorMenu",
-  "devtools/client/inspector/shared/style-inspector-menu"
+  "resource://devtools/client/inspector/shared/style-inspector-menu.js"
 );
 loader.lazyRequireGetter(
   this,
   "AutocompletePopup",
-  "devtools/client/shared/autocomplete-popup"
+  "resource://devtools/client/shared/autocomplete-popup.js"
 );
 loader.lazyRequireGetter(
   this,
   "KeyShortcuts",
-  "devtools/client/shared/key-shortcuts"
+  "resource://devtools/client/shared/key-shortcuts.js"
 );
 loader.lazyRequireGetter(
   this,
   "clipboardHelper",
-  "devtools/shared/platform/clipboard"
+  "resource://devtools/shared/platform/clipboard.js"
 );
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";

devtools/client/inspector/rules/views/rule-editor.js

@@ -33,7 +33,12 @@ const {
 const EventEmitter = require("resource://devtools/shared/event-emitter.js");
 const CssLogic = require("resource://devtools/shared/inspector/css-logic.js");
 
-loader.lazyRequireGetter(this, "Tools", "devtools/client/definitions", true);
+loader.lazyRequireGetter(
+  this,
+  "Tools",
+  "resource://devtools/client/definitions.js",
+  true
+);
 
 const STYLE_INSPECTOR_PROPERTIES =
   "devtools/shared/locales/styleinspector.properties";

devtools/client/inspector/rules/views/text-property-editor.js

@@ -23,19 +23,19 @@ const {
 loader.lazyRequireGetter(
   this,
   "openContentLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   ["parseDeclarations", "parseSingleValue"],
-  "devtools/shared/css/parsing-utils",
+  "resource://devtools/shared/css/parsing-utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "findCssSelector",
-  "devtools/shared/inspector/css-logic",
+  "resource://devtools/shared/inspector/css-logic.js",
   true
 );
 const lazy = {};

devtools/client/inspector/shared/highlighters-overlay.js

@@ -17,29 +17,33 @@ const {
 loader.lazyRequireGetter(
   this,
   "parseURL",
-  "devtools/client/shared/source-utils",
+  "resource://devtools/client/shared/source-utils.js",
   true
 );
-loader.lazyRequireGetter(this, "asyncStorage", "devtools/shared/async-storage");
+loader.lazyRequireGetter(
+  this,
+  "asyncStorage",
+  "resource://devtools/shared/async-storage.js"
+);
 loader.lazyRequireGetter(
   this,
   "gridsReducer",
-  "devtools/client/inspector/grids/reducers/grids"
+  "resource://devtools/client/inspector/grids/reducers/grids.js"
 );
 loader.lazyRequireGetter(
   this,
   "highlighterSettingsReducer",
-  "devtools/client/inspector/grids/reducers/highlighter-settings"
+  "resource://devtools/client/inspector/grids/reducers/highlighter-settings.js"
 );
 loader.lazyRequireGetter(
   this,
   "flexboxReducer",
-  "devtools/client/inspector/flexbox/reducers/flexbox"
+  "resource://devtools/client/inspector/flexbox/reducers/flexbox.js"
 );
 loader.lazyRequireGetter(
   this,
   "deepEqual",
-  "devtools/shared/DevToolsUtils",
+  "resource://devtools/shared/DevToolsUtils.js",
   true
 );
 

devtools/client/inspector/shared/node-reps.js

@@ -20,7 +20,7 @@ loader.lazyGetter(this, "TextNode", function() {
 loader.lazyRequireGetter(
   this,
   "translateNodeFrontToGrip",
-  "devtools/client/inspector/shared/utils",
+  "resource://devtools/client/inspector/shared/utils.js",
   true
 );
 

devtools/client/inspector/shared/style-inspector-menu.js

@@ -12,22 +12,26 @@ const {
   VIEW_NODE_LOCATION_TYPE,
 } = require("resource://devtools/client/inspector/shared/node-types.js");
 
-loader.lazyRequireGetter(this, "Menu", "devtools/client/framework/menu");
+loader.lazyRequireGetter(
+  this,
+  "Menu",
+  "resource://devtools/client/framework/menu.js"
+);
 loader.lazyRequireGetter(
   this,
   "MenuItem",
-  "devtools/client/framework/menu-item"
+  "resource://devtools/client/framework/menu-item.js"
 );
 loader.lazyRequireGetter(
   this,
   "getRuleFromNode",
-  "devtools/client/inspector/rules/utils/utils",
+  "resource://devtools/client/inspector/rules/utils/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "clipboardHelper",
-  "devtools/shared/platform/clipboard"
+  "resource://devtools/shared/platform/clipboard.js"
 );
 
 const STYLE_INSPECTOR_PROPERTIES =

devtools/client/inspector/shared/tooltips-overlay.js

@@ -21,43 +21,43 @@ const {
 loader.lazyRequireGetter(
   this,
   "getColor",
-  "devtools/client/shared/theme",
+  "resource://devtools/client/shared/theme.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "HTMLTooltip",
-  "devtools/client/shared/widgets/tooltip/HTMLTooltip",
+  "resource://devtools/client/shared/widgets/tooltip/HTMLTooltip.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   ["getImageDimensions", "setImageTooltip", "setBrokenImageTooltip"],
-  "devtools/client/shared/widgets/tooltip/ImageTooltipHelper",
+  "resource://devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "setVariableTooltip",
-  "devtools/client/shared/widgets/tooltip/VariableTooltipHelper",
+  "resource://devtools/client/shared/widgets/tooltip/VariableTooltipHelper.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "InactiveCssTooltipHelper",
-  "devtools/client/shared/widgets/tooltip/inactive-css-tooltip-helper",
+  "resource://devtools/client/shared/widgets/tooltip/inactive-css-tooltip-helper.js",
   false
 );
 loader.lazyRequireGetter(
   this,
   "CssCompatibilityTooltipHelper",
-  "devtools/client/shared/widgets/tooltip/css-compatibility-tooltip-helper",
+  "resource://devtools/client/shared/widgets/tooltip/css-compatibility-tooltip-helper.js",
   false
 );
 loader.lazyRequireGetter(
   this,
   "Telemetry",
-  "devtools/client/shared/telemetry",
+  "resource://devtools/client/shared/telemetry.js",
   false
 );
 

devtools/client/inspector/shared/utils.js

@@ -7,19 +7,19 @@
 loader.lazyRequireGetter(
   this,
   "KeyCodes",
-  "devtools/client/shared/keycodes",
+  "resource://devtools/client/shared/keycodes.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "getCSSLexer",
-  "devtools/shared/css/lexer",
+  "resource://devtools/shared/css/lexer.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "parseDeclarations",
-  "devtools/shared/css/parsing-utils",
+  "resource://devtools/shared/css/parsing-utils.js",
   true
 );
 

devtools/client/jsonview/converter-child.js

@@ -7,7 +7,7 @@
 loader.lazyRequireGetter(
   this,
   "NetworkHelper",
-  "devtools/shared/webconsole/network-helper"
+  "resource://devtools/shared/webconsole/network-helper.js"
 );
 loader.lazyGetter(this, "debugJsModules", function() {
   const { AppConstants } = ChromeUtils.import(

devtools/client/menus.js

@@ -31,36 +31,36 @@ ChromeUtils.defineESModuleGetters(lazy, {
     "resource://devtools/client/framework/browser-toolbox/Launcher.sys.mjs",
 });
 
-loader.lazyRequireGetter(this, "flags", "devtools/shared/flags");
+loader.lazyRequireGetter(this, "flags", "resource://devtools/shared/flags.js");
 
 loader.lazyRequireGetter(
   this,
   "gDevToolsBrowser",
-  "devtools/client/framework/devtools-browser",
+  "resource://devtools/client/framework/devtools-browser.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "ResponsiveUIManager",
-  "devtools/client/responsive/manager"
+  "resource://devtools/client/responsive/manager.js"
 );
 loader.lazyRequireGetter(
   this,
   "openDocLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "CommandsFactory",
-  "devtools/shared/commands/commands-factory",
+  "resource://devtools/shared/commands/commands-factory.js",
   true
 );
 
 loader.lazyRequireGetter(
   this,
   "PICKER_TYPES",
-  "devtools/shared/picker-constants"
+  "resource://devtools/shared/picker-constants.js"
 );
 
 exports.menuitems = [

devtools/client/netmonitor/src/components/DropHarHandler.js

@@ -19,7 +19,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "HarMenuUtils",
-  "devtools/client/netmonitor/src/har/har-menu-utils",
+  "resource://devtools/client/netmonitor/src/har/har-menu-utils.js",
   true
 );
 

devtools/client/netmonitor/src/components/Toolbar.js

@@ -38,7 +38,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "KeyShortcuts",
-  "devtools/client/shared/key-shortcuts"
+  "resource://devtools/client/shared/key-shortcuts.js"
 );
 
 // MDN
@@ -116,13 +116,13 @@ loader.lazyGetter(this, "MenuList", function() {
 loader.lazyRequireGetter(
   this,
   "HarMenuUtils",
-  "devtools/client/netmonitor/src/har/har-menu-utils",
+  "resource://devtools/client/netmonitor/src/har/har-menu-utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "copyString",
-  "devtools/shared/platform/clipboard",
+  "resource://devtools/shared/platform/clipboard.js",
   true
 );
 

devtools/client/netmonitor/src/components/messages/MessageFilterMenu.js

@@ -17,7 +17,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 

devtools/client/netmonitor/src/components/messages/MessageListContextMenu.js

@@ -10,13 +10,13 @@ const {
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "copyString",
-  "devtools/shared/platform/clipboard",
+  "resource://devtools/shared/platform/clipboard.js",
   true
 );
 const {

devtools/client/netmonitor/src/components/request-details/HeadersPanel.js

@@ -78,13 +78,13 @@ loader.lazyGetter(this, "TreeRow", function() {
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "openContentLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 

devtools/client/netmonitor/src/components/request-list/RequestListContent.js

@@ -31,7 +31,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "openRequestInTab",
-  "devtools/client/netmonitor/src/utils/firefox/open-request-in-tab",
+  "resource://devtools/client/netmonitor/src/utils/firefox/open-request-in-tab.js",
   true
 );
 loader.lazyGetter(this, "setImageTooltip", function() {

devtools/client/netmonitor/src/connector/index.js

@@ -22,7 +22,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "throttlingProfiles",
-  "devtools/client/shared/components/throttling/profiles"
+  "resource://devtools/client/shared/components/throttling/profiles.js"
 );
 
 const DEVTOOLS_ENABLE_PERSISTENT_LOG_PREF = "devtools.netmonitor.persistlog";

devtools/client/netmonitor/src/har/har-menu-utils.js

@@ -11,7 +11,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "HarExporter",
-  "devtools/client/netmonitor/src/har/har-exporter",
+  "resource://devtools/client/netmonitor/src/har/har-exporter.js",
   true
 );
 

devtools/client/netmonitor/src/utils/open-request-in-tab.js

@@ -17,7 +17,7 @@
 loader.lazyRequireGetter(
   this,
   "openContentLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 

devtools/client/netmonitor/src/widgets/HeadersPanelContextMenu.js

@@ -14,13 +14,13 @@ const {
 loader.lazyRequireGetter(
   this,
   "copyString",
-  "devtools/shared/platform/clipboard",
+  "resource://devtools/shared/platform/clipboard.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 

devtools/client/netmonitor/src/widgets/PropertiesViewContextMenu.js

@@ -14,13 +14,13 @@ const {
 loader.lazyRequireGetter(
   this,
   "copyString",
-  "devtools/shared/platform/clipboard",
+  "resource://devtools/shared/platform/clipboard.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 

devtools/client/netmonitor/src/widgets/RequestBlockingContextMenu.js

@@ -11,7 +11,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 

devtools/client/netmonitor/src/widgets/RequestListContextMenu.js

@@ -18,24 +18,34 @@ const {
   hasMatchingBlockingRequestPattern,
 } = require("resource://devtools/client/netmonitor/src/utils/request-blocking.js");
 
-loader.lazyRequireGetter(this, "Curl", "devtools/client/shared/curl", true);
-loader.lazyRequireGetter(this, "saveAs", "devtools/shared/DevToolsUtils", true);
+loader.lazyRequireGetter(
+  this,
+  "Curl",
+  "resource://devtools/client/shared/curl.js",
+  true
+);
+loader.lazyRequireGetter(
+  this,
+  "saveAs",
+  "resource://devtools/shared/DevToolsUtils.js",
+  true
+);
 loader.lazyRequireGetter(
   this,
   "copyString",
-  "devtools/shared/platform/clipboard",
+  "resource://devtools/shared/platform/clipboard.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "HarMenuUtils",
-  "devtools/client/netmonitor/src/har/har-menu-utils",
+  "resource://devtools/client/netmonitor/src/har/har-menu-utils.js",
   true
 );
 

devtools/client/responsive/components/DevicePixelRatioMenu.js

@@ -21,7 +21,7 @@ const Types = require("resource://devtools/client/responsive/types.js");
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 

devtools/client/responsive/components/SettingsMenu.js

@@ -20,7 +20,7 @@ const {
 loader.lazyRequireGetter(
   this,
   "showMenu",
-  "devtools/client/shared/components/menu/utils",
+  "resource://devtools/client/shared/components/menu/utils.js",
   true
 );
 

devtools/client/responsive/manager.js

@@ -6,45 +6,57 @@
 
 const EventEmitter = require("resource://devtools/shared/event-emitter.js");
 
-loader.lazyRequireGetter(this, "ResponsiveUI", "devtools/client/responsive/ui");
+loader.lazyRequireGetter(
+  this,
+  "ResponsiveUI",
+  "resource://devtools/client/responsive/ui.js"
+);
 loader.lazyRequireGetter(
   this,
   "startup",
-  "devtools/client/responsive/utils/window",
+  "resource://devtools/client/responsive/utils/window.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "showNotification",
-  "devtools/client/responsive/utils/notification",
+  "resource://devtools/client/responsive/utils/notification.js",
   true
 );
-loader.lazyRequireGetter(this, "l10n", "devtools/client/responsive/utils/l10n");
+loader.lazyRequireGetter(
+  this,
+  "l10n",
+  "resource://devtools/client/responsive/utils/l10n.js"
+);
 loader.lazyRequireGetter(
   this,
   "PriorityLevels",
-  "devtools/client/shared/components/NotificationBox",
+  "resource://devtools/client/shared/components/NotificationBox.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "TabDescriptorFactory",
-  "devtools/client/framework/tab-descriptor-factory",
+  "resource://devtools/client/framework/tab-descriptor-factory.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "gDevTools",
-  "devtools/client/framework/devtools",
+  "resource://devtools/client/framework/devtools.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "gDevToolsBrowser",
-  "devtools/client/framework/devtools-browser",
+  "resource://devtools/client/framework/devtools-browser.js",
   true
 );
-loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry");
+loader.lazyRequireGetter(
+  this,
+  "Telemetry",
+  "resource://devtools/client/shared/telemetry.js"
+);
 
 /**
  * ResponsiveUIManager is the external API for the browser UI, etc. to use when

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

@@ -39,12 +39,12 @@ const localTypes = require("resource://devtools/client/responsive/types.js");
 loader.lazyRequireGetter(
   this,
   "ResponsiveUIManager",
-  "devtools/client/responsive/manager"
+  "resource://devtools/client/responsive/manager.js"
 );
 loader.lazyRequireGetter(
   this,
   "message",
-  "devtools/client/responsive/utils/message"
+  "resource://devtools/client/responsive/utils/message.js"
 );
 
 const E10S_MULTI_ENABLED =

devtools/client/responsive/ui.js

@@ -16,31 +16,39 @@ const {
 loader.lazyRequireGetter(
   this,
   "throttlingProfiles",
-  "devtools/client/shared/components/throttling/profiles"
+  "resource://devtools/client/shared/components/throttling/profiles.js"
 );
 loader.lazyRequireGetter(
   this,
   "message",
-  "devtools/client/responsive/utils/message"
+  "resource://devtools/client/responsive/utils/message.js"
 );
 loader.lazyRequireGetter(
   this,
   "showNotification",
-  "devtools/client/responsive/utils/notification",
+  "resource://devtools/client/responsive/utils/notification.js",
   true
 );
 loader.lazyRequireGetter(
   this,
   "PriorityLevels",
-  "devtools/client/shared/components/NotificationBox",
+  "resource://devtools/client/shared/components/NotificationBox.js",
   true
 );
-loader.lazyRequireGetter(this, "l10n", "devtools/client/responsive/utils/l10n");
-loader.lazyRequireGetter(this, "asyncStorage", "devtools/shared/async-storage");
+loader.lazyRequireGetter(
+  this,
+  "l10n",
+  "resource://devtools/client/responsive/utils/l10n.js"
+);
+loader.lazyRequireGetter(
+  this,
+  "asyncStorage",
+  "resource://devtools/shared/async-storage.js"
+);
 loader.lazyRequireGetter(
   this,
   "captureAndSaveScreenshot",
-  "devtools/client/shared/screenshot",
+  "resource://devtools/client/shared/screenshot.js",
   true
 );
 

devtools/client/responsive/utils/notification.js

@@ -7,7 +7,7 @@
 loader.lazyRequireGetter(
   this,
   "gDevTools",
-  "devtools/client/framework/devtools",
+  "resource://devtools/client/framework/devtools.js",
   true
 );
 

devtools/client/shared/autocomplete-popup.js

@@ -9,10 +9,15 @@ const EventEmitter = require("resource://devtools/shared/event-emitter.js");
 loader.lazyRequireGetter(
   this,
   "HTMLTooltip",
-  "devtools/client/shared/widgets/tooltip/HTMLTooltip",
+  "resource://devtools/client/shared/widgets/tooltip/HTMLTooltip.js",
+  true
+);
+loader.lazyRequireGetter(
+  this,
+  "colorUtils",
+  "resource://devtools/shared/css/color.js",
   true
 );
-loader.lazyRequireGetter(this, "colorUtils", "devtools/shared/css/color", true);
 
 const HTML_NS = "http://www.w3.org/1999/xhtml";
 let itemIdCounter = 0;

devtools/client/shared/components/List.js

@@ -27,7 +27,7 @@ const {
 loader.lazyRequireGetter(
   this,
   ["getFocusableElements", "wrapMoveFocus"],
-  "devtools/client/shared/focus",
+  "resource://devtools/client/shared/focus.js",
   true
 );
 

devtools/client/shared/components/MdnLink.js

@@ -11,7 +11,7 @@ const { a } = dom;
 loader.lazyRequireGetter(
   this,
   "openDocLink",
-  "devtools/client/shared/link",
+  "resource://devtools/client/shared/link.js",
   true
 );
 

devtools/client/shared/components/SearchBox.js

@@ -28,7 +28,7 @@ loader.lazyGetter(this, "MDNLink", function() {
 loader.lazyRequireGetter(
   this,
   "KeyShortcuts",
-  "devtools/client/shared/key-shortcuts"
+  "resource://devtools/client/shared/key-shortcuts.js"
 );
 
 class SearchBox extends PureComponent {

devtools/client/shared/components/VirtualizedTree.js

@@ -20,7 +20,7 @@ const {
 loader.lazyRequireGetter(
   this,
   ["wrapMoveFocus", "getFocusableElements"],
-  "devtools/client/shared/focus",
+  "resource://devtools/client/shared/focus.js",
   true
 );