author | Nicolas Chevobbe <nchevobbe@mozilla.com> |
Tue, 10 Apr 2018 07:57:31 +0200 | |
changeset 412971 | 06f67baf2aed4715a995bfd41a98833d984de27f |
parent 412970 | 18c6e8809c2bbcf0a96b5c11d86f5105d0754d4a |
child 412972 | eaf30a1f59eedf65d4d6a5009bebfd014873d64e |
push id | 33828 |
push user | archaeopteryx@coole-files.de |
push date | Thu, 12 Apr 2018 19:19:41 +0000 |
treeherder | mozilla-central@6e22c4a726c2 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bgrins |
bugs | 1425521 |
milestone | 61.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
|
--- a/devtools/client/webconsole/moz.build +++ b/devtools/client/webconsole/moz.build @@ -12,17 +12,16 @@ DIRS += [ 'selectors', 'test', 'utils', ] DevToolsModules( 'console-commands.js', 'constants.js', 'hudservice.js', - 'jsterm.js', 'main.js', 'new-console-output-wrapper.js', 'new-webconsole.js', 'panel.js', 'store.js', 'types.js', 'utils.js', 'webconsole-connection-proxy.js',
--- a/devtools/client/webconsole/old/moz.build +++ b/devtools/client/webconsole/old/moz.build @@ -6,12 +6,13 @@ BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] DIRS += [ 'net', ] DevToolsModules( 'console-output.js', + 'jsterm.js', 'webconsole.js', ) with Files('**'): BUG_COMPONENT = ('Firefox', 'Developer Tools: Console')
--- a/devtools/client/webconsole/old/webconsole.js +++ b/devtools/client/webconsole/old/webconsole.js @@ -26,18 +26,18 @@ loader.lazyServiceGetter(this, "clipboar "@mozilla.org/widget/clipboardhelper;1", "nsIClipboardHelper"); loader.lazyRequireGetter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm", true); loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter"); loader.lazyRequireGetter(this, "ConsoleOutput", "devtools/client/webconsole/old/console-output", true); loader.lazyRequireGetter(this, "Messages", "devtools/client/webconsole/old/console-output", true); loader.lazyRequireGetter(this, "EnvironmentClient", "devtools/shared/client/environment-client"); loader.lazyRequireGetter(this, "ObjectClient", "devtools/shared/client/object-client"); -loader.lazyRequireGetter(this, "JSTerm", "devtools/client/webconsole/jsterm", true); -loader.lazyRequireGetter(this, "gSequenceId", "devtools/client/webconsole/jsterm", true); +loader.lazyRequireGetter(this, "JSTerm", "devtools/client/webconsole/old/jsterm", true); +loader.lazyRequireGetter(this, "gSequenceId", "devtools/client/webconsole/old/jsterm", true); loader.lazyImporter(this, "VariablesView", "resource://devtools/client/shared/widgets/VariablesView.jsm"); loader.lazyImporter(this, "VariablesViewController", "resource://devtools/client/shared/widgets/VariablesViewController.jsm"); loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true); loader.lazyRequireGetter(this, "KeyShortcuts", "devtools/client/shared/key-shortcuts"); loader.lazyRequireGetter(this, "ZoomKeys", "devtools/client/shared/zoom-keys"); loader.lazyRequireGetter(this, "WebConsoleConnectionProxy", "devtools/client/webconsole/webconsole-connection-proxy", true); const {PluralForm} = require("devtools/shared/plural-form");
--- a/devtools/client/webconsole/webpack.config.js +++ b/devtools/client/webconsole/webpack.config.js @@ -72,17 +72,16 @@ webpackConfig.resolve = { modules: [ // Make sure webpack is always looking for modules in // `webconsole/node_modules` directory first. path.resolve(__dirname, "node_modules"), "node_modules" ], alias: { "Services": "devtools-modules/src/Services", - "devtools/client/webconsole/jsterm": path.join(__dirname, "../../client/shared/webpack/shims/jsterm-stub"), "devtools/client/webconsole/utils": path.join(__dirname, "test/fixtures/WebConsoleUtils"), "devtools/client/shared/vendor/immutable": "immutable", "devtools/client/shared/vendor/react": "react", "devtools/client/shared/vendor/react-dom": "react-dom", "devtools/client/shared/vendor/react-redux": "react-redux", "devtools/client/shared/vendor/redux": "redux", "devtools/client/shared/vendor/reselect": "reselect",