diff options
| author | Jacob Evans <dekz@dekz.net> | 2018-07-02 09:21:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-02 09:21:16 +0800 |
| commit | ad570b8ae162a213b4b88c417ecd64d4661df18b (patch) | |
| tree | d9acfb9e2459c4dfcac191061fefebe015ff5771 /package.json | |
| parent | b9165c03af40983d885af2b18e729f11746de91d (diff) | |
| parent | b9b00e10d39c3c84bc72892ef37f1313e904414d (diff) | |
| download | dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.gz dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.bz2 dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.lz dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.xz dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.zst dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.zip | |
Merge branch 'v2-prototype' into eth-lightwallet-subprovider-final
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index 11444d16d..036815b32 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "name": "0x-monorepo", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "workspaces": [ "packages/*" @@ -25,6 +25,7 @@ "build": "wsrun build $PKG --fast-exit -r --stages", "build:monorepo_scripts": "PKG=@0xproject/monorepo-scripts yarn build", "clean": "wsrun clean $PKG --fast-exit -r --parallel", + "remove_node_modules": "lerna clean --yes; rm -rf node_modules", "rebuild": "run-s clean build", "test": "wsrun test $PKG --fast-exit --serial --exclude-missing", "stage_docs": "wsrun docs:stage $PKG --fast-exit --parallel --exclude-missing", @@ -38,7 +39,7 @@ "devDependencies": { "async-child-process": "^1.1.1", "coveralls": "^3.0.0", - "ganache-cli": "^6.1.0", + "ganache-cli": "6.1.3", "lcov-result-merger": "^3.0.0", "lerna": "^2.5.1", "npm-run-all": "^4.1.2", @@ -47,7 +48,6 @@ "source-map-support": "^0.5.6" }, "resolutions": { - "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default", "ethers": "0xproject/ethers.js#eip-838-reasons" } } |