From 50818ae3f2991aa1df092a46477c9053a7797273 Mon Sep 17 00:00:00 2001 From: Rosco Kalis Date: Tue, 2 Jun 2026 11:08:12 +0200 Subject: [PATCH] Update to TypeScript v6 --- examples/package.json | 8 +++++--- examples/testing-suite/package.json | 2 +- examples/testing-suite/tsconfig.json | 5 +++-- package.json | 2 +- packages/cashc/package.json | 2 +- packages/cashc/tsconfig.build.json | 1 + packages/cashscript/package.json | 2 +- packages/cashscript/tsconfig.build.json | 1 + packages/utils/package.json | 2 +- packages/utils/tsconfig.build.json | 7 ++++--- tsconfig.build.json | 4 ++-- tsconfig.json | 15 ++++++++++----- website/package.json | 2 +- website/tsconfig.json | 6 +++--- website/yarn.lock | 8 ++++---- yarn.lock | 8 ++++---- 16 files changed, 43 insertions(+), 32 deletions(-) diff --git a/examples/package.json b/examples/package.json index 76a41602..d28530e8 100644 --- a/examples/package.json +++ b/examples/package.json @@ -12,10 +12,12 @@ }, "dependencies": { "@bitauth/libauth": "^3.1.0-next.8", - "@types/node": "^22.17.0", "cashc": "^0.13.0", - "cashscript": "^0.13.0", + "cashscript": "^0.13.0" + }, + "devDependencies": { + "@types/node": "^22.17.0", "eslint": "^8.56.0", - "typescript": "^5.9.2" + "typescript": "^6.0.3" } } diff --git a/examples/testing-suite/package.json b/examples/testing-suite/package.json index e8d96e5b..958391f0 100644 --- a/examples/testing-suite/package.json +++ b/examples/testing-suite/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "tsx": "^4.20.3", - "typescript": "^5.9.2", + "typescript": "^6.0.3", "vitest": "^4.0.15" } } diff --git a/examples/testing-suite/tsconfig.json b/examples/testing-suite/tsconfig.json index 2ba88f5a..1ab501f9 100644 --- a/examples/testing-suite/tsconfig.json +++ b/examples/testing-suite/tsconfig.json @@ -1,7 +1,8 @@ { "compilerOptions": { + "rootDir": ".", "target": "es2021", - "module": "esnext", + "module": "NodeNext", "declaration": true, "lib": [ "es2023", @@ -15,7 +16,7 @@ "strict": true, "strictPropertyInitialization": false, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "nodenext", "resolveJsonModule": true, "esModuleInterop": true, "skipLibCheck": true, diff --git a/package.json b/package.json index 003bae23..a99d396a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "eslint-plugin-import": "^2.31.0", "lerna": "^3.22.1", "tsx": "^4.20.3", - "typescript": "^5.9.2" + "typescript": "^6.0.3" }, "scripts": { "test": "lerna run test --ignore cashscript-examples --ignore testing-suite", diff --git a/packages/cashc/package.json b/packages/cashc/package.json index bd53f73b..d001403a 100644 --- a/packages/cashc/package.json +++ b/packages/cashc/package.json @@ -61,7 +61,7 @@ "eslint": "^8.54.0", "eslint-plugin-import": "^2.31.0", "tsx": "^4.20.3", - "typescript": "^5.9.2", + "typescript": "^6.0.3", "vitest": "^4.0.15" }, "gitHead": "bf02a4b641d5d03c035d052247a545109c17b708" diff --git a/packages/cashc/tsconfig.build.json b/packages/cashc/tsconfig.build.json index df1a92e3..b852d5f2 100644 --- a/packages/cashc/tsconfig.build.json +++ b/packages/cashc/tsconfig.build.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { + "rootDir": "./src", "outDir": "./dist", "types": [ "node", diff --git a/packages/cashscript/package.json b/packages/cashscript/package.json index e2fd7a5c..f437b2b3 100644 --- a/packages/cashscript/package.json +++ b/packages/cashscript/package.json @@ -53,7 +53,7 @@ "eslint": "^8.54.0", "p-queue": "^9.1.2", "p-retry": "^8.0.0", - "typescript": "^5.9.2", + "typescript": "^6.0.3", "vitest": "^4.0.15" }, "gitHead": "bf02a4b641d5d03c035d052247a545109c17b708" diff --git a/packages/cashscript/tsconfig.build.json b/packages/cashscript/tsconfig.build.json index bcb7a177..68265ea6 100644 --- a/packages/cashscript/tsconfig.build.json +++ b/packages/cashscript/tsconfig.build.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { + "rootDir": "./src", "outDir": "./dist", "types": [ "vitest/globals" diff --git a/packages/utils/package.json b/packages/utils/package.json index 55a91aac..a6857942 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@vitest/coverage-v8": "^4.0.15", "eslint": "^8.54.0", - "typescript": "^5.9.2", + "typescript": "^6.0.3", "vitest": "^4.0.15" }, "gitHead": "bf02a4b641d5d03c035d052247a545109c17b708" diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json index 57db4af0..4065617f 100644 --- a/packages/utils/tsconfig.build.json +++ b/packages/utils/tsconfig.build.json @@ -1,11 +1,12 @@ { "extends": "../../tsconfig.build.json", - "compilerOptions": { + "rootDir": "./src", "outDir": "./dist", - "types": ["vitest/globals"], + "types": [ + "vitest/globals" + ], }, - "include": [ "src/**/*", ], diff --git a/tsconfig.build.json b/tsconfig.build.json index ec7d7c52..bd0e3942 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -1,7 +1,7 @@ { "compilerOptions": { "target": "es2021", - "module": "esnext", + "module": "NodeNext", "declaration": true, "lib": [ "es2023", @@ -15,7 +15,7 @@ "strict": true, "strictPropertyInitialization": false, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "nodenext", "resolveJsonModule": true, "esModuleInterop": true, "skipLibCheck": true, diff --git a/tsconfig.json b/tsconfig.json index 26d06b41..126c4103 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,12 +1,17 @@ { "extends": "./tsconfig.build.json", - "compilerOptions": { - "baseUrl": "./packages", + "rootDir": ".", "paths": { - "cashc": ["cashc/src"], - "cashscript": ["cashscript/src"], - "@cashscript/utils": ["utils/src"], + "cashc": [ + "./packages/cashc/src" + ], + "cashscript": [ + "./packages/cashscript/src" + ], + "@cashscript/utils": [ + "./packages/utils/src" + ], }, }, } diff --git a/website/package.json b/website/package.json index 9ec9a1e8..73686eab 100755 --- a/website/package.json +++ b/website/package.json @@ -22,7 +22,7 @@ }, "devDependencies": { "@docusaurus/tsconfig": "^3.9.2", - "typescript": "^5.9.2" + "typescript": "^6.0.3" }, "browserslist": { "production": [ diff --git a/website/tsconfig.json b/website/tsconfig.json index 487a9ecb..e0d9543f 100644 --- a/website/tsconfig.json +++ b/website/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@docusaurus/tsconfig", "compilerOptions": { + "rootDir": ".", "target": "es2020", "lib": [ "dom", @@ -14,13 +15,12 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "allowSyntheticDefaultImports": true, - "module": "esnext", - "moduleResolution": "node", + "module": "NodeNext", + "moduleResolution": "nodenext", "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, "jsx": "react-jsx", - "baseUrl": ".", }, "include": [ "**/*.ts", diff --git a/website/yarn.lock b/website/yarn.lock index 5f97eb44..840db035 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -10430,10 +10430,10 @@ typescript@^4.8.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@^5.9.2: - version "5.9.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" - integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== +typescript@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21" + integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw== undici-types@~7.16.0: version "7.16.0" diff --git a/yarn.lock b/yarn.lock index a8290daa..8b9b50d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8250,10 +8250,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^5.9.2: - version "5.9.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6" - integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A== +typescript@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21" + integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw== uglify-js@^3.1.4: version "3.10.2"