Merge branch 'main' into issue-14835

sillvva · web-flow · commit ddf1c314d685 · 2025-10-28T11:21:05.000-05:00
diff --git a/.changeset/eager-experts-roll.md b/.changeset/eager-experts-roll.md
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: pnpm/action-setup@v4.2.0
       - uses: actions/setup-node@v6
         with:
-          node-version: '22.x'
+          node-version: '24.x'
           cache: pnpm
       - run: pnpm install --frozen-lockfile
       # check prod dependencies as these would affect users
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: pnpm/action-setup@v4.2.0
       - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
           cache: pnpm
       - run: pnpm install --frozen-lockfile
       - run: pnpm build
@@ -38,7 +38,7 @@ jobs:
       - uses: pnpm/action-setup@v4.2.0
       - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
           cache: pnpm
       - run: pnpm install --frozen-lockfile
       - run: pnpm run lint
@@ -84,7 +84,7 @@ jobs:
         run: find packages -type d -name test-results -not -empty | tar -czf test-results.tar.gz --files-from=-
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           retention-days: 3
           name: test-failure-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }}
@@ -142,7 +142,7 @@ jobs:
         run: find packages -type d -name test-results -not -empty | tar -czf test-results-cross-platform-${{ matrix.mode }}.tar.gz --files-from=-
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           retention-days: 3
           name: test-failure-cross-platform-${{ matrix.mode }}-${{ github.run_id }}-${{ matrix.os }}-${{ matrix.node-version }}-${{ matrix.e2e-browser }}
@@ -162,7 +162,7 @@ jobs:
       - uses: pnpm/action-setup@v4.2.0
       - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
           cache: pnpm
       - run: pnpm install --frozen-lockfile
       - run: pnpm playwright install chromium
@@ -176,7 +176,7 @@ jobs:
         run: find packages -type d -name test-results -not -empty | tar -czf test-results-server-side-route-resolution-${{ matrix.mode }}.tar.gz --files-from=-
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           retention-days: 3
           name: test-failure-server-side-route-resolution-${{ matrix.mode }}-${{ github.run_id }}
diff --git a/packages/adapter-static/test/apps/spa/package.json b/packages/adapter-static/test/apps/spa/package.json
@@ -9,7 +9,6 @@
 		"test": "playwright test"
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-node": "workspace:^",
 		"@sveltejs/kit": "workspace:^",
 		"@sveltejs/vite-plugin-svelte": "catalog:",
 		"sirv-cli": "catalog:",
diff --git a/packages/adapter-vercel/CHANGELOG.md b/packages/adapter-vercel/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @sveltejs/adapter-vercel
 
