Merge branch 'main' into fix-rolldown-single-bundle

eltigerchino · eltigerchino · commit 24f5572611ea · 2025-07-11T10:17:34.000+08:00
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
 		"prettier-plugin-svelte": "^3.4.0",
 		"typescript-eslint": "^8.35.0"
 	},
-	"packageManager": "pnpm@10.12.4",
+	"packageManager": "pnpm@10.13.1",
 	"engines": {
 		"pnpm": ">=9.0.0"
 	},
diff --git a/packages/adapter-cloudflare/test/apps/pages/package.json b/packages/adapter-cloudflare/test/apps/pages/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"server-side-dep": "file:server-side-dep",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"vite": "catalog:",
 		"wrangler": "^4.14.3"
 	},
diff --git a/packages/adapter-cloudflare/test/apps/workers/package.json b/packages/adapter-cloudflare/test/apps/workers/package.json
@@ -16,7 +16,7 @@
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
 		"server-side-dep": "file:server-side-dep",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"vite": "catalog:",
 		"wrangler": "^4.14.3"
 	},
diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json
@@ -44,7 +44,7 @@
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"@types/node": "^18.19.48",
 		"sirv": "^3.0.0",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"typescript": "^5.3.3",
 		"vite": "catalog:"
 	},
diff --git a/packages/adapter-static/test/apps/prerendered/package.json b/packages/adapter-static/test/apps/prerendered/package.json
@@ -12,7 +12,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"sirv-cli": "^3.0.0",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"vite": "catalog:"
 	},
 	"type": "module"
diff --git a/packages/adapter-static/test/apps/spa/package.json b/packages/adapter-static/test/apps/spa/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"sirv-cli": "^3.0.0",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"vite": "catalog:"
 	},
 	"type": "module"
diff --git a/packages/enhanced-img/package.json b/packages/enhanced-img/package.json
@@ -47,7 +47,7 @@
 		"@types/estree": "^1.0.5",
 		"@types/node": "^18.19.48",
 		"rollup": "^4.27.4",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"typescript": "^5.6.3",
 		"vite": "catalog:",
 		"vitest": "catalog:"
diff --git a/packages/enhanced-img/types/internal.d.ts b/packages/enhanced-img/types/internal.d.ts
@@ -31,4 +31,4 @@ type Block = AST.EachBlock | AST.IfBlock | AST.AwaitBlock | AST.KeyBlock | AST.S
 
 export type TemplateNode = AST.Text | Tag | ElementLike | AST.Comment | Block;
 
-export type Attribute = AST.Attribute | AST.SpreadAttribute | Directive;
+export type Attribute = AST.RegularElement['attributes'][number];
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/kit
 
