aboutsummaryrefslogtreecommitdiffstats
path: root/package-lock.json
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-07-27 09:04:03 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-07-27 09:04:03 +0800
commit69f4c8c336a0f2fad2027c4a5f76e28a976b5e75 (patch)
treec34647abca3a765d525e222855a7a93f4658f800 /package-lock.json
parentd4a15f22c24074f44daa9eeb4fda192ea3742792 (diff)
parente715d0e6915a9bb0ac69db06144253ddff54ba44 (diff)
downloadtangerine-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-lock.json')
-rw-r--r--package-lock.json43
1 files changed, 25 insertions, 18 deletions
diff --git a/package-lock.json b/package-lock.json
index 01239dd79..6acc27a24 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3626,9 +3626,9 @@
}
},
"babel-preset-env": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz",
- "integrity": "sha512-W6VIyA6Ch9ePMI7VptNn2wBM6dbG0eSz25HEiL40nQXCsXGTGZSTZu1Iap+cj3Q0S5a7T9+529l/5Bkvd+afNA==",
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
+ "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
"requires": {
"babel-plugin-check-es2015-constants": "^6.22.0",
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
@@ -3657,7 +3657,7 @@
"babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
"babel-plugin-transform-exponentiation-operator": "^6.22.0",
"babel-plugin-transform-regenerator": "^6.22.0",
- "browserslist": "^2.1.2",
+ "browserslist": "^3.2.6",
"invariant": "^2.2.2",
"semver": "^5.3.0"
}
@@ -4672,12 +4672,19 @@
}
},
"browserslist": {
- "version": "2.11.0",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.0.tgz",
- "integrity": "sha512-mNYp0RNeu1xueGuJFSXkU+K0nH+dBE/gcjtyhtNKfU8hwdrVIfoA7i5iFSjOmzkGdL2QaO7YX9ExiVPE7AY9JA==",
+ "version": "3.2.8",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
+ "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
"requires": {
- "caniuse-lite": "^1.0.30000784",
- "electron-to-chromium": "^1.3.30"
+ "caniuse-lite": "^1.0.30000844",
+ "electron-to-chromium": "^1.3.47"
+ },
+ "dependencies": {
+ "electron-to-chromium": {
+ "version": "1.3.52",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.52.tgz",
+ "integrity": "sha1-0tnxJwuko7lnuDHEDvcftNmrXOA="
+ }
}
},
"bs58": {
@@ -5004,9 +5011,9 @@
"integrity": "sha1-MN/YMAnVcE8C3/s3clBo7RKjZrs="
},
"caniuse-lite": {
- "version": "1.0.30000786",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000786.tgz",
- "integrity": "sha1-G0Jc2FaNgFvFY4veSQXNhjVod0Y="
+ "version": "1.0.30000865",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz",
+ "integrity": "sha512-vs79o1mOSKRGv/1pSkp4EXgl4ZviWeYReXw60XfacPU64uQWZwJT6vZNmxRF9O+6zu71sJwMxLK5JXxbzuVrLw=="
},
"capture-stack-trace": {
"version": "1.0.0",
@@ -13483,9 +13490,9 @@
"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
},
"node-sass": {
- "version": "4.9.1",
- "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.1.tgz",
- "integrity": "sha512-m6H1I6cHXsHsJ7BIWdnJsz9S9gVMyh+/H2cOTXgl2/2WqyyWlBcl4PHJcqrXo5RZVCfCUFqOtjPN0+0XbVHR5Q==",
+ "version": "4.9.2",
+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.2.tgz",
+ "integrity": "sha512-LdxoJLZutx0aQXHtWIYwJKMj+9pTjneTcLWJgzf2XbGu0q5pRNqW5QvFCEdm3mc5rJOdru/mzln5d0EZLacf6g==",
"requires": {
"async-foreach": "^0.1.3",
"chalk": "^1.1.1",
@@ -20666,9 +20673,9 @@
}
},
"node-sass": {
- "version": "4.9.1",
- "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.1.tgz",
- "integrity": "sha512-m6H1I6cHXsHsJ7BIWdnJsz9S9gVMyh+/H2cOTXgl2/2WqyyWlBcl4PHJcqrXo5RZVCfCUFqOtjPN0+0XbVHR5Q==",
+ "version": "4.9.2",
+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.2.tgz",
+ "integrity": "sha512-LdxoJLZutx0aQXHtWIYwJKMj+9pTjneTcLWJgzf2XbGu0q5pRNqW5QvFCEdm3mc5rJOdru/mzln5d0EZLacf6g==",
"dev": true,
"requires": {
"async-foreach": "^0.1.3",