Bug 1419665 - Support babel object-rest-spread syntax for launchpad r?honza
MozReview-Commit-ID: JC6vWNMp3a7
new file mode 100644
--- /dev/null
+++ b/devtools/client/netmonitor/.babelrc
@@ -0,0 +1,5 @@
+{
+ "plugins": [
+ "transform-object-rest-spread"
+ ]
+}
--- a/devtools/client/netmonitor/package.json
+++ b/devtools/client/netmonitor/package.json
@@ -16,15 +16,16 @@
"jszip": "^3.1.3",
"react": "=15.6.1",
"react-dom": "=15.6.1",
"react-redux": "=5.0.3",
"redux": "^3.6.0",
"reselect": "^3.0.1"
},
"devDependencies": {
+ "babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-register": "^6.24.0",
"file-loader": "^0.10.1"
},
"scripts": {
"start": "node bin/dev-server"
}
}
--- a/devtools/client/netmonitor/src/connector/firefox-connector.js
+++ b/devtools/client/netmonitor/src/connector/firefox-connector.js
@@ -134,17 +134,19 @@ class FirefoxConnector {
}
window.off(EVENTS.PAYLOAD_READY, listener);
this.onReloaded();
};
window.on(EVENTS.PAYLOAD_READY, listener);
}
onReloaded() {
- this.panel.emit("reloaded");
+ if (this.panel) {
+ this.panel.emit("reloaded");
+ }
}
/**
* Display any network events already in the cache.
*/
displayCachedEvents() {
for (let networkInfo of this.webConsoleClient.getNetworkEvents()) {
// First add the request to the timeline.
--- a/devtools/client/netmonitor/yarn.lock
+++ b/devtools/client/netmonitor/yarn.lock
@@ -584,16 +584,23 @@ babel-plugin-transform-flow-strip-types@
babel-plugin-transform-object-rest-spread@^6.22.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
dependencies:
babel-plugin-syntax-object-rest-spread "^6.8.0"
babel-runtime "^6.22.0"
+babel-plugin-transform-object-rest-spread@^6.26.0:
+ version "6.26.0"
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+ dependencies:
+ babel-plugin-syntax-object-rest-spread "^6.8.0"
+ babel-runtime "^6.26.0"
+
babel-plugin-transform-runtime@^6.7.5:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
dependencies:
babel-runtime "^6.22.0"
babel-plugin-transform-strict-mode@^6.24.1:
version "6.24.1"
@@ -4433,19 +4440,19 @@ require-directory@^2.1.1:
require-from-string@^1.1.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
require-main-filename@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-reselect@^2.5.4:
- version "2.5.4"
- resolved "https://registry.yarnpkg.com/reselect/-/reselect-2.5.4.tgz#b7d23fdf00b83fa7ad0279546f8dbbbd765c7047"
+reselect@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
resolve@1.1.7:
version "1.1.7"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
resolve@^1.2.0:
version "1.3.3"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"