diff options
author | Thomas <thomas.b.huang@gmail.com> | 2018-05-04 05:10:26 +0800 |
---|---|---|
committer | Thomas <thomas.b.huang@gmail.com> | 2018-05-04 05:10:26 +0800 |
commit | f900821a425ce97695034b3445effe1bbaf4a9a5 (patch) | |
tree | f426762d58f31b3c527491e7e8ba25dd11936f3a /package.json | |
parent | 9bba97a676b47667abdd7b020cebd56a0f3b96c7 (diff) | |
parent | 096851d091385ee786ab1374e83aaf6a1aa7cbce (diff) | |
download | tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.gz tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.bz2 tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.lz tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.xz tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.tar.zst tangerine-wallet-browser-f900821a425ce97695034b3445effe1bbaf4a9a5.zip |
Merge branch 'develop' into e2e-tests
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/package.json b/package.json index 2a10ca47c..af2cf4706 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "classnames": "^2.2.5", "clone": "^2.1.1", "copy-to-clipboard": "^3.0.8", + "css-loader": "^0.28.11", "currency-formatter": "^1.4.2", "debounce": "^1.0.0", "debounce-stream": "^2.0.0", @@ -89,10 +90,9 @@ "ensnare": "^1.0.0", "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", - "eth-block-tracker": "^2.3.0", "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.2.1", - "eth-json-rpc-filters": "^1.2.5", + "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", "eth-keyring-controller": "^2.2.0", "eth-phishing-detect": "^1.1.4", @@ -113,6 +113,7 @@ "extensionizer": "^1.0.0", "fast-json-patch": "^2.0.4", "fast-levenshtein": "^2.0.6", + "file-loader": "^1.1.11", "fuse.js": "^3.2.0", "gulp": "github:gulpjs/gulp#4.0", "gulp-autoprefixer": "^5.0.0", @@ -187,7 +188,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^13.8.0", + "web3-provider-engine": "^14.0.5", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, @@ -206,7 +207,7 @@ "brfs": "^1.4.3", "browserify": "^16.1.1", "chai": "^4.1.0", - "chromedriver": "^2.34.1", + "chromedriver": "2.36.0", "compression": "^1.7.1", "coveralls": "^3.0.0", "cross-env": "^5.1.4", @@ -219,9 +220,10 @@ "eslint-plugin-json": "^1.2.0", "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", - "eth-json-rpc-middleware": "^1.2.7", + "eth-json-rpc-middleware": "^1.6.0", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", + "ganache-core": "^2.1.0", "geckodriver": "^1.11.0", "gifencoder": "^1.1.0", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", @@ -257,8 +259,10 @@ "mocha-sinon": "^2.0.0", "nock": "^9.0.14", "node-sass": "^4.7.2", + "nsp": "^3.2.1", "nyc": "^11.0.3", "open": "0.0.5", + "path": "^0.12.7", "png-file-stream": "^1.0.0", "prompt": "^1.0.0", "qs": "^6.2.0", @@ -268,14 +272,17 @@ "react-test-renderer": "^15.6.2", "react-testutils-additions": "^15.2.0", "redux-test-utils": "^0.2.2", + "resolve-url-loader": "^2.3.0", "rimraf": "^2.6.2", + "sass-loader": "^7.0.1", "selenium-webdriver": "^3.5.0", "shell-parallel": "^1.0.3", "sinon": "^5.0.0", + "source-map": "^0.7.2", + "style-loader": "^0.21.0", "stylelint-config-standard": "^18.2.0", "tape": "^4.5.1", "testem": "^2.0.0", - "uglifyify": "^4.0.5", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", "watchify": "^3.9.0" |