Bug 1332062 - upgrade inspector to launchpad 0.0.24 & fix unix regexp;r=pbro
MozReview-Commit-ID: GPivBy1OmhP
--- a/devtools/client/inspector/bin/dev-server.js
+++ b/devtools/client/inspector/bin/dev-server.js
@@ -3,17 +3,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global __dirname */
"use strict";
-const toolbox = require("../node_modules/devtools-local-toolbox/index");
+const toolbox = require("../node_modules/devtools-launchpad/index");
const feature = require("devtools-config");
const envConfig = require("../configs/development.json");
const fs = require("fs");
const path = require("path");
feature.setConfig(envConfig);
const webpackConfig = require("../webpack.config")(envConfig);
--- a/devtools/client/inspector/local-toolbox.js
+++ b/devtools/client/inspector/local-toolbox.js
@@ -111,11 +111,11 @@ window.addEventListener("DOMContentLoade
inspectorRoot.remove();
let mount = document.createElement("div");
mount.setAttribute("id", "mount");
document.body.appendChild(mount);
}
// Toolbox tries to add a theme classname on the documentElement and should only be
// required after DOMContentLoaded.
- const { bootstrap } = require("devtools-local-toolbox");
+ const { bootstrap } = require("devtools-launchpad");
bootstrap(React, ReactDOM).then(onConnect);
});
--- a/devtools/client/inspector/package.json
+++ b/devtools/client/inspector/package.json
@@ -2,13 +2,13 @@
"name": "inspector.html",
"version": "0.0.1",
"description": "The Firefox Inspector",
"scripts": {
"start": "node bin/dev-server"
},
"author": "",
"dependencies": {
- "devtools-local-toolbox": "0.0.12",
+ "devtools-launchpad": "0.0.24",
"raw-loader": "^0.5.1",
"json-loader": "^0.5.4"
}
}
--- a/devtools/client/inspector/webpack.config.js
+++ b/devtools/client/inspector/webpack.config.js
@@ -1,17 +1,17 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global __dirname */
"use strict";
-const {toolboxConfig} = require("devtools-local-toolbox/index");
+const {toolboxConfig} = require("devtools-launchpad/index");
const path = require("path");
const webpack = require("webpack");
module.exports = envConfig => {
let webpackConfig = {
bail: true,
entry: [
@@ -37,17 +37,17 @@ module.exports = envConfig => {
loaders: [
{
test: /event-emitter/,
exclude: /node_modules/,
loaders: [path.join(__dirname, "./webpack/rewrite-event-emitter")],
}, {
// Replace all references to this.browserRequire() by require() in
// client/inspector/*.js files
- test: /client\/inspector\/.*\.js$/,
+ test: /client(\/|\\)inspector(\/|\\).*\.js$/,
loaders: [path.join(__dirname, "./webpack/rewrite-browser-require")],
}
]
},
resolveLoader: {
root: [
path.resolve("./node_modules"),
path.resolve("./webpack"),