Bug 1380927 - Fix context menu alias; r=rickychien

MozReview-Commit-ID: LcJQiWF61rC

--HG--
extra : rebase_source : 796fe221d86654ac96df40a58b3dd1bbaa72c22c

devtools/client/netmonitor/package.json

@@ -9,7 +9,7 @@
     "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",

devtools/client/netmonitor/src/request-list-context-menu.js

@@ -19,7 +19,7 @@ const {
   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,

devtools/client/netmonitor/src/request-list-header-context-menu.js

@@ -6,7 +6,7 @@
 
 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"))

devtools/client/netmonitor/webpack.config.js

@@ -42,6 +42,7 @@ let webpackConfig = {
       "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"),
@@ -82,15 +83,11 @@ let webpackConfig = {
       "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) => {