diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-27 09:04:03 +0800 |
| commit | 69f4c8c336a0f2fad2027c4a5f76e28a976b5e75 (patch) | |
| tree | c34647abca3a765d525e222855a7a93f4658f800 /package.json | |
| parent | d4a15f22c24074f44daa9eeb4fda192ea3742792 (diff) | |
| parent | e715d0e6915a9bb0ac69db06144253ddff54ba44 (diff) | |
| download | tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.gz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.bz2 tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.lz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.xz tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.tar.zst tangerine-wallet-browser-69f4c8c336a0f2fad2027c4a5f76e28a976b5e75.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/package.json b/package.json index c1ce555eb..cff1b28be 100644 --- a/package.json +++ b/package.json @@ -54,9 +54,19 @@ "babelify", { "presets": [ - "es2015", + [ + "env", + { + "debug": true + } + ], "stage-0" ] + }, + { + "plugins": [ + "transform-class-properties" + ] } ], "reactify", @@ -211,6 +221,7 @@ "babel-plugin-transform-async-to-generator": "^6.24.1", "babel-plugin-transform-runtime": "^6.23.0", "babel-polyfill": "^6.23.0", + "babel-preset-env": "^1.7.0", "babel-preset-react": "^6.24.1", "babel-preset-stage-0": "^6.24.1", "babel-register": "^6.7.2", @@ -276,7 +287,7 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^2.0.0", "nock": "^9.0.14", - "node-sass": "^4.9.1", + "node-sass": "^4.9.2", "nsp": "^3.2.1", "nyc": "^13.0.0", "open": "0.0.5", |