From 7cae62cfb5d601064de8dc25695413ca5805d52f Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Thu, 26 Feb 2026 10:10:57 +0100 Subject: [PATCH 01/13] feat: update deprecated stuff --- .github/scripts/bundle-size.mjs | 2 +- packages/astro/src/vite-plugin-config-alias/README.md | 1 - packages/astro/test/fixtures/alias-tsconfig/tsconfig.json | 1 - packages/astro/test/fixtures/core-image-base/tsconfig.json | 1 - .../astro/test/fixtures/core-image-deletion/tsconfig.json | 1 - .../astro/test/fixtures/core-image-infersize/tsconfig.json | 3 --- .../astro/test/fixtures/core-image-layout/tsconfig.json | 1 - .../fixtures/core-image-picture-emit-file/tsconfig.json | 1 - .../test/fixtures/core-image-remark-imgattr/tsconfig.json | 3 --- packages/astro/test/fixtures/core-image-ssg/tsconfig.json | 1 - .../test/fixtures/core-image-svg-optimized/tsconfig.json | 1 - packages/astro/test/fixtures/core-image-svg/tsconfig.json | 1 - .../core-image-unconventional-settings/tsconfig.json | 1 - packages/astro/test/fixtures/core-image/tsconfig.json | 1 - packages/astro/test/fixtures/custom-renderer/tsconfig.json | 1 - .../astro/test/fixtures/svg-deduplication/tsconfig.json | 1 - packages/astro/tsconfigs/base.json | 4 +++- .../markdoc/test/fixtures/image-assets-custom/tsconfig.json | 1 - .../markdoc/test/fixtures/image-assets/tsconfig.json | 1 - .../integrations/mdx/test/fixtures/mdx-images/tsconfig.json | 1 - packages/language-tools/tsconfig.json | 2 +- scripts/jsconfig.json | 2 +- tsconfig.base.json | 6 +++--- 23 files changed, 9 insertions(+), 29 deletions(-) diff --git a/.github/scripts/bundle-size.mjs b/.github/scripts/bundle-size.mjs index ff36f3cbd778..c78f20fec6c4 100644 --- a/.github/scripts/bundle-size.mjs +++ b/.github/scripts/bundle-size.mjs @@ -75,7 +75,7 @@ async function bundle(files) { bundle: true, minify: true, sourcemap: false, - target: ['es2018'], + target: ['esnext'], outdir: 'out', external: ['astro:*', 'aria-query', 'axobject-query'], metafile: true, diff --git a/packages/astro/src/vite-plugin-config-alias/README.md b/packages/astro/src/vite-plugin-config-alias/README.md index 3b470adeda33..0c480d3dbf23 100644 --- a/packages/astro/src/vite-plugin-config-alias/README.md +++ b/packages/astro/src/vite-plugin-config-alias/README.md @@ -7,7 +7,6 @@ Consider the following example configuration: ``` { "compilerOptions": { - "baseUrl": "src", "paths": { "components:*": ["components/*.astro"] } diff --git a/packages/astro/test/fixtures/alias-tsconfig/tsconfig.json b/packages/astro/test/fixtures/alias-tsconfig/tsconfig.json index 31340063c1c6..dd3320cb4d4a 100644 --- a/packages/astro/test/fixtures/alias-tsconfig/tsconfig.json +++ b/packages/astro/test/fixtures/alias-tsconfig/tsconfig.json @@ -1,6 +1,5 @@ { "compilerOptions": { - "baseUrl": ".", "paths": { "@components/*": [ "src/components/*" diff --git a/packages/astro/test/fixtures/core-image-base/tsconfig.json b/packages/astro/test/fixtures/core-image-base/tsconfig.json index ff44eda8dc0e..1854f60e49c2 100644 --- a/packages/astro/test/fixtures/core-image-base/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-base/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/strict", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": [ "src/assets/*" diff --git a/packages/astro/test/fixtures/core-image-deletion/tsconfig.json b/packages/astro/test/fixtures/core-image-deletion/tsconfig.json index c193287fccd6..f79821518be8 100644 --- a/packages/astro/test/fixtures/core-image-deletion/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-deletion/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/base", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": ["src/assets/*"] }, diff --git a/packages/astro/test/fixtures/core-image-infersize/tsconfig.json b/packages/astro/test/fixtures/core-image-infersize/tsconfig.json index 2124752725b7..f11a46c8e5fb 100644 --- a/packages/astro/test/fixtures/core-image-infersize/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-infersize/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "astro/tsconfigs/base", - "compilerOptions": { - "baseUrl": ".", - }, "include": [".astro/types.d.ts", "**/*"], "exclude": ["dist"] } diff --git a/packages/astro/test/fixtures/core-image-layout/tsconfig.json b/packages/astro/test/fixtures/core-image-layout/tsconfig.json index c193287fccd6..f79821518be8 100644 --- a/packages/astro/test/fixtures/core-image-layout/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-layout/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/base", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": ["src/assets/*"] }, diff --git a/packages/astro/test/fixtures/core-image-picture-emit-file/tsconfig.json b/packages/astro/test/fixtures/core-image-picture-emit-file/tsconfig.json index ff44eda8dc0e..1854f60e49c2 100644 --- a/packages/astro/test/fixtures/core-image-picture-emit-file/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-picture-emit-file/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/strict", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": [ "src/assets/*" diff --git a/packages/astro/test/fixtures/core-image-remark-imgattr/tsconfig.json b/packages/astro/test/fixtures/core-image-remark-imgattr/tsconfig.json index 2124752725b7..f11a46c8e5fb 100644 --- a/packages/astro/test/fixtures/core-image-remark-imgattr/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-remark-imgattr/tsconfig.json @@ -1,8 +1,5 @@ { "extends": "astro/tsconfigs/base", - "compilerOptions": { - "baseUrl": ".", - }, "include": [".astro/types.d.ts", "**/*"], "exclude": ["dist"] } diff --git a/packages/astro/test/fixtures/core-image-ssg/tsconfig.json b/packages/astro/test/fixtures/core-image-ssg/tsconfig.json index c193287fccd6..f79821518be8 100644 --- a/packages/astro/test/fixtures/core-image-ssg/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-ssg/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/base", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": ["src/assets/*"] }, diff --git a/packages/astro/test/fixtures/core-image-svg-optimized/tsconfig.json b/packages/astro/test/fixtures/core-image-svg-optimized/tsconfig.json index 923ed4e24fb7..51747eeb3102 100644 --- a/packages/astro/test/fixtures/core-image-svg-optimized/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-svg-optimized/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/strict", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": [ "src/assets/*" diff --git a/packages/astro/test/fixtures/core-image-svg/tsconfig.json b/packages/astro/test/fixtures/core-image-svg/tsconfig.json index 923ed4e24fb7..51747eeb3102 100644 --- a/packages/astro/test/fixtures/core-image-svg/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-svg/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/strict", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": [ "src/assets/*" diff --git a/packages/astro/test/fixtures/core-image-unconventional-settings/tsconfig.json b/packages/astro/test/fixtures/core-image-unconventional-settings/tsconfig.json index c193287fccd6..f79821518be8 100644 --- a/packages/astro/test/fixtures/core-image-unconventional-settings/tsconfig.json +++ b/packages/astro/test/fixtures/core-image-unconventional-settings/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/base", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": ["src/assets/*"] }, diff --git a/packages/astro/test/fixtures/core-image/tsconfig.json b/packages/astro/test/fixtures/core-image/tsconfig.json index ff44eda8dc0e..1854f60e49c2 100644 --- a/packages/astro/test/fixtures/core-image/tsconfig.json +++ b/packages/astro/test/fixtures/core-image/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/strict", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": [ "src/assets/*" diff --git a/packages/astro/test/fixtures/custom-renderer/tsconfig.json b/packages/astro/test/fixtures/custom-renderer/tsconfig.json index f1ad59fe06c3..fe4fe0892c95 100644 --- a/packages/astro/test/fixtures/custom-renderer/tsconfig.json +++ b/packages/astro/test/fixtures/custom-renderer/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/base", "compilerOptions": { - "baseUrl": ".", "paths": { "@custom-renderer/*": ["src/custom-renderer/*"] }, diff --git a/packages/astro/test/fixtures/svg-deduplication/tsconfig.json b/packages/astro/test/fixtures/svg-deduplication/tsconfig.json index a1269dab909f..ab8e2d451686 100644 --- a/packages/astro/test/fixtures/svg-deduplication/tsconfig.json +++ b/packages/astro/test/fixtures/svg-deduplication/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../../tsconfigs/strictest.json", "compilerOptions": { - "baseUrl": ".", "paths": { "~/*": ["./src/*"] } diff --git a/packages/astro/tsconfigs/base.json b/packages/astro/tsconfigs/base.json index 55adf57bb5e4..1c667f933a8b 100644 --- a/packages/astro/tsconfigs/base.json +++ b/packages/astro/tsconfigs/base.json @@ -26,7 +26,9 @@ // Allow JavaScript files to be imported "allowJs": true, // Allow JSX files (or files that are internally considered JSX, like Astro files) to be imported inside `.js` and `.ts` files. - "jsx": "preserve" + "jsx": "preserve", + "types": ["node"], + "libReplacement": false }, "exclude": ["${configDir}/dist"], "include": ["${configDir}/.astro/types.d.ts", "${configDir}/**/*"] diff --git a/packages/integrations/markdoc/test/fixtures/image-assets-custom/tsconfig.json b/packages/integrations/markdoc/test/fixtures/image-assets-custom/tsconfig.json index c193287fccd6..f79821518be8 100644 --- a/packages/integrations/markdoc/test/fixtures/image-assets-custom/tsconfig.json +++ b/packages/integrations/markdoc/test/fixtures/image-assets-custom/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/base", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": ["src/assets/*"] }, diff --git a/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json b/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json index c193287fccd6..f79821518be8 100644 --- a/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json +++ b/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/base", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": ["src/assets/*"] }, diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json b/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json index c193287fccd6..f79821518be8 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json +++ b/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "astro/tsconfigs/base", "compilerOptions": { - "baseUrl": ".", "paths": { "~/assets/*": ["src/assets/*"] }, diff --git a/packages/language-tools/tsconfig.json b/packages/language-tools/tsconfig.json index 9e965c52c3c8..f2872f217d84 100644 --- a/packages/language-tools/tsconfig.json +++ b/packages/language-tools/tsconfig.json @@ -3,7 +3,7 @@ "target": "ES2021", "lib": ["WebWorker", "ES2021"], "module": "commonjs", - "moduleResolution": "node", + "moduleResolution": "nodenext", "declaration": true, "emitDeclarationOnly": true, "strict": true, diff --git a/scripts/jsconfig.json b/scripts/jsconfig.json index 5cf3835e818d..0caa704a7a8e 100644 --- a/scripts/jsconfig.json +++ b/scripts/jsconfig.json @@ -3,7 +3,7 @@ "declaration": true, "strict": true, "module": "esnext", - "moduleResolution": "node", + "moduleResolution": "nodenext", "esModuleInterop": true, "skipLibCheck": true, "forceConsistentCasingInFileNames": true, diff --git a/tsconfig.base.json b/tsconfig.base.json index 432d3c35380d..2d4c180ab7dc 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -4,9 +4,9 @@ "declaration": true, "emitDeclarationOnly": true, "strict": true, - "moduleResolution": "Node16", - "target": "ES2022", - "module": "Node16", + "moduleResolution": "nodenext", + "target": "esnext", + "module": "nodenext", "esModuleInterop": true, "skipLibCheck": true, "verbatimModuleSyntax": true, From 01249203babb5ff05537a690bf73d9cfbbee6acb Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Thu, 26 Feb 2026 10:17:23 +0100 Subject: [PATCH 02/13] update ts --- package.json | 2 +- .../e2e/fixtures/actions-blog/package.json | 2 +- .../fixtures/actions-react-19/package.json | 2 +- packages/astro/package.json | 2 +- .../fixtures/astro-check-errors/package.json | 2 +- .../astro-check-no-errors/package.json | 2 +- packages/db/package.json | 2 +- .../fixtures/ticketing-example/package.json | 2 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/svelte/package.json | 2 +- .../language-tools/astro-check/package.json | 2 +- .../language-server/package.json | 2 +- .../language-tools/ts-plugin/package.json | 2 +- packages/language-tools/tsconfig.json | 2 +- packages/language-tools/yaml2ts/package.json | 2 +- pnpm-lock.yaml | 211 +++++++++++------- 16 files changed, 142 insertions(+), 99 deletions(-) diff --git a/package.json b/package.json index 07af218309b9..524d4482bd5d 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "publint": "^0.3.17", "tinyglobby": "^0.2.15", "turbo": "^2.8.10", - "typescript": "~5.9.3", + "typescript": "^6.0.0-beta", "typescript-eslint": "^8.56.0", "valibot": "^1.2.0" } diff --git a/packages/astro/e2e/fixtures/actions-blog/package.json b/packages/astro/e2e/fixtures/actions-blog/package.json index 4d3cecc5bb25..07a67cddb58a 100644 --- a/packages/astro/e2e/fixtures/actions-blog/package.json +++ b/packages/astro/e2e/fixtures/actions-blog/package.json @@ -19,6 +19,6 @@ "astro": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1", - "typescript": "^5.9.3" + "typescript": "^6.0.0-beta" } } diff --git a/packages/astro/e2e/fixtures/actions-react-19/package.json b/packages/astro/e2e/fixtures/actions-react-19/package.json index 2650dfba9b6d..5ccbb6a38856 100644 --- a/packages/astro/e2e/fixtures/actions-react-19/package.json +++ b/packages/astro/e2e/fixtures/actions-react-19/package.json @@ -19,7 +19,7 @@ "astro": "workspace:*", "react": "19.2.4", "react-dom": "19.2.4", - "typescript": "^5.9.3" + "typescript": "^6.0.0-beta" }, "overrides": { "@types/react": "npm:types-react", diff --git a/packages/astro/package.json b/packages/astro/package.json index 1a3f5ab126d7..3516ddb88be8 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -204,7 +204,7 @@ "remark-code-titles": "^0.1.2", "rollup": "^4.58.0", "sass": "^1.97.3", - "typescript": "^5.9.3", + "typescript": "^6.0.0-beta", "undici": "^7.22.0", "unified": "^11.0.5", "vitest": "^3.2.4" diff --git a/packages/astro/test/fixtures/astro-check-errors/package.json b/packages/astro/test/fixtures/astro-check-errors/package.json index 4f9bea71fd40..c2742a4d9d02 100644 --- a/packages/astro/test/fixtures/astro-check-errors/package.json +++ b/packages/astro/test/fixtures/astro-check-errors/package.json @@ -5,6 +5,6 @@ "dependencies": { "astro": "workspace:*", "@astrojs/check": "workspace:*", - "typescript": "^5.9.3" + "typescript": "^6.0.0-beta" } } diff --git a/packages/astro/test/fixtures/astro-check-no-errors/package.json b/packages/astro/test/fixtures/astro-check-no-errors/package.json index df6a4a9312ab..fdd2d0acdfa8 100644 --- a/packages/astro/test/fixtures/astro-check-no-errors/package.json +++ b/packages/astro/test/fixtures/astro-check-no-errors/package.json @@ -5,6 +5,6 @@ "dependencies": { "astro": "workspace:*", "@astrojs/check": "workspace:*", - "typescript": "^5.9.3" + "typescript": "^6.0.0-beta" } } diff --git a/packages/db/package.json b/packages/db/package.json index 71481ae11e89..0d33d1543424 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -88,7 +88,7 @@ "astro-scripts": "workspace:*", "cheerio": "1.2.0", "expect-type": "^1.3.0", - "typescript": "^5.9.3", + "typescript": "^6.0.0-beta", "vite": "^7.3.1" } } diff --git a/packages/db/test/fixtures/ticketing-example/package.json b/packages/db/test/fixtures/ticketing-example/package.json index da84882cb01b..42c78ac01687 100644 --- a/packages/db/test/fixtures/ticketing-example/package.json +++ b/packages/db/test/fixtures/ticketing-example/package.json @@ -20,7 +20,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "simple-stack-form": "^0.1.12", - "typescript": "^5.9.3", + "typescript": "^6.0.0-beta", "zod": "^4.3.6" } } diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 30e5f1987f6b..50c401a283f3 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -58,7 +58,7 @@ "astro-scripts": "workspace:*", "cheerio": "1.2.0", "devalue": "^5.6.3", - "typescript": "^5.9.3" + "typescript": "^6.0.0-beta" }, "astro": { "external": true diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 4935c3e5cf14..86825183c18f 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -51,7 +51,7 @@ "peerDependencies": { "astro": "^6.0.0-alpha.0", "svelte": "^5.43.6", - "typescript": "^5.3.3" + "typescript": "^5.3.3 || ^6.0.0" }, "engines": { "node": "^20.19.1 || >=22.12.0" diff --git a/packages/language-tools/astro-check/package.json b/packages/language-tools/astro-check/package.json index e80888305f2f..6fe3502f3bc3 100644 --- a/packages/language-tools/astro-check/package.json +++ b/packages/language-tools/astro-check/package.json @@ -41,6 +41,6 @@ "astro-scripts": "workspace:*" }, "peerDependencies": { - "typescript": "^5.0.0" + "typescript": "^5.0.0 || ^6.0.0" } } diff --git a/packages/language-tools/language-server/package.json b/packages/language-tools/language-server/package.json index bf597bb69a7c..b1b12085af9e 100644 --- a/packages/language-tools/language-server/package.json +++ b/packages/language-tools/language-server/package.json @@ -50,7 +50,7 @@ "@volar/test-utils": "~2.4.28", "@volar/typescript": "~2.4.28", "tsx": "^4.21.0", - "typescript": "^5.9.3", + "typescript": "^6.0.0-beta", "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.12", "astro-scripts": "workspace:*" diff --git a/packages/language-tools/ts-plugin/package.json b/packages/language-tools/ts-plugin/package.json index b236b14ea1de..f88eaa7721fc 100644 --- a/packages/language-tools/ts-plugin/package.json +++ b/packages/language-tools/ts-plugin/package.json @@ -42,7 +42,7 @@ "@vscode/test-electron": "^2.5.2", "@vscode/test-cli": "^0.0.12", "mocha": "^11.7.5", - "typescript": "^5.9.3", + "typescript": "^6.0.0-beta", "vscode-uri": "^3.1.0" } } diff --git a/packages/language-tools/tsconfig.json b/packages/language-tools/tsconfig.json index f2872f217d84..9e965c52c3c8 100644 --- a/packages/language-tools/tsconfig.json +++ b/packages/language-tools/tsconfig.json @@ -3,7 +3,7 @@ "target": "ES2021", "lib": ["WebWorker", "ES2021"], "module": "commonjs", - "moduleResolution": "nodenext", + "moduleResolution": "node", "declaration": true, "emitDeclarationOnly": true, "strict": true, diff --git a/packages/language-tools/yaml2ts/package.json b/packages/language-tools/yaml2ts/package.json index c20ad97d4ef7..b30be2e2bad1 100644 --- a/packages/language-tools/yaml2ts/package.json +++ b/packages/language-tools/yaml2ts/package.json @@ -25,6 +25,6 @@ }, "devDependencies": { "@volar/language-core": "~2.4.28", - "typescript": "^5.9.3" + "typescript": "^6.0.0-beta" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index be4f2fdebffe..88c30ddb9b86 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,7 +14,7 @@ importers: devDependencies: '@astrojs/check': specifier: ^0.9.5 - version: 0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3) + version: 0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@6.0.0-beta) '@biomejs/biome': specifier: 2.4.2 version: 2.4.2 @@ -26,10 +26,10 @@ importers: version: 2.29.8(@types/node@18.19.130) '@flue/cli': specifier: ^0.0.44 - version: 0.0.44(typescript@5.9.3) + version: 0.0.44(typescript@6.0.0-beta) '@flue/client': specifier: ^0.0.27 - version: 0.0.27(typescript@5.9.3) + version: 0.0.27(typescript@6.0.0-beta) '@types/node': specifier: ^18.19.115 version: 18.19.130 @@ -47,7 +47,7 @@ importers: version: 3.0.0(eslint@9.39.2(jiti@2.6.1)) knip: specifier: 5.82.1 - version: 5.82.1(@types/node@18.19.130)(typescript@5.9.3) + version: 5.82.1(@types/node@18.19.130)(typescript@6.0.0-beta) only-allow: specifier: ^1.2.2 version: 1.2.2 @@ -67,14 +67,14 @@ importers: specifier: ^2.8.10 version: 2.8.10 typescript: - specifier: ~5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta typescript-eslint: specifier: ^8.56.0 - version: 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) + version: 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) valibot: specifier: ^1.2.0 - version: 1.2.0(typescript@5.9.3) + version: 1.2.0(typescript@6.0.0-beta) benchmark: dependencies: @@ -639,7 +639,7 @@ importers: version: 0.2.15 tsconfck: specifier: ^3.1.6 - version: 3.1.6(typescript@5.9.3) + version: 3.1.6(typescript@6.0.0-beta) ultrahtml: specifier: ^1.6.0 version: 1.6.0 @@ -756,8 +756,8 @@ importers: specifier: ^1.97.3 version: 1.97.3 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta undici: specifier: ^7.22.0 version: 7.22.0 @@ -843,8 +843,8 @@ importers: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta packages/astro/e2e/fixtures/actions-react-19: dependencies: @@ -876,8 +876,8 @@ importers: specifier: 19.2.4 version: 19.2.4(react@19.2.4) typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta packages/astro/e2e/fixtures/astro-component: dependencies: @@ -2025,8 +2025,8 @@ importers: specifier: workspace:* version: link:../../.. typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta packages/astro/test/fixtures/astro-check-no-errors: dependencies: @@ -2037,8 +2037,8 @@ importers: specifier: workspace:* version: link:../../.. typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta packages/astro/test/fixtures/astro-check-watch: dependencies: @@ -4701,8 +4701,8 @@ importers: specifier: ^1.3.0 version: 1.3.0 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta vite: specifier: ^7.3.1 version: 7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.31.1)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2) @@ -4842,8 +4842,8 @@ importers: specifier: ^0.1.12 version: 0.1.12(astro@packages+astro)(zod@4.3.6) typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta zod: specifier: ^4.3.6 version: 4.3.6 @@ -5531,7 +5531,7 @@ importers: version: 11.1.2 remark-shiki-twoslash: specifier: ^3.1.3 - version: 3.1.3(typescript@5.9.3) + version: 3.1.3(typescript@6.0.0-beta) remark-toc: specifier: ^9.0.0 version: 9.0.0 @@ -5747,8 +5747,8 @@ importers: specifier: ^5.6.3 version: 5.6.3 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta packages/integrations/netlify/test/development/fixtures/primitives: dependencies: @@ -6238,7 +6238,7 @@ importers: version: 6.2.4(svelte@5.53.1)(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.31.1)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2)) svelte2tsx: specifier: ^0.7.51 - version: 0.7.51(svelte@5.53.1)(typescript@5.9.3) + version: 0.7.51(svelte@5.53.1)(typescript@6.0.0-beta) vite: specifier: ^7.3.1 version: 7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.31.1)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2) @@ -6689,7 +6689,7 @@ importers: version: 1.5.5 '@volar/kit': specifier: ~2.4.28 - version: 2.4.28(typescript@5.9.3) + version: 2.4.28(typescript@6.0.0-beta) '@volar/language-core': specifier: ~2.4.28 version: 2.4.28 @@ -6749,8 +6749,8 @@ importers: specifier: ^4.21.0 version: 4.21.0 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta vscode-languageserver-protocol: specifier: ^3.17.5 version: 3.17.5 @@ -6826,8 +6826,8 @@ importers: specifier: ^11.7.5 version: 11.7.5 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta vscode-uri: specifier: ^3.1.0 version: 3.1.0 @@ -6909,8 +6909,8 @@ importers: specifier: ~2.4.28 version: 2.4.28 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0-beta + version: 6.0.0-beta packages/markdown/remark: dependencies: @@ -15268,6 +15268,11 @@ packages: engines: {node: '>=14.17'} hasBin: true + typescript@6.0.0-beta: + resolution: {integrity: sha512-CldZdztDpQRLM1HC6WDQjQkQN5Ub5zRau737a1diGh3lPmb9oRsaWHk1y5iqK0o7+1bNJ0oXfEGRkAogFZBL+Q==} + engines: {node: '>=14.17'} + hasBin: true + uc.micro@1.0.6: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} @@ -16172,12 +16177,12 @@ snapshots: dependencies: lite-youtube-embed: 0.3.4 - '@astrojs/check@0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3)': + '@astrojs/check@0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@6.0.0-beta)': dependencies: - '@astrojs/language-server': 2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3) + '@astrojs/language-server': 2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@6.0.0-beta) chokidar: 4.0.3 kleur: 4.1.5 - typescript: 5.9.3 + typescript: 6.0.0-beta yargs: 17.7.2 transitivePeerDependencies: - prettier @@ -16240,12 +16245,12 @@ snapshots: '@astrojs/internal-helpers@0.7.5': {} - '@astrojs/language-server@2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3)': + '@astrojs/language-server@2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@6.0.0-beta)': dependencies: '@astrojs/compiler': 2.13.1 '@astrojs/yaml2ts': 0.2.2 '@jridgewell/sourcemap-codec': 1.5.5 - '@volar/kit': 2.4.28(typescript@5.9.3) + '@volar/kit': 2.4.28(typescript@6.0.0-beta) '@volar/language-core': 2.4.28 '@volar/language-server': 2.4.28 '@volar/language-service': 2.4.28 @@ -17735,19 +17740,19 @@ snapshots: fastq: 1.20.1 glob: 13.0.3 - '@flue/cli@0.0.44(typescript@5.9.3)': + '@flue/cli@0.0.44(typescript@6.0.0-beta)': dependencies: - '@flue/client': 0.0.27(typescript@5.9.3) - '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@5.9.3)) - valibot: 1.2.0(typescript@5.9.3) + '@flue/client': 0.0.27(typescript@6.0.0-beta) + '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@6.0.0-beta)) + valibot: 1.2.0(typescript@6.0.0-beta) transitivePeerDependencies: - typescript - '@flue/client@0.0.27(typescript@5.9.3)': + '@flue/client@0.0.27(typescript@6.0.0-beta)': dependencies: '@opencode-ai/sdk': 1.1.65 - '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@5.9.3)) - valibot: 1.2.0(typescript@5.9.3) + '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@6.0.0-beta)) + valibot: 1.2.0(typescript@6.0.0-beta) transitivePeerDependencies: - typescript @@ -19287,31 +19292,31 @@ snapshots: '@types/node': 18.19.130 optional: true - '@typescript-eslint/eslint-plugin@8.56.0(@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/eslint-plugin@8.56.0(@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta))(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/parser': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) '@typescript-eslint/scope-manager': 8.56.0 - '@typescript-eslint/type-utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/type-utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) + '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) '@typescript-eslint/visitor-keys': 8.56.0 eslint: 9.39.2(jiti@2.6.1) ignore: 7.0.5 natural-compare: 1.4.0 - ts-api-utils: 2.4.0(typescript@5.9.3) - typescript: 5.9.3 + ts-api-utils: 2.4.0(typescript@6.0.0-beta) + typescript: 6.0.0-beta transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta)': dependencies: '@typescript-eslint/scope-manager': 8.56.0 '@typescript-eslint/types': 8.56.0 - '@typescript-eslint/typescript-estree': 8.56.0(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.56.0(typescript@6.0.0-beta) '@typescript-eslint/visitor-keys': 8.56.0 debug: 4.4.3(supports-color@8.1.1) eslint: 9.39.2(jiti@2.6.1) - typescript: 5.9.3 + typescript: 6.0.0-beta transitivePeerDependencies: - supports-color @@ -19324,6 +19329,15 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/project-service@8.56.0(typescript@6.0.0-beta)': + dependencies: + '@typescript-eslint/tsconfig-utils': 8.56.0(typescript@6.0.0-beta) + '@typescript-eslint/types': 8.56.0 + debug: 4.4.3(supports-color@8.1.1) + typescript: 6.0.0-beta + transitivePeerDependencies: + - supports-color + '@typescript-eslint/scope-manager@8.56.0': dependencies: '@typescript-eslint/types': 8.56.0 @@ -19333,15 +19347,19 @@ snapshots: dependencies: typescript: 5.9.3 - '@typescript-eslint/type-utils@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/tsconfig-utils@8.56.0(typescript@6.0.0-beta)': + dependencies: + typescript: 6.0.0-beta + + '@typescript-eslint/type-utils@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta)': dependencies: '@typescript-eslint/types': 8.56.0 - '@typescript-eslint/typescript-estree': 8.56.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.56.0(typescript@6.0.0-beta) + '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) debug: 4.4.3(supports-color@8.1.1) eslint: 9.39.2(jiti@2.6.1) - ts-api-utils: 2.4.0(typescript@5.9.3) - typescript: 5.9.3 + ts-api-utils: 2.4.0(typescript@6.0.0-beta) + typescript: 6.0.0-beta transitivePeerDependencies: - supports-color @@ -19362,14 +19380,29 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)': + '@typescript-eslint/typescript-estree@8.56.0(typescript@6.0.0-beta)': + dependencies: + '@typescript-eslint/project-service': 8.56.0(typescript@6.0.0-beta) + '@typescript-eslint/tsconfig-utils': 8.56.0(typescript@6.0.0-beta) + '@typescript-eslint/types': 8.56.0 + '@typescript-eslint/visitor-keys': 8.56.0 + debug: 4.4.3(supports-color@8.1.1) + minimatch: 9.0.5 + semver: 7.7.4 + tinyglobby: 0.2.15 + ts-api-utils: 2.4.0(typescript@6.0.0-beta) + typescript: 6.0.0-beta + transitivePeerDependencies: + - supports-color + + '@typescript-eslint/utils@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta)': dependencies: '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1)) '@typescript-eslint/scope-manager': 8.56.0 '@typescript-eslint/types': 8.56.0 - '@typescript-eslint/typescript-estree': 8.56.0(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.56.0(typescript@6.0.0-beta) eslint: 9.39.2(jiti@2.6.1) - typescript: 5.9.3 + typescript: 6.0.0-beta transitivePeerDependencies: - supports-color @@ -19408,9 +19441,9 @@ snapshots: '@ungap/structured-clone@1.3.0': {} - '@valibot/to-json-schema@1.5.0(valibot@1.2.0(typescript@5.9.3))': + '@valibot/to-json-schema@1.5.0(valibot@1.2.0(typescript@6.0.0-beta))': dependencies: - valibot: 1.2.0(typescript@5.9.3) + valibot: 1.2.0(typescript@6.0.0-beta) '@vercel/analytics@1.6.1(react@19.2.4)(svelte@5.53.1)(vue@3.5.28(typescript@5.9.3))': optionalDependencies: @@ -19596,12 +19629,12 @@ snapshots: '@vitest/pretty-format': 4.0.18 tinyrainbow: 3.0.3 - '@volar/kit@2.4.28(typescript@5.9.3)': + '@volar/kit@2.4.28(typescript@6.0.0-beta)': dependencies: '@volar/language-service': 2.4.28 '@volar/typescript': 2.4.28 typesafe-path: 0.2.2 - typescript: 5.9.3 + typescript: 6.0.0-beta vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 @@ -22365,7 +22398,7 @@ snapshots: kleur@4.1.5: {} - knip@5.82.1(@types/node@18.19.130)(typescript@5.9.3): + knip@5.82.1(@types/node@18.19.130)(typescript@6.0.0-beta): dependencies: '@nodelib/fs.walk': 1.2.8 '@types/node': 18.19.130 @@ -22379,7 +22412,7 @@ snapshots: picomatch: 4.0.3 smol-toml: 1.6.0 strip-json-comments: 5.0.3 - typescript: 5.9.3 + typescript: 6.0.0-beta zod: 4.3.6 kolorist@1.8.0: {} @@ -24438,7 +24471,7 @@ snapshots: unified: 11.0.5 vfile: 6.0.3 - remark-shiki-twoslash@3.1.3(typescript@5.9.3): + remark-shiki-twoslash@3.1.3(typescript@6.0.0-beta): dependencies: '@types/unist': 2.0.11 '@typescript/twoslash': 3.1.0 @@ -24446,9 +24479,9 @@ snapshots: fenceparser: 1.1.1 regenerator-runtime: 0.13.11 shiki: 0.10.1 - shiki-twoslash: 3.1.2(typescript@5.9.3) + shiki-twoslash: 3.1.2(typescript@6.0.0-beta) tslib: 2.1.0 - typescript: 5.9.3 + typescript: 6.0.0-beta unist-util-visit: 2.0.3 transitivePeerDependencies: - supports-color @@ -24751,13 +24784,13 @@ snapshots: shebang-regex@3.0.0: {} - shiki-twoslash@3.1.2(typescript@5.9.3): + shiki-twoslash@3.1.2(typescript@6.0.0-beta): dependencies: '@typescript/twoslash': 3.1.0 '@typescript/vfs': 1.3.4 fenceparser: 1.1.1 shiki: 0.10.1 - typescript: 5.9.3 + typescript: 6.0.0-beta transitivePeerDependencies: - supports-color @@ -25074,12 +25107,12 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - svelte2tsx@0.7.51(svelte@5.53.1)(typescript@5.9.3): + svelte2tsx@0.7.51(svelte@5.53.1)(typescript@6.0.0-beta): dependencies: dedent-js: 1.0.1 scule: 1.3.0 svelte: 5.53.1 - typescript: 5.9.3 + typescript: 6.0.0-beta svelte@5.53.1: dependencies: @@ -25259,10 +25292,18 @@ snapshots: dependencies: typescript: 5.9.3 + ts-api-utils@2.4.0(typescript@6.0.0-beta): + dependencies: + typescript: 6.0.0-beta + tsconfck@3.1.6(typescript@5.9.3): optionalDependencies: typescript: 5.9.3 + tsconfck@3.1.6(typescript@6.0.0-beta): + optionalDependencies: + typescript: 6.0.0-beta + tslib@2.1.0: {} tslib@2.8.1: {} @@ -25347,19 +25388,21 @@ snapshots: dependencies: semver: 7.7.4 - typescript-eslint@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3): + typescript-eslint@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta): dependencies: - '@typescript-eslint/eslint-plugin': 8.56.0(@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/parser': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) - '@typescript-eslint/typescript-estree': 8.56.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/eslint-plugin': 8.56.0(@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta))(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) + '@typescript-eslint/parser': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) + '@typescript-eslint/typescript-estree': 8.56.0(typescript@6.0.0-beta) + '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) eslint: 9.39.2(jiti@2.6.1) - typescript: 5.9.3 + typescript: 6.0.0-beta transitivePeerDependencies: - supports-color typescript@5.9.3: {} + typescript@6.0.0-beta: {} + uc.micro@1.0.6: {} uc.micro@2.1.0: {} @@ -25556,9 +25599,9 @@ snapshots: '@types/istanbul-lib-coverage': 2.0.6 convert-source-map: 2.0.0 - valibot@1.2.0(typescript@5.9.3): + valibot@1.2.0(typescript@6.0.0-beta): optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.0-beta validate-npm-package-license@3.0.4: dependencies: From 381a544f0ca0ac419b926ef91c511ad054e452e8 Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Thu, 26 Feb 2026 10:43:11 +0100 Subject: [PATCH 03/13] fix: build --- benchmark/packages/adapter/tsconfig.json | 1 + benchmark/packages/timer/tsconfig.json | 1 + examples/toolbar-app/tsconfig.json | 4 ++-- packages/astro-prism/tsconfig.json | 1 + packages/astro-rss/tsconfig.json | 1 + packages/create-astro/tsconfig.json | 1 + packages/db/tsconfig.json | 1 + packages/db/tsconfig.virtual.json | 1 + packages/integrations/alpinejs/tsconfig.json | 1 + packages/integrations/cloudflare/tsconfig.json | 1 + packages/integrations/markdoc/tsconfig.json | 1 + packages/integrations/mdx/tsconfig.json | 1 + packages/integrations/netlify/tsconfig.json | 1 + packages/integrations/node/tsconfig.json | 1 + packages/integrations/partytown/tsconfig.json | 1 + packages/integrations/preact/tsconfig.json | 1 + packages/integrations/react/tsconfig.json | 1 + packages/integrations/sitemap/tsconfig.json | 1 + packages/integrations/solid/tsconfig.json | 1 + packages/integrations/svelte/tsconfig.json | 1 + packages/integrations/vercel/tsconfig.json | 1 + packages/integrations/vue/tsconfig.json | 1 + packages/internal-helpers/tsconfig.json | 1 + packages/language-tools/astro-check/tsconfig.json | 4 ++-- .../language-server/src/core/compilerUtils.ts | 13 ------------- .../language-server/test/units/utils.test.ts | 14 -------------- .../language-tools/language-server/tsconfig.json | 4 ++-- packages/language-tools/ts-plugin/tsconfig.json | 9 +++------ packages/language-tools/tsconfig.json | 11 ++++------- packages/language-tools/vscode/tsconfig.json | 5 +++-- packages/language-tools/yaml2ts/tsconfig.json | 4 ++-- packages/telemetry/tsconfig.json | 1 + packages/underscore-redirects/tsconfig.json | 1 + packages/upgrade/tsconfig.json | 1 + tsconfig.base.json | 3 ++- 35 files changed, 45 insertions(+), 51 deletions(-) delete mode 100644 packages/language-tools/language-server/src/core/compilerUtils.ts diff --git a/benchmark/packages/adapter/tsconfig.json b/benchmark/packages/adapter/tsconfig.json index 1504b4b6dfa4..7f8d5c4c2184 100644 --- a/benchmark/packages/adapter/tsconfig.json +++ b/benchmark/packages/adapter/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/benchmark/packages/timer/tsconfig.json b/benchmark/packages/timer/tsconfig.json index 1504b4b6dfa4..7f8d5c4c2184 100644 --- a/benchmark/packages/timer/tsconfig.json +++ b/benchmark/packages/timer/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/examples/toolbar-app/tsconfig.json b/examples/toolbar-app/tsconfig.json index 281fb7f925fa..0a393886f195 100644 --- a/examples/toolbar-app/tsconfig.json +++ b/examples/toolbar-app/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "astro/tsconfigs/strict", "compilerOptions": { - "outDir": "dist", - "rootDir": "src" + "outDir": "./dist", + "rootDir": "./src" } } diff --git a/packages/astro-prism/tsconfig.json b/packages/astro-prism/tsconfig.json index 18443cddf207..17e08031358c 100644 --- a/packages/astro-prism/tsconfig.json +++ b/packages/astro-prism/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/astro-rss/tsconfig.json b/packages/astro-rss/tsconfig.json index 18443cddf207..17e08031358c 100644 --- a/packages/astro-rss/tsconfig.json +++ b/packages/astro-rss/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/create-astro/tsconfig.json b/packages/create-astro/tsconfig.json index 18443cddf207..17e08031358c 100644 --- a/packages/create-astro/tsconfig.json +++ b/packages/create-astro/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json index 7592ad8a1774..de415b5be4ad 100644 --- a/packages/db/tsconfig.json +++ b/packages/db/tsconfig.json @@ -3,6 +3,7 @@ "include": ["src"], "exclude": ["src/runtime/virtual.ts"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/db/tsconfig.virtual.json b/packages/db/tsconfig.virtual.json index 41d2aef4a11b..cd589bc96819 100644 --- a/packages/db/tsconfig.virtual.json +++ b/packages/db/tsconfig.virtual.json @@ -7,6 +7,7 @@ "extends": "../../tsconfig.base.json", "files": ["./src/runtime/virtual.ts"], "compilerOptions": { + "rootDir": ".", "outDir": "./dist/_internal" } } diff --git a/packages/integrations/alpinejs/tsconfig.json b/packages/integrations/alpinejs/tsconfig.json index 1504b4b6dfa4..7f8d5c4c2184 100644 --- a/packages/integrations/alpinejs/tsconfig.json +++ b/packages/integrations/alpinejs/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/cloudflare/tsconfig.json b/packages/integrations/cloudflare/tsconfig.json index 555bd5e4145b..cc4ec75d8fbc 100644 --- a/packages/integrations/cloudflare/tsconfig.json +++ b/packages/integrations/cloudflare/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src", "virtual.d.ts", "types.d.ts"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/markdoc/tsconfig.json b/packages/integrations/markdoc/tsconfig.json index 1504b4b6dfa4..7f8d5c4c2184 100644 --- a/packages/integrations/markdoc/tsconfig.json +++ b/packages/integrations/markdoc/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/mdx/tsconfig.json b/packages/integrations/mdx/tsconfig.json index 1504b4b6dfa4..7f8d5c4c2184 100644 --- a/packages/integrations/mdx/tsconfig.json +++ b/packages/integrations/mdx/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/netlify/tsconfig.json b/packages/integrations/netlify/tsconfig.json index ea1c17c2952b..8b6303c6d76d 100644 --- a/packages/integrations/netlify/tsconfig.json +++ b/packages/integrations/netlify/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src", "virtual.d.ts"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/node/tsconfig.json b/packages/integrations/node/tsconfig.json index ea1c17c2952b..8b6303c6d76d 100644 --- a/packages/integrations/node/tsconfig.json +++ b/packages/integrations/node/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src", "virtual.d.ts"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/partytown/tsconfig.json b/packages/integrations/partytown/tsconfig.json index 1504b4b6dfa4..7f8d5c4c2184 100644 --- a/packages/integrations/partytown/tsconfig.json +++ b/packages/integrations/partytown/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/preact/tsconfig.json b/packages/integrations/preact/tsconfig.json index 1504b4b6dfa4..7f8d5c4c2184 100644 --- a/packages/integrations/preact/tsconfig.json +++ b/packages/integrations/preact/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/react/tsconfig.json b/packages/integrations/react/tsconfig.json index c152f18f8f55..c72c8035a4ba 100644 --- a/packages/integrations/react/tsconfig.json +++ b/packages/integrations/react/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src", "env.d.ts"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/sitemap/tsconfig.json b/packages/integrations/sitemap/tsconfig.json index 1504b4b6dfa4..7f8d5c4c2184 100644 --- a/packages/integrations/sitemap/tsconfig.json +++ b/packages/integrations/sitemap/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/solid/tsconfig.json b/packages/integrations/solid/tsconfig.json index 1504b4b6dfa4..7f8d5c4c2184 100644 --- a/packages/integrations/solid/tsconfig.json +++ b/packages/integrations/solid/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/svelte/tsconfig.json b/packages/integrations/svelte/tsconfig.json index 5742d1f6efd2..cf99770081ac 100644 --- a/packages/integrations/svelte/tsconfig.json +++ b/packages/integrations/svelte/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist", "verbatimModuleSyntax": false } diff --git a/packages/integrations/vercel/tsconfig.json b/packages/integrations/vercel/tsconfig.json index ea1c17c2952b..8b6303c6d76d 100644 --- a/packages/integrations/vercel/tsconfig.json +++ b/packages/integrations/vercel/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src", "virtual.d.ts"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/integrations/vue/tsconfig.json b/packages/integrations/vue/tsconfig.json index 100f3c93b6d7..346a8461206c 100644 --- a/packages/integrations/vue/tsconfig.json +++ b/packages/integrations/vue/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../../tsconfig.base.json", "include": ["src", "env.d.ts"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist", "verbatimModuleSyntax": false } diff --git a/packages/internal-helpers/tsconfig.json b/packages/internal-helpers/tsconfig.json index 18443cddf207..17e08031358c 100644 --- a/packages/internal-helpers/tsconfig.json +++ b/packages/internal-helpers/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/language-tools/astro-check/tsconfig.json b/packages/language-tools/astro-check/tsconfig.json index 99f2d27ea436..7c2d5f06b897 100644 --- a/packages/language-tools/astro-check/tsconfig.json +++ b/packages/language-tools/astro-check/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "rootDir": "src", - "outDir": "dist", + "rootDir": "./src", + "outDir": "./dist", "emitDeclarationOnly": false, "sourceMap": true, "module": "ES2022", diff --git a/packages/language-tools/language-server/src/core/compilerUtils.ts b/packages/language-tools/language-server/src/core/compilerUtils.ts deleted file mode 100644 index 3bc0a2dead3d..000000000000 --- a/packages/language-tools/language-server/src/core/compilerUtils.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { AttributeNode, Point } from '@astrojs/compiler'; -import { Position as LSPPosition } from '@volar/language-server'; - -/** - * Transform a Point from the Astro compiler to an LSP Position - */ -export function PointToPosition(point: Point) { - // Columns and lines are 0-based in LSP, but the compiler's Point are 1 based. - return LSPPosition.create(point.line - 1, point.column - 1); -} - -type WithRequired = T & { [P in K]-?: T[P] }; -export type AttributeNodeWithPosition = WithRequired; diff --git a/packages/language-tools/language-server/test/units/utils.test.ts b/packages/language-tools/language-server/test/units/utils.test.ts index 3fdbd46a79ae..9ba81a001c7f 100644 --- a/packages/language-tools/language-server/test/units/utils.test.ts +++ b/packages/language-tools/language-server/test/units/utils.test.ts @@ -1,11 +1,9 @@ import assert from 'node:assert'; import { describe, it } from 'node:test'; -import type { Point } from '@astrojs/compiler/types.js'; import { Range } from '@volar/language-server'; import type { Node } from 'vscode-html-languageservice'; import * as html from 'vscode-html-languageservice'; import { getTSXRangesAsLSPRanges, safeConvertToTSX } from '../../dist/core/astro2tsx.js'; -import * as compilerUtils from '../../dist/core/compilerUtils.js'; import { getAstroMetadata } from '../../dist/core/parseAstro.js'; import * as utils from '../../dist/plugins/utils.js'; @@ -64,18 +62,6 @@ describe('Utilities', async () => { assert.strictEqual(utils.isInsideFrontmatter(6, openFrontmatter.frontmatter), true); }); - it('PointToPosition - properly transform a Point from the Astro compiler to an LSP Position', () => { - const point: Point = { - line: 1, - column: 2, - offset: 3, - }; - assert.deepStrictEqual(compilerUtils.PointToPosition(point), { - line: 0, - character: 1, - }); - }); - it('ensureRangeIsInFrontmatter - properly return a range inside the frontmatter', () => { const beforeFrontmatterRange = Range.create(0, 0, 0, 0); const input = '---\nfoo\n---\n'; diff --git a/packages/language-tools/language-server/tsconfig.json b/packages/language-tools/language-server/tsconfig.json index 029f1c7f6a9e..2b5c5fb560b6 100644 --- a/packages/language-tools/language-server/tsconfig.json +++ b/packages/language-tools/language-server/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "outDir": "dist", - "rootDir": "src", + "outDir": "./dist", + "rootDir": "./src", "emitDeclarationOnly": false, "sourceMap": true }, diff --git a/packages/language-tools/ts-plugin/tsconfig.json b/packages/language-tools/ts-plugin/tsconfig.json index 15bae86fc5f0..90eb9eaaad2b 100644 --- a/packages/language-tools/ts-plugin/tsconfig.json +++ b/packages/language-tools/ts-plugin/tsconfig.json @@ -1,12 +1,9 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "outDir": "dist", - "rootDir": "src", - "target": "ES2020", - "module": "CommonJS", - "emitDeclarationOnly": false, - "ignoreDeprecations": "5.0" + "outDir": "./dist", + "rootDir": "./src", + "emitDeclarationOnly": false }, "include": ["src"], "exclude": ["node_modules"] diff --git a/packages/language-tools/tsconfig.json b/packages/language-tools/tsconfig.json index 9e965c52c3c8..7732f35e14a0 100644 --- a/packages/language-tools/tsconfig.json +++ b/packages/language-tools/tsconfig.json @@ -1,14 +1,11 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { "target": "ES2021", "lib": ["WebWorker", "ES2021"], "module": "commonjs", - "moduleResolution": "node", - "declaration": true, - "emitDeclarationOnly": true, - "strict": true, - "esModuleInterop": true, - "skipLibCheck": true, - "forceConsistentCasingInFileNames": true + "moduleResolution": "bundler", + "forceConsistentCasingInFileNames": true, + "verbatimModuleSyntax": false } } diff --git a/packages/language-tools/vscode/tsconfig.json b/packages/language-tools/vscode/tsconfig.json index 6e3b3eca1868..523b94dc4b99 100644 --- a/packages/language-tools/vscode/tsconfig.json +++ b/packages/language-tools/vscode/tsconfig.json @@ -1,9 +1,10 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "outDir": "dist", + "rootDir": "./src", + "outDir": "./dist", "emitDeclarationOnly": true, "checkJs": true }, - "include": ["src", ".vscode-test.js"] + "include": ["src"] } diff --git a/packages/language-tools/yaml2ts/tsconfig.json b/packages/language-tools/yaml2ts/tsconfig.json index 029f1c7f6a9e..2b5c5fb560b6 100644 --- a/packages/language-tools/yaml2ts/tsconfig.json +++ b/packages/language-tools/yaml2ts/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "outDir": "dist", - "rootDir": "src", + "outDir": "./dist", + "rootDir": "./src", "emitDeclarationOnly": false, "sourceMap": true }, diff --git a/packages/telemetry/tsconfig.json b/packages/telemetry/tsconfig.json index 18443cddf207..17e08031358c 100644 --- a/packages/telemetry/tsconfig.json +++ b/packages/telemetry/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/underscore-redirects/tsconfig.json b/packages/underscore-redirects/tsconfig.json index 18443cddf207..17e08031358c 100644 --- a/packages/underscore-redirects/tsconfig.json +++ b/packages/underscore-redirects/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["src"], "compilerOptions": { + "rootDir": "./src", "outDir": "./dist" } } diff --git a/packages/upgrade/tsconfig.json b/packages/upgrade/tsconfig.json index d15ade00ff80..2341647f4266 100644 --- a/packages/upgrade/tsconfig.json +++ b/packages/upgrade/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.base.json", "include": ["src", "index.d.ts"], "compilerOptions": { + "rootDir": "./src", "allowJs": true, "emitDeclarationOnly": false, "noEmit": true, diff --git a/tsconfig.base.json b/tsconfig.base.json index 2d4c180ab7dc..7ed082d83639 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -12,6 +12,7 @@ "verbatimModuleSyntax": true, "stripInternal": true, "noUnusedLocals": true, - "noUnusedParameters": true + "noUnusedParameters": true, + "types": ["node"] } } From 578fe454b265482cd9f44947185023f0bca28521 Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Thu, 26 Feb 2026 10:51:14 +0100 Subject: [PATCH 04/13] fix: db types --- packages/db/tsconfig.virtual.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/db/tsconfig.virtual.json b/packages/db/tsconfig.virtual.json index cd589bc96819..f23230d26235 100644 --- a/packages/db/tsconfig.virtual.json +++ b/packages/db/tsconfig.virtual.json @@ -7,7 +7,7 @@ "extends": "../../tsconfig.base.json", "files": ["./src/runtime/virtual.ts"], "compilerOptions": { - "rootDir": ".", + "rootDir": "./src", "outDir": "./dist/_internal" } } From f9817262234ce4ad60719f9b8359490077c16456 Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Thu, 26 Feb 2026 10:59:23 +0100 Subject: [PATCH 05/13] fix: examples check --- examples/portfolio/src/components/Nav.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/portfolio/src/components/Nav.astro b/examples/portfolio/src/components/Nav.astro index d8fbd075c30f..88652f5763cd 100644 --- a/examples/portfolio/src/components/Nav.astro +++ b/examples/portfolio/src/components/Nav.astro @@ -124,7 +124,7 @@ const isCurrentPage = (href: string) => { }; // Toggle menu visibility when the menu button is clicked. - btn.addEventListener('click', () => setExpanded(menu.hidden)); + btn.addEventListener('click', () => setExpanded(menu.hidden === true)); // Hide menu button for large screens. const handleViewports = (e: MediaQueryList | MediaQueryListEvent) => { From 962f768ede7f41e8ea478cc466696da9e0da1f17 Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Thu, 26 Feb 2026 11:12:59 +0100 Subject: [PATCH 06/13] fix: mdx test --- .../test/fixtures/mdx-images/src/pages/content-collection.astro | 2 +- .../mdx/test/fixtures/mdx-images/src/pages/esm-import.astro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/content-collection.astro b/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/content-collection.astro index 68a3fe3baba5..444a90cf53c9 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/content-collection.astro +++ b/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/content-collection.astro @@ -1,6 +1,6 @@ --- import { getEntry, render } from 'astro:content'; -import MyImage from 'src/components/MyImage.astro'; +import MyImage from '../components/MyImage.astro'; const entry = await getEntry('blog', 'entry'); const { Content } = await render(entry) diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/esm-import.astro b/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/esm-import.astro index 4e4db66a4d17..c250d50ba203 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/esm-import.astro +++ b/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/esm-import.astro @@ -1,5 +1,5 @@ --- -import MyImage from 'src/components/MyImage.astro'; +import MyImage from '../components/MyImage.astro'; import MDX from '../components/Component.mdx'; --- From 05061f278d205b1f92ebf2643c9adb4175cfc6d7 Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Fri, 27 Feb 2026 08:39:14 +0100 Subject: [PATCH 07/13] Update packages/astro/src/vite-plugin-config-alias/README.md --- packages/astro/src/vite-plugin-config-alias/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/astro/src/vite-plugin-config-alias/README.md b/packages/astro/src/vite-plugin-config-alias/README.md index 0c480d3dbf23..765a00550c5c 100644 --- a/packages/astro/src/vite-plugin-config-alias/README.md +++ b/packages/astro/src/vite-plugin-config-alias/README.md @@ -8,7 +8,7 @@ Consider the following example configuration: { "compilerOptions": { "paths": { - "components:*": ["components/*.astro"] + "components:*": ["src/components/*.astro"] } } } From f76b4b78d2854050797d8706f4443d26c3ba6276 Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Fri, 27 Feb 2026 08:44:24 +0100 Subject: [PATCH 08/13] downgrade --- package.json | 2 +- .../e2e/fixtures/actions-blog/package.json | 2 +- .../fixtures/actions-react-19/package.json | 2 +- packages/astro/package.json | 2 +- .../fixtures/astro-check-errors/package.json | 2 +- .../astro-check-no-errors/package.json | 2 +- packages/db/package.json | 2 +- .../fixtures/ticketing-example/package.json | 2 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/svelte/package.json | 2 +- .../language-tools/astro-check/package.json | 2 +- .../language-server/package.json | 2 +- .../language-tools/ts-plugin/package.json | 2 +- packages/language-tools/yaml2ts/package.json | 2 +- pnpm-lock.yaml | 211 +++++++----------- 15 files changed, 98 insertions(+), 141 deletions(-) diff --git a/package.json b/package.json index 524d4482bd5d..b80fe2b7186c 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "publint": "^0.3.17", "tinyglobby": "^0.2.15", "turbo": "^2.8.10", - "typescript": "^6.0.0-beta", + "typescript": "^5.9.3", "typescript-eslint": "^8.56.0", "valibot": "^1.2.0" } diff --git a/packages/astro/e2e/fixtures/actions-blog/package.json b/packages/astro/e2e/fixtures/actions-blog/package.json index 07a67cddb58a..4d3cecc5bb25 100644 --- a/packages/astro/e2e/fixtures/actions-blog/package.json +++ b/packages/astro/e2e/fixtures/actions-blog/package.json @@ -19,6 +19,6 @@ "astro": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1", - "typescript": "^6.0.0-beta" + "typescript": "^5.9.3" } } diff --git a/packages/astro/e2e/fixtures/actions-react-19/package.json b/packages/astro/e2e/fixtures/actions-react-19/package.json index 5ccbb6a38856..2650dfba9b6d 100644 --- a/packages/astro/e2e/fixtures/actions-react-19/package.json +++ b/packages/astro/e2e/fixtures/actions-react-19/package.json @@ -19,7 +19,7 @@ "astro": "workspace:*", "react": "19.2.4", "react-dom": "19.2.4", - "typescript": "^6.0.0-beta" + "typescript": "^5.9.3" }, "overrides": { "@types/react": "npm:types-react", diff --git a/packages/astro/package.json b/packages/astro/package.json index 4fbab5789441..78ad1b186f1d 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -202,7 +202,7 @@ "remark-code-titles": "^0.1.2", "rollup": "^4.58.0", "sass": "^1.97.3", - "typescript": "^6.0.0-beta", + "typescript": "^5.9.3", "undici": "^7.22.0", "unified": "^11.0.5", "vitest": "^3.2.4" diff --git a/packages/astro/test/fixtures/astro-check-errors/package.json b/packages/astro/test/fixtures/astro-check-errors/package.json index c2742a4d9d02..4f9bea71fd40 100644 --- a/packages/astro/test/fixtures/astro-check-errors/package.json +++ b/packages/astro/test/fixtures/astro-check-errors/package.json @@ -5,6 +5,6 @@ "dependencies": { "astro": "workspace:*", "@astrojs/check": "workspace:*", - "typescript": "^6.0.0-beta" + "typescript": "^5.9.3" } } diff --git a/packages/astro/test/fixtures/astro-check-no-errors/package.json b/packages/astro/test/fixtures/astro-check-no-errors/package.json index fdd2d0acdfa8..df6a4a9312ab 100644 --- a/packages/astro/test/fixtures/astro-check-no-errors/package.json +++ b/packages/astro/test/fixtures/astro-check-no-errors/package.json @@ -5,6 +5,6 @@ "dependencies": { "astro": "workspace:*", "@astrojs/check": "workspace:*", - "typescript": "^6.0.0-beta" + "typescript": "^5.9.3" } } diff --git a/packages/db/package.json b/packages/db/package.json index 0d33d1543424..71481ae11e89 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -88,7 +88,7 @@ "astro-scripts": "workspace:*", "cheerio": "1.2.0", "expect-type": "^1.3.0", - "typescript": "^6.0.0-beta", + "typescript": "^5.9.3", "vite": "^7.3.1" } } diff --git a/packages/db/test/fixtures/ticketing-example/package.json b/packages/db/test/fixtures/ticketing-example/package.json index 42c78ac01687..da84882cb01b 100644 --- a/packages/db/test/fixtures/ticketing-example/package.json +++ b/packages/db/test/fixtures/ticketing-example/package.json @@ -20,7 +20,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "simple-stack-form": "^0.1.12", - "typescript": "^6.0.0-beta", + "typescript": "^5.9.3", "zod": "^4.3.6" } } diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 5ebd0713f52d..2033097629c0 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -58,7 +58,7 @@ "astro-scripts": "workspace:*", "cheerio": "1.2.0", "devalue": "^5.6.3", - "typescript": "^6.0.0-beta" + "typescript": "^5.9.3" }, "astro": { "external": true diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 86825183c18f..4935c3e5cf14 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -51,7 +51,7 @@ "peerDependencies": { "astro": "^6.0.0-alpha.0", "svelte": "^5.43.6", - "typescript": "^5.3.3 || ^6.0.0" + "typescript": "^5.3.3" }, "engines": { "node": "^20.19.1 || >=22.12.0" diff --git a/packages/language-tools/astro-check/package.json b/packages/language-tools/astro-check/package.json index 6fe3502f3bc3..e80888305f2f 100644 --- a/packages/language-tools/astro-check/package.json +++ b/packages/language-tools/astro-check/package.json @@ -41,6 +41,6 @@ "astro-scripts": "workspace:*" }, "peerDependencies": { - "typescript": "^5.0.0 || ^6.0.0" + "typescript": "^5.0.0" } } diff --git a/packages/language-tools/language-server/package.json b/packages/language-tools/language-server/package.json index b1b12085af9e..bf597bb69a7c 100644 --- a/packages/language-tools/language-server/package.json +++ b/packages/language-tools/language-server/package.json @@ -50,7 +50,7 @@ "@volar/test-utils": "~2.4.28", "@volar/typescript": "~2.4.28", "tsx": "^4.21.0", - "typescript": "^6.0.0-beta", + "typescript": "^5.9.3", "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.12", "astro-scripts": "workspace:*" diff --git a/packages/language-tools/ts-plugin/package.json b/packages/language-tools/ts-plugin/package.json index f88eaa7721fc..b236b14ea1de 100644 --- a/packages/language-tools/ts-plugin/package.json +++ b/packages/language-tools/ts-plugin/package.json @@ -42,7 +42,7 @@ "@vscode/test-electron": "^2.5.2", "@vscode/test-cli": "^0.0.12", "mocha": "^11.7.5", - "typescript": "^6.0.0-beta", + "typescript": "^5.9.3", "vscode-uri": "^3.1.0" } } diff --git a/packages/language-tools/yaml2ts/package.json b/packages/language-tools/yaml2ts/package.json index b30be2e2bad1..c20ad97d4ef7 100644 --- a/packages/language-tools/yaml2ts/package.json +++ b/packages/language-tools/yaml2ts/package.json @@ -25,6 +25,6 @@ }, "devDependencies": { "@volar/language-core": "~2.4.28", - "typescript": "^6.0.0-beta" + "typescript": "^5.9.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c70bd9420113..941f5dbdd13f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,7 +14,7 @@ importers: devDependencies: '@astrojs/check': specifier: ^0.9.5 - version: 0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@6.0.0-beta) + version: 0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3) '@biomejs/biome': specifier: 2.4.2 version: 2.4.2 @@ -26,10 +26,10 @@ importers: version: 2.29.8(@types/node@18.19.130) '@flue/cli': specifier: ^0.0.44 - version: 0.0.44(typescript@6.0.0-beta) + version: 0.0.44(typescript@5.9.3) '@flue/client': specifier: ^0.0.27 - version: 0.0.27(typescript@6.0.0-beta) + version: 0.0.27(typescript@5.9.3) '@types/node': specifier: ^18.19.115 version: 18.19.130 @@ -47,7 +47,7 @@ importers: version: 3.0.0(eslint@9.39.2(jiti@2.6.1)) knip: specifier: 5.82.1 - version: 5.82.1(@types/node@18.19.130)(typescript@6.0.0-beta) + version: 5.82.1(@types/node@18.19.130)(typescript@5.9.3) only-allow: specifier: ^1.2.2 version: 1.2.2 @@ -67,14 +67,14 @@ importers: specifier: ^2.8.10 version: 2.8.10 typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 typescript-eslint: specifier: ^8.56.0 - version: 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) + version: 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) valibot: specifier: ^1.2.0 - version: 1.2.0(typescript@6.0.0-beta) + version: 1.2.0(typescript@5.9.3) benchmark: dependencies: @@ -636,7 +636,7 @@ importers: version: 0.2.15 tsconfck: specifier: ^3.1.6 - version: 3.1.6(typescript@6.0.0-beta) + version: 3.1.6(typescript@5.9.3) ultrahtml: specifier: ^1.6.0 version: 1.6.0 @@ -750,8 +750,8 @@ importers: specifier: ^1.97.3 version: 1.97.3 typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 undici: specifier: ^7.22.0 version: 7.22.0 @@ -837,8 +837,8 @@ importers: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 packages/astro/e2e/fixtures/actions-react-19: dependencies: @@ -870,8 +870,8 @@ importers: specifier: 19.2.4 version: 19.2.4(react@19.2.4) typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 packages/astro/e2e/fixtures/astro-component: dependencies: @@ -2019,8 +2019,8 @@ importers: specifier: workspace:* version: link:../../.. typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 packages/astro/test/fixtures/astro-check-no-errors: dependencies: @@ -2031,8 +2031,8 @@ importers: specifier: workspace:* version: link:../../.. typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 packages/astro/test/fixtures/astro-check-watch: dependencies: @@ -4653,8 +4653,8 @@ importers: specifier: ^1.3.0 version: 1.3.0 typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 vite: specifier: ^7.3.1 version: 7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.31.1)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2) @@ -4794,8 +4794,8 @@ importers: specifier: ^0.1.12 version: 0.1.12(astro@packages+astro)(zod@4.3.6) typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 zod: specifier: ^4.3.6 version: 4.3.6 @@ -5498,7 +5498,7 @@ importers: version: 11.1.2 remark-shiki-twoslash: specifier: ^3.1.3 - version: 3.1.3(typescript@6.0.0-beta) + version: 3.1.3(typescript@5.9.3) remark-toc: specifier: ^9.0.0 version: 9.0.0 @@ -5723,8 +5723,8 @@ importers: specifier: ^5.6.3 version: 5.6.3 typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 packages/integrations/netlify/test/development/fixtures/primitives: dependencies: @@ -6214,7 +6214,7 @@ importers: version: 6.2.4(svelte@5.53.1)(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.31.1)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2)) svelte2tsx: specifier: ^0.7.51 - version: 0.7.51(svelte@5.53.1)(typescript@6.0.0-beta) + version: 0.7.51(svelte@5.53.1)(typescript@5.9.3) vite: specifier: ^7.3.1 version: 7.3.1(@types/node@25.2.3)(jiti@2.6.1)(lightningcss@1.31.1)(sass@1.97.3)(tsx@4.21.0)(yaml@2.8.2) @@ -6665,7 +6665,7 @@ importers: version: 1.5.5 '@volar/kit': specifier: ~2.4.28 - version: 2.4.28(typescript@6.0.0-beta) + version: 2.4.28(typescript@5.9.3) '@volar/language-core': specifier: ~2.4.28 version: 2.4.28 @@ -6725,8 +6725,8 @@ importers: specifier: ^4.21.0 version: 4.21.0 typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 vscode-languageserver-protocol: specifier: ^3.17.5 version: 3.17.5 @@ -6802,8 +6802,8 @@ importers: specifier: ^11.7.5 version: 11.7.5 typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 vscode-uri: specifier: ^3.1.0 version: 3.1.0 @@ -6885,8 +6885,8 @@ importers: specifier: ~2.4.28 version: 2.4.28 typescript: - specifier: ^6.0.0-beta - version: 6.0.0-beta + specifier: ^5.9.3 + version: 5.9.3 packages/markdown/remark: dependencies: @@ -15241,11 +15241,6 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@6.0.0-beta: - resolution: {integrity: sha512-CldZdztDpQRLM1HC6WDQjQkQN5Ub5zRau737a1diGh3lPmb9oRsaWHk1y5iqK0o7+1bNJ0oXfEGRkAogFZBL+Q==} - engines: {node: '>=14.17'} - hasBin: true - uc.micro@1.0.6: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} @@ -16150,12 +16145,12 @@ snapshots: dependencies: lite-youtube-embed: 0.3.4 - '@astrojs/check@0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@6.0.0-beta)': + '@astrojs/check@0.9.6(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3)': dependencies: - '@astrojs/language-server': 2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@6.0.0-beta) + '@astrojs/language-server': 2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3) chokidar: 4.0.3 kleur: 4.1.5 - typescript: 6.0.0-beta + typescript: 5.9.3 yargs: 17.7.2 transitivePeerDependencies: - prettier @@ -16218,12 +16213,12 @@ snapshots: '@astrojs/internal-helpers@0.7.5': {} - '@astrojs/language-server@2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@6.0.0-beta)': + '@astrojs/language-server@2.16.3(prettier-plugin-astro@0.14.1)(prettier@3.8.1)(typescript@5.9.3)': dependencies: '@astrojs/compiler': 2.13.1 '@astrojs/yaml2ts': 0.2.2 '@jridgewell/sourcemap-codec': 1.5.5 - '@volar/kit': 2.4.28(typescript@6.0.0-beta) + '@volar/kit': 2.4.28(typescript@5.9.3) '@volar/language-core': 2.4.28 '@volar/language-server': 2.4.28 '@volar/language-service': 2.4.28 @@ -17713,19 +17708,19 @@ snapshots: fastq: 1.20.1 glob: 13.0.3 - '@flue/cli@0.0.44(typescript@6.0.0-beta)': + '@flue/cli@0.0.44(typescript@5.9.3)': dependencies: - '@flue/client': 0.0.27(typescript@6.0.0-beta) - '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@6.0.0-beta)) - valibot: 1.2.0(typescript@6.0.0-beta) + '@flue/client': 0.0.27(typescript@5.9.3) + '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@5.9.3)) + valibot: 1.2.0(typescript@5.9.3) transitivePeerDependencies: - typescript - '@flue/client@0.0.27(typescript@6.0.0-beta)': + '@flue/client@0.0.27(typescript@5.9.3)': dependencies: '@opencode-ai/sdk': 1.1.65 - '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@6.0.0-beta)) - valibot: 1.2.0(typescript@6.0.0-beta) + '@valibot/to-json-schema': 1.5.0(valibot@1.2.0(typescript@5.9.3)) + valibot: 1.2.0(typescript@5.9.3) transitivePeerDependencies: - typescript @@ -19263,31 +19258,31 @@ snapshots: '@types/node': 18.19.130 optional: true - '@typescript-eslint/eslint-plugin@8.56.0(@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta))(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta)': + '@typescript-eslint/eslint-plugin@8.56.0(@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.12.2 - '@typescript-eslint/parser': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) + '@typescript-eslint/parser': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) '@typescript-eslint/scope-manager': 8.56.0 - '@typescript-eslint/type-utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) - '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) + '@typescript-eslint/type-utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) '@typescript-eslint/visitor-keys': 8.56.0 eslint: 9.39.2(jiti@2.6.1) ignore: 7.0.5 natural-compare: 1.4.0 - ts-api-utils: 2.4.0(typescript@6.0.0-beta) - typescript: 6.0.0-beta + ts-api-utils: 2.4.0(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta)': + '@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)': dependencies: '@typescript-eslint/scope-manager': 8.56.0 '@typescript-eslint/types': 8.56.0 - '@typescript-eslint/typescript-estree': 8.56.0(typescript@6.0.0-beta) + '@typescript-eslint/typescript-estree': 8.56.0(typescript@5.9.3) '@typescript-eslint/visitor-keys': 8.56.0 debug: 4.4.3(supports-color@8.1.1) eslint: 9.39.2(jiti@2.6.1) - typescript: 6.0.0-beta + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -19300,15 +19295,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.56.0(typescript@6.0.0-beta)': - dependencies: - '@typescript-eslint/tsconfig-utils': 8.56.0(typescript@6.0.0-beta) - '@typescript-eslint/types': 8.56.0 - debug: 4.4.3(supports-color@8.1.1) - typescript: 6.0.0-beta - transitivePeerDependencies: - - supports-color - '@typescript-eslint/scope-manager@8.56.0': dependencies: '@typescript-eslint/types': 8.56.0 @@ -19318,19 +19304,15 @@ snapshots: dependencies: typescript: 5.9.3 - '@typescript-eslint/tsconfig-utils@8.56.0(typescript@6.0.0-beta)': - dependencies: - typescript: 6.0.0-beta - - '@typescript-eslint/type-utils@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta)': + '@typescript-eslint/type-utils@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)': dependencies: '@typescript-eslint/types': 8.56.0 - '@typescript-eslint/typescript-estree': 8.56.0(typescript@6.0.0-beta) - '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) + '@typescript-eslint/typescript-estree': 8.56.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) debug: 4.4.3(supports-color@8.1.1) eslint: 9.39.2(jiti@2.6.1) - ts-api-utils: 2.4.0(typescript@6.0.0-beta) - typescript: 6.0.0-beta + ts-api-utils: 2.4.0(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -19351,29 +19333,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.56.0(typescript@6.0.0-beta)': - dependencies: - '@typescript-eslint/project-service': 8.56.0(typescript@6.0.0-beta) - '@typescript-eslint/tsconfig-utils': 8.56.0(typescript@6.0.0-beta) - '@typescript-eslint/types': 8.56.0 - '@typescript-eslint/visitor-keys': 8.56.0 - debug: 4.4.3(supports-color@8.1.1) - minimatch: 9.0.5 - semver: 7.7.4 - tinyglobby: 0.2.15 - ts-api-utils: 2.4.0(typescript@6.0.0-beta) - typescript: 6.0.0-beta - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/utils@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta)': + '@typescript-eslint/utils@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.2(jiti@2.6.1)) '@typescript-eslint/scope-manager': 8.56.0 '@typescript-eslint/types': 8.56.0 - '@typescript-eslint/typescript-estree': 8.56.0(typescript@6.0.0-beta) + '@typescript-eslint/typescript-estree': 8.56.0(typescript@5.9.3) eslint: 9.39.2(jiti@2.6.1) - typescript: 6.0.0-beta + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -19412,9 +19379,9 @@ snapshots: '@ungap/structured-clone@1.3.0': {} - '@valibot/to-json-schema@1.5.0(valibot@1.2.0(typescript@6.0.0-beta))': + '@valibot/to-json-schema@1.5.0(valibot@1.2.0(typescript@5.9.3))': dependencies: - valibot: 1.2.0(typescript@6.0.0-beta) + valibot: 1.2.0(typescript@5.9.3) '@vercel/analytics@1.6.1(react@19.2.4)(svelte@5.53.1)(vue@3.5.28(typescript@5.9.3))': optionalDependencies: @@ -19600,12 +19567,12 @@ snapshots: '@vitest/pretty-format': 4.0.18 tinyrainbow: 3.0.3 - '@volar/kit@2.4.28(typescript@6.0.0-beta)': + '@volar/kit@2.4.28(typescript@5.9.3)': dependencies: '@volar/language-service': 2.4.28 '@volar/typescript': 2.4.28 typesafe-path: 0.2.2 - typescript: 6.0.0-beta + typescript: 5.9.3 vscode-languageserver-textdocument: 1.0.12 vscode-uri: 3.1.0 @@ -22369,7 +22336,7 @@ snapshots: kleur@4.1.5: {} - knip@5.82.1(@types/node@18.19.130)(typescript@6.0.0-beta): + knip@5.82.1(@types/node@18.19.130)(typescript@5.9.3): dependencies: '@nodelib/fs.walk': 1.2.8 '@types/node': 18.19.130 @@ -22383,7 +22350,7 @@ snapshots: picomatch: 4.0.3 smol-toml: 1.6.0 strip-json-comments: 5.0.3 - typescript: 6.0.0-beta + typescript: 5.9.3 zod: 4.3.6 kolorist@1.8.0: {} @@ -24442,7 +24409,7 @@ snapshots: unified: 11.0.5 vfile: 6.0.3 - remark-shiki-twoslash@3.1.3(typescript@6.0.0-beta): + remark-shiki-twoslash@3.1.3(typescript@5.9.3): dependencies: '@types/unist': 2.0.11 '@typescript/twoslash': 3.1.0 @@ -24450,9 +24417,9 @@ snapshots: fenceparser: 1.1.1 regenerator-runtime: 0.13.11 shiki: 0.10.1 - shiki-twoslash: 3.1.2(typescript@6.0.0-beta) + shiki-twoslash: 3.1.2(typescript@5.9.3) tslib: 2.1.0 - typescript: 6.0.0-beta + typescript: 5.9.3 unist-util-visit: 2.0.3 transitivePeerDependencies: - supports-color @@ -24755,13 +24722,13 @@ snapshots: shebang-regex@3.0.0: {} - shiki-twoslash@3.1.2(typescript@6.0.0-beta): + shiki-twoslash@3.1.2(typescript@5.9.3): dependencies: '@typescript/twoslash': 3.1.0 '@typescript/vfs': 1.3.4 fenceparser: 1.1.1 shiki: 0.10.1 - typescript: 6.0.0-beta + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -25078,12 +25045,12 @@ snapshots: supports-preserve-symlinks-flag@1.0.0: {} - svelte2tsx@0.7.51(svelte@5.53.1)(typescript@6.0.0-beta): + svelte2tsx@0.7.51(svelte@5.53.1)(typescript@5.9.3): dependencies: dedent-js: 1.0.1 scule: 1.3.0 svelte: 5.53.1 - typescript: 6.0.0-beta + typescript: 5.9.3 svelte@5.53.1: dependencies: @@ -25263,18 +25230,10 @@ snapshots: dependencies: typescript: 5.9.3 - ts-api-utils@2.4.0(typescript@6.0.0-beta): - dependencies: - typescript: 6.0.0-beta - tsconfck@3.1.6(typescript@5.9.3): optionalDependencies: typescript: 5.9.3 - tsconfck@3.1.6(typescript@6.0.0-beta): - optionalDependencies: - typescript: 6.0.0-beta - tslib@2.1.0: {} tslib@2.8.1: {} @@ -25359,21 +25318,19 @@ snapshots: dependencies: semver: 7.7.4 - typescript-eslint@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta): + typescript-eslint@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.56.0(@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta))(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) - '@typescript-eslint/parser': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) - '@typescript-eslint/typescript-estree': 8.56.0(typescript@6.0.0-beta) - '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@6.0.0-beta) + '@typescript-eslint/eslint-plugin': 8.56.0(@typescript-eslint/parser@8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/parser': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.56.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.56.0(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3) eslint: 9.39.2(jiti@2.6.1) - typescript: 6.0.0-beta + typescript: 5.9.3 transitivePeerDependencies: - supports-color typescript@5.9.3: {} - typescript@6.0.0-beta: {} - uc.micro@1.0.6: {} uc.micro@2.1.0: {} @@ -25570,9 +25527,9 @@ snapshots: '@types/istanbul-lib-coverage': 2.0.6 convert-source-map: 2.0.0 - valibot@1.2.0(typescript@6.0.0-beta): + valibot@1.2.0(typescript@5.9.3): optionalDependencies: - typescript: 6.0.0-beta + typescript: 5.9.3 validate-npm-package-license@3.0.4: dependencies: From 090e6a799ff2520d4bba29f4fafdb9fdf5dd370f Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Fri, 27 Feb 2026 08:46:21 +0100 Subject: [PATCH 09/13] chore: comment --- packages/language-tools/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/language-tools/tsconfig.json b/packages/language-tools/tsconfig.json index 7732f35e14a0..7c2d0d787d86 100644 --- a/packages/language-tools/tsconfig.json +++ b/packages/language-tools/tsconfig.json @@ -4,7 +4,8 @@ "target": "ES2021", "lib": ["WebWorker", "ES2021"], "module": "commonjs", - "moduleResolution": "bundler", + // TODO: when upgrading to TS 6, will need to be set to "bundler" + "moduleResolution": "node", "forceConsistentCasingInFileNames": true, "verbatimModuleSyntax": false } From 5c93f68fc69fd133e9f5fcd9a58acaf242e4c1db Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Fri, 27 Feb 2026 08:49:52 +0100 Subject: [PATCH 10/13] changeset --- .changeset/kind-hairs-report.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/kind-hairs-report.md diff --git a/.changeset/kind-hairs-report.md b/.changeset/kind-hairs-report.md new file mode 100644 index 000000000000..019bdae743fc --- /dev/null +++ b/.changeset/kind-hairs-report.md @@ -0,0 +1,5 @@ +--- +'astro': major +--- + +Changes TypeScript configuration - ([v6 upgrade guidance](https://v6.docs.astro.build/en/guides/upgrade-to/v6/#TODO:)) From 8c3d85e6a858890de39f92f71ab7413f10ee01af Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Fri, 27 Feb 2026 09:02:03 +0100 Subject: [PATCH 11/13] Update .changeset/kind-hairs-report.md --- .changeset/kind-hairs-report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/kind-hairs-report.md b/.changeset/kind-hairs-report.md index 019bdae743fc..64565bd50923 100644 --- a/.changeset/kind-hairs-report.md +++ b/.changeset/kind-hairs-report.md @@ -2,4 +2,4 @@ 'astro': major --- -Changes TypeScript configuration - ([v6 upgrade guidance](https://v6.docs.astro.build/en/guides/upgrade-to/v6/#TODO:)) +Changes TypeScript configuration - ([v6 upgrade guidance](https://v6.docs.astro.build/en/guides/upgrade-to/v6/#changed-typescript-configuration)) From 954da7ee08eb7b3dc72877befaac5f1cf2b3275f Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Fri, 27 Feb 2026 09:14:38 +0100 Subject: [PATCH 12/13] fix: tsconfig --- packages/language-tools/tsconfig.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/language-tools/tsconfig.json b/packages/language-tools/tsconfig.json index 7c2d0d787d86..83a96ac9ee32 100644 --- a/packages/language-tools/tsconfig.json +++ b/packages/language-tools/tsconfig.json @@ -1,12 +1,15 @@ { - "extends": "../../tsconfig.base.json", "compilerOptions": { "target": "ES2021", "lib": ["WebWorker", "ES2021"], "module": "commonjs", // TODO: when upgrading to TS 6, will need to be set to "bundler" "moduleResolution": "node", - "forceConsistentCasingInFileNames": true, - "verbatimModuleSyntax": false + "declaration": true, + "emitDeclarationOnly": true, + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true } } From c7534304fd941168055336e2f47f303311d4d5fd Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Fri, 27 Feb 2026 09:16:56 +0100 Subject: [PATCH 13/13] fix: tsconfig --- packages/astro/test/fixtures/alias-tsconfig/tsconfig.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/astro/test/fixtures/alias-tsconfig/tsconfig.json b/packages/astro/test/fixtures/alias-tsconfig/tsconfig.json index dd3320cb4d4a..a448e76fbc8f 100644 --- a/packages/astro/test/fixtures/alias-tsconfig/tsconfig.json +++ b/packages/astro/test/fixtures/alias-tsconfig/tsconfig.json @@ -1,5 +1,7 @@ { "compilerOptions": { + // TODO: remove when upgrading to TS 6 + "baseUrl": ".", "paths": { "@components/*": [ "src/components/*"