diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-06-28 04:10:56 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-06-28 04:10:56 +0800 |
| commit | 847a4282a2c0db6561972147bd366622424f5d28 (patch) | |
| tree | 2eefd2831cb627b9fd41e8858fe82714d85d399b /package.json | |
| parent | abbbe1156c03700c4476d0618e65aa2eed2c264e (diff) | |
| parent | 48f7cff8c0e765e85532c860c5f3061ca1d6deb7 (diff) | |
| download | tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.gz tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.bz2 tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.lz tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.xz tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.zst tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.zip | |
Merge branch 'master' into nonce-tracker
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/package.json b/package.json index 9085e4565..82792351d 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "start": "npm run dev", "dev": "gulp dev --debug", "disc": "gulp disc --debug", - "dist": "npm install && gulp dist --disableLiveReload", + "dist": "npm install && gulp dist", "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\"", "single-test": "METAMASK_ENV=test mocha --require test/helper.js", @@ -63,11 +63,12 @@ "end-of-stream": "^1.1.0", "ensnare": "^1.0.0", "eth-bin-to-ops": "^1.0.1", - "eth-contract-metadata": "^1.0.0", + "eth-contract-metadata": "^1.1.3", "eth-hd-keyring": "^1.1.1", "eth-query": "^2.1.2", "eth-sig-util": "^1.1.1", "eth-simple-keyring": "^1.1.1", + "eth-token-tracker": "^1.0.9", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", @@ -129,8 +130,11 @@ "xtend": "^4.0.1" }, "devDependencies": { + "babel-core": "^6.24.1", "babel-eslint": "^6.0.5", + "babel-plugin-transform-async-to-generator": "^6.24.1", "babel-plugin-transform-runtime": "^6.23.0", + "babel-polyfill": "^6.23.0", "babel-preset-stage-0": "^6.24.1", "babel-register": "^6.7.2", "babelify": "^7.2.0", |