+## 2.22.5
+### Patch Changes
+
+
+- fix: re-add `@sveltejs/kit` to `optimizeDeps.exclude` ([#13983](https://github.com/sveltejs/kit/pull/13983))
+
 ## 2.22.4
 ### Patch Changes
 
diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "2.22.4",
+	"version": "2.22.5",
 	"description": "SvelteKit is the fastest way to build Svelte apps",
 	"keywords": [
 		"framework",
@@ -39,7 +39,7 @@
 		"@types/set-cookie-parser": "^2.4.7",
 		"dts-buddy": "^0.6.1",
 		"rollup": "^4.14.2",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-preprocess": "^6.0.0",
 		"typescript": "^5.3.3",
 		"vite": "catalog:",
diff --git a/packages/kit/src/exports/vite/index.js b/packages/kit/src/exports/vite/index.js
@@ -287,6 +287,9 @@ async function kit({ svelte_config }) {
 						`!${kit.files.routes}/**/+*server.*`
 					],
 					exclude: [
+						// Without this SvelteKit will be prebundled on the client, which means we end up with two versions of Redirect etc.
+						// Also see https://github.com/sveltejs/kit/issues/5952#issuecomment-1218844057
+						'@sveltejs/kit',
 						// exclude kit features so that libraries using them work even when they are prebundled
 						// this does not affect app code, just handling of imported libraries that use $app or $env
 						'$app',
diff --git a/packages/kit/src/version.js b/packages/kit/src/version.js
@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '2.22.4';
+export const VERSION = '2.22.5';
diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json
@@ -18,7 +18,7 @@
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
 		"dropcss": "^1.0.16",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
@@ -20,7 +20,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"test-redirect-importer": "workspace:*",
 		"typescript": "^5.5.4",
diff --git a/packages/kit/test/apps/dev-only/package.json b/packages/kit/test/apps/dev-only/package.json
@@ -24,7 +24,7 @@
 		"e2e-test-dep-page-svelte": "file:./_test_dependencies/cjs-only",
 		"e2e-test-dep-page-universal": "file:./_test_dependencies/cjs-only",
 		"e2e-test-dep-server": "file:./_test_dependencies/cjs-only",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/apps/embed/package.json b/packages/kit/test/apps/embed/package.json
@@ -16,7 +16,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/apps/hash-based-routing/package.json b/packages/kit/test/apps/hash-based-routing/package.json
@@ -16,7 +16,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/apps/no-ssr/package.json b/packages/kit/test/apps/no-ssr/package.json
@@ -16,7 +16,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/apps/options-2/package.json b/packages/kit/test/apps/options-2/package.json
@@ -17,7 +17,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/apps/options/package.json b/packages/kit/test/apps/options/package.json
@@ -19,7 +19,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/apps/prerendered-app-error-pages/package.json b/packages/kit/test/apps/prerendered-app-error-pages/package.json
@@ -18,7 +18,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/apps/writes/package.json b/packages/kit/test/apps/writes/package.json
@@ -16,7 +16,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/prerender-entry-generator-mismatch/package.json b/packages/kit/test/build-errors/apps/prerender-entry-generator-mismatch/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/adapter-auto": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/prerenderable-incorrect-fragment/package.json b/packages/kit/test/build-errors/apps/prerenderable-incorrect-fragment/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/adapter-auto": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/prerenderable-not-prerendered/package.json b/packages/kit/test/build-errors/apps/prerenderable-not-prerendered/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/adapter-auto": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/package.json b/packages/kit/test/build-errors/apps/private-dynamic-env-dynamic-import/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/private-dynamic-env/package.json b/packages/kit/test/build-errors/apps/private-dynamic-env/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/package.json b/packages/kit/test/build-errors/apps/private-static-env-dynamic-import/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/private-static-env/package.json b/packages/kit/test/build-errors/apps/private-static-env/package.json
@@ -14,7 +14,7 @@
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"cross-env": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/package.json b/packages/kit/test/build-errors/apps/server-only-folder-dynamic-import/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/server-only-folder/package.json b/packages/kit/test/build-errors/apps/server-only-folder/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/package.json b/packages/kit/test/build-errors/apps/server-only-module-dynamic-import/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/server-only-module/package.json b/packages/kit/test/build-errors/apps/server-only-module/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/service-worker-dynamic-public-env/package.json b/packages/kit/test/build-errors/apps/service-worker-dynamic-public-env/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/service-worker-private-env/package.json b/packages/kit/test/build-errors/apps/service-worker-private-env/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/build-errors/apps/syntax-error/package.json b/packages/kit/test/build-errors/apps/syntax-error/package.json
@@ -11,7 +11,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:"
diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:",
diff --git a/packages/kit/test/prerendering/options/package.json b/packages/kit/test/prerendering/options/package.json
@@ -12,7 +12,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:",
diff --git a/packages/kit/test/prerendering/paths-base/package.json b/packages/kit/test/prerendering/paths-base/package.json
@@ -12,7 +12,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.4",
 		"vite": "catalog:",
diff --git a/packages/package/package.json b/packages/package/package.json
@@ -31,7 +31,7 @@
 		"@types/node": "^18.19.48",
 		"@types/semver": "^7.5.6",
 		"prettier": "^3.1.1",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-preprocess": "^6.0.0",
 		"typescript": "^5.3.3",
 		"uvu": "^0.5.6"
diff --git a/playgrounds/basic/package.json b/playgrounds/basic/package.json
@@ -29,7 +29,7 @@
 		"prettier": "^3.3.2",
 		"prettier-plugin-svelte": "^3.2.6",
 		"publint": "^0.3.0",
-		"svelte": "^5.23.1",
+		"svelte": "^5.35.5",
 		"svelte-check": "^4.1.1",
 		"typescript": "^5.5.0",
 		"vite": "catalog:"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,4 @@ type Block = AST.EachBlock \| AST.IfBlock \| AST.AwaitBlock \| AST.KeyBlock \| AST.S`
`31`	`31`
`32`	`32`	`export type TemplateNode = AST.Text \| Tag \| ElementLike \| AST.Comment \| Block;`
`33`	`33`
`34`		`-export type Attribute = AST.Attribute \| AST.SpreadAttribute \| Directive;`
	`34`	`+export type Attribute = AST.RegularElement['attributes'][number];`