diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-02-01 10:24:20 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-02-01 10:24:20 +0800 |
| commit | 4f1fe1da6295902e3e0fee633444f84f61f28449 (patch) | |
| tree | a8e35564ec7963c70cd61868323c202bdc7131dd /package.json | |
| parent | 0c6fef3dec4f3ba70e8e86275ee9db4f2d58d129 (diff) | |
| parent | 78bce55858916ba9d3189f76db440768e6ae95b1 (diff) | |
| download | tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.gz tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.bz2 tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.lz tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.xz tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.tar.zst tangerine-wallet-browser-4f1fe1da6295902e3e0fee633444f84f61f28449.zip | |
Fix merge conflicts from uat-next
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/package.json b/package.json index ea9b937d3..e85eb91a1 100644 --- a/package.json +++ b/package.json @@ -76,9 +76,9 @@ "ensnare": "^1.0.0", "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", - "eth-block-tracker": "^2.2.0", + "eth-block-tracker": "^2.3.0", "eth-json-rpc-filters": "^1.2.5", - "eth-json-rpc-infura": "^2.0.5", + "eth-json-rpc-infura": "^2.0.11", "eth-keyring-controller": "^2.1.4", "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.2.1", @@ -113,7 +113,7 @@ "iframe-stream": "^3.0.0", "inject-css": "^0.1.1", "jazzicon": "^1.2.0", - "json-rpc-engine": "3.2.0", + "json-rpc-engine": "^3.6.1", "json-rpc-middleware-stream": "^1.0.1", "lodash.debounce": "^4.0.8", "lodash.memoize": "^4.1.2", @@ -150,6 +150,7 @@ "react-router-dom": "^4.2.2", "react-select": "^1.0.0", "react-simple-file-input": "^2.0.0", + "react-tippy": "^1.2.2", "react-toggle-button": "^2.2.0", "react-tooltip-component": "^0.3.0", "react-transition-group": "^2.2.1", @@ -171,7 +172,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.5.0", + "web3-provider-engine": "^13.5.6", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, @@ -189,6 +190,7 @@ "brfs": "^1.4.3", "browserify": "^14.4.0", "chai": "^4.1.0", + "compression": "^1.7.1", "coveralls": "^3.0.0", "deep-freeze-strict": "^1.1.1", "del": "^3.0.0", @@ -200,7 +202,7 @@ "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.2.7", "fs-promise": "^2.0.3", - "gulp": "github:gulpjs/gulp#4.0", + "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp-babel": "^7.0.0", "gulp-if": "^2.0.2", "gulp-json-editor": "^2.2.1", |