diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-06-07 09:07:22 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-06-07 09:07:22 +0800 |
| commit | 2af6d3f6bc03932f53d199971694c3c0d9441ba8 (patch) | |
| tree | b17f3343a635aa72a917b89f278f63924e25da3e /package.json | |
| parent | cbe5438a31a54a92a198b2cc5ad8a5d5feb033b4 (diff) | |
| parent | 67c4ad128c405692e471274148c9a2ef7cd8b6ca (diff) | |
| download | dexon-sol-tools-2af6d3f6bc03932f53d199971694c3c0d9441ba8.tar.gz dexon-sol-tools-2af6d3f6bc03932f53d199971694c3c0d9441ba8.tar.zst dexon-sol-tools-2af6d3f6bc03932f53d199971694c3c0d9441ba8.zip | |
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/website/onboarding-flow-allowances
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json index 74d32c3ef..f25438224 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "install:all": "yarn install", "wsrun": "wsrun", "lerna:run": "lerna run", - "watch": "wsrun watch $PKG --fast-exit -r --stages --done-criteria='complete|successfully'", + "watch": "wsrun watch_without_deps $PKG --fast-exit -r --stages --done-criteria='complete|successfully'", "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", @@ -46,6 +46,7 @@ "wsrun": "^2.2.0" }, "resolutions": { - "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default" + "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default", + "ethers": "0xproject/ethers.js#eip-838-reasons" } } |