diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-03 14:55:35 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-03 14:55:35 +1200 |
| commit | 08e4cd2a40778a1a10eef1bba0d2c167f6edeea9 (patch) | |
| tree | a36d0a637ae2a46c8425c56439927ff04392b5ef /web | |
| parent | 25671b91bd16d7c355742a6094addad00e331af5 (diff) | |
| parent | a2d13714a6d73595820e8ca7bdada3a4eabec36e (diff) | |
| download | mitmproxy-08e4cd2a40778a1a10eef1bba0d2c167f6edeea9.tar.gz mitmproxy-08e4cd2a40778a1a10eef1bba0d2c167f6edeea9.tar.bz2 mitmproxy-08e4cd2a40778a1a10eef1bba0d2c167f6edeea9.zip | |
Merge remote-tracking branch 'upstream/master'
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", |