From 953e868e91ae688d8390ff32298e1b83f5fc0871 Mon Sep 17 00:00:00 2001 From: jdevcs Date: Tue, 13 Jun 2023 13:27:26 +0200 Subject: [PATCH 1/4] updated PrimitiveTupleType type to allow unknown --- packages/web3-types/src/eth_abi_types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web3-types/src/eth_abi_types.ts b/packages/web3-types/src/eth_abi_types.ts index a172bea2855..c5d6e093f65 100644 --- a/packages/web3-types/src/eth_abi_types.ts +++ b/packages/web3-types/src/eth_abi_types.ts @@ -220,7 +220,7 @@ export type PrimitiveBytesType = Type extends `bytes${strin export type PrimitiveTupleType< Type extends string, - TypeComponents extends ReadonlyArray | undefined = [], + TypeComponents extends ReadonlyArray | undefined | unknown = [], > = TypeComponents extends ReadonlyArray ? Type extends 'tuple' ? { @@ -251,7 +251,7 @@ type ArrToObjectWithFunctions = Array & ObjectToAr export type MatchPrimitiveType< Type extends string, - TypeComponents extends ReadonlyArray | undefined, + TypeComponents extends ReadonlyArray | undefined | unknown, > = | PrimitiveAddressType | PrimitiveStringType From 2a0a4548695e61202a523c01dd73f9d2ca43c017 Mon Sep 17 00:00:00 2001 From: jdevcs Date: Tue, 13 Jun 2023 13:27:59 +0200 Subject: [PATCH 2/4] @types/node update --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9f2cd16c182..46e47f05cb8 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "@cypress/webpack-preprocessor": "^5.12.0", "@droppedcode/typedoc-plugin-relative-includes": "^1.0.2", "@openzeppelin/contracts": "^4.7.1", - "@types/node": "^17.0.40", + "@types/node": "^18.11.9", "@types/webpack": "^5.28.0", "assert": "^2.0.0", "buffer": "^6.0.3", diff --git a/yarn.lock b/yarn.lock index 4dca974e8bc..86bfe0968e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2114,10 +2114,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.6.tgz#31743bc5772b6ac223845e18c3fc26f042713c83" integrity sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A== -"@types/node@^17.0.40": - version "17.0.45" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190" - integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw== +"@types/node@^18.11.9": + version "18.16.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.18.tgz#85da09bafb66d4bc14f7c899185336d0c1736390" + integrity sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw== "@types/normalize-package-data@^2.4.0": version "2.4.1" From e19feebf8afcfc0a6484f3ec7bf3ac9f60c40145 Mon Sep 17 00:00:00 2001 From: jdevcs Date: Tue, 13 Jun 2023 13:28:37 +0200 Subject: [PATCH 3/4] changelog update --- packages/web3-eth-ens/CHANGELOG.md | 4 ++++ packages/web3-types/CHANGELOG.md | 4 ++++ packages/web3/CHANGELOG.md | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/packages/web3-eth-ens/CHANGELOG.md b/packages/web3-eth-ens/CHANGELOG.md index bd282b35608..4a42beae03d 100644 --- a/packages/web3-eth-ens/CHANGELOG.md +++ b/packages/web3-eth-ens/CHANGELOG.md @@ -100,3 +100,7 @@ Documentation: [Migration Guide from 1.x](https://docs.web3js.org/guides/web3_upgrade_guide/x/) ## [Unreleased] + +### Fixed + +- Fixed bug #6185, now web3.js compiles on typescript v5 diff --git a/packages/web3-types/CHANGELOG.md b/packages/web3-types/CHANGELOG.md index 365dfaa6422..5bd892e7f17 100644 --- a/packages/web3-types/CHANGELOG.md +++ b/packages/web3-types/CHANGELOG.md @@ -120,3 +120,7 @@ Documentation: [Migration Guide from 1.x](https://docs.web3js.org/guides/web3_upgrade_guide/x/) ## [Unreleased] + +### Fixed + +- Fixed bug #6185, now web3.js compiles on typescript v5 diff --git a/packages/web3/CHANGELOG.md b/packages/web3/CHANGELOG.md index 4a75460eb4a..0e26e046595 100644 --- a/packages/web3/CHANGELOG.md +++ b/packages/web3/CHANGELOG.md @@ -117,3 +117,7 @@ Documentation: ### Added - Exported `Web3Context`, `Web3PluginBase`, `Web3EthPluginBase` from `'web3-core'`, and `Web3Validator` from `'web3-validator'` (#6165) + +### Fixed + +- Fixed bug #6185, now web3.js compiles on typescript v5 From 53940449156f754c23eee27463d716b2910b255a Mon Sep 17 00:00:00 2001 From: jdevcs Date: Tue, 13 Jun 2023 14:12:25 +0200 Subject: [PATCH 4/4] changelog update --- packages/web3-eth-ens/CHANGELOG.md | 2 +- packages/web3-types/CHANGELOG.md | 2 +- packages/web3/CHANGELOG.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/web3-eth-ens/CHANGELOG.md b/packages/web3-eth-ens/CHANGELOG.md index 4a42beae03d..5e60f71da22 100644 --- a/packages/web3-eth-ens/CHANGELOG.md +++ b/packages/web3-eth-ens/CHANGELOG.md @@ -103,4 +103,4 @@ Documentation: ### Fixed -- Fixed bug #6185, now web3.js compiles on typescript v5 +- Fixed bug #6185, now web3.js compiles on typescript v5 (#6195) diff --git a/packages/web3-types/CHANGELOG.md b/packages/web3-types/CHANGELOG.md index 5bd892e7f17..eae97aa7dde 100644 --- a/packages/web3-types/CHANGELOG.md +++ b/packages/web3-types/CHANGELOG.md @@ -123,4 +123,4 @@ Documentation: ### Fixed -- Fixed bug #6185, now web3.js compiles on typescript v5 +- Fixed bug #6185, now web3.js compiles on typescript v5 (#6195) diff --git a/packages/web3/CHANGELOG.md b/packages/web3/CHANGELOG.md index 0e26e046595..036ac023e26 100644 --- a/packages/web3/CHANGELOG.md +++ b/packages/web3/CHANGELOG.md @@ -120,4 +120,4 @@ Documentation: ### Fixed -- Fixed bug #6185, now web3.js compiles on typescript v5 +- Fixed bug #6185, now web3.js compiles on typescript v5 (#6195)