Skip to content
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/full-flies-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
Comment thread
teemingc marked this conversation as resolved.
Outdated
---

feat: support TypeScript 6.0
2 changes: 1 addition & 1 deletion packages/adapter-auto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"devDependencies": {
"@sveltejs/kit": "workspace:^",
"@types/node": "catalog:",
"typescript": "^5.3.3",
"typescript": "catalog:",
"vitest": "catalog:"
},
"peerDependencies": {
Expand Down
4 changes: 1 addition & 3 deletions packages/adapter-auto/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"noImplicitAny": true,
"strictNullChecks": true,
"target": "es2022",
"module": "node16",
"moduleResolution": "node16",
"baseUrl": "."
"types": ["node"]
},
"include": ["**/*.js"]
}
2 changes: 1 addition & 1 deletion packages/adapter-cloudflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@sveltejs/kit": "workspace:^",
"@types/node": "catalog:",
"esbuild": "catalog:",
"typescript": "^5.3.3",
"typescript": "catalog:",
"vitest": "catalog:"
},
"peerDependencies": {
Expand Down
1 change: 0 additions & 1 deletion packages/adapter-cloudflare/test/apps/pages/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"moduleResolution": "bundler"
},
"extends": "./.svelte-kit/tsconfig.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"moduleResolution": "bundler"
},
"extends": "./.svelte-kit/tsconfig.json"
Expand Down
5 changes: 1 addition & 4 deletions packages/adapter-cloudflare/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"noImplicitAny": true,
"strictNullChecks": true,
"target": "es2022",
"module": "node16",
"moduleResolution": "node16",
"baseUrl": ".",
"paths": {
"@sveltejs/kit": ["../kit/types/index"]
},
// taken from the Cloudflare Workers TypeScript template https://github.com/cloudflare/workers-sdk/blob/main/packages/create-cloudflare/templates/hello-world/ts/tsconfig.json
"lib": ["es2021"],
"types": ["@cloudflare/workers-types"]
"types": ["node", "@cloudflare/workers-types"]
},
"include": [
"index.js",
Expand Down
4 changes: 3 additions & 1 deletion packages/adapter-netlify/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,9 @@ function get_netlify_config() {
try {
return /** @type {NetlifyConfig} */ (toml.parse(readFileSync('netlify.toml', 'utf-8')));
} catch (err) {
err.message = `Error parsing netlify.toml: ${err.message}`;
if (err instanceof Error) {
err.message = `Error parsing netlify.toml: ${err.message}`;
}
throw err;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-netlify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@sveltejs/kit": "workspace:^",
"@types/node": "catalog:",
"rollup": "^4.59.0",
"typescript": "^5.3.3",
"typescript": "catalog:",
"vitest": "catalog:"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-netlify/src/serverless.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import './shims';
import './shims.js';
import { Server } from '0SERVER';
import { createReadableStream } from '@sveltejs/kit/node';
import process from 'node:process';
Expand Down
1 change: 0 additions & 1 deletion packages/adapter-netlify/test/apps/basic/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"moduleResolution": "bundler"
},
"extends": "./.svelte-kit/tsconfig.json"
Expand Down
1 change: 0 additions & 1 deletion packages/adapter-netlify/test/apps/edge/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"moduleResolution": "bundler"
},
"extends": "./.svelte-kit/tsconfig.json"
Expand Down
1 change: 0 additions & 1 deletion packages/adapter-netlify/test/apps/split/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"moduleResolution": "bundler"
},
"extends": "./.svelte-kit/tsconfig.json"
Expand Down
7 changes: 2 additions & 5 deletions packages/adapter-netlify/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"noImplicitAny": true,
"strictNullChecks": true,
"target": "es2022",
"module": "node16",
"moduleResolution": "node16",
"allowSyntheticDefaultImports": true,
"baseUrl": ".",
"paths": {
"@sveltejs/kit": ["../kit/types/index"]
}
},
"types": ["node"]
},
"include": ["*.js", "src/**/*.js", "internal.d.ts", "test/utils.js"]
}
2 changes: 2 additions & 0 deletions packages/adapter-node/internal.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ declare module 'MANIFEST' {
declare module 'SERVER' {
export { Server } from '@sveltejs/kit';
}

declare module 'SHIMS' {}
2 changes: 1 addition & 1 deletion packages/adapter-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@types/node": "catalog:",
"polka": "catalog:",
"sirv": "^3.0.2",
"typescript": "^5.3.3",
"typescript": "catalog:",
"vitest": "catalog:"
},
"dependencies": {
Expand Down
7 changes: 2 additions & 5 deletions packages/adapter-node/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"noImplicitAny": true,
"strictNullChecks": true,
"allowSyntheticDefaultImports": true,
"target": "es2022",
"module": "node16",
"moduleResolution": "node16",
"baseUrl": ".",
"paths": {
"@sveltejs/kit": ["../kit/types/index"]
}
},
"types": ["node"]
},
"include": [
"index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@types/node": "catalog:",
"sirv": "^3.0.0",
"svelte": "catalog:",
"typescript": "^5.3.3",
"typescript": "catalog:",
"vite": "catalog:"
},
"peerDependencies": {
Expand Down
7 changes: 2 additions & 5 deletions packages/adapter-static/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"noImplicitAny": true,
"strictNullChecks": true,
"target": "es2022",
"module": "node16",
"moduleResolution": "node16",
"allowSyntheticDefaultImports": true,
"baseUrl": ".",
"paths": {
"@sveltejs/kit": ["../kit/types/index"]
}
},
"types": ["node"]
},
"include": ["index.js", "internal.d.ts", "test/utils.js"]
}
2 changes: 1 addition & 1 deletion packages/adapter-vercel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"devDependencies": {
"@sveltejs/kit": "workspace:^",
"@types/node": "catalog:",
"typescript": "^5.3.3",
"typescript": "catalog:",
"vitest": "catalog:"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-vercel/test/apps/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@sveltejs/kit": "workspace:*",
"@sveltejs/vite-plugin-svelte": "catalog:",
"svelte": "catalog:",
"typescript": "^5.3.3",
"typescript": "catalog:",
"vite": "catalog:"
},
"type": "module"
Expand Down
1 change: 0 additions & 1 deletion packages/adapter-vercel/test/apps/basic/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true,
"moduleResolution": "bundler"
}
}
8 changes: 2 additions & 6 deletions packages/adapter-vercel/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"strict": true,
"noEmit": true,
"noImplicitAny": true,
"strictNullChecks": true,
"target": "es2022",
"module": "node16",
"moduleResolution": "node16",
"allowSyntheticDefaultImports": true,
"baseUrl": ".",
"paths": {
"@sveltejs/kit": ["../kit/types/index"]
}
},
"types": ["node"]
},
"include": ["*.js", "files/**/*.js", "internal.d.ts", "test/**/*.js"]
}
2 changes: 1 addition & 1 deletion packages/amp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"devDependencies": {
"@sveltejs/kit": "workspace:^",
"typescript": "^5.3.3"
"typescript": "catalog:"
},
"peerDependencies": {
"@sveltejs/kit": "^1.0.0 || ^2.0.0"
Expand Down
4 changes: 1 addition & 3 deletions packages/amp/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"strict": true,
"target": "es2022",
"module": "node16",
"moduleResolution": "node16",
"allowSyntheticDefaultImports": true
"moduleResolution": "node16"
}
}
2 changes: 1 addition & 1 deletion packages/enhanced-img/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@types/node": "catalog:",
"rollup": "^4.59.0",
"svelte": "catalog:",
"typescript": "^5.6.3",
"typescript": "catalog:",
"vite": "catalog:",
"vitest": "catalog:"
},
Expand Down
5 changes: 2 additions & 3 deletions packages/enhanced-img/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"strict": true,
"target": "es2022",
"module": "node16",
"moduleResolution": "node16",
"allowSyntheticDefaultImports": true,
"paths": {
"types": ["./types/index"],
"types/*": ["./types/*"]
},
"noUnusedLocals": true,
"noUnusedParameters": true
"noUnusedParameters": true,
"types": ["node"]
},
"include": ["src/**/*", "types/**/*", "test/**/*"]
}
4 changes: 2 additions & 2 deletions packages/kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@types/connect": "catalog:",
"@types/node": "catalog:",
"@types/set-cookie-parser": "catalog:",
"dts-buddy": "catalog:",
"dts-buddy": "^0.7.0",
"rollup": "^4.59.0",
"svelte": "catalog:",
"svelte-preprocess": "catalog:",
Expand All @@ -50,7 +50,7 @@
"@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0 || ^7.0.0",
"@opentelemetry/api": "^1.0.0",
"svelte": "^4.0.0 || ^5.0.0-next.0",
"typescript": "^5.3.3",
"typescript": "^5.3.3 || ^6.0.0",
"vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0 || ^8.0.0"
},
"peerDependenciesMeta": {
Expand Down
4 changes: 3 additions & 1 deletion packages/kit/src/core/sync/write_tsconfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ export function get_tsconfig(kit) {
moduleResolution: 'bundler',
module: 'esnext',
noEmit: true, // prevent tsconfig error "overwriting input files" - Vite handles the build and ignores this
target: 'esnext'
target: 'esnext',
types: ['node']
},
include: [...include],
exclude
Expand Down Expand Up @@ -165,6 +166,7 @@ function validate_user_config(cwd, out, config) {
if (extends_framework_config) {
const { paths, baseUrl } = options;

// TODO: baseUrl will be removed in TypeScript 7.0
if (baseUrl || paths) {
console.warn(
colors
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"strict": true,
"target": "es2022",
"module": "es2022",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"baseUrl": ".",
"paths": {
"@sveltejs/kit": ["../../../../../exports/public"],
"types": ["../../../../../types/internal"],
"$app/types": ["../../../../../types/ambient.d.ts"]
}
},
"types": ["node"]
},
"include": ["./**/*.js", "./**/*.ts", ".svelte-kit/non-ambient.d.ts"],
"exclude": ["..svelte-kit/**"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"strict": true,
"target": "es2022",
"module": "es2022",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"baseUrl": ".",
"paths": {
"@sveltejs/kit": ["../../../../../exports/public"],
"types": ["../../../../../types/internal"],
"$app/types": ["../../../../../types/ambient.d.ts"]
}
},
"types": ["node"]
},
"include": ["./**/*.js", "./**/*.ts", ".svelte-kit/non-ambient.d.ts"],
"exclude": ["..svelte-kit/**"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
"allowJs": true,
"checkJs": true,
"noEmit": true,
"strict": true,
"target": "es2022",
"module": "es2022",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"baseUrl": ".",
"paths": {
"@sveltejs/kit": ["../../../../../exports/public"],
"types": ["../../../../../types/internal"],
"$app/types": ["../../../../../types/ambient.d.ts"]
}
},
"types": ["node"]
},
"include": ["./**/*.js", "./**/*.ts", ".svelte-kit/non-ambient.d.ts"],
"exclude": ["..svelte-kit/**"]
Expand Down
Loading
Loading