feat: support Vite 6 (#12270)

sveltejs · Nov 29, 2024 · d030f4b · d030f4b
1 parent da965d7
commit d030f4b
Show file tree

Hide file tree

Showing 67 changed files with 1,365 additions and 1,593 deletions.
diff --git a/.changeset/curvy-garlics-walk.md b/.changeset/curvy-garlics-walk.md
@@ -0,0 +1,8 @@
+---
+'@sveltejs/adapter-cloudflare-workers': minor
+'@sveltejs/adapter-cloudflare': minor
+'@sveltejs/adapter-netlify': minor
+'@sveltejs/adapter-vercel': minor
+---
+
+chore: upgrade esbuild to 0.24.0
diff --git a/.changeset/purple-comics-know.md b/.changeset/purple-comics-know.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': minor
+---
+
+feat: Vite 6 support
diff --git a/packages/adapter-auto/package.json b/packages/adapter-auto/package.json
@@ -40,7 +40,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"@types/node": "^18.19.48",
 		"typescript": "^5.3.3"
 	},

diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
@@ -40,7 +40,7 @@
 	"dependencies": {
 		"@cloudflare/workers-types": "^4.20231121.0",
 		"@iarna/toml": "^2.2.5",
-		"esbuild": "^0.21.5"
+		"esbuild": "^0.24.0"
 	},
 	"devDependencies": {
 		"@cloudflare/kv-asset-handler": "^0.3.0",

diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json
@@ -41,7 +41,7 @@
 	},
 	"dependencies": {
 		"@cloudflare/workers-types": "^4.20231121.0",
-		"esbuild": "^0.21.5",
+		"esbuild": "^0.24.0",
 		"worktop": "0.8.0-next.18"
 	},
 	"devDependencies": {

diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json
@@ -42,7 +42,7 @@
 	},
 	"dependencies": {
 		"@iarna/toml": "^2.2.5",
-		"esbuild": "^0.21.5",
+		"esbuild": "^0.24.0",
 		"set-cookie-parser": "^2.6.0"
 	},
 	"devDependencies": {
@@ -51,12 +51,12 @@
 		"@rollup/plugin-json": "^6.1.0",
 		"@rollup/plugin-node-resolve": "^15.3.0",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"@types/node": "^18.19.48",
 		"@types/set-cookie-parser": "^2.4.7",
 		"rollup": "^4.14.2",
 		"typescript": "^5.3.3",
-		"vitest": "^2.0.1"
+		"vitest": "^2.1.6"
 	},
 	"peerDependencies": {
 		"@sveltejs/kit": "^2.4.0"

diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json
@@ -43,12 +43,12 @@
 	"devDependencies": {
 		"@polka/url": "^1.0.0-next.28",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"@types/node": "^18.19.48",
 		"polka": "^1.0.0-next.28",
 		"sirv": "^3.0.0",
 		"typescript": "^5.3.3",
-		"vitest": "^2.0.1"
+		"vitest": "^2.1.6"
 	},
 	"dependencies": {
 		"@rollup/plugin-commonjs": "^28.0.1",

diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json
@@ -41,12 +41,12 @@
 	"devDependencies": {
 		"@playwright/test": "^1.44.1",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"@types/node": "^18.19.48",
 		"sirv": "^3.0.0",
-		"svelte": "^4.2.10",
+		"svelte": "^5.2.9",
 		"typescript": "^5.3.3",
-		"vite": "^5.3.2"
+		"vite": "^6.0.1"
 	},
 	"peerDependencies": {
 		"@sveltejs/kit": "^2.0.0"

diff --git a/packages/adapter-static/test/apps/prerendered/package.json b/packages/adapter-static/test/apps/prerendered/package.json
@@ -10,10 +10,10 @@
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"sirv-cli": "^3.0.0",
-		"svelte": "^4.2.10",
-		"vite": "^5.3.2"
+		"svelte": "^5.2.9",
+		"vite": "^6.0.1"
 	},
 	"type": "module"
 }
diff --git a/packages/adapter-static/test/apps/spa/package.json b/packages/adapter-static/test/apps/spa/package.json
@@ -11,10 +11,10 @@
 	"devDependencies": {
 		"@sveltejs/adapter-node": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"sirv-cli": "^3.0.0",
-		"svelte": "^4.2.10",
-		"vite": "^5.3.2"
+		"svelte": "^5.2.9",
+		"vite": "^6.0.1"
 	},
 	"type": "module"
 }
diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
@@ -40,14 +40,14 @@
 	},
 	"dependencies": {
 		"@vercel/nft": "^0.27.1",
-		"esbuild": "^0.21.5"
+		"esbuild": "^0.24.0"
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"@types/node": "^18.19.48",
 		"typescript": "^5.3.3",
-		"vitest": "^2.0.1"
+		"vitest": "^2.1.6"
 	},
 	"peerDependencies": {
 		"@sveltejs/kit": "^2.4.0"

diff --git a/packages/enhanced-img/package.json b/packages/enhanced-img/package.json
@@ -44,11 +44,11 @@
 	"devDependencies": {
 		"@types/estree": "^1.0.5",
 		"@types/node": "^18.19.48",
-		"rollup": "^4.14.2",
-		"svelte": "^5.1.3",
+		"rollup": "^4.27.4",
+		"svelte": "^5.2.9",
 		"typescript": "^5.6.3",
-		"vite": "^5.3.2",
-		"vitest": "^2.0.1"
+		"vite": "^6.0.1",
+		"vitest": "^2.1.6"
 	},
 	"peerDependencies": {
 		"svelte": "^5.0.0",

diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -21,7 +21,7 @@
 		"@types/cookie": "^0.6.0",
 		"cookie": "^0.6.0",
 		"devalue": "^5.1.0",
-		"esm-env": "^1.0.0",
+		"esm-env": "^1.2.1",
 		"import-meta-resolve": "^4.1.0",
 		"kleur": "^4.1.5",
 		"magic-string": "^0.30.5",
@@ -33,22 +33,22 @@
 	},
 	"devDependencies": {
 		"@playwright/test": "^1.44.1",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"@types/connect": "^3.4.38",
 		"@types/node": "^18.19.48",
 		"@types/set-cookie-parser": "^2.4.7",
-		"dts-buddy": "^0.5.3",
+		"dts-buddy": "^0.5.4",
 		"rollup": "^4.14.2",
-		"svelte": "^4.2.10",
+		"svelte": "^5.2.9",
 		"svelte-preprocess": "^6.0.0",
 		"typescript": "^5.3.3",
-		"vite": "^5.3.2",
-		"vitest": "^2.0.1"
+		"vite": "^6.0.1",
+		"vitest": "^2.1.6"
 	},
 	"peerDependencies": {
-		"@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1",
+		"@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0",
 		"svelte": "^4.0.0 || ^5.0.0-next.0",
-		"vite": "^5.0.3"
+		"vite": "^5.0.3 || ^6.0.0"
 	},
 	"bin": {
 		"svelte-kit": "svelte-kit.js"

diff --git a/packages/kit/src/exports/public.d.ts b/packages/kit/src/exports/public.d.ts
@@ -79,11 +79,12 @@ export interface ActionFailure<T extends Record<string, unknown> | undefined = u
 	[uniqueSymbol]: true; // necessary or else UnpackValidationError could wrongly unpack objects with the same shape as ActionFailure
 }
 
-type UnpackValidationError<T> = T extends ActionFailure<infer X>
-	? X
-	: T extends void
-		? undefined // needs to be undefined, because void will corrupt union type
-		: T;
+type UnpackValidationError<T> =
+	T extends ActionFailure<infer X>
+		? X
+		: T extends void
+			? undefined // needs to be undefined, because void will corrupt union type
+			: T;
 
 /**
  * This object is passed to the `adapt` function of adapters.

diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js
@@ -972,7 +972,7 @@ async function load_route({ id, invalidating, url, params, route, preload }) {
 			server_data_node: create_data_node(
 				// server_data_node is undefined if it wasn't reloaded from the server;
 				// and if current loader uses server data, we want to reuse previous data.
-				server_data_node === undefined && loader[0] ? { type: 'skip' } : server_data_node ?? null,
+				server_data_node === undefined && loader[0] ? { type: 'skip' } : (server_data_node ?? null),
 				loader[0] ? previous?.server : undefined
 			)
 		});

diff --git a/packages/kit/src/runtime/server/page/load_data.js b/packages/kit/src/runtime/server/page/load_data.js
@@ -244,7 +244,7 @@ export function create_universal_fetch(event, state, fetched, csr, resolve_opts)
 			}
 		} else {
 			// simulate CORS errors and "no access to body in no-cors mode" server-side for consistency with client-side behaviour
-			const mode = input instanceof Request ? input.mode : init?.mode ?? 'cors';
+			const mode = input instanceof Request ? input.mode : (init?.mode ?? 'cors');
 			if (mode === 'no-cors') {
 				response = new Response('', {
 					status: response.status,

diff --git a/packages/kit/src/runtime/server/page/render.js b/packages/kit/src/runtime/server/page/render.js
@@ -79,7 +79,7 @@ export async function render_response({
 
 	const form_value =
 		action_result?.type === 'success' || action_result?.type === 'failure'
-			? action_result.data ?? null
+			? (action_result.data ?? null)
 			: null;
 
 	/** @type {string} */

diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json
@@ -14,13 +14,13 @@
 	"devDependencies": {
 		"@sveltejs/amp": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"cross-env": "^7.0.3",
 		"dropcss": "^1.0.16",
-		"svelte": "^4.2.10",
+		"svelte": "^5.2.9",
 		"svelte-check": "^4.0.1",
 		"typescript": "^5.5.4",
-		"vite": "^5.3.2"
+		"vite": "^6.0.1"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
@@ -15,12 +15,12 @@
 	},
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:^",
-		"@sveltejs/vite-plugin-svelte": "^3.0.1",
+		"@sveltejs/vite-plugin-svelte": "^5.0.1",
 		"cross-env": "^7.0.3",
-		"svelte": "^4.2.10",
+		"svelte": "^5.2.9",
 		"svelte-check": "^4.0.1",
 		"typescript": "^5.5.4",
-		"vite": "^5.3.2"
+		"vite": "^6.0.1"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/test/apps/basics/test/cross-platform/client.test.js b/packages/kit/test/apps/basics/test/cross-platform/client.test.js
@@ -283,13 +283,12 @@ test.describe('Scrolling', () => {
 	test('url-supplied non-ascii anchor works on navigation to page after manual scroll', async ({
 		page,
 		in_view,
-		clicknav
+		clicknav,
+		scroll_to
 	}) => {
 		await page.goto('/anchor');
 		await clicknav('#non-ascii-anchor');
-		await page.evaluate(() => {
-			window.scrollTo(0, 50);
-		});
+		await scroll_to(0, 50);
 		await page.locator('#non-ascii-anchor').click();
 		expect(await in_view('#go-to-encöded')).toBe(true);
 	});
@@ -359,7 +358,8 @@ test.describe('Scrolling', () => {
 
 	test('scroll is restored after hitting the back button for an in-app cross-document navigation', async ({
 		page,
-		clicknav
+		clicknav,
+		scroll_to
 	}) => {
 		await page.goto('/scroll/cross-document/a');
 
@@ -368,7 +368,7 @@ test.describe('Scrolling', () => {
 		if (!rect) throw new Error('Could not determine bounding box');
 
 		const target_scroll_y = rect.y + rect.height - height;
-		await page.evaluate((y) => scrollTo(0, y), target_scroll_y);
+		await scroll_to(0, target_scroll_y);
 
 		await page.locator('[href="/scroll/cross-document/b"]').click();
 		expect(await page.textContent('h1')).toBe('b');
@@ -441,7 +441,8 @@ test.describe('Scrolling', () => {
 	test('scroll positions are recovered on reloading the page', async ({
 		page,
 		app,
-		browserName
+		browserName,
+		scroll_to
 	}) => {
 		// No idea why the workaround below works only in dev mode
 		// A better solution would probably be to set fission.webContentIsolationStrategy: 1
@@ -451,20 +452,21 @@ test.describe('Scrolling', () => {
 		}
 
 		await page.goto('/anchor');
-		await page.evaluate(() => window.scrollTo(0, 1000));
+		await scroll_to(0, 1000);
 		await app.goto('/anchor/anchor');
-		await page.evaluate(() => window.scrollTo(0, 1000));
+		await scroll_to(0, 1000);
 
 		await page.reload();
 		if (browserName === 'firefox') {
 			// Firefox with Playwright pushed new history entry history after reload
 			// See https://github.com/microsoft/playwright/issues/22640
 			await page.goBack();
 		}
-		expect(await page.evaluate(() => window.scrollY)).toBe(1000);
+		await page.waitForFunction(() => window.scrollY === 1000);
 
+		const waiter = page.waitForFunction(() => window.scrollY === 1000);
 		await page.goBack();
-		expect(await page.evaluate(() => window.scrollY)).toBe(1000);
+		await waiter;
 	});
 
 	test('scroll position is top of page on ssr:false reload', async ({ page }) => {
@@ -474,26 +476,32 @@ test.describe('Scrolling', () => {
 		expect(await page.evaluate(() => window.scrollY)).toBe(0);
 	});
 
-	test('clicking # or #top takes you to the top of the current page', async ({ page }) => {
+	test('clicking # or #top takes you to the top of the current page', async ({
+		page,
+		scroll_to
+	}) => {
 		await page.goto('/scroll/top');
 
 		for (const href of ['#', '#top']) {
-			await page.evaluate(() => window.scrollTo(0, 1000));
+			await scroll_to(0, 1000);
 			await page.click(`a[href="${href}"]`);
 			expect(await page.evaluate(() => window.scrollY)).toBe(0);
 
-			await page.evaluate(() => window.scrollTo(0, 1000));
+			await scroll_to(0, 1000);
 			await page.click(`a[href="${href}"]`);
 			expect(await page.evaluate(() => window.scrollY)).toBe(0);
 		}
 	});
 
-	test('Scroll position is correct after going back from a shallow route', async ({ page }) => {
+	test('Scroll position is correct after going back from a shallow route', async ({
+		page,
+		scroll_to
+	}) => {
 		await page.goto('/scroll/push-state');
 		await page.locator('#subpage-link').click();
 		await page.locator('#back-button').click();
 
-		await page.evaluate(() => window.scrollTo(0, 9999));
+		await scroll_to(0, 9999);
 
 		const scroll = await page.evaluate(() => window.scrollY);
 		expect(scroll).toBeGreaterThan(0);