Bug 1397296 - remove mappings for gre/modules/commonjs in devtools loaders;r=ochameau
authorJulian Descottes <jdescottes@mozilla.com>
Wed, 06 Sep 2017 16:42:48 +0200
changeset 429085 bd760aeac6c0b65e7e3fc7fd6549f3caa3bb2222
parent 429084 34529d61b6a8253f9f64b4f632e8f5a6360203d8
child 429086 def8963114c345d89e9c3e318ddb7471ec622467
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersochameau
bugs1397296
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1397296 - remove mappings for gre/modules/commonjs in devtools loaders;r=ochameau MozReview-Commit-ID: 2l3cJhGs24t
devtools/client/shared/test/unit/test_undoStack.js
devtools/shared/Loader.jsm
devtools/shared/worker/loader.js
--- a/devtools/client/shared/test/unit/test_undoStack.js
+++ b/devtools/client/shared/test/unit/test_undoStack.js
@@ -5,17 +5,16 @@
 
 "use strict";
 
 const {Loader, Require} =
   Components.utils.import("resource://devtools/shared/base-loader.js", {});
 
 const loader = new Loader({
   paths: {
-    "": "resource://gre/modules/commonjs/",
     "devtools": "resource://devtools",
   },
   globals: {},
 });
 const require = Require(loader, { id: "undo-test" });
 
 const {UndoStack} = require("devtools/client/shared/undo");
 
--- a/devtools/shared/Loader.jsm
+++ b/devtools/shared/Loader.jsm
@@ -25,18 +25,16 @@ this.EXPORTED_SYMBOLS = ["DevToolsLoader
  * Used when the tools should be loaded from the Firefox package itself.
  * This is the default case.
  */
 function BuiltinProvider() {}
 BuiltinProvider.prototype = {
   load: function () {
     const paths = {
       // ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
-      "": "resource://gre/modules/commonjs/",
-      // ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
       // Modules here are intended to have one implementation for
       // chrome, and a separate implementation for content.  Here we
       // map the directory to the chrome subdirectory, but the content
       // loader will map to the content subdirectory.  See the
       // README.md in devtools/shared/platform.
       "devtools/shared/platform": "resource://devtools/shared/platform/chrome",
       // ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
       "devtools": "resource://devtools",
--- a/devtools/shared/worker/loader.js
+++ b/devtools/shared/worker/loader.js
@@ -573,18 +573,16 @@ this.worker = new WorkerDebuggerLoader({
   modules: {
     "Debugger": Debugger,
     "Services": Object.create(null),
     "chrome": chrome,
     "xpcInspector": xpcInspector
   },
   paths: {
     // ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
-    "": "resource://gre/modules/commonjs/",
-    // ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
     // Modules here are intended to have one implementation for
     // chrome, and a separate implementation for content.  Here we
     // map the directory to the chrome subdirectory, but the content
     // loader will map to the content subdirectory.  See the
     // README.md in devtools/shared/platform.
     "devtools/shared/platform": "resource://devtools/shared/platform/chrome",
     // ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
     "devtools": "resource://devtools",