diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-18 05:48:16 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-18 05:48:16 +0800 |
commit | b80ed2c451fee7b94edea9d1655baa2e908939b9 (patch) | |
tree | e9a67e289f043900a77b1bfb34088ad2e5f83864 /package.json | |
parent | ccb80594be3000488b7c73f9fd5e56168e0d5042 (diff) | |
parent | aa08d1a09dce7324eaa3b3df568df43f8c55cc63 (diff) | |
download | tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar.gz tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar.bz2 tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar.lz tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar.xz tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.tar.zst tangerine-wallet-browser-b80ed2c451fee7b94edea9d1655baa2e908939b9.zip |
Merge pull request #3007 from alextsg/uat-master-011618
[NewUI] Merge master into uat branch
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/package.json b/package.json index e635e8fc4..abe3133d9 100644 --- a/package.json +++ b/package.json @@ -77,15 +77,14 @@ "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", "eth-block-tracker": "^2.2.0", + "eth-json-rpc-filters": "^1.2.5", + "eth-json-rpc-infura": "^2.0.5", + "eth-keyring-controller": "^2.1.4", "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.2.1", - "eth-json-rpc-filters": "^1.2.4", - "eth-json-rpc-infura": "^1.0.2", - "eth-keyring-controller": "^2.1.3", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", - "eth-sig-util": "^1.4.0", - "eth-simple-keyring": "^1.2.0", + "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", @@ -130,6 +129,7 @@ "obj-multiplex": "^1.0.0", "obs-store": "^3.0.0", "once": "^1.3.3", + "percentile": "^1.2.0", "ping-pong-stream": "^1.0.0", "pojo-migrator": "^2.1.0", "polyfill-crypto.getrandomvalues": "^1.0.0", @@ -169,7 +169,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.4.0", + "web3-provider-engine": "^13.5.0", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, @@ -212,6 +212,7 @@ "gulp-util": "^3.0.7", "gulp-watch": "^4.3.5", "gulp-zip": "^4.0.0", + "gulp-eslint": "^4.0.0", "isomorphic-fetch": "^2.2.1", "jsdom": "^11.1.0", "jsdom-global": "^3.0.2", @@ -241,7 +242,7 @@ "tape": "^4.5.1", "testem": "^1.10.3", "uglifyify": "^4.0.2", - "vinyl-buffer": "^1.0.0", + "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", "watchify": "^3.9.0" }, |