Bug 1380927 - Fix context menu alias; r=rickychien draft
authorJan Odvarko <odvarko@gmail.com>
Fri, 14 Jul 2017 09:13:43 +0200
changeset 609867 796fe221d86654ac96df40a58b3dd1bbaa72c22c
parent 608658 67cd1ee26f2661fa5efe3d952485ab3c89af4271
child 637701 e07f01db654e4213b6430ccefc04df46fba70c2a
push id68717
push userjodvarko@mozilla.com
push dateMon, 17 Jul 2017 16:52:52 +0000
reviewersrickychien
bugs1380927
milestone56.0a1
Bug 1380927 - Fix context menu alias; r=rickychien MozReview-Commit-ID: LcJQiWF61rC
devtools/client/netmonitor/package.json
devtools/client/netmonitor/src/request-list-context-menu.js
devtools/client/netmonitor/src/request-list-header-context-menu.js
devtools/client/netmonitor/webpack.config.js
--- a/devtools/client/netmonitor/package.json
+++ b/devtools/client/netmonitor/package.json
@@ -4,17 +4,17 @@
   "engines": {
     "node": ">=6.9.0"
   },
   "description": "Network monitor in developer tools",
   "dependencies": {
     "codemirror": "^5.24.2",
     "devtools-config": "=0.0.12",
     "devtools-contextmenu": "=0.0.3",
-    "devtools-launchpad": "=0.0.75",
+    "devtools-launchpad": "=0.0.88",
     "devtools-modules": "=0.0.27",
     "devtools-source-editor": "=0.0.3",
     "immutable": "^3.8.1",
     "jszip": "^3.1.3",
     "react": "=15.3.2",
     "react-dom": "=15.3.2",
     "react-redux": "=5.0.3",
     "redux": "^3.6.0",
--- a/devtools/client/netmonitor/src/request-list-context-menu.js
+++ b/devtools/client/netmonitor/src/request-list-context-menu.js
@@ -14,17 +14,17 @@ const {
   getLongString,
   getTabTarget,
 } = require("./connector/index");
 const {
   getSelectedRequest,
   getSortedRequests,
 } = require("./selectors/index");
 const { L10N } = require("./utils/l10n");
-const { showMenu } = require("./utils/menu");
+const { showMenu } = require("devtools/client/netmonitor/src/utils/menu");
 const {
   getUrlQuery,
   parseQueryString,
   getUrlBaseName,
 } = require("./utils/request-utils");
 
 function RequestListContextMenu({
   cloneSelectedRequest,
--- a/devtools/client/netmonitor/src/request-list-header-context-menu.js
+++ b/devtools/client/netmonitor/src/request-list-header-context-menu.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/. */
 
 "use strict";
 
 const { HEADERS } = require("./constants");
 const { L10N } = require("./utils/l10n");
-const { showMenu } = require("./utils/menu");
+const { showMenu } = require("devtools/client/netmonitor/src/utils/menu");
 
 const stringMap = HEADERS
   .filter((header) => header.hasOwnProperty("label"))
   .reduce((acc, { name, label }) => Object.assign(acc, { [name]: label }), {});
 
 const subMenuMap = HEADERS
   .filter((header) => header.hasOwnProperty("subMenu"))
   .reduce((acc, { name, subMenu }) => Object.assign(acc, { [name]: subMenu }), {});
--- a/devtools/client/netmonitor/webpack.config.js
+++ b/devtools/client/netmonitor/webpack.config.js
@@ -37,16 +37,17 @@ let webpackConfig = {
   resolve: {
     fallback: path.join(__dirname, "node_modules"),
     alias: {
       "react": path.join(__dirname, "node_modules/react"),
       "devtools/client/framework/devtools": path.join(__dirname, "../../client/shims/devtools"),
       "devtools/client/framework/menu": "devtools-modules/src/menu",
       "devtools/client/framework/menu-item": path.join(__dirname, "../../client/framework/menu-item"),
       "devtools/client/locales": path.join(__dirname, "../../client/locales/en-US"),
+      "devtools/client/netmonitor/src/utils/menu": "devtools-contextmenu",
       "devtools/client/shared/components/autocomplete-popup": path.join(__dirname, "../../client/shared/components/autocomplete-popup"),
       "devtools/client/shared/components/reps/reps": path.join(__dirname, "../../client/shared/components/reps/reps"),
       "devtools/client/shared/components/search-box": path.join(__dirname, "../../client/shared/components/search-box"),
       "devtools/client/shared/components/splitter/draggable": path.join(__dirname, "../../client/shared/components/splitter/draggable"),
       "devtools/client/shared/components/splitter/split-box": path.join(__dirname, "../../client/shared/components/splitter/split-box"),
       "devtools/client/shared/components/stack-trace": path.join(__dirname, "../../client/shared/components/stack-trace"),
       "devtools/client/shared/components/tabs/tabbar": path.join(__dirname, "../../client/shared/components/tabs/tabbar"),
       "devtools/client/shared/components/tabs/tabs": path.join(__dirname, "../../client/shared/components/tabs/tabs"),
@@ -77,26 +78,22 @@ let webpackConfig = {
       "devtools/shared/fronts/timeline": path.join(__dirname, "../../shared/shims/fronts/timeline"),
       "devtools/shared/l10n": path.join(__dirname, "../../shared/l10n"),
       "devtools/shared/locales": path.join(__dirname, "../../shared/locales/en-US"),
       "devtools/shared/platform/clipboard": path.join(__dirname, "../../shared/platform/content/clipboard"),
       "devtools/shared/plural-form": path.join(__dirname, "../../shared/plural-form"),
       "devtools/shared/task": path.join(__dirname, "../../shared/task"),
       "toolkit/locales": path.join(__dirname, "../../../toolkit/locales/en-US"),
       "Services": "devtools-modules/src/Services",
-      "./utils/menu": path.join(__dirname, "devtools-contextmenu"),
     },
   },
 };
 
 const mappings = [
   [
-    /utils\/menu/, "devtools-launchpad/src/components/shared/menu"
-  ],
-  [
     /chrome:\/\/devtools\/skin/,
     (result) => {
       result.request = result.request
         .replace("./chrome://devtools/skin", path.join(__dirname, "../themes"));
     }
   ],
   [
     /chrome:\/\/devtools\/content/,