diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-04-03 13:26:25 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-04-03 13:26:25 +0800 |
| commit | 89c924101e3ff52849c5a82ced7e058e1fa39dfd (patch) | |
| tree | ebc5e65345362b9912d893ee70f3d27a4cf4fd3c /package.json | |
| parent | 8d49d519c090d287484008346aba1df6d7ad77e7 (diff) | |
| parent | 0a5c634081656c9450d4341b96bab6b4134a0b7a (diff) | |
| download | tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.gz tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.bz2 tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.lz tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.xz tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.tar.zst tangerine-wallet-browser-89c924101e3ff52849c5a82ced7e058e1fa39dfd.zip | |
Merge branch 'master' into mascara
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 d69dcbb91..b96197915 100644 --- a/package.json +++ b/package.json @@ -5,20 +5,20 @@ "private": true, "scripts": { "start": "npm run dev", - "lint": "gulp lint", - "buildCiUnits": "node test/integration/index.js", "dev": "gulp dev --debug", "disc": "gulp disc --debug", "dist": "gulp dist --disableLiveReload", - "test": "npm run lint && npm run fastTest && npm run ci", - "fastTest": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"", + "test": "npm run lint && npm run test-unit && npm run test-integration", + "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"", + "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", + "lint": "gulp lint", + "buildCiUnits": "node test/integration/index.js", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", "genStates": "node development/genStates.js", "ui": "npm run genStates && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "buildMock": "npm run genStates && browserify ./mock-dev.js -o ./development/bundle.js", "testem": "npm run buildMock && testem", - "ci": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", "announce": "node development/announcer.js", "generateNotice": "node notices/notice-generator.js", "deleteNotice": "node notices/notice-delete.js" @@ -40,6 +40,7 @@ "async": "^1.5.2", "async-q": "^0.3.1", "bip39": "^2.2.0", + "bluebird": "^3.5.0", "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", "client-sw-ready-event": "^1.0.2", @@ -57,7 +58,7 @@ "eth-query": "^1.0.3", "eth-sig-util": "^1.1.1", "eth-simple-keyring": "^1.1.1", - "ethereumjs-tx": "^1.0.0", + "ethereumjs-tx": "^1.2.5", "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", "ethjs-ens": "^1.0.2", @@ -111,7 +112,7 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "0.18.2", - "web3-provider-engine": "^11.0.1", + "web3-provider-engine": "^11.0.2", "web3-stream-provider": "^2.0.6", "xtend": "^4.0.1" }, |