From c4535aeca375b551e938faf0f27fe1fa316af2c9 Mon Sep 17 00:00:00 2001 From: Sam Hodak Date: Sat, 13 Feb 2021 10:56:08 -0800 Subject: [PATCH 1/4] Change 'tsc' command in scripts & lerna run to 'compile' --- package.json | 2 +- packages/web3-bzz/package.json | 2 +- packages/web3-core-helpers/package.json | 2 +- packages/web3-core-method/package.json | 2 +- packages/web3-core-promievent/package.json | 2 +- packages/web3-core-requestmanager/package.json | 2 +- packages/web3-core-subscriptions/package.json | 2 +- packages/web3-core/package.json | 2 +- packages/web3-eth-abi/package-lock.json | 2 +- packages/web3-eth-abi/package.json | 2 +- packages/web3-eth-accounts/package.json | 2 +- packages/web3-eth-contract/package.json | 2 +- packages/web3-eth-ens/package.json | 2 +- packages/web3-eth-iban/package.json | 2 +- packages/web3-eth-personal/package.json | 2 +- packages/web3-eth/package.json | 2 +- packages/web3-eth2-beaconchain/package.json | 2 +- packages/web3-eth2-core/package.json | 2 +- packages/web3-net/package.json | 2 +- packages/web3-providers-http/package.json | 2 +- packages/web3-providers-ipc/package.json | 2 +- packages/web3-providers-ws/package.json | 2 +- packages/web3-shh/package.json | 2 +- packages/web3-utils/package.json | 2 +- packages/web3/package.json | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 204acd3ec81..a8351847046 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "scripts": { "version": "npm run build", "postinstall": "npm run bootstrap", - "build": "npm run bootstrap && lerna run tsc && webpack && cp -r ./dist ./packages/web3", + "build": "npm run bootstrap && lerna run compile && webpack && cp -r ./dist ./packages/web3", "publish": "lerna publish", "bootstrap": "lerna bootstrap --hoist", "lint": "jshint *.js packages", diff --git a/packages/web3-bzz/package.json b/packages/web3-bzz/package.json index d52890ede1d..6ded3f4ab83 100644 --- a/packages/web3-bzz/package.json +++ b/packages/web3-bzz/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-core-helpers/package.json b/packages/web3-core-helpers/package.json index d3598747cc6..0f2f7e2f99f 100644 --- a/packages/web3-core-helpers/package.json +++ b/packages/web3-core-helpers/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-core-method/package.json b/packages/web3-core-method/package.json index 40a0f6561a9..c124c170438 100644 --- a/packages/web3-core-method/package.json +++ b/packages/web3-core-method/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-core-promievent/package.json b/packages/web3-core-promievent/package.json index 29eeff7992e..b6a79830bfa 100644 --- a/packages/web3-core-promievent/package.json +++ b/packages/web3-core-promievent/package.json @@ -9,7 +9,7 @@ }, "main": "lib/index.js", "scripts": { - "tsc": "tsc -b tsconfig.json" + "compile": "tsc -b tsconfig.json" }, "dependencies": { "eventemitter3": "4.0.4" diff --git a/packages/web3-core-requestmanager/package.json b/packages/web3-core-requestmanager/package.json index 55b64dff7e6..29bedb66c9e 100644 --- a/packages/web3-core-requestmanager/package.json +++ b/packages/web3-core-requestmanager/package.json @@ -9,7 +9,7 @@ }, "main": "lib/index.js", "scripts": { - "tsc": "tsc -b tsconfig.json" + "compile": "tsc -b tsconfig.json" }, "dependencies": { "underscore": "1.9.1", diff --git a/packages/web3-core-subscriptions/package.json b/packages/web3-core-subscriptions/package.json index 9062e8cdab7..a418ed28056 100644 --- a/packages/web3-core-subscriptions/package.json +++ b/packages/web3-core-subscriptions/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json index b77ec3213f3..615285860d7 100644 --- a/packages/web3-core/package.json +++ b/packages/web3-core/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-eth-abi/package-lock.json b/packages/web3-eth-abi/package-lock.json index ce17fb1e1cd..e7839da0db5 100644 --- a/packages/web3-eth-abi/package-lock.json +++ b/packages/web3-eth-abi/package-lock.json @@ -2294,7 +2294,7 @@ "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==", "dev": true, "bin": { - "tsc": "bin/tsc", + "compile": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { diff --git a/packages/web3-eth-abi/package.json b/packages/web3-eth-abi/package.json index 9dfffd1b6c8..1ccd8dc2a19 100644 --- a/packages/web3-eth-abi/package.json +++ b/packages/web3-eth-abi/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-eth-accounts/package.json b/packages/web3-eth-accounts/package.json index a7c7d0509a9..2213c637b8b 100644 --- a/packages/web3-eth-accounts/package.json +++ b/packages/web3-eth-accounts/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json index 296fd0a23af..94723cb21f8 100644 --- a/packages/web3-eth-contract/package.json +++ b/packages/web3-eth-contract/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-eth-ens/package.json b/packages/web3-eth-ens/package.json index 93f780b43a1..9046c8f1ee8 100644 --- a/packages/web3-eth-ens/package.json +++ b/packages/web3-eth-ens/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-eth-iban/package.json b/packages/web3-eth-iban/package.json index 8834dbc82ca..0d8bfb97adb 100644 --- a/packages/web3-eth-iban/package.json +++ b/packages/web3-eth-iban/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-eth-personal/package.json b/packages/web3-eth-personal/package.json index 053dbb696f1..1caf26a0646 100644 --- a/packages/web3-eth-personal/package.json +++ b/packages/web3-eth-personal/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-eth/package.json b/packages/web3-eth/package.json index 90c0f05c06a..a32a7524534 100644 --- a/packages/web3-eth/package.json +++ b/packages/web3-eth/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-eth2-beaconchain/package.json b/packages/web3-eth2-beaconchain/package.json index 1b597d98e0a..d8c815608c1 100644 --- a/packages/web3-eth2-beaconchain/package.json +++ b/packages/web3-eth2-beaconchain/package.json @@ -10,7 +10,7 @@ "types": "types.ts", "scripts": { "test": "jest", - "tsc": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline", + "compile": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline", "type-check": "tsc --noEmit", "type-check:watch": "npm run type-check -- --watch" }, diff --git a/packages/web3-eth2-core/package.json b/packages/web3-eth2-core/package.json index bc07b286110..01715b7d561 100644 --- a/packages/web3-eth2-core/package.json +++ b/packages/web3-eth2-core/package.json @@ -10,7 +10,7 @@ "types": "types.ts", "scripts": { "test": "jest", - "tsc": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline", + "compile": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline", "type-check": "tsc --noEmit", "type-check:watch": "npm run type-check -- --watch" }, diff --git a/packages/web3-net/package.json b/packages/web3-net/package.json index d97c48093a9..588f88374b5 100644 --- a/packages/web3-net/package.json +++ b/packages/web3-net/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-providers-http/package.json b/packages/web3-providers-http/package.json index 06fe82f3e93..c1f33d0a273 100644 --- a/packages/web3-providers-http/package.json +++ b/packages/web3-providers-http/package.json @@ -8,7 +8,7 @@ "node": ">=8.0.0" }, "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "types": "types/index.d.ts", diff --git a/packages/web3-providers-ipc/package.json b/packages/web3-providers-ipc/package.json index bce34ea9a96..a366efd08e0 100644 --- a/packages/web3-providers-ipc/package.json +++ b/packages/web3-providers-ipc/package.json @@ -8,7 +8,7 @@ "node": ">=8.0.0" }, "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "types": "types/index.d.ts", diff --git a/packages/web3-providers-ws/package.json b/packages/web3-providers-ws/package.json index 52541a8ed80..b16cd5030c0 100644 --- a/packages/web3-providers-ws/package.json +++ b/packages/web3-providers-ws/package.json @@ -8,7 +8,7 @@ "node": ">=8.0.0" }, "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "types": "types/index.d.ts", diff --git a/packages/web3-shh/package.json b/packages/web3-shh/package.json index a41518b7a95..1188cff0dd5 100644 --- a/packages/web3-shh/package.json +++ b/packages/web3-shh/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3-utils/package.json b/packages/web3-utils/package.json index 99f96ce37a1..0788521ad3f 100644 --- a/packages/web3-utils/package.json +++ b/packages/web3-utils/package.json @@ -9,7 +9,7 @@ }, "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "main": "lib/index.js", diff --git a/packages/web3/package.json b/packages/web3/package.json index dac5f9a4467..3c8ed4ba1d4 100644 --- a/packages/web3/package.json +++ b/packages/web3/package.json @@ -19,7 +19,7 @@ "author": "ethereum.org", "types": "types/index.d.ts", "scripts": { - "tsc": "tsc -b tsconfig.json", + "compile": "tsc -b tsconfig.json", "dtslint": "dtslint --localTs ../../node_modules/typescript/lib types" }, "authors": [ From 19cb7b928874b40af687feeef7e86084ee3e3945 Mon Sep 17 00:00:00 2001 From: Sam Hodak Date: Sat, 13 Feb 2021 11:18:16 -0800 Subject: [PATCH 2/4] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d0f2e32697..01be1b0aa44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -361,3 +361,7 @@ Released with 1.0.0-beta.37 code base. ### Changed - Unified babel compiler for `web3-eth2-core` and `web3-eth2-beaconchain` (#3892) + +### Changed + +- Renamed the `tsc` script in all packages to `compile`, and the corresponding `lerna run` usage in the main `package.json` (#3894) \ No newline at end of file From fa55e8d2b87a74e8048d40d4ed9a35138a7934ae Mon Sep 17 00:00:00 2001 From: Sam Hodak Date: Sat, 13 Feb 2021 11:51:09 -0800 Subject: [PATCH 3/4] Undo incorrect rename --- packages/web3-eth-abi/package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-eth-abi/package-lock.json b/packages/web3-eth-abi/package-lock.json index e7839da0db5..ce17fb1e1cd 100644 --- a/packages/web3-eth-abi/package-lock.json +++ b/packages/web3-eth-abi/package-lock.json @@ -2294,7 +2294,7 @@ "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==", "dev": true, "bin": { - "compile": "bin/tsc", + "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { From 4ba7faeebceb159040aed39b92b7be9bf2dd705a Mon Sep 17 00:00:00 2001 From: Sam Hodak Date: Sat, 13 Feb 2021 14:01:48 -0800 Subject: [PATCH 4/4] Checking if e2e test is deterministic --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01be1b0aa44..6191a1f0710 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -364,4 +364,4 @@ Released with 1.0.0-beta.37 code base. ### Changed -- Renamed the `tsc` script in all packages to `compile`, and the corresponding `lerna run` usage in the main `package.json` (#3894) \ No newline at end of file +- Renamed the `tsc` script in all packages to `compile`; updates the corresponding `lerna run` usage in the main `package.json` (#3894) \ No newline at end of file