Backed out changeset a3ef74b43978 (bug 1352699)

devtools/client/netmonitor/bin/dev-server.js

@@ -6,8 +6,11 @@
 
 "use strict";
 
+const path = require("path");
+
 const toolbox = require("devtools-launchpad/index");
 const feature = require("devtools-config");
+const express = require("express");
 const { getConfig } = require("./configure");
 
 const envConfig = getConfig();
@@ -16,4 +19,13 @@ feature.setConfig(envConfig);
 
 let webpackConfig = require("../webpack.config");
 
-toolbox.startDevServer(envConfig, webpackConfig, __dirname);
+let { app } = toolbox.startDevServer(envConfig, webpackConfig, __dirname);
+
+app.use(
+  "/integration/examples",
+  express.static("src/test/mochitest/examples")
+);
+
+app.get("/integration", function (req, res) {
+  res.sendFile(path.join(__dirname, "../src/test/integration/index.html"));
+});

devtools/client/netmonitor/index.html

@@ -37,8 +37,8 @@
           const App = createFactory(require("./src/components/app"));
           render(Provider({ store }, App()), this.mount);
           return NetMonitorController.startupNetMonitor({
-            tabConnection: {
-              tabTarget: toolbox.target,
+            client: {
+              getTabTarget: () => toolbox.target,
             },
             toolbox,
           });

devtools/client/netmonitor/index.js

@@ -11,7 +11,7 @@
  */
 const React = require("react");
 const ReactDOM = require("react-dom");
-const { bootstrap, renderRoot } = require("devtools-launchpad");
+const { bootstrap } = require("devtools-launchpad");
 const { EventEmitter } = require("devtools-modules");
 const { Services: { appinfo, pref }} = require("devtools-modules");
 const { configureStore } = require("./src/utils/create-store");
@@ -40,21 +40,7 @@ const App = require("./src/components/app");
 const store = window.gStore = configureStore();
 const { NetMonitorController } = require("./src/netmonitor-controller");
 
-/**
- * Stylesheet links in devtools xhtml files are using chrome or resource URLs.
- * Rewrite the href attribute to remove the protocol. web-server.js contains redirects
- * to map CSS urls to the proper file. Supports urls using:
- *   - devtools/client/
- *   - devtools/content/
- *   - skin/
- * Will also add mandatory classnames and attributes to be compatible with devtools theme
- * stylesheet.
- */
 window.addEventListener("DOMContentLoaded", () => {
-  for (let link of document.head.querySelectorAll("link")) {
-    link.href = link.href.replace(/(resource|chrome)\:\/\//, "/");
-  }
-
   if (appinfo.OS === "Darwin") {
     document.documentElement.setAttribute("platform", "mac");
   } else if (appinfo.OS === "Linux") {
@@ -64,10 +50,9 @@ window.addEventListener("DOMContentLoaded", () => {
   }
 });
 
-bootstrap(React, ReactDOM).then(connection => {
-  if (!connection) {
+bootstrap(React, ReactDOM, App, null, store).then(connection => {
+  if (!connection || !connection.tab) {
     return;
   }
-  renderRoot(React, ReactDOM, App, store);
   NetMonitorController.startupNetMonitor(connection);
 });

devtools/client/netmonitor/package.json

@@ -7,8 +7,7 @@
   "description": "Network monitor in developer tools",
   "dependencies": {
     "codemirror": "^5.24.2",
-    "devtools-config": "^0.0.12",
-    "devtools-launchpad": "^0.0.65",
+    "devtools-launchpad": "^0.0.59",
     "devtools-modules": "^0.0.18",
     "devtools-reps": "^0.4.0",
     "devtools-splitter": "^0.0.2",
@@ -19,8 +18,7 @@
     "react-dom": "=15.3.2",
     "react-redux": "=5.0.3",
     "redux": "^3.6.0",
-    "reselect": "^2.5.4",
-    "webpack": "^2.3.2"
+    "reselect": "^2.5.4"
   },
   "devDependencies": {
     "babel-preset-es2015": "^6.6.0",

devtools/client/netmonitor/src/har/test/browser_net_har_throttle_upload.js

@@ -16,10 +16,8 @@ function* throttleUploadTest(actuallyThrottle) {
 
   info("Starting test... (actuallyThrottle = " + actuallyThrottle + ")");
 
-  let { gStore, windowRequire } = monitor.panelWin;
+  let { gStore, windowRequire, NetMonitorController } = monitor.panelWin;
   let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
-  let { NetMonitorController } =
-    windowRequire("devtools/client/netmonitor/src/netmonitor-controller");
   let RequestListContextMenu = windowRequire(
     "devtools/client/netmonitor/src/request-list-context-menu");
 

devtools/client/netmonitor/src/middleware/moz.build

@@ -5,5 +5,4 @@
 DevToolsModules(
     'batching.js',
     'prefs.js',
-    'thunk.js',
 )

devtools/client/netmonitor/src/middleware/prefs.js

@@ -21,6 +21,7 @@ const { getRequestFilterTypes } = require("../selectors/index");
 function prefsMiddleware(store) {
   return next => action => {
     const res = next(action);
+
     switch (action.type) {
       case ENABLE_REQUEST_FILTER_TYPE_ONLY:
       case TOGGLE_REQUEST_FILTER_TYPE:

devtools/client/netmonitor/src/middleware/thunk.js

@@ -1,20 +0,0 @@
-/* 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/. */
-"use strict";
-
-/**
- * A middleware that allows thunks (functions) to be dispatched.
- * If it's a thunk, it is called with `dispatch` and `getState`,
- * allowing the action to create multiple actions (most likely
- * asynchronously).
- */
-function thunk({ dispatch, getState }) {
-  return next => action => {
-    return (typeof action === "function")
-      ? action(dispatch, getState)
-      : next(action);
-  };
-}
-
-module.exports = thunk;

devtools/client/netmonitor/src/netmonitor-controller.js

@@ -85,7 +85,7 @@ var NetMonitorController = {
       // Some actors like AddonActor or RootActor for chrome debugging
       // aren't actual tabs.
       this.toolbox = connection.toolbox;
-      this._target = connection.tabConnection.tabTarget;
+      this._target = connection.client.getTabTarget();
       this.tabClient = this._target.isTabActor ? this._target.activeTab : null;
 
       let connectTimeline = () => {
@@ -251,12 +251,12 @@ var NetMonitorController = {
    * @return object
    *         A promise resolved once the task finishes.
    */
-  inspectRequest(requestId) {
+  inspectRequest: function (requestId) {
     // Look for the request in the existing ones or wait for it to appear, if
     // the network monitor is still loading.
     return new Promise((resolve) => {
       let request = null;
-      let inspector = () => {
+      let inspector = function () {
         request = getDisplayedRequestById(window.gStore.getState(), requestId);
         if (!request) {
           // Reset filters so that the request is visible.

devtools/client/netmonitor/src/utils/create-store.js

@@ -8,7 +8,6 @@ const Services = require("Services");
 const { createStore, applyMiddleware } = require("devtools/client/shared/vendor/redux");
 const batching = require("../middleware/batching");
 const prefs = require("../middleware/prefs");
-const thunk = require("../middleware/thunk");
 const rootReducer = require("../reducers/index");
 const { FilterTypes, Filters } = require("../reducers/filters");
 const { Requests } = require("../reducers/requests");
@@ -23,8 +22,7 @@ function configureStore() {
     activeFilters[filter] = true;
   });
 
-  let hiddenColumns = Services.prefs.getCharPref("devtools.netmonitor.hiddenColumns");
-  let inactiveColumns = JSON.parse(hiddenColumns).reduce((acc, col) => {
+  let inactiveColumns = Prefs.hiddenColumns.reduce((acc, col) => {
     acc[col] = false;
     return acc;
   }, {});
@@ -41,7 +39,7 @@ function configureStore() {
     }),
   };
 
-  return createStore(rootReducer, initialState, applyMiddleware(thunk, prefs, batching));
+  return createStore(rootReducer, initialState, applyMiddleware(prefs, batching));
 }
 
 exports.configureStore = configureStore;

devtools/client/netmonitor/webpack.config.js

@@ -64,6 +64,7 @@ let webpackConfig = {
       "devtools/client/shared/curl": "devtools-modules",
       "devtools/client/shared/file-saver": "devtools-modules",
       "devtools/client/shared/prefs": "devtools-modules",
+      "devtools/client/shared/redux/middleware/thunk": "devtools-launchpad/src/utils/redux/middleware/thunk",
       "devtools/client/shared/vendor/immutable": "immutable",
       "devtools/client/shared/vendor/react": "react",
       "devtools/client/shared/vendor/react-dom": "react-dom",

devtools/client/themes/dark-theme.css

@@ -5,8 +5,8 @@
 
 @import url(resource://devtools/client/themes/variables.css);
 @import url(resource://devtools/client/themes/common.css);
-@import url(chrome://devtools/skin/toolbars.css);
-@import url(chrome://devtools/skin/tooltips.css);
+@import url(toolbars.css);
+@import url(tooltips.css);
 
 body {
   margin: 0;

devtools/client/themes/firebug-theme.css

@@ -5,7 +5,7 @@
 
 @import url(resource://devtools/client/themes/variables.css);
 @import url(resource://devtools/client/themes/common.css);
-@import url(chrome://devtools/skin/light-theme.css);
+@import url(light-theme.css);
 
 :root {
   font-size: 11px;

devtools/client/themes/light-theme.css

@@ -5,8 +5,8 @@
 
 @import url(resource://devtools/client/themes/variables.css);
 @import url(resource://devtools/client/themes/common.css);
-@import url(chrome://devtools/skin/toolbars.css);
-@import url(chrome://devtools/skin/tooltips.css);
+@import url(toolbars.css);
+@import url(tooltips.css);
 
 body {
   margin: 0;

devtools/client/webconsole/test/browser_webconsole_netlogging_panel.js

@@ -25,8 +25,6 @@ add_task(function* () {
 
   let { gStore, windowRequire } = panel.panelWin;
   let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
-  let { NetMonitorController } =
-    windowRequire("devtools/client/netmonitor/src/netmonitor-controller");
   let { getSelectedRequest } = windowRequire("devtools/client/netmonitor/src/selectors/index");
 
   let selected = getSelectedRequest(gStore.getState());

devtools/client/webconsole/webconsole.js

@@ -1937,9 +1937,7 @@ WebConsoleFrame.prototype = {
       return;
     }
     return toolbox.selectTool("netmonitor").then(panel => {
-      let { NetMonitorController } = panel.panelWin
-        .windowRequire("devtools/client/netmonitor/src/netmonitor-controller");
-      return NetMonitorController.inspectRequest(requestId);
+      return panel.panelWin.NetMonitorController.inspectRequest(requestId);
     });
   },