Bug 1376291 - Use devtools-contextmenu module for Launchpad r=rickychien draft
authorJan Odvarko <odvarko@gmail.com>
Thu, 13 Jul 2017 16:34:16 +0200
changeset 608382 7f11f826609bda378932aff9ca849a77f81b8350
parent 607967 30ea2905130e85f9e1d8d56fa3097901eec6514b
child 637283 c26b5f12d10d0200c9fce0986c78192a121f063a
push id68253
push userjodvarko@mozilla.com
push dateThu, 13 Jul 2017 14:35:08 +0000
reviewersrickychien
bugs1376291
milestone56.0a1
Bug 1376291 - Use devtools-contextmenu module for Launchpad r=rickychien MozReview-Commit-ID: 1V8vCP946tj
devtools/client/netmonitor/package.json
devtools/client/netmonitor/webpack.config.js
devtools/client/netmonitor/yarn.lock
--- a/devtools/client/netmonitor/package.json
+++ b/devtools/client/netmonitor/package.json
@@ -3,16 +3,17 @@
   "version": "0.0.1",
   "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-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",
--- a/devtools/client/netmonitor/webpack.config.js
+++ b/devtools/client/netmonitor/webpack.config.js
@@ -77,16 +77,17 @@ 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"
   ],
--- a/devtools/client/netmonitor/yarn.lock
+++ b/devtools/client/netmonitor/yarn.lock
@@ -1473,16 +1473,22 @@ detect-indent@^4.0.0:
 devtools-config@=0.0.12, devtools-config@^0.0.12:
   version "0.0.12"
   resolved "https://registry.yarnpkg.com/devtools-config/-/devtools-config-0.0.12.tgz#4094e62efec23cdc31bd0e6d89e15f7c51d6a7e6"
 
 devtools-connection@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/devtools-connection/-/devtools-connection-0.0.4.tgz#96174ad89dcfd34604829eee4cb4cb2673242ebf"
 
+devtools-contextmenu@=0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/devtools-contextmenu/-/devtools-contextmenu-0.0.3.tgz#be5183abcaeb728b6c5e2fe60fa9f0525fc959e0"
+  dependencies:
+    devtools-modules "^0.0.28"
+
 devtools-launchpad@=0.0.75:
   version "0.0.75"
   resolved "https://registry.yarnpkg.com/devtools-launchpad/-/devtools-launchpad-0.0.75.tgz#1ce79b4ad65ceee14cfb8e7b0e8b98710c4016bc"
   dependencies:
     amd-loader "0.0.5"
     autoprefixer "^6.7.6"
     babel-cli "^6.7.5"
     babel-core "^6.17.0"
@@ -1548,16 +1554,20 @@ devtools-launchpad@=0.0.75:
     webpack-env-loader-plugin "^0.1.4"
     webpack-hot-middleware "^2.12.0"
     ws "^1.0.1"
 
 devtools-modules@=0.0.27, devtools-modules@^0.0.27:
   version "0.0.27"
   resolved "https://registry.yarnpkg.com/devtools-modules/-/devtools-modules-0.0.27.tgz#55ba9cc4fab4eb37335b343a94f26ded9b360e81"
 
+devtools-modules@^0.0.28:
+  version "0.0.28"
+  resolved "https://registry.yarnpkg.com/devtools-modules/-/devtools-modules-0.0.28.tgz#5b3498a4844675daedc3c7128a95ba011431eb46"
+
 devtools-source-editor@=0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/devtools-source-editor/-/devtools-source-editor-0.0.3.tgz#691a8376667907809597c1dbe310965208b346a7"
   dependencies:
     codemirror "^5.25.0"
 
 devtools-sprintf-js@^1.0.3:
   version "1.0.3"