Bug 1332062 - upgrade inspector to launchpad 0.0.24 & fix unix regexp;r=pbro
authorJulian Descottes <jdescottes@mozilla.com>
Wed, 18 Jan 2017 20:49:40 +0100
changeset 377307 f5fdf8bb9729298c05cea82e9cebd90ed9d231ec
parent 377306 bc9d8f30b7f0a765835efc764afc1fccbb638373
child 377308 7400d6afc2d2190e9276647a944f35008dfdf267
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspbro
bugs1332062
milestone53.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 1332062 - upgrade inspector to launchpad 0.0.24 & fix unix regexp;r=pbro MozReview-Commit-ID: GPivBy1OmhP
devtools/client/inspector/bin/dev-server.js
devtools/client/inspector/local-toolbox.js
devtools/client/inspector/package.json
devtools/client/inspector/webpack.config.js
--- 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"),