diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
| commit | 90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4 (patch) | |
| tree | 3739c65edfe8a7c4e7eca455d2f1a522176e3af7 /package.json | |
| parent | 44f25cd93c18c57acf993ace3387a4d569d8dcca (diff) | |
| parent | 43ea223c9fe8ee593a572b153defc5ddefd72e95 (diff) | |
| download | tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.gz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.bz2 tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.lz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.xz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.zst tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.zip | |
Fix merge conflicts.
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/package.json b/package.json index f4bdbd998..eb5ed8a32 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ { "presets": [ "es2015", - "stage-3" + "stage-0" ] } ], @@ -45,7 +45,6 @@ }, "dependencies": { "async": "^1.5.2", - "async-q": "^0.3.1", "babel-runtime": "^6.23.0", "bip39": "^2.2.0", "bluebird": "^3.5.0", @@ -57,6 +56,7 @@ "debounce": "^1.0.0", "deep-extend": "^0.4.1", "denodeify": "^1.2.1", + "detect-node": "^2.0.3", "disc": "^1.3.2", "dnode": "^1.2.2", "end-of-stream": "^1.1.0", @@ -121,14 +121,14 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "0.18.2", - "web3-provider-engine": "^12.0.3", + "web3-provider-engine": "^12.0.6", "web3-stream-provider": "^2.0.6", "xtend": "^4.0.1" }, "devDependencies": { "babel-eslint": "^6.0.5", "babel-plugin-transform-runtime": "^6.23.0", - "babel-preset-stage-3": "^6.24.1", + "babel-preset-stage-0": "^6.24.1", "babel-register": "^6.7.2", "babelify": "^7.2.0", "beefy": "^2.1.5", @@ -136,9 +136,11 @@ "browserify": "^13.0.0", "chai": "^3.5.0", "clone": "^1.0.2", + "create-react-factory": "^0.2.1", "deep-freeze-strict": "^1.1.1", "del": "^2.2.0", "envify": "^4.0.0", + "enzyme": "^2.8.2", "eslint-plugin-chai": "0.0.1", "eslint-plugin-mocha": "^4.9.0", "fs-promise": "^1.0.0", @@ -165,6 +167,10 @@ "prompt": "^1.0.0", "qs": "^6.2.0", "qunit": "^0.9.1", + "react-addons-test-utils": "^15.5.1", + "react-dom": "^15.5.4", + "react-test-renderer": "^15.5.4", + "react-testutils-additions": "^15.2.0", "sinon": "^1.17.3", "tape": "^4.5.1", "testem": "^1.10.3", |