Skip to content

Commit

Permalink
build(typescript): upgrade compiler to v5.x project-wide
Browse files Browse the repository at this point in the history
- Upgrade typescript to 5.3.3
- Fix minor compilation issues where problems occurred.
- Upgraded the protoc-gen-ts package to 0.8.7 which supports
typescript 5.x whereas the previously used version only
supported typescript 4.9 or earlier. This was causing the
yarn codegen script to fail (the code generator script)

Update from Peter: Bumped up protoc-gen-ts to latest versionl.

Closes #2700

Depends on #2971

Signed-off-by: Michal Bajer <[email protected]>
Signed-off-by: Peter Somogyvari <[email protected]>
  • Loading branch information
outSH authored and petermetz committed Jan 19, 2024
1 parent 6d4fd00 commit 39cc9d2
Show file tree
Hide file tree
Showing 30 changed files with 80 additions and 83 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"sinon-chai": "^3.5.0",
"ts-node": "^8.8.1",
"tslint": "^6.1.0",
"typescript": "^3.8.3",
"typescript": "5.3.3",
"winston": "^3.2.1"
},
"nyc": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"declarationDir": "dist/lib",
"rootDir": "./src",
"moduleResolution": "Node16",
"module": "Node16",
"tsBuildInfoFile": "../../.build-cache/cactus-example-cbdc-bridging-backend.tsbuildinfo",
},
"references": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "5.0.1",
"typescript": "^4.9.5",
"typescript": "5.3.3",
"uuid": "^9.0.1",
"web-vitals": "^2.1.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"socket.io": "4.5.4"
},
"devDependencies": {
"typescript": "4.9.5"
"typescript": "5.3.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"ts-node": "9.1.1"
},
"devDependencies": {
"typescript": "4.9.5"
"typescript": "5.3.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"socket.io": "4.5.4"
},
"devDependencies": {
"typescript": "4.9.5"
"typescript": "5.3.3"
}
}
2 changes: 1 addition & 1 deletion examples/test-run-transaction/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@
"eslint-plugin-prettier": "4.0.0",
"prettier": "2.8.8",
"tslint": "6.0.0",
"typescript": "4.9.5"
"typescript": "5.3.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"express": "4.18.2",
"moment": "2.29.4",
"ts-node": "10.9.1",
"typescript": "4.9.5",
"typescript": "5.3.3",
"helmet": "4.6.0"
},
"devDependencies": {
Expand Down
8 changes: 3 additions & 5 deletions extensions/cactus-plugin-object-store-ipfs/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
"tsBuildInfoFile": "../../.build-cache/cactus-plugin-object-store-ipfs.tsbuildinfo",
"skipLibCheck": true,
"composite": true,
"module": "Node16",
"moduleResolution": "Node16"
},
"include": [
"./src",
"src/**/*.json",
],
"include": ["./src", "src/**/*.json"],
"references": [
{
"path": "../../packages/cactus-common/tsconfig.json"
Expand All @@ -27,4 +25,4 @@
"path": "../../packages/cactus-test-tooling/tsconfig.json"
}
]
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"npm-watch": "0.11.0",
"openapi-types": "12.1.3",
"prettier": "3.0.3",
"protoc-gen-ts": "0.8.6",
"protoc-gen-ts": "0.8.7",
"run-time-error": "1.4.0",
"run-time-error-cjs": "1.4.0",
"secp256k1": "4.0.3",
Expand All @@ -175,7 +175,7 @@
"ts-jest": "29.1.1",
"ts-loader": "9.4.4",
"ts-node": "10.9.1",
"typescript": "4.9.5",
"typescript": "5.3.3",
"web3": "4.1.1",
"web3-core": "4.1.1",
"web3-eth": "4.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"sinon-chai": "3.7.0",
"ts-node": "7.0.1",
"tslint": "5.20.1",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"nyc": {
"extension": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"sinon-chai": "3.7.0",
"ts-node": "7.0.1",
"tslint": "5.20.1",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"nyc": {
"extension": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"web3": "1.7.0"
},
"devDependencies": {
"typescript": "4.9.5",
"typescript": "5.3.3",
"@types/shelljs": "^0.8.12"
}
}
3 changes: 2 additions & 1 deletion packages/cactus-plugin-ledger-connector-iroha2/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"outDir": "./dist/lib/",
"declarationDir": "dist/types",
"resolveJsonModule": true,
"moduleResolution": "nodenext",
"module": "Node16",
"moduleResolution": "Node16",
"rootDir": "./src",
"tsBuildInfoFile": "../../.build-cache/cactus-plugin-ledger-connector-iroha2.tsbuildinfo"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-plugin-odap-hermes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"express": "4.18.2",
"fabric-network": "2.2.19",
"kubo-rpc-client": "3.0.1",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"sinon-chai": "3.7.0",
"ts-node": "7.0.1",
"tslint": "5.20.1",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"nyc": {
"extension": [
Expand Down
4 changes: 2 additions & 2 deletions weaver/core/drivers/fabric-driver/package-local.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"@types/node": "16.18.41",
"nodemon": "2.0.22",
"patch-package": "6.5.1",
"typedoc": "0.24.8",
"typescript": "4.9.5"
"typedoc": "0.25.6",
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
4 changes: 2 additions & 2 deletions weaver/core/drivers/fabric-driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"@types/node": "16.18.41",
"nodemon": "2.0.22",
"patch-package": "6.5.1",
"typedoc": "0.24.8",
"typescript": "4.9.5"
"typedoc": "0.25.6",
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
4 changes: 2 additions & 2 deletions weaver/core/identity-management/iin-agent/package-local.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"sinon": "6.3.5",
"sinon-chai": "3.7.0",
"ts-node": "10.9.1",
"typedoc": "0.24.8",
"typescript": "4.9.5"
"typedoc": "0.25.6",
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
4 changes: 2 additions & 2 deletions weaver/core/identity-management/iin-agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"sinon": "6.3.5",
"sinon-chai": "3.7.0",
"ts-node": "10.9.1",
"typedoc": "0.24.8",
"typescript": "4.9.5"
"typedoc": "0.25.6",
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
2 changes: 1 addition & 1 deletion weaver/samples/besu/besu-cli/package-local.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"tslint": "5.20.1",
"tslint-config-prettier": "1.18.0",
"tslint-config-standard": "8.0.1",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
2 changes: 1 addition & 1 deletion weaver/samples/besu/besu-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"tslint": "5.20.1",
"tslint-config-prettier": "1.18.0",
"tslint-config-standard": "8.0.1",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
2 changes: 1 addition & 1 deletion weaver/samples/besu/simpleasset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"devDependencies": {
"truffle": "5.11.2",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
2 changes: 1 addition & 1 deletion weaver/samples/fabric/fabric-cli/package-local.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"protobufjs": "7.2.5",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
2 changes: 1 addition & 1 deletion weaver/samples/fabric/fabric-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"protobufjs": "7.2.5",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
4 changes: 2 additions & 2 deletions weaver/sdks/besu/node/package-local.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"sinon": "6.3.5",
"sinon-chai": "3.7.0",
"ts-node": "10.9.1",
"typedoc": "0.24.8",
"typescript": "4.9.5"
"typedoc": "0.25.6",
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
4 changes: 2 additions & 2 deletions weaver/sdks/besu/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"sinon": "6.3.5",
"sinon-chai": "3.7.0",
"ts-node": "10.9.1",
"typedoc": "0.24.8",
"typescript": "4.9.5"
"typedoc": "0.25.6",
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
4 changes: 2 additions & 2 deletions weaver/sdks/fabric/interoperation-node-sdk/package-local.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"sinon": "6.3.5",
"sinon-chai": "3.7.0",
"ts-node": "10.9.1",
"typedoc": "0.24.8",
"typescript": "4.9.5"
"typedoc": "0.25.6",
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
4 changes: 2 additions & 2 deletions weaver/sdks/fabric/interoperation-node-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"sinon": "6.3.5",
"sinon-chai": "3.7.0",
"ts-node": "10.9.1",
"typedoc": "0.24.8",
"typescript": "4.9.5"
"typedoc": "0.25.6",
"typescript": "5.3.3"
},
"engines": {
"node": ">=18",
Expand Down
Loading

0 comments on commit 39cc9d2

Please sign in to comment.