Skip to content

Commit 2dada8f

Browse files
committedSep 21, 2015
Bug 912121 - Rewrite require / import to match source tree. rs=devtools
In a following patch, all DevTools moz.build files will use DevToolsModules to install JS modules at a path that corresponds directly to their source tree location. Here we rewrite all require and import calls to match the new location that these files are installed to.
1 parent 2df2dd8 commit 2dada8f

File tree

786 files changed

+2675
-2408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

786 files changed

+2675
-2408
lines changed
 

‎addon-sdk/source/lib/dev/debuggee.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.metadata = {
1111
const { Cu } = require("chrome");
1212
const { Class } = require("../sdk/core/heritage");
1313
const { MessagePort, MessageChannel } = require("../sdk/messaging");
14-
const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
14+
const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
1515
const { DebuggerServer } = devtoolsRequire("devtools/server/main");
1616

1717
const outputs = new WeakMap();

‎addon-sdk/source/lib/dev/toolbox.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const { contract, validate } = require("../sdk/util/contract");
1515
const { each, pairs, values } = require("../sdk/util/sequence");
1616
const { onEnable, onDisable } = require("../dev/theme/hooks");
1717

18-
const { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
18+
const { gDevTools } = Cu.import("resource:///modules/devtools/client/framework/gDevTools.jsm", {});
1919

2020
// This is temporary workaround to allow loading of the developer tools client - volcan
2121
// into a toolbox panel, this hack won't be necessary as soon as devtools patch will be

0 commit comments

Comments
 (0)
Failed to load comments.