diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-03 10:19:22 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-03 10:19:22 +1200 |
| commit | c6d15904f3e3a54690637990525da0b53ff1e299 (patch) | |
| tree | acabc150ed24f601bff293587d327c26557c43fe /web | |
| parent | 5fd52970fd30f00d7a7e6ebfb6ce0d4d03942ed3 (diff) | |
| parent | b9ad7be5ac3c33970a3a4cb1829108f1cdfda12e (diff) | |
| download | mitmproxy-c6d15904f3e3a54690637990525da0b53ff1e299.tar.gz mitmproxy-c6d15904f3e3a54690637990525da0b53ff1e299.tar.bz2 mitmproxy-c6d15904f3e3a54690637990525da0b53ff1e299.zip | |
Merge remote-tracking branch 'upstream/master' into testsuite
Diffstat (limited to 'web')
| -rw-r--r-- | web/.babelrc | 2 | ||||
| -rw-r--r-- | web/package.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/web/.babelrc b/web/.babelrc index 5dd7708c..e2d67e33 100644 --- a/web/.babelrc +++ b/web/.babelrc @@ -1,4 +1,4 @@ { "presets": ["es2015", "react"], - "plugins": ["transform-class-properties"] + "plugins": ["transform-class-properties", "transform-object-rest-spread"] }
\ No newline at end of file diff --git a/web/package.json b/web/package.json index 2eaac445..88e976e1 100644 --- a/web/package.json +++ b/web/package.json @@ -30,6 +30,7 @@ "babel-core": "^6.7.7", "babel-jest": "^12.0.2", "babel-plugin-transform-class-properties": "^6.6.0", + "babel-plugin-transform-object-rest-spread": "^6.8.0", "babel-preset-es2015": "^6.6.0", "babel-preset-react": "^6.5.0", "babelify": "^7.3.0", |