+## 6.1.0
+### Minor Changes
+
+
+- feat: Add experimental support for Bun runtime ([#14817](https://github.com/sveltejs/kit/pull/14817))
+
+
+### Patch Changes
+
+- Updated dependencies [[`102aecf`](https://github.com/sveltejs/kit/commit/102aecfd228dd632664d748b9e87bc6d219294c4)]:
+  - @sveltejs/kit@2.48.1
+
 ## 6.0.0
 ### Major Changes
 
diff --git a/packages/adapter-vercel/index.d.ts b/packages/adapter-vercel/index.d.ts
@@ -7,9 +7,8 @@ export interface ServerlessConfig {
 	/**
 	 * Whether to use [Edge Functions](https://vercel.com/docs/concepts/functions/edge-functions) (`'edge'`) or [Serverless Functions](https://vercel.com/docs/concepts/functions/serverless-functions) (`'nodejs18.x'`, `'nodejs20.x'` etc).
 	 * @default Same as the build environment
-	 * @deprecated
 	 */
-	runtime?: `nodejs${number}.x`;
+	runtime?: `nodejs${number}.x` | `experimental_bun1.x`;
 	/**
 	 * To which regions to deploy the app. A list of regions.
 	 * More info: https://vercel.com/docs/concepts/edge-network/regions
diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js
@@ -294,7 +294,11 @@ const plugin = function (defaults = {}) {
 
 			// group routes by config
 			for (const route of builder.routes) {
-				const runtime = route.config?.runtime ?? defaults?.runtime ?? get_default_runtime();
+				const runtime = (
+					route.config?.runtime ??
+					defaults?.runtime ??
+					get_default_runtime()
+				).replace('experimental_', '');
 				const config = { runtime, ...defaults, ...route.config };
 
 				if (is_prerendered(route)) {
@@ -305,19 +309,24 @@ const plugin = function (defaults = {}) {
 				}
 
 				const node_runtime = /nodejs([0-9]+)\.x/.exec(runtime);
-				if (runtime !== 'edge' && (!node_runtime || parseInt(node_runtime[1]) < 20)) {
+				const bun_runtime = /^bun/.exec(runtime);
+				if (
+					runtime !== 'edge' &&
+					!bun_runtime &&
+					(!node_runtime || parseInt(node_runtime[1]) < 20)
+				) {
 					throw new Error(
-						`Invalid runtime '${runtime}' for route ${route.id}. Valid runtimes are 'edge' and 'nodejs20.x' or higher ` +
+						`Invalid runtime '${runtime}' for route ${route.id}. Valid runtimes are 'edge', 'experimental_bun1.x', 'nodejs20.x' or 'nodejs22.x' ` +
 							'(see the Node.js Version section in your Vercel project settings for info on the currently supported versions).'
 					);
 				}
 
 				if (config.isr) {
 					const directory = path.relative('.', builder.config.kit.files.routes + route.id);
 
-					if (!runtime.startsWith('nodejs')) {
+					if (!runtime.startsWith('nodejs') && !bun_runtime) {
 						throw new Error(
-							`${directory}: Routes using \`isr\` must use a Node.js runtime (for example 'nodejs20.x')`
+							`${directory}: Routes using \`isr\` must use a Node.js or Bun runtime (for example 'nodejs22.x' or 'experimental_bun1.x')`
 						);
 					}
 
@@ -400,7 +409,7 @@ const plugin = function (defaults = {}) {
 				// we need to create a catch-all route so that 404s are handled
 				// by SvelteKit rather than Vercel
 
-				const runtime = defaults.runtime ?? get_default_runtime();
+				const runtime = (defaults.runtime ?? get_default_runtime()).replace('experimental_', '');
 				const generate_function =
 					runtime === 'edge' ? generate_edge_function : generate_serverless_function;
 
diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-vercel",
-	"version": "6.0.0",
+	"version": "6.1.0",
 	"description": "A SvelteKit adapter that creates a Vercel app",
 	"keywords": [
 		"adapter",
diff --git a/packages/enhanced-img/package.json b/packages/enhanced-img/package.json
@@ -24,7 +24,9 @@
 		"lint": "prettier --check .",
 		"check": "tsc",
 		"format": "prettier --write .",
-		"test": "vitest run"
+		"test": "pnpm test:unit && pnpm test:integration",
+		"test:unit": "vitest run",
+		"test:integration": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test"
 	},
 	"files": [
 		"src",
diff --git a/packages/enhanced-img/test/apps/basics/.gitignore b/packages/enhanced-img/test/apps/basics/.gitignore
@@ -0,0 +1,5 @@
+.DS_Store
+node_modules
+/.svelte-kit
+/build
+/functions
diff --git a/packages/enhanced-img/test/apps/basics/.npmrc b/packages/enhanced-img/test/apps/basics/.npmrc
@@ -0,0 +1 @@
+engine-strict=true
diff --git a/packages/enhanced-img/test/apps/basics/jsconfig.json b/packages/enhanced-img/test/apps/basics/jsconfig.json
@@ -0,0 +1,4 @@
+{
+	"extends": "./.svelte-kit/tsconfig.json",
+	"include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"]
+}
diff --git a/packages/enhanced-img/test/apps/basics/package.json b/packages/enhanced-img/test/apps/basics/package.json
@@ -0,0 +1,19 @@
+{
+	"name": "enhanced-img-basics",
+	"version": "0.0.1",
+	"private": true,
+	"scripts": {
+		"dev": "vite dev",
+		"build": "vite build",
+		"preview": "vite preview",
+		"test": "playwright test"
+	},
+	"devDependencies": {
+		"@sveltejs/enhanced-img": "workspace:^",
+		"@sveltejs/kit": "workspace:^",
+		"@sveltejs/vite-plugin-svelte": "catalog:",
+		"svelte": "catalog:",
+		"vite": "catalog:"
+	},
+	"type": "module"
+}
diff --git a/packages/enhanced-img/test/apps/basics/playwright.config.js b/packages/enhanced-img/test/apps/basics/playwright.config.js
@@ -0,0 +1 @@
+export { config as default } from '../../utils.js';
diff --git a/packages/enhanced-img/test/apps/basics/src/app.html b/packages/enhanced-img/test/apps/basics/src/app.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		%sveltekit.head%
+	</head>
+	<body>
+		<div>%sveltekit.body%</div>
+	</body>
+</html>
diff --git a/packages/enhanced-img/test/apps/basics/src/routes/+error.svelte b/packages/enhanced-img/test/apps/basics/src/routes/+error.svelte
@@ -0,0 +1,5 @@
+<script>
+	import { page } from '$app/state';
+</script>
+
+<h1>{page.status}</h1>
diff --git a/packages/enhanced-img/test/apps/basics/src/routes/+layout.svelte b/packages/enhanced-img/test/apps/basics/src/routes/+layout.svelte
@@ -0,0 +1,6 @@
+<script>
+	/** @type {{children?: import('svelte').Snippet}} */
+	let { children } = $props();
+</script>
+
+{@render children?.()}
diff --git a/packages/enhanced-img/test/apps/basics/src/routes/+page.svelte b/packages/enhanced-img/test/apps/basics/src/routes/+page.svelte
@@ -0,0 +1,8 @@
+<script>
+	import logo from './logo.png';
+</script>
+
+<enhanced:img id="birds" src="./birds.jpg" alt="birds" />
+<!--
+<enhanced:img id="logo" src={logo} alt="Svelte logo" />
+-->
diff --git a/packages/enhanced-img/test/apps/basics/src/routes/birds.jpg b/packages/enhanced-img/test/apps/basics/src/routes/birds.jpg
diff --git a/packages/enhanced-img/test/apps/basics/src/routes/logo.png b/packages/enhanced-img/test/apps/basics/src/routes/logo.png
diff --git a/packages/enhanced-img/test/apps/basics/svelte.config.js b/packages/enhanced-img/test/apps/basics/svelte.config.js
@@ -0,0 +1,6 @@
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+	kit: {}
+};
+
+export default config;
diff --git a/packages/enhanced-img/test/apps/basics/test/test.js b/packages/enhanced-img/test/apps/basics/test/test.js
@@ -0,0 +1,13 @@
+import { expect, test } from '@playwright/test';
+
+test('images are properly rendered', async ({ page }) => {
+	await page.goto('/');
+
+	const birdsImg = page.locator('#birds');
+	await expect(birdsImg).toBeVisible();
+	await expect(birdsImg).toHaveAttribute('alt', 'birds');
+
+	//	const logoImg = page.locator('#logo');
+	//	await expect(logoImg).toBeVisible();
+	//	await expect(logoImg).toHaveAttribute('alt', 'Svelte logo');
+});
diff --git a/packages/enhanced-img/test/apps/basics/vite.config.js b/packages/enhanced-img/test/apps/basics/vite.config.js
@@ -0,0 +1,18 @@
+import * as path from 'node:path';
+import { sveltekit } from '@sveltejs/kit/vite';
+import { enhancedImages } from '../../../src/index.js';
+
+/** @type {import('vite').UserConfig} */
+const config = {
+	build: {
+		minify: false
+	},
+	plugins: [enhancedImages(), sveltekit()],
+	server: {
+		fs: {
+			allow: [path.resolve('../../../../kit/src')]
+		}
+	}
+};
+
+export default config;
diff --git a/packages/enhanced-img/test/utils.js b/packages/enhanced-img/test/utils.js
@@ -0,0 +1,28 @@
+import { devices } from '@playwright/test';
+import process from 'node:process';
+
+/** @type {import('@playwright/test').PlaywrightTestConfig} */
+export const config = {
+	forbidOnly: !!process.env.CI,
+	// generous timeouts on CI
+	timeout: process.env.CI ? 45000 : 15000,
+	webServer: {
+		command: 'pnpm build && pnpm preview',
+		port: 4173
+	},
+	retries: process.env.CI ? 2 : 0,
+	projects: [
+		{
+			name: 'chromium'
+		}
+	],
+	use: {
+		...devices['Desktop Chrome'],
+		screenshot: 'only-on-failure',
+		trace: 'retain-on-failure'
+	},
+	workers: process.env.CI ? 2 : undefined,
+	reporter: 'list',
+	testDir: 'test',
+	testMatch: /(.+\.)?(test|spec)\.[jt]s/
+};
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @sveltejs/kit
 
+## 2.48.2
+### Patch Changes
+
+
+- fix: update DOM before running navigate callbacks ([#14829](https://github.com/sveltejs/kit/pull/14829))
+
+## 2.48.1
+### Patch Changes
+
+
+- fix: wait for commit promise instead of `settled` ([#14818](https://github.com/sveltejs/kit/pull/14818))
+
 ## 2.48.0
 ### Minor Changes
 
diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "2.48.0",
+	"version": "2.48.2",
 	"description": "SvelteKit is the fastest way to build Svelte apps",
 	"keywords": [
 		"framework",
diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js
@@ -540,6 +540,7 @@ async function _preload_data(intent) {
 					try {
 						return svelte.fork(() => {
 							root.$set(result.props);
+							update(result.props.page);
 						});
 					} catch {
 						// if it errors, it's because the experimental flag isn't enabled
@@ -1729,25 +1730,25 @@ async function navigate({
 			commit_promise = fork.commit();
 		} else {
 			root.$set(navigation_result.props);
+			update(navigation_result.props.page);
+
+			commit_promise = svelte.settled?.();
 		}
 
-		update(navigation_result.props.page);
 		has_navigated = true;
 	} else {
 		initialize(navigation_result, target, false);
 	}
 
 	const { activeElement } = document;
 
-	const promises = [tick()];
+	await commit_promise;
 
-	// need to render the DOM before we can scroll to the rendered elements and do focus management
-	// so we wait for the commit if there's one
-	if (commit_promise) {
-		promises.push(commit_promise);
-	}
-	// we still need to await tick everytime because if there's no async work settled resolves immediately
-	await Promise.all(promises);
+	// TODO 3.0 remote — the double tick is probably necessary because
+	// of some store shenanigans. `settled()` and `f.commit()`
+	// should resolve after DOM updates in newer versions
+	await svelte.tick();
+	await svelte.tick();
 
 	// we reset scroll before dealing with focus, to avoid a flash of unscrolled content
 	let scroll = popped ? popped.scroll : noscroll ? scroll_state() : null;
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.48.0';
+export const VERSION = '2.48.2';
diff --git a/packages/kit/test/apps/options/source/pages/on-navigate/+layout.svelte b/packages/kit/test/apps/options/source/pages/on-navigate/+layout.svelte
diff --git a/packages/kit/test/apps/options/source/pages/on-navigate/a/+page.svelte b/packages/kit/test/apps/options/source/pages/on-navigate/a/+page.svelte
diff --git a/packages/kit/test/apps/options/source/pages/on-navigate/b/+page.svelte b/packages/kit/test/apps/options/source/pages/on-navigate/b/+page.svelte
diff --git a/packages/kit/test/apps/options/svelte.config.js b/packages/kit/test/apps/options/svelte.config.js
diff --git a/packages/kit/test/apps/options/test/test.js b/packages/kit/test/apps/options/test/test.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sveltejs/adapter-vercel",`
`3`		`- "version": "6.0.0",`
	`3`	`+ "version": "6.1.0",`
`4`	`4`	`"description": "A SvelteKit adapter that creates a Vercel app",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"adapter",`