diff options
author | Fabio Berger <me@fabioberger.com> | 2018-03-04 22:21:32 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-04 22:21:32 +0800 |
commit | 42f4f0726864d425266a72607592207e81dc2696 (patch) | |
tree | 2765a9fd93a4ae3c988f23979c20c63506275288 | |
parent | 4445d1d5a0f5d5fa263d7a063519a9a9bca1ec94 (diff) | |
parent | 3ab613952222eb24bbabb551ac9928e212c3e90d (diff) | |
download | dexon-sol-tools-42f4f0726864d425266a72607592207e81dc2696.tar dexon-sol-tools-42f4f0726864d425266a72607592207e81dc2696.tar.gz dexon-sol-tools-42f4f0726864d425266a72607592207e81dc2696.tar.bz2 dexon-sol-tools-42f4f0726864d425266a72607592207e81dc2696.tar.lz dexon-sol-tools-42f4f0726864d425266a72607592207e81dc2696.tar.xz dexon-sol-tools-42f4f0726864d425266a72607592207e81dc2696.tar.zst dexon-sol-tools-42f4f0726864d425266a72607592207e81dc2696.zip |
Merge pull request #429 from 0xProject/fix/incorrectDeps
Move required typing from devDeps to deps
-rw-r--r-- | packages/0x.js/CHANGELOG.md | 1 | ||||
-rw-r--r-- | packages/0x.js/package.json | 4 | ||||
-rw-r--r-- | packages/base-contract/package.json | 8 | ||||
-rw-r--r-- | packages/subproviders/CHANGELOG.md | 4 | ||||
-rw-r--r-- | packages/subproviders/package.json | 2 | ||||
-rw-r--r-- | packages/types/CHANGELOG.md | 3 | ||||
-rw-r--r-- | packages/types/package.json | 6 | ||||
-rw-r--r-- | packages/utils/CHANGELOG.md | 1 | ||||
-rw-r--r-- | packages/utils/package.json | 8 | ||||
-rw-r--r-- | packages/web3-wrapper/package.json | 6 |
10 files changed, 25 insertions, 18 deletions
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index b882a1b31..cbb3d45f4 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -6,6 +6,7 @@ * Improve validation to force passing contract addresses on private networks (#385) * Change `LogErrorContractEventArgs.errorId` type from `BigNumber` to `number` (#413) * Rename all public `_unsubscribeAll` methods to `unsubscribeAll` (#415) + * Move web3 typings from devDep to dep since cannot use this package without it (#429) ## v0.32.2 - _February 9, 2018_ diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index cc01d15ae..98b0981d4 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -78,7 +78,6 @@ "typescript": "2.7.1", "web3-provider-engine": "^13.0.1", "ethers-typescript-typings": "^0.0.1", - "web3-typescript-typings": "^0.9.11", "webpack": "^3.1.0" }, "dependencies": { @@ -97,6 +96,7 @@ "js-sha3": "^0.7.0", "lodash": "^4.17.4", "uuid": "^3.1.0", - "web3": "^0.20.0" + "web3": "^0.20.0", + "web3-typescript-typings": "^0.9.11" } } diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 65a1653f1..888b2fc75 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -25,15 +25,15 @@ "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", - "typescript": "2.7.1", - "ethers-typescript-typings": "^0.0.1", - "web3-typescript-typings": "^0.9.11" + "typescript": "2.7.1" }, "dependencies": { "@0xproject/types": "^0.2.3", "@0xproject/web3-wrapper": "^0.1.14", "ethers-contracts": "^2.2.1", + "ethers-typescript-typings": "^0.0.1", "lodash": "^4.17.4", - "web3": "^0.20.0" + "web3": "^0.20.0", + "web3-typescript-typings": "^0.9.11" } } diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md index c2d590a35..c1288e2b5 100644 --- a/packages/subproviders/CHANGELOG.md +++ b/packages/subproviders/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.6.0 - _TBD_ + + * Move web3 types from being a devDep to a dep since one cannot use this package without it (#429) + ## v0.5.0 - _February 16, 2018_ * Add EmptyWalletSubprovider and FakeGasEstimateSubprovider (#392) diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 5e9c2ed89..6b702fcb3 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -30,6 +30,7 @@ "lodash": "^4.17.4", "semaphore-async-await": "^1.5.1", "web3": "^0.20.0", + "web3-typescript-typings": "^0.9.11", "web3-provider-engine": "^13.0.1" }, "devDependencies": { @@ -51,7 +52,6 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.11", "webpack": "^3.1.0" } } diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index a4f293d60..b35433d62 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -1,9 +1,10 @@ # CHANGELOG -## v0.2.4 - _TBD, 2018_ +## v0.3.0 - _TBD, 2018_ * Add `data` to `TxData` (#413) * Add `number` as an option to `ContractEventArg` (#413) + * Move web3 types from devDep to dep since required when using this package (#429) ## v0.2.1 - _February 9, 2018_ diff --git a/packages/types/package.json b/packages/types/package.json index d88a3a2da..966308287 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -23,11 +23,11 @@ "@0xproject/tslint-config": "^0.4.9", "shx": "^0.2.2", "tslint": "5.8.0", - "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.11" + "typescript": "2.7.1" }, "dependencies": { "bignumber.js": "~4.1.0", - "web3": "^0.20.0" + "web3": "^0.20.0", + "web3-typescript-typings": "^0.9.11" } } diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 81792bee8..b19656ed7 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -3,6 +3,7 @@ ## v0.4.0 - _TBD, 2018_ * Use `ethers-contracts` as a backend to decode event args (#413) + * Move web3 types from devDep to dep since required when using this package (#429) ## v0.3.2 - _February 9, 2018_ diff --git a/packages/utils/package.json b/packages/utils/package.json index 8b6dbc825..33890f15b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -25,16 +25,16 @@ "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", - "typescript": "2.7.1", - "ethers-typescript-typings": "^0.0.1", - "web3-typescript-typings": "^0.9.11" + "typescript": "2.7.1" }, "dependencies": { "@0xproject/types": "^0.2.3", "bignumber.js": "~4.1.0", "ethers-contracts": "^2.2.1", + "ethers-typescript-typings": "^0.0.1", "js-sha3": "^0.7.0", "lodash": "^4.17.4", - "web3": "^0.20.0" + "web3": "^0.20.0", + "web3-typescript-typings": "^0.9.11" } } diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index c4ec6f23a..38038f393 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -25,8 +25,7 @@ "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", - "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.11" + "typescript": "2.7.1" }, "dependencies": { "@0xproject/types": "^0.2.3", @@ -34,6 +33,7 @@ "ethers-contracts": "^2.2.1", "ethers-typescript-typings": "^0.0.1", "lodash": "^4.17.4", - "web3": "^0.20.0" + "web3": "^0.20.0", + "web3-typescript-typings": "^0.9.11" } } |