From eb223805cab473ec998a8a66f10a66003f738039 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:02:48 +0100 Subject: Move web3 typings to dependencies since the types package cannot function without them being available when imported --- packages/types/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/types/package.json b/packages/types/package.json index afaa1aa48..1a792baf8 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" } } -- cgit v1.2.3 From c5003554f40e974df95e96a71606e9e39d16545e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:06:02 +0100 Subject: Move ethers and web3 types to deps since both are required when interacting with this package --- packages/base-contract/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 6edbed161..62bcf032e 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", "lodash": "^4.17.4", - "web3": "^0.20.0" + "web3": "^0.20.0", + "web3-typescript-typings": "^0.9.11", + "ethers-typescript-typings": "^0.0.1" } } -- cgit v1.2.3 From 02603e8926a561c931afcf416dcc1ec0ce47a146 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:20:04 +0100 Subject: reorder deps --- packages/base-contract/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 62bcf032e..d353e6126 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -31,9 +31,9 @@ "@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-typescript-typings": "^0.9.11", - "ethers-typescript-typings": "^0.0.1" + "web3-typescript-typings": "^0.9.11" } } -- cgit v1.2.3 From 3db42deb426580d204bcd73d957b64ac556a6e6c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:20:30 +0100 Subject: Make web3 typings a dep for subproviders --- packages/subproviders/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 5e9c2ed89..250a608ef 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -30,7 +30,8 @@ "lodash": "^4.17.4", "semaphore-async-await": "^1.5.1", "web3": "^0.20.0", - "web3-provider-engine": "^13.0.1" + "web3-typescript-typings": "^0.9.11", + "web3-provider-engine": "^13.0.1", }, "devDependencies": { "@0xproject/tslint-config": "^0.4.9", @@ -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" } } -- cgit v1.2.3 From c7d97c733a04e8c625eda912a9d5065cd1b68649 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:20:53 +0100 Subject: Make web3 typings a dep for web3Wrapper --- packages/web3-wrapper/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 55f1ffff0..1cef83475 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -26,7 +26,6 @@ "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.11" }, "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" } } -- cgit v1.2.3 From eefce48e680ceb17333db0db058b0cac38becb8e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:24:29 +0100 Subject: Move web3 and ethers types to deps for utils package --- packages/utils/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/utils/package.json b/packages/utils/package.json index 4f63aa4ce..092d0e8d0 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" } } -- cgit v1.2.3 From 6d56f01c40d6a1852f10d1391f144478f3c0339f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:28:51 +0100 Subject: Remove extra comma --- packages/subproviders/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 250a608ef..6b702fcb3 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -31,7 +31,7 @@ "semaphore-async-await": "^1.5.1", "web3": "^0.20.0", "web3-typescript-typings": "^0.9.11", - "web3-provider-engine": "^13.0.1", + "web3-provider-engine": "^13.0.1" }, "devDependencies": { "@0xproject/tslint-config": "^0.4.9", -- cgit v1.2.3 From e5c755b1fce92db572ada978e591bc8933811d23 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:29:14 +0100 Subject: Add changelog entry to subproviders --- packages/subproviders/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md index c2d590a35..3be8cdbe3 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. + ## v0.5.0 - _February 16, 2018_ * Add EmptyWalletSubprovider and FakeGasEstimateSubprovider (#392) -- cgit v1.2.3 From 968c24f0bca55032c88a4089e5c0433b4363ade5 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:32:01 +0100 Subject: Add changelog entries from types and utils --- packages/types/CHANGELOG.md | 3 ++- packages/utils/CHANGELOG.md | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index a4f293d60..b7e7e3280 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. ## v0.2.1 - _February 9, 2018_ diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 81792bee8..2929f57d5 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. ## v0.3.2 - _February 9, 2018_ -- cgit v1.2.3 From 8eafa62bbeae2f636b40de2c5c21f1ade70eb2ae Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:36:53 +0100 Subject: Add PR number --- packages/subproviders/CHANGELOG.md | 2 +- packages/types/CHANGELOG.md | 2 +- packages/utils/CHANGELOG.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md index 3be8cdbe3..c1288e2b5 100644 --- a/packages/subproviders/CHANGELOG.md +++ b/packages/subproviders/CHANGELOG.md @@ -2,7 +2,7 @@ ## v0.6.0 - _TBD_ - * Move web3 types from being a devDep to a dep since one cannot use this package without it. + * 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_ diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index b7e7e3280..b35433d62 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -4,7 +4,7 @@ * 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. + * Move web3 types from devDep to dep since required when using this package (#429) ## v0.2.1 - _February 9, 2018_ diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 2929f57d5..b19656ed7 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -3,7 +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. + * Move web3 types from devDep to dep since required when using this package (#429) ## v0.3.2 - _February 9, 2018_ -- cgit v1.2.3 From 9aa54257e73eb28c5d017bf881e330b4dd9930a9 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:38:51 +0100 Subject: remove extrenuous comma --- packages/web3-wrapper/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 1cef83475..4b623098f 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -25,7 +25,7 @@ "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", - "typescript": "2.7.1", + "typescript": "2.7.1" }, "dependencies": { "@0xproject/types": "^0.2.3", -- cgit v1.2.3 From 3ab613952222eb24bbabb551ac9928e212c3e90d Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sat, 3 Mar 2018 10:59:43 +0100 Subject: Move web3 typings from devDeps to deps --- packages/0x.js/CHANGELOG.md | 1 + packages/0x.js/package.json | 4 ++-- 2 files changed, 3 insertions(+), 2 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 20af430d6..fde7ee74b 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" } } -- cgit v1.2.3