diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-06-29 02:13:19 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-06-29 02:17:30 +0800 |
| commit | e4188f5d4c38e53bf6966a364da41a3aa164b567 (patch) | |
| tree | ac24b29f975be088a9d3d391f8a73acc7ad14aba /package.json | |
| parent | 360927ec77d5ea50848f4c1b2c66566542a28d1c (diff) | |
| parent | 0fcbd02d50bd564a9c888f247a4b0a565d928cc6 (diff) | |
| download | dexon-sol-tools-e4188f5d4c38e53bf6966a364da41a3aa164b567.tar dexon-sol-tools-e4188f5d4c38e53bf6966a364da41a3aa164b567.tar.gz dexon-sol-tools-e4188f5d4c38e53bf6966a364da41a3aa164b567.tar.bz2 dexon-sol-tools-e4188f5d4c38e53bf6966a364da41a3aa164b567.tar.lz dexon-sol-tools-e4188f5d4c38e53bf6966a364da41a3aa164b567.tar.xz dexon-sol-tools-e4188f5d4c38e53bf6966a364da41a3aa164b567.tar.zst dexon-sol-tools-e4188f5d4c38e53bf6966a364da41a3aa164b567.zip | |
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/website/support-new-metamask
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 11444d16d..a960fd569 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", @@ -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" } } |