From f51c04afcecd8496bc9ecd5d4d5bb4715a7fd0c0 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 4 Sep 2025 04:06:17 +0200
Subject: [PATCH 01/68] fix: ensure batch exists when resetting a failed
 boundary (#16698)

fixes #16681
---
 .changeset/ninety-ravens-join.md              |  5 +++++
 .../internal/client/dom/blocks/boundary.js    |  3 +++
 .../samples/async-boundary-reset/Test.svelte  | 15 +++++++++++++++
 .../samples/async-boundary-reset/_config.js   | 19 +++++++++++++++++++
 .../samples/async-boundary-reset/main.svelte  | 12 ++++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 .changeset/ninety-ravens-join.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-boundary-reset/Test.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-boundary-reset/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-boundary-reset/main.svelte

diff --git a/.changeset/ninety-ravens-join.md b/.changeset/ninety-ravens-join.md
new file mode 100644
index 0000000000..f7bc6f8def
--- /dev/null
+++ b/.changeset/ninety-ravens-join.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure batch exists when resetting a failed boundary
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 60fe2b7d3c..12ca547608 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -297,6 +297,9 @@ export class Boundary {
 				e.svelte_boundary_reset_onerror();
 			}
 
+			// If the failure happened while flushing effects, current_batch can be null
+			Batch.ensure();
+
 			this.#pending_count = 0;
 
 			if (this.#failed_effect !== null) {
diff --git a/packages/svelte/tests/runtime-runes/samples/async-boundary-reset/Test.svelte b/packages/svelte/tests/runtime-runes/samples/async-boundary-reset/Test.svelte
new file mode 100644
index 0000000000..2232a094cb
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-boundary-reset/Test.svelte
@@ -0,0 +1,15 @@
+<script>
+	async function c(a) {
+			await Promise.resolve()
+			if (a) {
+				throw new Error('error');
+			} else {
+				return 'ok';
+			}
+	}
+
+	let a = $state();
+	let b = $derived(await c(a));
+</script>
+
+<button onclick={() => a = 1}>{b}</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-boundary-reset/_config.js b/packages/svelte/tests/runtime-runes/samples/async-boundary-reset/_config.js
new file mode 100644
index 0000000000..19b273175b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-boundary-reset/_config.js
@@ -0,0 +1,19 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		await tick();
+		let [btn] = target.querySelectorAll('button');
+		btn.click();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, '<button>reset</button>');
+
+		[btn] = target.querySelectorAll('button');
+		btn.click();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, '<button>ok</button>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-boundary-reset/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-boundary-reset/main.svelte
new file mode 100644
index 0000000000..42242f26d6
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-boundary-reset/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	import Test from './Test.svelte';
+</script>
+
+<svelte:boundary>
+	<Test />
+
+	{#snippet pending()}pending{/snippet}
+	{#snippet failed(_, reset)}
+		<button onclick={reset}>reset</button>
+	{/snippet}
+</svelte:boundary>

From 08b3b66865db472e5e6d2262386c1dc030c10a78 Mon Sep 17 00:00:00 2001
From: Kyle Gach <kyle.gach@gmail.com>
Date: Thu, 4 Sep 2025 13:36:34 -0600
Subject: [PATCH 02/68] docs: add testing with storybook (#16701)

* docs: add testing with storybook

* docs: remove video

* docs: address feedback

- consistent tabs vs. spaces in snippet
- add more Storybook details

* Revise Storybook testing documentation

condense, remove referer query parameters

* Update documentation/docs/07-misc/02-testing.md

Co-authored-by: Jeppe Reinhold <jeppe@reinhold.is>

* Tweaks

- Prose updates
- More helpful link

* make it its own section

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Jeppe Reinhold <jeppe@reinhold.is>
---
 documentation/docs/07-misc/02-testing.md | 46 ++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/documentation/docs/07-misc/02-testing.md b/documentation/docs/07-misc/02-testing.md
index bcec4db0a3..23e2e023d3 100644
--- a/documentation/docs/07-misc/02-testing.md
+++ b/documentation/docs/07-misc/02-testing.md
@@ -160,9 +160,9 @@ export function logger(getValue) {
 
 ### Component testing
 
-It is possible to test your components in isolation using Vitest.
+It is possible to test your components in isolation, which allows you to render them in a browser (real or simulated), simulate behavior, and make assertions, without spinning up your whole app.
 
-> [!NOTE] Before writing component tests, think about whether you actually need to test the component, or if it's more about the logic _inside_ the component. If so, consider extracting out that logic to test it in isolation, without the overhead of a component
+> [!NOTE] Before writing component tests, think about whether you actually need to test the component, or if it's more about the logic _inside_ the component. If so, consider extracting out that logic to test it in isolation, without the overhead of a component.
 
 To get started, install jsdom (a library that shims DOM APIs):
 
@@ -246,6 +246,48 @@ test('Component', async () => {
 
 When writing component tests that involve two-way bindings, context or snippet props, it's best to create a wrapper component for your specific test and interact with that. `@testing-library/svelte` contains some [examples](https://testing-library.com/docs/svelte-testing-library/example).
 
+### Component testing with Storybook
+
+[Storybook](https://storybook.js.org) is a tool for developing and documenting UI components, and it can also be used to test your components. They're run with Vitest's browser mode, which renders your components in a real browser for the most realistic testing environment.
+
+To get started, first install Storybook ([using Svelte's CLI](/docs/cli/storybook)) in your project via `npx sv add storybook` and choose the recommended configuration that includes testing features. If you're already using Storybook, and for more information on Storybook's testing capabilities, follow the [Storybook testing docs](https://storybook.js.org/docs/writing-tests?renderer=svelte) to get started.
+
+You can create stories for component variations and test interactions with the [play function](https://storybook.js.org/docs/writing-tests/interaction-testing?renderer=svelte#writing-interaction-tests), which allows you to simulate behavior and make assertions using the Testing Library and Vitest APIs. Here's an example of two stories that can be tested, one that renders an empty LoginForm component and one that simulates a user filling out the form:
+
+```svelte
+/// file: LoginForm.stories.svelte
+<script module>
+	import { defineMeta } from '@storybook/addon-svelte-csf';
+	import { expect, fn } from 'storybook/test';
+
+	import LoginForm from './LoginForm.svelte';
+
+	const { Story } = defineMeta({
+		component: LoginForm,
+		args: {
+			// Pass a mock function to the `onSubmit` prop
+			onSubmit: fn(),
+		}
+	});
+</script>
+ 
+<Story name="Empty Form" />
+ 
+<Story
+	name="Filled Form"
+	play={async ({ args, canvas, userEvent }) => {
+		// Simulate a user filling out the form
+		await userEvent.type(canvas.getByTestId('email'), 'email@provider.com');
+		await userEvent.type(canvas.getByTestId('password'), 'a-random-password');
+		await userEvent.click(canvas.getByRole('button'));
+
+		// Run assertions
+		await expect(args.onSubmit).toHaveBeenCalledTimes(1);
+		await expect(canvas.getByText('You’re in!')).toBeInTheDocument();
+	}}
+/>
+```
+
 ## E2E tests using Playwright
 
 E2E (short for 'end to end') tests allow you to test your full application through the eyes of the user. This section uses [Playwright](https://playwright.dev/) as an example, but you can also use other solutions like [Cypress](https://www.cypress.io/) or [NightwatchJS](https://nightwatchjs.org/).

From d92fa432d1032f4e1746af654eb5a7b7f536fbe9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Sep 2025 09:08:32 +0200
Subject: [PATCH 03/68] Version Packages (#16690)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/ninety-olives-report.md |  5 -----
 .changeset/ninety-ravens-join.md   |  5 -----
 .changeset/wise-schools-report.md  |  5 -----
 packages/svelte/CHANGELOG.md       | 10 ++++++++++
 packages/svelte/package.json       |  2 +-
 packages/svelte/src/version.js     |  2 +-
 6 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 .changeset/ninety-olives-report.md
 delete mode 100644 .changeset/ninety-ravens-join.md
 delete mode 100644 .changeset/wise-schools-report.md

diff --git a/.changeset/ninety-olives-report.md b/.changeset/ninety-olives-report.md
deleted file mode 100644
index 3e66a41d02..0000000000
--- a/.changeset/ninety-olives-report.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: replace `undefined` with `void(0)` in CallExpressions
diff --git a/.changeset/ninety-ravens-join.md b/.changeset/ninety-ravens-join.md
deleted file mode 100644
index f7bc6f8def..0000000000
--- a/.changeset/ninety-ravens-join.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ensure batch exists when resetting a failed boundary
diff --git a/.changeset/wise-schools-report.md b/.changeset/wise-schools-report.md
deleted file mode 100644
index 47ec887256..0000000000
--- a/.changeset/wise-schools-report.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: place store setup inside async body
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index de94eb1897..535214781c 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.38.7
+
+### Patch Changes
+
+- fix: replace `undefined` with `void(0)` in CallExpressions ([#16693](https://github.com/sveltejs/svelte/pull/16693))
+
+- fix: ensure batch exists when resetting a failed boundary ([#16698](https://github.com/sveltejs/svelte/pull/16698))
+
+- fix: place store setup inside async body ([#16687](https://github.com/sveltejs/svelte/pull/16687))
+
 ## 5.38.6
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index fe42603184..c6bc40ae2c 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.38.6",
+  "version": "5.38.7",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 67c586790f..d499c06797 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.38.6';
+export const VERSION = '5.38.7';
 export const PUBLIC_VERSION = '5';

From 18dd45640b14873ea3485fd1c19b0efaaaccf05f Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 9 Sep 2025 10:28:14 -0400
Subject: [PATCH 04/68] fix: send `$effect.pending` count to the correct
 boundary (#16732)

* fix: send `$effect.pending` count to the correct boundary

* make boundary.pending private, use boundary.is_pending consistently

* move error to correct place

* we need that error

* update JSDoc
---
 .changeset/dirty-cycles-smash.md              |  5 +
 .../src/internal/client/dom/blocks/async.js   |  4 +-
 .../internal/client/dom/blocks/boundary.js    | 66 ++++++++-----
 .../src/internal/client/reactivity/async.js   |  4 +-
 .../src/internal/client/reactivity/batch.js   | 11 ++-
 .../internal/client/reactivity/deriveds.js    |  2 +-
 .../async-effect-pending-nested/_config.js    | 95 +++++++++++++++++++
 .../async-effect-pending-nested/main.svelte   | 34 +++++++
 8 files changed, 189 insertions(+), 32 deletions(-)
 create mode 100644 .changeset/dirty-cycles-smash.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-effect-pending-nested/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-effect-pending-nested/main.svelte

diff --git a/.changeset/dirty-cycles-smash.md b/.changeset/dirty-cycles-smash.md
new file mode 100644
index 0000000000..1b031cf0af
--- /dev/null
+++ b/.changeset/dirty-cycles-smash.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: send `$effect.pending` count to the correct boundary
diff --git a/packages/svelte/src/internal/client/dom/blocks/async.js b/packages/svelte/src/internal/client/dom/blocks/async.js
index 82f107ab29..5ec50a5988 100644
--- a/packages/svelte/src/internal/client/dom/blocks/async.js
+++ b/packages/svelte/src/internal/client/dom/blocks/async.js
@@ -1,7 +1,7 @@
 /** @import { TemplateNode, Value } from '#client' */
 import { flatten } from '../../reactivity/async.js';
 import { get } from '../../runtime.js';
-import { get_pending_boundary } from './boundary.js';
+import { get_boundary } from './boundary.js';
 
 /**
  * @param {TemplateNode} node
@@ -9,7 +9,7 @@ import { get_pending_boundary } from './boundary.js';
  * @param {(anchor: TemplateNode, ...deriveds: Value[]) => void} fn
  */
 export function async(node, expressions, fn) {
-	var boundary = get_pending_boundary();
+	var boundary = get_boundary();
 
 	boundary.update_pending_count(1);
 
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 12ca547608..b7f1803782 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -49,11 +49,11 @@ export function boundary(node, props, children) {
 }
 
 export class Boundary {
-	pending = false;
-
 	/** @type {Boundary | null} */
 	parent;
 
+	#pending = false;
+
 	/** @type {TemplateNode} */
 	#anchor;
 
@@ -81,6 +81,7 @@ export class Boundary {
 	/** @type {DocumentFragment | null} */
 	#offscreen_fragment = null;
 
+	#local_pending_count = 0;
 	#pending_count = 0;
 	#is_creating_fallback = false;
 
@@ -95,12 +96,12 @@ export class Boundary {
 
 	#effect_pending_update = () => {
 		if (this.#effect_pending) {
-			internal_set(this.#effect_pending, this.#pending_count);
+			internal_set(this.#effect_pending, this.#local_pending_count);
 		}
 	};
 
 	#effect_pending_subscriber = createSubscriber(() => {
-		this.#effect_pending = source(this.#pending_count);
+		this.#effect_pending = source(this.#local_pending_count);
 
 		if (DEV) {
 			tag(this.#effect_pending, '$effect.pending()');
@@ -125,7 +126,7 @@ export class Boundary {
 
 		this.parent = /** @type {Effect} */ (active_effect).b;
 
-		this.pending = !!this.#props.pending;
+		this.#pending = !!this.#props.pending;
 
 		this.#effect = block(() => {
 			/** @type {Effect} */ (active_effect).b = this;
@@ -156,7 +157,7 @@ export class Boundary {
 							this.#pending_effect = null;
 						});
 
-						this.pending = false;
+						this.#pending = false;
 					}
 				});
 			} else {
@@ -169,7 +170,7 @@ export class Boundary {
 				if (this.#pending_count > 0) {
 					this.#show_pending_snippet();
 				} else {
-					this.pending = false;
+					this.#pending = false;
 				}
 			}
 		}, flags);
@@ -179,6 +180,14 @@ export class Boundary {
 		}
 	}
 
+	/**
+	 * Returns `true` if the effect exists inside a boundary whose pending snippet is shown
+	 * @returns {boolean}
+	 */
+	is_pending() {
+		return this.#pending || (!!this.parent && this.parent.is_pending());
+	}
+
 	has_pending_snippet() {
 		return !!this.#props.pending;
 	}
@@ -220,12 +229,25 @@ export class Boundary {
 		}
 	}
 
-	/** @param {1 | -1} d */
+	/**
+	 * Updates the pending count associated with the currently visible pending snippet,
+	 * if any, such that we can replace the snippet with content once work is done
+	 * @param {1 | -1} d
+	 */
 	#update_pending_count(d) {
+		if (!this.has_pending_snippet()) {
+			if (this.parent) {
+				this.parent.#update_pending_count(d);
+				return;
+			}
+
+			e.await_outside_boundary();
+		}
+
 		this.#pending_count += d;
 
 		if (this.#pending_count === 0) {
-			this.pending = false;
+			this.#pending = false;
 
 			if (this.#pending_effect) {
 				pause_effect(this.#pending_effect, () => {
@@ -240,14 +262,16 @@ export class Boundary {
 		}
 	}
 
-	/** @param {1 | -1} d */
+	/**
+	 * Update the source that powers `$effect.pending()` inside this boundary,
+	 * and controls when the current `pending` snippet (if any) is removed.
+	 * Do not call from inside the class
+	 * @param {1 | -1} d
+	 */
 	update_pending_count(d) {
-		if (this.has_pending_snippet()) {
-			this.#update_pending_count(d);
-		} else if (this.parent) {
-			this.parent.#update_pending_count(d);
-		}
+		this.#update_pending_count(d);
 
+		this.#local_pending_count += d;
 		effect_pending_updates.add(this.#effect_pending_update);
 	}
 
@@ -308,7 +332,7 @@ export class Boundary {
 				});
 			}
 
-			this.pending = true;
+			this.#pending = true;
 
 			this.#main_effect = this.#run(() => {
 				this.#is_creating_fallback = false;
@@ -318,7 +342,7 @@ export class Boundary {
 			if (this.#pending_count > 0) {
 				this.#show_pending_snippet();
 			} else {
-				this.pending = false;
+				this.#pending = false;
 			}
 		};
 
@@ -384,12 +408,8 @@ function move_effect(effect, fragment) {
 	}
 }
 
-export function get_pending_boundary() {
-	var boundary = /** @type {Effect} */ (active_effect).b;
-
-	while (boundary !== null && !boundary.has_pending_snippet()) {
-		boundary = boundary.parent;
-	}
+export function get_boundary() {
+	const boundary = /** @type {Effect} */ (active_effect).b;
 
 	if (boundary === null) {
 		e.await_outside_boundary();
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 65d004137f..b7a5d5cdb7 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -3,7 +3,7 @@
 import { DESTROYED } from '#client/constants';
 import { DEV } from 'esm-env';
 import { component_context, is_runes, set_component_context } from '../context.js';
-import { get_pending_boundary } from '../dom/blocks/boundary.js';
+import { get_boundary } from '../dom/blocks/boundary.js';
 import { invoke_error_boundary } from '../error-handling.js';
 import {
 	active_effect,
@@ -39,7 +39,7 @@ export function flatten(sync, async, fn) {
 	var parent = /** @type {Effect} */ (active_effect);
 
 	var restore = capture();
-	var boundary = get_pending_boundary();
+	var boundary = get_boundary();
 
 	Promise.all(async.map((expression) => async_derived(expression)))
 		.then((result) => {
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 82f1de67a9..5176a4f74b 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -15,7 +15,7 @@ import {
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
-import { get_pending_boundary } from '../dom/blocks/boundary.js';
+import { get_boundary } from '../dom/blocks/boundary.js';
 import {
 	active_effect,
 	is_dirty,
@@ -298,7 +298,10 @@ export class Batch {
 					this.#render_effects.push(effect);
 				} else if ((flags & CLEAN) === 0) {
 					if ((flags & ASYNC) !== 0) {
-						var effects = effect.b?.pending ? this.#boundary_async_effects : this.#async_effects;
+						var effects = effect.b?.is_pending()
+							? this.#boundary_async_effects
+							: this.#async_effects;
+
 						effects.push(effect);
 					} else if (is_dirty(effect)) {
 						if ((effect.f & BLOCK_EFFECT) !== 0) this.#block_effects.push(effect);
@@ -668,9 +671,9 @@ export function schedule_effect(signal) {
 }
 
 export function suspend() {
-	var boundary = get_pending_boundary();
+	var boundary = get_boundary();
 	var batch = /** @type {Batch} */ (current_batch);
-	var pending = boundary.pending;
+	var pending = boundary.is_pending();
 
 	boundary.update_pending_count(1);
 	if (!pending) batch.increment();
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 31dc267960..299251a2dc 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -135,7 +135,7 @@ export function async_derived(fn, location) {
 		prev = promise;
 
 		var batch = /** @type {Batch} */ (current_batch);
-		var pending = boundary.pending;
+		var pending = boundary.is_pending();
 
 		if (should_suspend) {
 			boundary.update_pending_count(1);
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-pending-nested/_config.js b/packages/svelte/tests/runtime-runes/samples/async-effect-pending-nested/_config.js
new file mode 100644
index 0000000000..9fe354bac0
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-pending-nested/_config.js
@@ -0,0 +1,95 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [increment, shift] = target.querySelectorAll('button');
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>increment</button>
+				<button>shift</button>
+				<p>loading...</p>
+			`
+		);
+
+		shift.click();
+		shift.click();
+		shift.click();
+
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>increment</button>
+				<button>shift</button>
+				<p>0</p>
+				<p>0</p>
+				<p>0</p>
+				<p>inner pending: 0</p>
+				<p>outer pending: 0</p>
+			`
+		);
+
+		increment.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>increment</button>
+				<button>shift</button>
+				<p>0</p>
+				<p>0</p>
+				<p>0</p>
+				<p>inner pending: 3</p>
+				<p>outer pending: 0</p>
+			`
+		);
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>increment</button>
+				<button>shift</button>
+				<p>0</p>
+				<p>0</p>
+				<p>0</p>
+				<p>inner pending: 2</p>
+				<p>outer pending: 0</p>
+			`
+		);
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>increment</button>
+				<button>shift</button>
+				<p>0</p>
+				<p>0</p>
+				<p>0</p>
+				<p>inner pending: 1</p>
+				<p>outer pending: 0</p>
+			`
+		);
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>increment</button>
+				<button>shift</button>
+				<p>1</p>
+				<p>1</p>
+				<p>1</p>
+				<p>inner pending: 0</p>
+				<p>outer pending: 0</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-pending-nested/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-effect-pending-nested/main.svelte
new file mode 100644
index 0000000000..eeafbdc3c4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-pending-nested/main.svelte
@@ -0,0 +1,34 @@
+<script>
+	let value = $state(0);
+	let deferreds = [];
+
+	function push(value) {
+		const deferred = Promise.withResolvers();
+		deferreds.push({ value, deferred });
+		return deferred.promise;
+	}
+
+	function shift() {
+		const d = deferreds.shift();
+		d?.deferred.resolve(d.value);
+	}
+</script>
+
+<button onclick={() => value++}>increment</button>
+<button onclick={() => shift()}>shift</button>
+
+<svelte:boundary>
+	<svelte:boundary>
+		<p>{await push(value)}</p>
+		<p>{await push(value)}</p>
+		<p>{await push(value)}</p>
+		<p>inner pending: {$effect.pending()}</p>
+	</svelte:boundary>
+	<p>outer pending: {$effect.pending()}</p>
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>
+
+

From 7f9fe999270a727d1129ff11e0cf6bb3701b15e6 Mon Sep 17 00:00:00 2001
From: "Dominik G." <dominik.goepel@gmx.de>
Date: Tue, 9 Sep 2025 17:53:35 +0200
Subject: [PATCH 05/68] refactor(release): run with node24 and remove NPM_TOKEN
 to use oidc publish (#16733)

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6debe5662a..f9d683a2ae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: 24.x
           cache: pnpm
 
       - name: Install
@@ -45,4 +45,3 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_CONFIG_PROVENANCE: true
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

From f778975b760bed4d5ae366d95ddc8d60e94531f3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 9 Sep 2025 11:57:51 -0400
Subject: [PATCH 06/68] Version Packages (#16734)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/dirty-cycles-smash.md | 5 -----
 packages/svelte/CHANGELOG.md     | 6 ++++++
 packages/svelte/package.json     | 2 +-
 packages/svelte/src/version.js   | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 .changeset/dirty-cycles-smash.md

diff --git a/.changeset/dirty-cycles-smash.md b/.changeset/dirty-cycles-smash.md
deleted file mode 100644
index 1b031cf0af..0000000000
--- a/.changeset/dirty-cycles-smash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: send `$effect.pending` count to the correct boundary
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 535214781c..20ae98a500 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.38.8
+
+### Patch Changes
+
+- fix: send `$effect.pending` count to the correct boundary ([#16732](https://github.com/sveltejs/svelte/pull/16732))
+
 ## 5.38.7
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index c6bc40ae2c..02fa445b0e 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.38.7",
+  "version": "5.38.8",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index d499c06797..8cb69aac5b 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.38.7';
+export const VERSION = '5.38.8';
 export const PUBLIC_VERSION = '5';

From f343b00cc6b6d2c14a5b6fe941e75928dd841a83 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 10 Sep 2025 18:32:09 +0200
Subject: [PATCH 07/68] fix: clean up scheduling system (#16741)

Consolidates our scheduling system that had diverged into two - queue_micro_task and Batch.ensure-queues and resolves some edge case race conditions related to flushSync along the way.
---
 .changeset/old-taxis-relate.md                |  5 ++++
 .../svelte/src/internal/client/dom/task.js    | 20 +++++++++++++--
 .../src/internal/client/reactivity/batch.js   | 25 +++----------------
 .../main.svelte                               |  5 ++++
 .../dynamic-component-transition/_config.js   |  5 ++--
 .../_config.js                                |  5 ++--
 6 files changed, 38 insertions(+), 27 deletions(-)
 create mode 100644 .changeset/old-taxis-relate.md

diff --git a/.changeset/old-taxis-relate.md b/.changeset/old-taxis-relate.md
new file mode 100644
index 0000000000..f38dc03f5e
--- /dev/null
+++ b/.changeset/old-taxis-relate.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: clean up scheduling system
diff --git a/packages/svelte/src/internal/client/dom/task.js b/packages/svelte/src/internal/client/dom/task.js
index 48a2fbe660..938f3ccda2 100644
--- a/packages/svelte/src/internal/client/dom/task.js
+++ b/packages/svelte/src/internal/client/dom/task.js
@@ -1,4 +1,5 @@
 import { run_all } from '../../shared/utils.js';
+import { is_flushing_sync } from '../reactivity/batch.js';
 
 // Fallback for when requestIdleCallback is not available
 const request_idle_callback =
@@ -24,12 +25,27 @@ function run_idle_tasks() {
 	run_all(tasks);
 }
 
+export function has_pending_tasks() {
+	return micro_tasks.length > 0 || idle_tasks.length > 0;
+}
+
 /**
  * @param {() => void} fn
  */
 export function queue_micro_task(fn) {
-	if (micro_tasks.length === 0) {
-		queueMicrotask(run_micro_tasks);
+	if (micro_tasks.length === 0 && !is_flushing_sync) {
+		var tasks = micro_tasks;
+		queueMicrotask(() => {
+			// If this is false, a flushSync happened in the meantime. Do _not_ run new scheduled microtasks in that case
+			// as the ordering of microtasks would be broken at that point - consider this case:
+			// - queue_micro_task schedules microtask A to flush task X
+			// - synchronously after, flushSync runs, processing task X
+			// - synchronously after, some other microtask B is scheduled, but not through queue_micro_task but for example a Promise.resolve() in user code
+			// - synchronously after, queue_micro_task schedules microtask C to flush task Y
+			// - one tick later, microtask A now resolves, flushing task Y before microtask B, which is incorrect
+			// This if check prevents that race condition (that realistically will only happen in tests)
+			if (tasks === micro_tasks) run_micro_tasks();
+		});
 	}
 
 	micro_tasks.push(fn);
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 5176a4f74b..c28617608e 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -25,7 +25,7 @@ import {
 	update_effect
 } from '../runtime.js';
 import * as e from '../errors.js';
-import { flush_tasks } from '../dom/task.js';
+import { flush_tasks, has_pending_tasks, queue_micro_task } from '../dom/task.js';
 import { DEV } from 'esm-env';
 import { invoke_error_boundary } from '../error-handling.js';
 import { old_values } from './sources.js';
@@ -56,19 +56,6 @@ export let batch_deriveds = null;
 /** @type {Set<() => void>} */
 export let effect_pending_updates = new Set();
 
-/** @type {Array<() => void>} */
-let tasks = [];
-
-function dequeue() {
-	const task = /** @type {() => void} */ (tasks.shift());
-
-	if (tasks.length > 0) {
-		queueMicrotask(dequeue);
-	}
-
-	task();
-}
-
 /** @type {Effect[]} */
 let queued_root_effects = [];
 
@@ -76,7 +63,7 @@ let queued_root_effects = [];
 let last_scheduled_effect = null;
 
 let is_flushing = false;
-let is_flushing_sync = false;
+export let is_flushing_sync = false;
 
 export class Batch {
 	/**
@@ -470,11 +457,7 @@ export class Batch {
 
 	/** @param {() => void} task */
 	static enqueue(task) {
-		if (tasks.length === 0) {
-			queueMicrotask(dequeue);
-		}
-
-		tasks.unshift(task);
+		queue_micro_task(task);
 	}
 }
 
@@ -505,7 +488,7 @@ export function flushSync(fn) {
 		while (true) {
 			flush_tasks();
 
-			if (queued_root_effects.length === 0) {
+			if (queued_root_effects.length === 0 && !has_pending_tasks()) {
 				current_batch?.flush();
 
 				// we need to check again, in case we just updated an `$effect.pending()`
diff --git a/packages/svelte/tests/runtime-runes/samples/async-top-level-error-nested-obsolete/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-top-level-error-nested-obsolete/main.svelte
index 2f461e96c8..2d8032228a 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-top-level-error-nested-obsolete/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-top-level-error-nested-obsolete/main.svelte
@@ -3,6 +3,11 @@
 	export let route = $state({ current: 'home' });
 </script>
 
+<script>
+	// reset from earlier tests
+	route.current = 'home'
+</script>
+
 <button onclick={() => route.reject()}>reject</button>
 
 <svelte:boundary>
diff --git a/packages/svelte/tests/runtime-runes/samples/dynamic-component-transition/_config.js b/packages/svelte/tests/runtime-runes/samples/dynamic-component-transition/_config.js
index 9c741d2b8c..19f0c38227 100644
--- a/packages/svelte/tests/runtime-runes/samples/dynamic-component-transition/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/dynamic-component-transition/_config.js
@@ -5,7 +5,8 @@ export default test({
 	async test({ assert, target, raf }) {
 		const btn = target.querySelector('button');
 
-		raf.tick(0);
+		// one tick to not be at 0. Else the flushSync would revert the in-transition which hasn't started, and directly remove the button
+		raf.tick(1);
 
 		flushSync(() => {
 			btn?.click();
@@ -13,7 +14,7 @@ export default test({
 
 		assert.htmlEqual(target.innerHTML, `<h1>Outside</h1><button style="opacity: 0;">Hide</button>`);
 
-		raf.tick(100);
+		raf.tick(101);
 
 		assert.htmlEqual(target.innerHTML, `<h1>Outside</h1>`);
 	}
diff --git a/packages/svelte/tests/runtime-runes/samples/dynamic-if-component-transition/_config.js b/packages/svelte/tests/runtime-runes/samples/dynamic-if-component-transition/_config.js
index 9c741d2b8c..19f0c38227 100644
--- a/packages/svelte/tests/runtime-runes/samples/dynamic-if-component-transition/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/dynamic-if-component-transition/_config.js
@@ -5,7 +5,8 @@ export default test({
 	async test({ assert, target, raf }) {
 		const btn = target.querySelector('button');
 
-		raf.tick(0);
+		// one tick to not be at 0. Else the flushSync would revert the in-transition which hasn't started, and directly remove the button
+		raf.tick(1);
 
 		flushSync(() => {
 			btn?.click();
@@ -13,7 +14,7 @@ export default test({
 
 		assert.htmlEqual(target.innerHTML, `<h1>Outside</h1><button style="opacity: 0;">Hide</button>`);
 
-		raf.tick(100);
+		raf.tick(101);
 
 		assert.htmlEqual(target.innerHTML, `<h1>Outside</h1>`);
 	}

From 68d27f1c4f64b070f322229e1f51460d1bf934b3 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Wed, 10 Sep 2025 13:52:11 -0700
Subject: [PATCH 08/68] chore: generate CSS hash using the filename (#16740)

* chore: generate CSS hash using the filename

* fix all tests but one

* slightly kludgy fix

* try this

* fix

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/fast-boxes-sort.md                 |  5 ++++
 .../src/compiler/phases/2-analyze/index.js    | 20 +++++++++-------
 packages/svelte/src/compiler/types/index.d.ts |  2 +-
 .../svelte/src/compiler/validate-options.js   |  4 ++--
 packages/svelte/tests/html_equal.js           |  8 ++++++-
 .../svelte/tests/runtime-browser/assert.js    |  1 +
 .../_config.js                                | 24 +++++++++----------
 .../_config.js                                | 20 ++++++++--------
 .../_config.js                                | 24 +++++++++----------
 .../_config.js                                | 20 ++++++++--------
 .../custom-element-svelte-class/_config.js    |  4 ++--
 .../_config.js                                |  6 ++---
 .../_expected.html                            |  2 +-
 .../_expected_head.html                       |  2 +-
 .../css-injected-options-nested/_expected.css |  2 +-
 .../_expected.html                            |  2 +-
 .../_expected_head.html                       |  2 +-
 .../css-injected-options/_expected.css        |  2 +-
 .../css-injected-options/_expected.html       |  2 +-
 .../css-injected-options/_expected_head.html  |  2 +-
 .../samples/css/_expected.css                 |  2 +-
 .../samples/css/_expected.html                |  2 +-
 .../samples/css/_expected_head.html           |  2 +-
 .../samples/attached-sourcemap/_config.js     |  2 +-
 .../tests/sourcemaps/samples/css/_config.js   |  2 +-
 packages/svelte/types/index.d.ts              |  4 ++--
 26 files changed, 91 insertions(+), 77 deletions(-)
 create mode 100644 .changeset/fast-boxes-sort.md

diff --git a/.changeset/fast-boxes-sort.md b/.changeset/fast-boxes-sort.md
new file mode 100644
index 0000000000..1edabf0582
--- /dev/null
+++ b/.changeset/fast-boxes-sort.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: generate CSS hash using the filename
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 92b89c588e..de27c4623b 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -456,10 +456,19 @@ export function analyze_component(root, source, options) {
 
 	const is_custom_element = !!options.customElementOptions || options.customElement;
 
+	const name = module.scope.generate(options.name ?? component_name);
+
+	state.adjust({
+		component_name: name,
+		dev: options.dev,
+		rootDir: options.rootDir,
+		runes
+	});
+
 	// TODO remove all the ?? stuff, we don't need it now that we're validating the config
 	/** @type {ComponentAnalysis} */
 	const analysis = {
-		name: module.scope.generate(options.name ?? component_name),
+		name,
 		root: scope_root,
 		module,
 		instance,
@@ -520,7 +529,7 @@ export function analyze_component(root, source, options) {
 			hash: root.css
 				? options.cssHash({
 						css: root.css.content.styles,
-						filename: options.filename,
+						filename: state.filename,
 						name: component_name,
 						hash
 					})
@@ -534,13 +543,6 @@ export function analyze_component(root, source, options) {
 		async_deriveds: new Set()
 	};
 
-	state.adjust({
-		component_name: analysis.name,
-		dev: options.dev,
-		rootDir: options.rootDir,
-		runes
-	});
-
 	if (!runes) {
 		// every exported `let` or `var` declaration becomes a prop, everything else becomes an export
 		for (const node of instance.ast.body) {
diff --git a/packages/svelte/src/compiler/types/index.d.ts b/packages/svelte/src/compiler/types/index.d.ts
index 6211e69bd3..e13c9a9e22 100644
--- a/packages/svelte/src/compiler/types/index.d.ts
+++ b/packages/svelte/src/compiler/types/index.d.ts
@@ -105,7 +105,7 @@ export interface CompileOptions extends ModuleCompileOptions {
 	css?: 'injected' | 'external';
 	/**
 	 * A function that takes a `{ hash, css, name, filename }` argument and returns the string that is used as a classname for scoped CSS.
-	 * It defaults to returning `svelte-${hash(css)}`.
+	 * It defaults to returning `svelte-${hash(filename ?? css)}`.
 	 *
 	 * @default undefined
 	 */
diff --git a/packages/svelte/src/compiler/validate-options.js b/packages/svelte/src/compiler/validate-options.js
index 2b727ad093..a94a553311 100644
--- a/packages/svelte/src/compiler/validate-options.js
+++ b/packages/svelte/src/compiler/validate-options.js
@@ -70,8 +70,8 @@ const component_options = {
 		return input;
 	}),
 
-	cssHash: fun(({ css, hash }) => {
-		return `svelte-${hash(css)}`;
+	cssHash: fun(({ css, filename, hash }) => {
+		return `svelte-${hash(filename === '(unknown)' ? css : filename ?? css)}`;
 	}),
 
 	// TODO this is a sourcemap option, would be good to put under a sourcemap namespace
diff --git a/packages/svelte/tests/html_equal.js b/packages/svelte/tests/html_equal.js
index b637e4d538..76a4a957a5 100644
--- a/packages/svelte/tests/html_equal.js
+++ b/packages/svelte/tests/html_equal.js
@@ -32,7 +32,13 @@ function clean_children(node, opts) {
 			return;
 		}
 
-		node.setAttribute(attr.name, attr.value);
+		let value = attr.value;
+
+		if (attr.name === 'class') {
+			value = value.replace(/svelte-\w+/, 'svelte-xyz123');
+		}
+
+		node.setAttribute(attr.name, value);
 	});
 
 	for (let child of [...node.childNodes]) {
diff --git a/packages/svelte/tests/runtime-browser/assert.js b/packages/svelte/tests/runtime-browser/assert.js
index 9a294a48c7..e331c8b677 100644
--- a/packages/svelte/tests/runtime-browser/assert.js
+++ b/packages/svelte/tests/runtime-browser/assert.js
@@ -74,6 +74,7 @@ function normalize_html(window, html) {
 		node.innerHTML = html
 			.replace(/<!--.*?-->/g, '')
 			.replace(/>[\s\r\n]+</g, '><')
+			.replace(/svelte-\w+/g, 'svelte-xyz123')
 			.trim();
 
 		normalize_children(node);
diff --git a/packages/svelte/tests/runtime-legacy/samples/attribute-null-classname-with-style/_config.js b/packages/svelte/tests/runtime-legacy/samples/attribute-null-classname-with-style/_config.js
index cbd0456e13..1fc15c7eda 100644
--- a/packages/svelte/tests/runtime-legacy/samples/attribute-null-classname-with-style/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/attribute-null-classname-with-style/_config.js
@@ -1,43 +1,43 @@
 import { ok, test } from '../../test';
 
 export default test({
-	html: '<div class="svelte-x1o6ra"></div>',
+	html: '<div class="svelte-70s021"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
 		ok(div);
 
 		component.testName = null;
-		assert.equal(div.className, 'svelte-x1o6ra');
+		assert.equal(div.className, 'svelte-70s021');
 
 		component.testName = undefined;
-		assert.equal(div.className, 'svelte-x1o6ra');
+		assert.equal(div.className, 'svelte-70s021');
 
 		component.testName = undefined + '';
-		assert.equal(div.className, 'undefined svelte-x1o6ra');
+		assert.equal(div.className, 'undefined svelte-70s021');
 
 		component.testName = null + '';
-		assert.equal(div.className, 'null svelte-x1o6ra');
+		assert.equal(div.className, 'null svelte-70s021');
 
 		component.testName = 1;
-		assert.equal(div.className, '1 svelte-x1o6ra');
+		assert.equal(div.className, '1 svelte-70s021');
 
 		component.testName = 0;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		assert.equal(div.className, '0 svelte-70s021');
 
 		component.testName = false;
-		assert.equal(div.className, 'false svelte-x1o6ra');
+		assert.equal(div.className, 'false svelte-70s021');
 
 		component.testName = true;
-		assert.equal(div.className, 'true svelte-x1o6ra');
+		assert.equal(div.className, 'true svelte-70s021');
 
 		component.testName = {};
-		assert.equal(div.className, 'svelte-x1o6ra');
+		assert.equal(div.className, 'svelte-70s021');
 
 		component.testName = '';
-		assert.equal(div.className, 'svelte-x1o6ra');
+		assert.equal(div.className, 'svelte-70s021');
 
 		component.testName = 'testClassName';
-		assert.equal(div.className, 'testClassName svelte-x1o6ra');
+		assert.equal(div.className, 'testClassName svelte-70s021');
 	}
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/attribute-null-classnames-with-style/_config.js b/packages/svelte/tests/runtime-legacy/samples/attribute-null-classnames-with-style/_config.js
index d2511a4403..2f4b6242cb 100644
--- a/packages/svelte/tests/runtime-legacy/samples/attribute-null-classnames-with-style/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/attribute-null-classnames-with-style/_config.js
@@ -10,43 +10,43 @@ export default test({
 		};
 	},
 
-	html: '<div class="test1test2 svelte-x1o6ra"></div>',
+	html: '<div class="test1test2 svelte-70s021"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
 		ok(div);
-		assert.equal(div.className, 'test1test2 svelte-x1o6ra');
+		assert.equal(div.className, 'test1test2 svelte-70s021');
 
 		component.testName1 = null;
 		component.testName2 = null;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		assert.equal(div.className, '0 svelte-70s021');
 
 		component.testName1 = null;
 		component.testName2 = 'test';
-		assert.equal(div.className, 'nulltest svelte-x1o6ra');
+		assert.equal(div.className, 'nulltest svelte-70s021');
 
 		component.testName1 = undefined;
 		component.testName2 = 'test';
-		assert.equal(div.className, 'undefinedtest svelte-x1o6ra');
+		assert.equal(div.className, 'undefinedtest svelte-70s021');
 
 		component.testName1 = undefined;
 		component.testName2 = undefined;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		assert.equal(div.className, 'NaN svelte-70s021');
 
 		component.testName1 = null;
 		component.testName2 = 1;
-		assert.equal(div.className, '1 svelte-x1o6ra');
+		assert.equal(div.className, '1 svelte-70s021');
 
 		component.testName1 = undefined;
 		component.testName2 = 1;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		assert.equal(div.className, 'NaN svelte-70s021');
 
 		component.testName1 = null;
 		component.testName2 = 0;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		assert.equal(div.className, '0 svelte-70s021');
 
 		component.testName1 = undefined;
 		component.testName2 = 0;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		assert.equal(div.className, 'NaN svelte-70s021');
 	}
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/attribute-null-func-classname-with-style/_config.js b/packages/svelte/tests/runtime-legacy/samples/attribute-null-func-classname-with-style/_config.js
index 081fceecf2..b06103992f 100644
--- a/packages/svelte/tests/runtime-legacy/samples/attribute-null-func-classname-with-style/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/attribute-null-func-classname-with-style/_config.js
@@ -8,41 +8,41 @@ export default test({
 		};
 	},
 
-	html: '<div class="testClassName svelte-x1o6ra"></div>',
+	html: '<div class="testClassName svelte-70s021"></div>',
 
 	test({ assert, component, target }) {
 		const div = target.querySelector('div');
 		ok(div);
-		assert.equal(div.className, 'testClassName svelte-x1o6ra');
+		assert.equal(div.className, 'testClassName svelte-70s021');
 
 		component.testName = null;
-		assert.equal(div.className, 'svelte-x1o6ra');
+		assert.equal(div.className, 'svelte-70s021');
 
 		component.testName = undefined;
-		assert.equal(div.className, 'svelte-x1o6ra');
+		assert.equal(div.className, 'svelte-70s021');
 
 		component.testName = undefined + '';
-		assert.equal(div.className, 'undefined svelte-x1o6ra');
+		assert.equal(div.className, 'undefined svelte-70s021');
 
 		component.testName = null + '';
-		assert.equal(div.className, 'null svelte-x1o6ra');
+		assert.equal(div.className, 'null svelte-70s021');
 
 		component.testName = 1;
-		assert.equal(div.className, '1 svelte-x1o6ra');
+		assert.equal(div.className, '1 svelte-70s021');
 
 		component.testName = 0;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		assert.equal(div.className, '0 svelte-70s021');
 
 		component.testName = false;
-		assert.equal(div.className, 'false svelte-x1o6ra');
+		assert.equal(div.className, 'false svelte-70s021');
 
 		component.testName = true;
-		assert.equal(div.className, 'true svelte-x1o6ra');
+		assert.equal(div.className, 'true svelte-70s021');
 
 		component.testName = {};
-		assert.equal(div.className, 'svelte-x1o6ra');
+		assert.equal(div.className, 'svelte-70s021');
 
 		component.testName = '';
-		assert.equal(div.className, 'svelte-x1o6ra');
+		assert.equal(div.className, 'svelte-70s021');
 	}
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/attribute-null-func-classnames-with-style/_config.js b/packages/svelte/tests/runtime-legacy/samples/attribute-null-func-classnames-with-style/_config.js
index d55a0079c0..7fc3dd85f4 100644
--- a/packages/svelte/tests/runtime-legacy/samples/attribute-null-func-classnames-with-style/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/attribute-null-func-classnames-with-style/_config.js
@@ -10,43 +10,43 @@ export default test({
 		};
 	},
 
-	html: '<div class="test1test2 svelte-x1o6ra"></div>',
+	html: '<div class="test1test2 svelte-70s021"></div>',
 
 	async test({ assert, component, target }) {
 		const div = target.querySelector('div');
 		ok(div);
-		assert.equal(div.className, 'test1test2 svelte-x1o6ra');
+		assert.equal(div.className, 'test1test2 svelte-70s021');
 
 		component.testName1 = null;
 		component.testName2 = null;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		assert.equal(div.className, '0 svelte-70s021');
 
 		component.testName1 = null;
 		component.testName2 = 'test';
-		assert.equal(div.className, 'nulltest svelte-x1o6ra');
+		assert.equal(div.className, 'nulltest svelte-70s021');
 
 		component.testName1 = undefined;
 		component.testName2 = 'test';
-		assert.equal(div.className, 'undefinedtest svelte-x1o6ra');
+		assert.equal(div.className, 'undefinedtest svelte-70s021');
 
 		component.testName1 = undefined;
 		component.testName2 = undefined;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		assert.equal(div.className, 'NaN svelte-70s021');
 
 		component.testName1 = null;
 		component.testName2 = 1;
-		assert.equal(div.className, '1 svelte-x1o6ra');
+		assert.equal(div.className, '1 svelte-70s021');
 
 		component.testName1 = undefined;
 		component.testName2 = 1;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		assert.equal(div.className, 'NaN svelte-70s021');
 
 		component.testName1 = null;
 		component.testName2 = 0;
-		assert.equal(div.className, '0 svelte-x1o6ra');
+		assert.equal(div.className, '0 svelte-70s021');
 
 		component.testName1 = undefined;
 		component.testName2 = 0;
-		assert.equal(div.className, 'NaN svelte-x1o6ra');
+		assert.equal(div.className, 'NaN svelte-70s021');
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/custom-element-svelte-class/_config.js b/packages/svelte/tests/runtime-runes/samples/custom-element-svelte-class/_config.js
index 0069a7dfd7..930de12585 100644
--- a/packages/svelte/tests/runtime-runes/samples/custom-element-svelte-class/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/custom-element-svelte-class/_config.js
@@ -3,7 +3,7 @@ import { test } from '../../test';
 export default test({
 	async test({ assert, target, logs }) {
 		const [my_element, my_element_1] = target.querySelectorAll('my-element');
-		assert.equal(my_element.classList.contains('svelte-1koh33s'), true);
-		assert.equal(my_element_1.classList.contains('svelte-1koh33s'), true);
+		assert.equal(my_element.classList.contains('svelte-70s021'), true);
+		assert.equal(my_element_1.classList.contains('svelte-70s021'), true);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/svelte-element-custom-element-css-hash/_config.js b/packages/svelte/tests/runtime-runes/samples/svelte-element-custom-element-css-hash/_config.js
index eae8101e6e..cb532b28b5 100644
--- a/packages/svelte/tests/runtime-runes/samples/svelte-element-custom-element-css-hash/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/svelte-element-custom-element-css-hash/_config.js
@@ -1,14 +1,14 @@
 import { ok, test } from '../../test';
 
 export default test({
-	html: `<custom-element class="red svelte-p153w3"></custom-element><custom-element class="red svelte-p153w3"></custom-element>`,
+	html: `<custom-element class="red svelte-70s021"></custom-element><custom-element class="red svelte-70s021"></custom-element>`,
 
 	async test({ assert, target }) {
 		const [el, el2] = target.querySelectorAll('custom-element');
 		ok(el);
 		ok(el2);
 
-		assert.deepEqual(el.className, 'red svelte-p153w3');
-		assert.deepEqual(el2.className, 'red svelte-p153w3');
+		assert.deepEqual(el.className, 'red svelte-70s021');
+		assert.deepEqual(el2.className, 'red svelte-70s021');
 	}
 });
diff --git a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_expected.html b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_expected.html
index 60e974bd1a..7ba4de394e 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_expected.html
@@ -1 +1 @@
-<!--[--><div class="foo svelte-gfnjhw">foo</div><!--]-->
\ No newline at end of file
+<!--[--><div class="foo svelte-1h3glmj">foo</div><!--]-->
diff --git a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_expected_head.html b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_expected_head.html
index 5350e77a49..99db8fc6dc 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_expected_head.html
+++ b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_expected_head.html
@@ -1 +1 @@
-<style id="svelte-gfnjhw">.foo.svelte-gfnjhw {color:green;}.foo.svelte-gfnjhw {color:green;} .foo.svelte-gfnjhw {color:green;}.foo.svelte-gfnjhw, .foo.svelte-gfnjhw {color:green;}</style>
\ No newline at end of file
+<style id="svelte-1h3glmj">.foo.svelte-1h3glmj {color:green;}.foo.svelte-1h3glmj {color:green;} .foo.svelte-1h3glmj {color:green;}.foo.svelte-1h3glmj, .foo.svelte-1h3glmj {color:green;}</style>
diff --git a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.css b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.css
index bddefdd00c..81c1111967 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.css
+++ b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.css
@@ -1,4 +1,4 @@
 
-.foo.svelte-sg04hs {
+.foo.svelte-1nvcr6w {
 	color: red;
 }
diff --git a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.html b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.html
index 1f0b2b95fe..a6eba00942 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.html
@@ -1 +1 @@
-<!--[--><div class="bar svelte-ievf05">bar</div><!----> <div class="foo svelte-sg04hs">foo</div><!--]-->
\ No newline at end of file
+<!--[--><div class="bar svelte-1nvcr6w">bar</div><!----> <div class="foo svelte-sg04hs">foo</div><!--]-->
diff --git a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected_head.html b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected_head.html
index 6d795670ff..516a9576b3 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected_head.html
+++ b/packages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected_head.html
@@ -1 +1 @@
-<style id="svelte-ievf05">.bar.svelte-ievf05 {color:red;}</style>
\ No newline at end of file
+<style id="svelte-lr8eda">.bar.svelte-lr8eda {color:red;}</style>
diff --git a/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected.css b/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected.css
index 8882c6ec7e..eb1f3e7a9b 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected.css
+++ b/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected.css
@@ -1,4 +1,4 @@
 
-	.foo.svelte-sg04hs {
+	.foo.svelte-okauro {
 		color: red;
 	}
diff --git a/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected.html b/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected.html
index 8ebe1ad73e..01ebd79914 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected.html
@@ -1 +1 @@
-<div class="foo svelte-sg04hs">foo</div>
\ No newline at end of file
+<div class="foo svelte-okauro">foo</div>
diff --git a/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected_head.html b/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected_head.html
index 9c4f8a8538..1a1511f55e 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected_head.html
+++ b/packages/svelte/tests/server-side-rendering/samples/css-injected-options/_expected_head.html
@@ -1 +1 @@
-<style id="svelte-sg04hs">.foo.svelte-sg04hs {color:red;}</style>
\ No newline at end of file
+<style id="svelte-okauro">.foo.svelte-okauro {color:red;}</style>
diff --git a/packages/svelte/tests/server-side-rendering/samples/css/_expected.css b/packages/svelte/tests/server-side-rendering/samples/css/_expected.css
index 8882c6ec7e..ec86890478 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css/_expected.css
+++ b/packages/svelte/tests/server-side-rendering/samples/css/_expected.css
@@ -1,4 +1,4 @@
 
-	.foo.svelte-sg04hs {
+	.foo.svelte-e9omc {
 		color: red;
 	}
diff --git a/packages/svelte/tests/server-side-rendering/samples/css/_expected.html b/packages/svelte/tests/server-side-rendering/samples/css/_expected.html
index 8ebe1ad73e..dc9409fa03 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/css/_expected.html
@@ -1 +1 @@
-<div class="foo svelte-sg04hs">foo</div>
\ No newline at end of file
+<div class="foo svelte-e9omc">foo</div>
diff --git a/packages/svelte/tests/server-side-rendering/samples/css/_expected_head.html b/packages/svelte/tests/server-side-rendering/samples/css/_expected_head.html
index 9c4f8a8538..941c1f13b4 100644
--- a/packages/svelte/tests/server-side-rendering/samples/css/_expected_head.html
+++ b/packages/svelte/tests/server-side-rendering/samples/css/_expected_head.html
@@ -1 +1 @@
-<style id="svelte-sg04hs">.foo.svelte-sg04hs {color:red;}</style>
\ No newline at end of file
+<style id="svelte-e9omc">.foo.svelte-e9omc {color:red;}</style>
diff --git a/packages/svelte/tests/sourcemaps/samples/attached-sourcemap/_config.js b/packages/svelte/tests/sourcemaps/samples/attached-sourcemap/_config.js
index ee9a3d92c4..3a292ff428 100644
--- a/packages/svelte/tests/sourcemaps/samples/attached-sourcemap/_config.js
+++ b/packages/svelte/tests/sourcemaps/samples/attached-sourcemap/_config.js
@@ -57,7 +57,7 @@ export default test({
 		{ str: 'replace_me_script', strGenerated: 'done_replace_script_2' },
 		{ str: 'done_replace_script_2', idxGenerated: 1 }
 	],
-	css: [{ str: '.replace_me_style', strGenerated: '.done_replace_style_2.svelte-o6vre' }],
+	css: [{ str: '.replace_me_style', strGenerated: '.done_replace_style_2.svelte-1vsrjd4' }],
 	test({ assert, code_preprocessed, code_css }) {
 		assert.equal(
 			code_preprocessed.includes('\n/*# sourceMappingURL=data:application/json;base64,'),
diff --git a/packages/svelte/tests/sourcemaps/samples/css/_config.js b/packages/svelte/tests/sourcemaps/samples/css/_config.js
index df3c83c703..fce38d401c 100644
--- a/packages/svelte/tests/sourcemaps/samples/css/_config.js
+++ b/packages/svelte/tests/sourcemaps/samples/css/_config.js
@@ -1,5 +1,5 @@
 import { test } from '../../test';
 
 export default test({
-	css: [{ str: '.foo', strGenerated: '.foo.svelte-sg04hs' }]
+	css: [{ str: '.foo', strGenerated: '.foo.svelte-1eyw86p' }]
 });
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 97e6f0f5a3..9888de59b2 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -998,7 +998,7 @@ declare module 'svelte/compiler' {
 		css?: 'injected' | 'external';
 		/**
 		 * A function that takes a `{ hash, css, name, filename }` argument and returns the string that is used as a classname for scoped CSS.
-		 * It defaults to returning `svelte-${hash(css)}`.
+		 * It defaults to returning `svelte-${hash(filename ?? css)}`.
 		 *
 		 * @default undefined
 		 */
@@ -2933,7 +2933,7 @@ declare module 'svelte/types/compiler/interfaces' {
 		css?: 'injected' | 'external';
 		/**
 		 * A function that takes a `{ hash, css, name, filename }` argument and returns the string that is used as a classname for scoped CSS.
-		 * It defaults to returning `svelte-${hash(css)}`.
+		 * It defaults to returning `svelte-${hash(filename ?? css)}`.
 		 *
 		 * @default undefined
 		 */

From f09f25e6a3ba7aa3562f62713e7cdc00b267fac7 Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Wed, 10 Sep 2025 16:29:31 -0600
Subject: [PATCH 09/68] fix: Don't destroy boundary contents on error unless
 the boundary is an error boundary (#16746)

* fix: Don't destroy contents of boundaries on errors if they're not error boundaries

* changeset

* test

* prettier

* prettier

* simplify test

* oops

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/tasty-trainers-sell.md             |  5 +++++
 .../internal/client/dom/blocks/boundary.js    | 12 +++++------
 .../_config.js                                | 20 +++++++++++++++++++
 .../main.svelte                               | 19 ++++++++++++++++++
 4 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/tasty-trainers-sell.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/non-error-boundary-preserve-on-error/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/non-error-boundary-preserve-on-error/main.svelte

diff --git a/.changeset/tasty-trainers-sell.md b/.changeset/tasty-trainers-sell.md
new file mode 100644
index 0000000000..4a2dd09fa6
--- /dev/null
+++ b/.changeset/tasty-trainers-sell.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't destroy contents of `svelte:boundary` unless the boundary is an error boundary
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index b7f1803782..d4582024f7 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -285,6 +285,12 @@ export class Boundary {
 		var onerror = this.#props.onerror;
 		let failed = this.#props.failed;
 
+		// If we have nothing to capture the error, or if we hit an error while
+		// rendering the fallback, re-throw for another boundary to handle
+		if (this.#is_creating_fallback || (!onerror && !failed)) {
+			throw error;
+		}
+
 		if (this.#main_effect) {
 			destroy_effect(this.#main_effect);
 			this.#main_effect = null;
@@ -346,12 +352,6 @@ export class Boundary {
 			}
 		};
 
-		// If we have nothing to capture the error, or if we hit an error while
-		// rendering the fallback, re-throw for another boundary to handle
-		if (this.#is_creating_fallback || (!onerror && !failed)) {
-			throw error;
-		}
-
 		var previous_reaction = active_reaction;
 
 		try {
diff --git a/packages/svelte/tests/runtime-runes/samples/non-error-boundary-preserve-on-error/_config.js b/packages/svelte/tests/runtime-runes/samples/non-error-boundary-preserve-on-error/_config.js
new file mode 100644
index 0000000000..7654cf1360
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/non-error-boundary-preserve-on-error/_config.js
@@ -0,0 +1,20 @@
+import { test } from '../../test';
+import { flushSync } from 'svelte';
+
+export default test({
+	test({ assert, target }) {
+		const [button] = target.querySelectorAll('button');
+
+		assert.throws(() => {
+			flushSync(() => button.click());
+		}, /oops/);
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>throw</button>
+				<p>some content</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/non-error-boundary-preserve-on-error/main.svelte b/packages/svelte/tests/runtime-runes/samples/non-error-boundary-preserve-on-error/main.svelte
new file mode 100644
index 0000000000..1c3f062b43
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/non-error-boundary-preserve-on-error/main.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	let should_throw = $state(false);
+
+	function throw_error() {
+		throw new Error('oops');
+	}
+</script>
+
+<button onclick={() => should_throw = true}>
+	throw
+</button>
+
+<svelte:boundary>
+	<p>some content</p>
+
+	{#if should_throw}
+		{throw_error()}
+	{/if}
+</svelte:boundary>

From 2743cd0fe5a305586e87b65301dc3466b7c265f9 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Wed, 10 Sep 2025 17:20:04 -0700
Subject: [PATCH 10/68] fix: correctly analyze `<object.property>` components
 (#16711)

* fix: correctly analyze `<object.property>` components

* add test

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/khaki-flies-remember.md                  |  5 +++++
 packages/svelte/src/compiler/phases/scope.js        |  2 +-
 .../samples/snippet-hoisting-4/Component.svelte     |  1 +
 .../samples/snippet-hoisting-4/_config.js           |  5 +++++
 .../samples/snippet-hoisting-4/main.svelte          | 13 +++++++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/khaki-flies-remember.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/main.svelte

diff --git a/.changeset/khaki-flies-remember.md b/.changeset/khaki-flies-remember.md
new file mode 100644
index 0000000000..16d0f79e0f
--- /dev/null
+++ b/.changeset/khaki-flies-remember.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly analyze `<object.property>` components
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index 76157d406f..887bc47c56 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -1032,7 +1032,7 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 		},
 
 		Component: (node, context) => {
-			context.state.scope.reference(b.id(node.name), context.path);
+			context.state.scope.reference(b.id(node.name.split('.')[0]), context.path);
 			Component(node, context);
 		},
 		SvelteSelf: Component,
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/Component.svelte b/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/Component.svelte
new file mode 100644
index 0000000000..597ecf5fc4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/Component.svelte
@@ -0,0 +1 @@
+<h1>Hello world!</h1>
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/_config.js b/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/_config.js
new file mode 100644
index 0000000000..240263603d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	html: '<h1>Hello world!</h1>'
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/main.svelte b/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/main.svelte
new file mode 100644
index 0000000000..d3130a99bd
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/snippet-hoisting-4/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	import Component from './Component.svelte';
+
+	const object = {
+		property: Component
+	};
+</script>
+
+{#snippet not_hoisted()}
+	<object.property />
+{/snippet}
+
+{@render not_hoisted()}

From 558a3c963bca4423cdd7b93d9588d05546dfa629 Mon Sep 17 00:00:00 2001
From: dai <contact@daimond113.com>
Date: Thu, 11 Sep 2025 03:10:45 +0200
Subject: [PATCH 11/68] fix: transform input defaults from spread (#16481)

* fix: transform input defaults from spread

* chore: add changeset

* fix: prevent duplicates

* do not remove defaults if they are in spreads

* fix spreading twice

* tweak

* tweak

* drive-by: remove unused export

* tweak

* undo comment change, to minimise diff

* oops

* tweak

---------

Co-authored-by: 7nik <kifiranet@gmail.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/quiet-planes-doubt.md              |  5 ++++
 .../client/visitors/RegularElement.js         | 18 +++++++++--
 .../client/visitors/shared/element.js         |  5 +++-
 .../server/visitors/shared/element.js         |  3 ++
 packages/svelte/src/constants.js              |  1 +
 .../client/dom/elements/attributes.js         | 30 +++++++++++++++++--
 packages/svelte/src/internal/client/index.js  |  1 -
 packages/svelte/src/internal/server/index.js  | 11 ++++++-
 .../form-default-value-from-spread/_config.js | 10 +++++++
 .../main.svelte                               |  8 +++++
 10 files changed, 85 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/quiet-planes-doubt.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/form-default-value-from-spread/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/form-default-value-from-spread/main.svelte

diff --git a/.changeset/quiet-planes-doubt.md b/.changeset/quiet-planes-doubt.md
new file mode 100644
index 0000000000..bd895f00ef
--- /dev/null
+++ b/.changeset/quiet-planes-doubt.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: transform input defaults from spread
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js
index 4296aa959e..e906061650 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js
@@ -72,6 +72,7 @@ export function RegularElement(node, context) {
 
 	let has_spread = node.metadata.has_spread;
 	let has_use = false;
+	let should_remove_defaults = false;
 
 	for (const attribute of node.attributes) {
 		switch (attribute.type) {
@@ -172,7 +173,12 @@ export function RegularElement(node, context) {
 				bindings.has('group') ||
 				(!bindings.has('group') && has_value_attribute))
 		) {
-			context.state.init.push(b.stmt(b.call('$.remove_input_defaults', context.state.node)));
+			if (has_spread) {
+				// remove_input_defaults will be called inside set_attributes
+				should_remove_defaults = true;
+			} else {
+				context.state.init.push(b.stmt(b.call('$.remove_input_defaults', context.state.node)));
+			}
 		}
 	}
 
@@ -202,7 +208,15 @@ export function RegularElement(node, context) {
 		bindings.has('checked');
 
 	if (has_spread) {
-		build_attribute_effect(attributes, class_directives, style_directives, context, node, node_id);
+		build_attribute_effect(
+			attributes,
+			class_directives,
+			style_directives,
+			context,
+			node,
+			node_id,
+			should_remove_defaults
+		);
 	} else {
 		for (const attribute of /** @type {AST.Attribute[]} */ (attributes)) {
 			if (is_event_attribute(attribute)) {
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/element.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/element.js
index 9143a57025..4b32dab82a 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/element.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/element.js
@@ -16,6 +16,7 @@ import { build_expression, build_template_chunk, Memoizer } from './utils.js';
  * @param {ComponentContext} context
  * @param {AST.RegularElement | AST.SvelteElement} element
  * @param {Identifier} element_id
+ * @param {boolean} [should_remove_defaults]
  */
 export function build_attribute_effect(
 	attributes,
@@ -23,7 +24,8 @@ export function build_attribute_effect(
 	style_directives,
 	context,
 	element,
-	element_id
+	element_id,
+	should_remove_defaults = false
 ) {
 	/** @type {ObjectExpression['properties']} */
 	const values = [];
@@ -91,6 +93,7 @@ export function build_attribute_effect(
 				element.metadata.scoped &&
 					context.state.analysis.css.hash !== '' &&
 					b.literal(context.state.analysis.css.hash),
+				should_remove_defaults && b.true,
 				is_ignored(element, 'hydration_attribute_changed') && b.true
 			)
 		)
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
index 7207564ef9..84692fca9c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
@@ -11,6 +11,7 @@ import {
 import { regex_starts_with_newline } from '../../../../patterns.js';
 import * as b from '#compiler/builders';
 import {
+	ELEMENT_IS_INPUT,
 	ELEMENT_IS_NAMESPACED,
 	ELEMENT_PRESERVE_ATTRIBUTE_CASE
 } from '../../../../../../constants.js';
@@ -401,6 +402,8 @@ function build_element_spread_attributes(
 		flags |= ELEMENT_IS_NAMESPACED | ELEMENT_PRESERVE_ATTRIBUTE_CASE;
 	} else if (is_custom_element_node(element)) {
 		flags |= ELEMENT_PRESERVE_ATTRIBUTE_CASE;
+	} else if (element.type === 'RegularElement' && element.name === 'input') {
+		flags |= ELEMENT_IS_INPUT;
 	}
 
 	const object = build_spread_object(element, attributes, context);
diff --git a/packages/svelte/src/constants.js b/packages/svelte/src/constants.js
index 69cd213940..63324c860f 100644
--- a/packages/svelte/src/constants.js
+++ b/packages/svelte/src/constants.js
@@ -28,6 +28,7 @@ export const HYDRATION_ERROR = {};
 
 export const ELEMENT_IS_NAMESPACED = 1;
 export const ELEMENT_PRESERVE_ATTRIBUTE_CASE = 1 << 1;
+export const ELEMENT_IS_INPUT = 1 << 2;
 
 export const UNINITIALIZED = Symbol();
 
diff --git a/packages/svelte/src/internal/client/dom/elements/attributes.js b/packages/svelte/src/internal/client/dom/elements/attributes.js
index a5b7140f25..fb6a92cc82 100644
--- a/packages/svelte/src/internal/client/dom/elements/attributes.js
+++ b/packages/svelte/src/internal/client/dom/elements/attributes.js
@@ -268,10 +268,27 @@ export function set_custom_element_data(node, prop, value) {
  * @param {Record<string | symbol, any> | undefined} prev
  * @param {Record<string | symbol, any>} next New attributes - this function mutates this object
  * @param {string} [css_hash]
+ * @param {boolean} [should_remove_defaults]
  * @param {boolean} [skip_warning]
  * @returns {Record<string, any>}
  */
-export function set_attributes(element, prev, next, css_hash, skip_warning = false) {
+function set_attributes(
+	element,
+	prev,
+	next,
+	css_hash,
+	should_remove_defaults = false,
+	skip_warning = false
+) {
+	if (hydrating && should_remove_defaults && element.tagName === 'INPUT') {
+		var input = /** @type {HTMLInputElement} */ (element);
+		var attribute = input.type === 'checkbox' ? 'defaultChecked' : 'defaultValue';
+
+		if (!(attribute in next)) {
+			remove_input_defaults(input);
+		}
+	}
+
 	var attributes = get_attributes(element);
 
 	var is_custom_element = attributes[IS_CUSTOM_ELEMENT];
@@ -467,6 +484,7 @@ export function set_attributes(element, prev, next, css_hash, skip_warning = fal
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
  * @param {string} [css_hash]
+ * @param {boolean} [should_remove_defaults]
  * @param {boolean} [skip_warning]
  */
 export function attribute_effect(
@@ -475,6 +493,7 @@ export function attribute_effect(
 	sync = [],
 	async = [],
 	css_hash,
+	should_remove_defaults = false,
 	skip_warning = false
 ) {
 	flatten(sync, async, (values) => {
@@ -490,7 +509,14 @@ export function attribute_effect(
 		block(() => {
 			var next = fn(...values.map(get));
 			/** @type {Record<string | symbol, any>} */
-			var current = set_attributes(element, prev, next, css_hash, skip_warning);
+			var current = set_attributes(
+				element,
+				prev,
+				next,
+				css_hash,
+				should_remove_defaults,
+				skip_warning
+			);
 
 			if (inited && is_select && 'value' in next) {
 				select_option(/** @type {HTMLSelectElement} */ (element), next.value);
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index c5b7bb845c..dbff5c4599 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -28,7 +28,6 @@ export { attach } from './dom/elements/attachments.js';
 export {
 	remove_input_defaults,
 	set_attribute,
-	set_attributes,
 	attribute_effect,
 	set_custom_element_data,
 	set_xlink_attribute,
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index 62ee22d6fc..3aa44f2daa 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -8,7 +8,8 @@ import { subscribe_to_store } from '../../store/utils.js';
 import {
 	UNINITIALIZED,
 	ELEMENT_PRESERVE_ATTRIBUTE_CASE,
-	ELEMENT_IS_NAMESPACED
+	ELEMENT_IS_NAMESPACED,
+	ELEMENT_IS_INPUT
 } from '../../constants.js';
 import { escape_html } from '../../escaping.js';
 import { DEV } from 'esm-env';
@@ -187,6 +188,7 @@ export function spread_attributes(attrs, css_hash, classes, styles, flags = 0) {
 
 	const is_html = (flags & ELEMENT_IS_NAMESPACED) === 0;
 	const lowercase = (flags & ELEMENT_PRESERVE_ATTRIBUTE_CASE) === 0;
+	const is_input = (flags & ELEMENT_IS_INPUT) !== 0;
 
 	for (name in attrs) {
 		// omit functions, internal svelte properties and invalid attribute names
@@ -200,6 +202,13 @@ export function spread_attributes(attrs, css_hash, classes, styles, flags = 0) {
 			name = name.toLowerCase();
 		}
 
+		if (is_input) {
+			if (name === 'defaultvalue' || name === 'defaultchecked') {
+				name = name === 'defaultvalue' ? 'value' : 'checked';
+				if (attrs[name]) continue;
+			}
+		}
+
 		attr_str += attr(name, value, is_html && is_boolean_attribute(name));
 	}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/form-default-value-from-spread/_config.js b/packages/svelte/tests/runtime-runes/samples/form-default-value-from-spread/_config.js
new file mode 100644
index 0000000000..3808ae6530
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/form-default-value-from-spread/_config.js
@@ -0,0 +1,10 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['server'],
+	html: `
+		<input value="a">
+		<input type="checkbox" checked>
+		<input value="b">
+`
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/form-default-value-from-spread/main.svelte b/packages/svelte/tests/runtime-runes/samples/form-default-value-from-spread/main.svelte
new file mode 100644
index 0000000000..7c0ce9cbe3
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/form-default-value-from-spread/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	let text = { defaultValue: "a" };
+	let checkbox = { defaultChecked: true }
+</script>
+
+<input {...text} />
+<input type="checkbox" {...checkbox} />
+<input value="b" {...text} />
\ No newline at end of file

From 96a4b16842e62a2e4224b084425cac6a191e6c2d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 Sep 2025 21:22:12 -0400
Subject: [PATCH 12/68] Version Packages (#16744)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/fast-boxes-sort.md      |  5 -----
 .changeset/khaki-flies-remember.md |  5 -----
 .changeset/old-taxis-relate.md     |  5 -----
 .changeset/quiet-planes-doubt.md   |  5 -----
 .changeset/tasty-trainers-sell.md  |  5 -----
 packages/svelte/CHANGELOG.md       | 14 ++++++++++++++
 packages/svelte/package.json       |  2 +-
 packages/svelte/src/version.js     |  2 +-
 8 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 .changeset/fast-boxes-sort.md
 delete mode 100644 .changeset/khaki-flies-remember.md
 delete mode 100644 .changeset/old-taxis-relate.md
 delete mode 100644 .changeset/quiet-planes-doubt.md
 delete mode 100644 .changeset/tasty-trainers-sell.md

diff --git a/.changeset/fast-boxes-sort.md b/.changeset/fast-boxes-sort.md
deleted file mode 100644
index 1edabf0582..0000000000
--- a/.changeset/fast-boxes-sort.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: generate CSS hash using the filename
diff --git a/.changeset/khaki-flies-remember.md b/.changeset/khaki-flies-remember.md
deleted file mode 100644
index 16d0f79e0f..0000000000
--- a/.changeset/khaki-flies-remember.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: correctly analyze `<object.property>` components
diff --git a/.changeset/old-taxis-relate.md b/.changeset/old-taxis-relate.md
deleted file mode 100644
index f38dc03f5e..0000000000
--- a/.changeset/old-taxis-relate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: clean up scheduling system
diff --git a/.changeset/quiet-planes-doubt.md b/.changeset/quiet-planes-doubt.md
deleted file mode 100644
index bd895f00ef..0000000000
--- a/.changeset/quiet-planes-doubt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: transform input defaults from spread
diff --git a/.changeset/tasty-trainers-sell.md b/.changeset/tasty-trainers-sell.md
deleted file mode 100644
index 4a2dd09fa6..0000000000
--- a/.changeset/tasty-trainers-sell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't destroy contents of `svelte:boundary` unless the boundary is an error boundary
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 20ae98a500..4e384d5697 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,19 @@
 # svelte
 
+## 5.38.9
+
+### Patch Changes
+
+- chore: generate CSS hash using the filename ([#16740](https://github.com/sveltejs/svelte/pull/16740))
+
+- fix: correctly analyze `<object.property>` components ([#16711](https://github.com/sveltejs/svelte/pull/16711))
+
+- fix: clean up scheduling system ([#16741](https://github.com/sveltejs/svelte/pull/16741))
+
+- fix: transform input defaults from spread ([#16481](https://github.com/sveltejs/svelte/pull/16481))
+
+- fix: don't destroy contents of `svelte:boundary` unless the boundary is an error boundary ([#16746](https://github.com/sveltejs/svelte/pull/16746))
+
 ## 5.38.8
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 02fa445b0e..d445e0acf8 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.38.8",
+  "version": "5.38.9",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 8cb69aac5b..edb787c00c 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.38.8';
+export const VERSION = '5.38.9';
 export const PUBLIC_VERSION = '5';

From 0b5bcc891e1e4582131b3e5eca1c48229f1f57d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Sep 2025 21:29:26 -0400
Subject: [PATCH 13/68] chore(deps-dev): bump vite from 5.4.19 to 5.4.20
 (#16749)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.19 to 5.4.20.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.20/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.20/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 5.4.20
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 playgrounds/sandbox/package.json |   2 +-
 pnpm-lock.yaml                   | 420 ++++++++++++++++++-------------
 2 files changed, 252 insertions(+), 170 deletions(-)

diff --git a/playgrounds/sandbox/package.json b/playgrounds/sandbox/package.json
index f11da983f6..8100084832 100644
--- a/playgrounds/sandbox/package.json
+++ b/playgrounds/sandbox/package.json
@@ -19,7 +19,7 @@
     "polka": "^1.0.0-next.25",
     "svelte": "workspace:*",
     "tinyglobby": "^0.2.12",
-    "vite": "^5.4.19",
+    "vite": "^5.4.20",
     "vite-plugin-inspect": "^0.8.4"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cad5fefdf8..1f6bff9bd4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -155,7 +155,7 @@ importers:
     devDependencies:
       '@sveltejs/vite-plugin-svelte':
         specifier: ^4.0.0-next.6
-        version: 4.0.0-next.6(svelte@packages+svelte)(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+        version: 4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
       polka:
         specifier: ^1.0.0-next.25
         version: 1.0.0-next.25
@@ -166,11 +166,11 @@ importers:
         specifier: ^0.2.12
         version: 0.2.12
       vite:
-        specifier: ^5.4.19
-        version: 5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+        specifier: ^5.4.20
+        version: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
       vite-plugin-inspect:
         specifier: ^0.8.4
-        version: 0.8.4(rollup@4.40.2)(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+        version: 0.8.4(rollup@4.50.1)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
 
 packages:
 
@@ -417,6 +417,12 @@ packages:
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
 
+  '@eslint-community/eslint-utils@4.9.0':
+    resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
   '@eslint-community/regexpp@4.12.1':
     resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
@@ -557,8 +563,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm-eabi@4.40.2':
-    resolution: {integrity: sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg==}
+  '@rollup/rollup-android-arm-eabi@4.50.1':
+    resolution: {integrity: sha512-HJXwzoZN4eYTdD8bVV22DN8gsPCAj3V20NHKOs8ezfXanGpmVPR7kalUHd+Y31IJp9stdB87VKPFbsGY3H/2ag==}
     cpu: [arm]
     os: [android]
 
@@ -567,8 +573,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.40.2':
-    resolution: {integrity: sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw==}
+  '@rollup/rollup-android-arm64@4.50.1':
+    resolution: {integrity: sha512-PZlsJVcjHfcH53mOImyt3bc97Ep3FJDXRpk9sMdGX0qgLmY0EIWxCag6EigerGhLVuL8lDVYNnSo8qnTElO4xw==}
     cpu: [arm64]
     os: [android]
 
@@ -577,8 +583,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-arm64@4.40.2':
-    resolution: {integrity: sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w==}
+  '@rollup/rollup-darwin-arm64@4.50.1':
+    resolution: {integrity: sha512-xc6i2AuWh++oGi4ylOFPmzJOEeAa2lJeGUGb4MudOtgfyyjr4UPNK+eEWTPLvmPJIY/pgw6ssFIox23SyrkkJw==}
     cpu: [arm64]
     os: [darwin]
 
@@ -587,18 +593,18 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.40.2':
-    resolution: {integrity: sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ==}
+  '@rollup/rollup-darwin-x64@4.50.1':
+    resolution: {integrity: sha512-2ofU89lEpDYhdLAbRdeyz/kX3Y2lpYc6ShRnDjY35bZhd2ipuDMDi6ZTQ9NIag94K28nFMofdnKeHR7BT0CATw==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.40.2':
-    resolution: {integrity: sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ==}
+  '@rollup/rollup-freebsd-arm64@4.50.1':
+    resolution: {integrity: sha512-wOsE6H2u6PxsHY/BeFHA4VGQN3KUJFZp7QJBmDYI983fgxq5Th8FDkVuERb2l9vDMs1D5XhOrhBrnqcEY6l8ZA==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.40.2':
-    resolution: {integrity: sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q==}
+  '@rollup/rollup-freebsd-x64@4.50.1':
+    resolution: {integrity: sha512-A/xeqaHTlKbQggxCqispFAcNjycpUEHP52mwMQZUNqDUJFFYtPHCXS1VAG29uMlDzIVr+i00tSFWFLivMcoIBQ==}
     cpu: [x64]
     os: [freebsd]
 
@@ -607,8 +613,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.40.2':
-    resolution: {integrity: sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
+    resolution: {integrity: sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg==}
     cpu: [arm]
     os: [linux]
 
@@ -617,8 +623,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.40.2':
-    resolution: {integrity: sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==}
+  '@rollup/rollup-linux-arm-musleabihf@4.50.1':
+    resolution: {integrity: sha512-p/LaFyajPN/0PUHjv8TNyxLiA7RwmDoVY3flXHPSzqrGcIp/c2FjwPPP5++u87DGHtw+5kSH5bCJz0mvXngYxw==}
     cpu: [arm]
     os: [linux]
 
@@ -627,8 +633,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.40.2':
-    resolution: {integrity: sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==}
+  '@rollup/rollup-linux-arm64-gnu@4.50.1':
+    resolution: {integrity: sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw==}
     cpu: [arm64]
     os: [linux]
 
@@ -637,13 +643,13 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.40.2':
-    resolution: {integrity: sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==}
+  '@rollup/rollup-linux-arm64-musl@4.50.1':
+    resolution: {integrity: sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.2':
-    resolution: {integrity: sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==}
+  '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
+    resolution: {integrity: sha512-RPhTwWMzpYYrHrJAS7CmpdtHNKtt2Ueo+BlLBjfZEhYBhK00OsEqM08/7f+eohiF6poe0YRDDd8nAvwtE/Y62Q==}
     cpu: [loong64]
     os: [linux]
 
@@ -652,8 +658,8 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.40.2':
-    resolution: {integrity: sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==}
+  '@rollup/rollup-linux-ppc64-gnu@4.50.1':
+    resolution: {integrity: sha512-eSGMVQw9iekut62O7eBdbiccRguuDgiPMsw++BVUg+1K7WjZXHOg/YOT9SWMzPZA+w98G+Fa1VqJgHZOHHnY0Q==}
     cpu: [ppc64]
     os: [linux]
 
@@ -662,13 +668,13 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.40.2':
-    resolution: {integrity: sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==}
+  '@rollup/rollup-linux-riscv64-gnu@4.50.1':
+    resolution: {integrity: sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-musl@4.40.2':
-    resolution: {integrity: sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==}
+  '@rollup/rollup-linux-riscv64-musl@4.50.1':
+    resolution: {integrity: sha512-3Ag8Ls1ggqkGUvSZWYcdgFwriy2lWo+0QlYgEFra/5JGtAd6C5Hw59oojx1DeqcA2Wds2ayRgvJ4qxVTzCHgzg==}
     cpu: [riscv64]
     os: [linux]
 
@@ -677,8 +683,8 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.40.2':
-    resolution: {integrity: sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==}
+  '@rollup/rollup-linux-s390x-gnu@4.50.1':
+    resolution: {integrity: sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg==}
     cpu: [s390x]
     os: [linux]
 
@@ -687,8 +693,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.40.2':
-    resolution: {integrity: sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==}
+  '@rollup/rollup-linux-x64-gnu@4.50.1':
+    resolution: {integrity: sha512-MCgtFB2+SVNuQmmjHf+wfI4CMxy3Tk8XjA5Z//A0AKD7QXUYFMQcns91K6dEHBvZPCnhJSyDWLApk40Iq/H3tA==}
     cpu: [x64]
     os: [linux]
 
@@ -697,18 +703,23 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.40.2':
-    resolution: {integrity: sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==}
+  '@rollup/rollup-linux-x64-musl@4.50.1':
+    resolution: {integrity: sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg==}
     cpu: [x64]
     os: [linux]
 
+  '@rollup/rollup-openharmony-arm64@4.50.1':
+    resolution: {integrity: sha512-RDsLm+phmT3MJd9SNxA9MNuEAO/J2fhW8GXk62G/B4G7sLVumNFbRwDL6v5NrESb48k+QMqdGbHgEtfU0LCpbA==}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@rollup/rollup-win32-arm64-msvc@4.22.4':
     resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-arm64-msvc@4.40.2':
-    resolution: {integrity: sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==}
+  '@rollup/rollup-win32-arm64-msvc@4.50.1':
+    resolution: {integrity: sha512-hpZB/TImk2FlAFAIsoElM3tLzq57uxnGYwplg6WDyAxbYczSi8O2eQ+H2Lx74504rwKtZ3N2g4bCUkiamzS6TQ==}
     cpu: [arm64]
     os: [win32]
 
@@ -717,8 +728,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.40.2':
-    resolution: {integrity: sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA==}
+  '@rollup/rollup-win32-ia32-msvc@4.50.1':
+    resolution: {integrity: sha512-SXjv8JlbzKM0fTJidX4eVsH+Wmnp0/WcD8gJxIZyR6Gay5Qcsmdbi9zVtnbkGPG8v2vMR1AD06lGWy5FLMcG7A==}
     cpu: [ia32]
     os: [win32]
 
@@ -727,8 +738,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.40.2':
-    resolution: {integrity: sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA==}
+  '@rollup/rollup-win32-x64-msvc@4.50.1':
+    resolution: {integrity: sha512-StxAO/8ts62KZVRAm4JZYq9+NqNsV7RvimNK+YM7ry//zebEH6meuugqW/P5OFUCjyQgui+9fUxT6d5NShvMvA==}
     cpu: [x64]
     os: [win32]
 
@@ -785,8 +796,8 @@ packages:
   '@types/estree@1.0.6':
     resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
 
-  '@types/estree@1.0.7':
-    resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==}
+  '@types/estree@1.0.8':
+    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
@@ -818,13 +829,25 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
+  '@typescript-eslint/project-service@8.43.0':
+    resolution: {integrity: sha512-htB/+D/BIGoNTQYffZw4uM4NzzuolCoaA/BusuSIcC8YjmBYQioew5VUZAYdAETPjeed0hqCaW7EHg+Robq8uw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.0.0'
+
   '@typescript-eslint/scope-manager@8.26.0':
     resolution: {integrity: sha512-E0ntLvsfPqnPwng8b8y4OGuzh/iIOm2z8U3S9zic2TeMLW61u5IH2Q1wu0oSTkfrSzwbDJIB/Lm8O3//8BWMPA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/scope-manager@8.32.1':
-    resolution: {integrity: sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==}
+  '@typescript-eslint/scope-manager@8.43.0':
+    resolution: {integrity: sha512-daSWlQ87ZhsjrbMLvpuuMAt3y4ba57AuvadcR7f3nl8eS3BjRc8L9VLxFLk92RL5xdXOg6IQ+qKjjqNEimGuAg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/tsconfig-utils@8.43.0':
+    resolution: {integrity: sha512-ALC2prjZcj2YqqL5X/bwWQmHA2em6/94GcbB/KKu5SX3EBDOsqztmmX1kMkvAJHzxk7TazKzJfFiEIagNV3qEA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/type-utils@8.26.0':
     resolution: {integrity: sha512-ruk0RNChLKz3zKGn2LwXuVoeBcUMh+jaqzN461uMMdxy5H9epZqIBtYj7UiPXRuOpaALXGbmRuZQhmwHhaS04Q==}
@@ -837,8 +860,8 @@ packages:
     resolution: {integrity: sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/types@8.32.1':
-    resolution: {integrity: sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==}
+  '@typescript-eslint/types@8.43.0':
+    resolution: {integrity: sha512-vQ2FZaxJpydjSZJKiSW/LJsabFFvV7KgLC5DiLhkBcykhQj8iK9BOaDmQt74nnKdLvceM5xmhaTF+pLekrxEkw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/typescript-estree@8.26.0':
@@ -847,11 +870,11 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <5.9.0'
 
-  '@typescript-eslint/typescript-estree@8.32.1':
-    resolution: {integrity: sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==}
+  '@typescript-eslint/typescript-estree@8.43.0':
+    resolution: {integrity: sha512-7Vv6zlAhPb+cvEpP06WXXy/ZByph9iL6BQRBDj4kmBsW98AqEeQHlj/13X+sZOrKSo9/rNKH4Ul4f6EICREFdw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      typescript: '>=4.8.4 <5.9.0'
+      typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/utils@8.26.0':
     resolution: {integrity: sha512-2L2tU3FVwhvU14LndnQCA2frYC8JnPDVKyQtWFPf8IYFMt/ykEN1bPolNhNbCVgOmdzTlWdusCTKA/9nKrf8Ig==}
@@ -860,19 +883,19 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
-  '@typescript-eslint/utils@8.32.1':
-    resolution: {integrity: sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==}
+  '@typescript-eslint/utils@8.43.0':
+    resolution: {integrity: sha512-S1/tEmkUeeswxd0GGcnwuVQPFWo8NzZTOMxCvw8BX7OMxnNae+i8Tm7REQen/SwUIPoPqfKn7EaZ+YLpiB3k9g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <5.9.0'
+      typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/visitor-keys@8.26.0':
     resolution: {integrity: sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/visitor-keys@8.32.1':
-    resolution: {integrity: sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==}
+  '@typescript-eslint/visitor-keys@8.43.0':
+    resolution: {integrity: sha512-T+S1KqRD4sg/bHfLwrpF/K3gQLBM1n7Rp7OjjikjTEssI2YJzQpi5WXoynOaQ93ERIuq3O8RBTOUYDKszUCEHw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@vitest/coverage-v8@2.1.9':
@@ -923,8 +946,8 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  acorn@8.14.1:
-    resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==}
+  acorn@8.15.0:
+    resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
@@ -1099,6 +1122,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
 
@@ -1161,8 +1193,8 @@ packages:
   emoji-regex@9.2.2:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
 
-  enhanced-resolve@5.18.1:
-    resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==}
+  enhanced-resolve@5.18.3:
+    resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
     engines: {node: '>=10.13.0'}
 
   enquirer@2.4.1:
@@ -1241,6 +1273,10 @@ packages:
     resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  eslint-visitor-keys@4.2.1:
+    resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
   eslint@9.9.1:
     resolution: {integrity: sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1387,8 +1423,8 @@ packages:
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  get-tsconfig@4.10.0:
-    resolution: {integrity: sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==}
+  get-tsconfig@4.10.1:
+    resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==}
 
   glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
@@ -1862,6 +1898,10 @@ packages:
     resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
     engines: {node: '>=12'}
 
+  picomatch@4.0.3:
+    resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
+    engines: {node: '>=12'}
+
   pify@4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
@@ -1912,6 +1952,10 @@ packages:
     resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
     engines: {node: ^10 || ^12 || >=14}
 
+  postcss@8.5.6:
+    resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
+    engines: {node: ^10 || ^12 || >=14}
+
   prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
@@ -1984,8 +2028,8 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
-  rollup@4.40.2:
-    resolution: {integrity: sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==}
+  rollup@4.50.1:
+    resolution: {integrity: sha512-78E9voJHwnXQMiQdiqswVLZwJIzdBKJ1GdI5Zx6XwoFKUIk09/sSrr+05QFzvYb8q6Y9pPV45zzDuYa3907TZA==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -2139,8 +2183,8 @@ packages:
   symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
 
-  tapable@2.2.1:
-    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
+  tapable@2.2.3:
+    resolution: {integrity: sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==}
     engines: {node: '>=6'}
 
   term-size@2.2.1:
@@ -2325,8 +2369,8 @@ packages:
       terser:
         optional: true
 
-  vite@5.4.19:
-    resolution: {integrity: sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==}
+  vite@5.4.20:
+    resolution: {integrity: sha512-j3lYzGC3P+B5Yfy/pfKNgVEg4+UtcIJcVRt2cDjIOmhLourAqPqf8P7acgxeiSgUB7E3p2P8/3gNIgDLpwzs4g==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -2731,6 +2775,11 @@ snapshots:
       eslint: 9.9.1
       eslint-visitor-keys: 3.4.3
 
+  '@eslint-community/eslint-utils@4.9.0(eslint@9.9.1)':
+    dependencies:
+      eslint: 9.9.1
+      eslint-visitor-keys: 3.4.3
+
   '@eslint-community/regexpp@4.12.1': {}
 
   '@eslint/config-array@0.18.0':
@@ -2880,126 +2929,129 @@ snapshots:
     optionalDependencies:
       rollup: 4.22.4
 
-  '@rollup/pluginutils@5.1.0(rollup@4.40.2)':
+  '@rollup/pluginutils@5.1.0(rollup@4.50.1)':
     dependencies:
       '@types/estree': 1.0.6
       estree-walker: 2.0.2
       picomatch: 2.3.1
     optionalDependencies:
-      rollup: 4.40.2
+      rollup: 4.50.1
 
   '@rollup/rollup-android-arm-eabi@4.22.4':
     optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.40.2':
+  '@rollup/rollup-android-arm-eabi@4.50.1':
     optional: true
 
   '@rollup/rollup-android-arm64@4.22.4':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.40.2':
+  '@rollup/rollup-android-arm64@4.50.1':
     optional: true
 
   '@rollup/rollup-darwin-arm64@4.22.4':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.40.2':
+  '@rollup/rollup-darwin-arm64@4.50.1':
     optional: true
 
   '@rollup/rollup-darwin-x64@4.22.4':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.40.2':
+  '@rollup/rollup-darwin-x64@4.50.1':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.40.2':
+  '@rollup/rollup-freebsd-arm64@4.50.1':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.40.2':
+  '@rollup/rollup-freebsd-x64@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-arm-gnueabihf@4.22.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.40.2':
+  '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-arm-musleabihf@4.22.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.40.2':
+  '@rollup/rollup-linux-arm-musleabihf@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-arm64-gnu@4.22.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.40.2':
+  '@rollup/rollup-linux-arm64-gnu@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-arm64-musl@4.22.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.40.2':
+  '@rollup/rollup-linux-arm64-musl@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.2':
+  '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-powerpc64le-gnu@4.22.4':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.40.2':
+  '@rollup/rollup-linux-ppc64-gnu@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-riscv64-gnu@4.22.4':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.40.2':
+  '@rollup/rollup-linux-riscv64-gnu@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.40.2':
+  '@rollup/rollup-linux-riscv64-musl@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-s390x-gnu@4.22.4':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.40.2':
+  '@rollup/rollup-linux-s390x-gnu@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-x64-gnu@4.22.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.40.2':
+  '@rollup/rollup-linux-x64-gnu@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-x64-musl@4.22.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.40.2':
+  '@rollup/rollup-linux-x64-musl@4.50.1':
+    optional: true
+
+  '@rollup/rollup-openharmony-arm64@4.50.1':
     optional: true
 
   '@rollup/rollup-win32-arm64-msvc@4.22.4':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.40.2':
+  '@rollup/rollup-win32-arm64-msvc@4.50.1':
     optional: true
 
   '@rollup/rollup-win32-ia32-msvc@4.22.4':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.40.2':
+  '@rollup/rollup-win32-ia32-msvc@4.50.1':
     optional: true
 
   '@rollup/rollup-win32-x64-msvc@4.22.4':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.40.2':
+  '@rollup/rollup-win32-x64-msvc@4.50.1':
     optional: true
 
   '@stylistic/eslint-plugin-js@1.8.0(eslint@9.9.1)':
     dependencies:
       '@types/eslint': 8.56.12
-      acorn: 8.14.1
+      acorn: 8.15.0
       escape-string-regexp: 4.0.0
       eslint: 9.9.1
       eslint-visitor-keys: 3.4.3
@@ -3020,25 +3072,25 @@ snapshots:
       typescript: 5.5.4
       typescript-eslint: 8.26.0(eslint@9.9.1)(typescript@5.5.4)
 
-  '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
+  '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 4.0.0-next.6(svelte@packages+svelte)(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+      '@sveltejs/vite-plugin-svelte': 4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
       debug: 4.4.0
       svelte: link:packages/svelte
-      vite: 5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
+  '@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+      '@sveltejs/vite-plugin-svelte-inspector': 3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
       debug: 4.4.0
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.17
       svelte: link:packages/svelte
-      vite: 5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
-      vitefu: 0.2.5(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vitefu: 0.2.5(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
     transitivePeerDependencies:
       - supports-color
 
@@ -3053,14 +3105,14 @@ snapshots:
 
   '@types/eslint@8.56.12':
     dependencies:
-      '@types/estree': 1.0.7
+      '@types/estree': 1.0.8
       '@types/json-schema': 7.0.15
 
   '@types/estree@1.0.5': {}
 
   '@types/estree@1.0.6': {}
 
-  '@types/estree@1.0.7': {}
+  '@types/estree@1.0.8': {}
 
   '@types/json-schema@7.0.15': {}
 
@@ -3103,15 +3155,28 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@typescript-eslint/project-service@8.43.0(typescript@5.5.4)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.43.0(typescript@5.5.4)
+      '@typescript-eslint/types': 8.43.0
+      debug: 4.4.1
+      typescript: 5.5.4
+    transitivePeerDependencies:
+      - supports-color
+
   '@typescript-eslint/scope-manager@8.26.0':
     dependencies:
       '@typescript-eslint/types': 8.26.0
       '@typescript-eslint/visitor-keys': 8.26.0
 
-  '@typescript-eslint/scope-manager@8.32.1':
+  '@typescript-eslint/scope-manager@8.43.0':
     dependencies:
-      '@typescript-eslint/types': 8.32.1
-      '@typescript-eslint/visitor-keys': 8.32.1
+      '@typescript-eslint/types': 8.43.0
+      '@typescript-eslint/visitor-keys': 8.43.0
+
+  '@typescript-eslint/tsconfig-utils@8.43.0(typescript@5.5.4)':
+    dependencies:
+      typescript: 5.5.4
 
   '@typescript-eslint/type-utils@8.26.0(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
@@ -3126,7 +3191,7 @@ snapshots:
 
   '@typescript-eslint/types@8.26.0': {}
 
-  '@typescript-eslint/types@8.32.1': {}
+  '@typescript-eslint/types@8.43.0': {}
 
   '@typescript-eslint/typescript-estree@8.26.0(typescript@5.5.4)':
     dependencies:
@@ -3142,11 +3207,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.32.1(typescript@5.5.4)':
+  '@typescript-eslint/typescript-estree@8.43.0(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/types': 8.32.1
-      '@typescript-eslint/visitor-keys': 8.32.1
-      debug: 4.4.0
+      '@typescript-eslint/project-service': 8.43.0(typescript@5.5.4)
+      '@typescript-eslint/tsconfig-utils': 8.43.0(typescript@5.5.4)
+      '@typescript-eslint/types': 8.43.0
+      '@typescript-eslint/visitor-keys': 8.43.0
+      debug: 4.4.1
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -3167,12 +3234,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.32.1(eslint@9.9.1)(typescript@5.5.4)':
+  '@typescript-eslint/utils@8.43.0(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.7.0(eslint@9.9.1)
-      '@typescript-eslint/scope-manager': 8.32.1
-      '@typescript-eslint/types': 8.32.1
-      '@typescript-eslint/typescript-estree': 8.32.1(typescript@5.5.4)
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
+      '@typescript-eslint/scope-manager': 8.43.0
+      '@typescript-eslint/types': 8.43.0
+      '@typescript-eslint/typescript-estree': 8.43.0(typescript@5.5.4)
       eslint: 9.9.1
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -3183,10 +3250,10 @@ snapshots:
       '@typescript-eslint/types': 8.26.0
       eslint-visitor-keys: 4.2.0
 
-  '@typescript-eslint/visitor-keys@8.32.1':
+  '@typescript-eslint/visitor-keys@8.43.0':
     dependencies:
-      '@typescript-eslint/types': 8.32.1
-      eslint-visitor-keys: 4.2.0
+      '@typescript-eslint/types': 8.43.0
+      eslint-visitor-keys: 4.2.1
 
   '@vitest/coverage-v8@2.1.9(vitest@2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
@@ -3250,13 +3317,13 @@ snapshots:
     dependencies:
       acorn: 8.14.0
 
-  acorn-jsx@5.3.2(acorn@8.14.1):
+  acorn-jsx@5.3.2(acorn@8.15.0):
     dependencies:
-      acorn: 8.14.1
+      acorn: 8.15.0
 
   acorn@8.14.0: {}
 
-  acorn@8.14.1: {}
+  acorn@8.15.0: {}
 
   agent-base@7.1.1:
     dependencies:
@@ -3416,6 +3483,10 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  debug@4.4.1:
+    dependencies:
+      ms: 2.1.3
+
   decimal.js@10.4.3: {}
 
   deep-eql@5.0.2: {}
@@ -3464,10 +3535,10 @@ snapshots:
 
   emoji-regex@9.2.2: {}
 
-  enhanced-resolve@5.18.1:
+  enhanced-resolve@5.18.3:
     dependencies:
       graceful-fs: 4.2.11
-      tapable: 2.2.1
+      tapable: 2.2.3
 
   enquirer@2.4.1:
     dependencies:
@@ -3519,7 +3590,7 @@ snapshots:
 
   eslint-plugin-es-x@7.8.0(eslint@9.9.1):
     dependencies:
-      '@eslint-community/eslint-utils': 4.7.0(eslint@9.9.1)
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
       '@eslint-community/regexpp': 4.12.1
       eslint: 9.9.1
       eslint-compat-utils: 0.5.1(eslint@9.9.1)
@@ -3528,12 +3599,12 @@ snapshots:
 
   eslint-plugin-n@17.16.1(eslint@9.9.1)(typescript@5.5.4):
     dependencies:
-      '@eslint-community/eslint-utils': 4.7.0(eslint@9.9.1)
-      '@typescript-eslint/utils': 8.32.1(eslint@9.9.1)(typescript@5.5.4)
-      enhanced-resolve: 5.18.1
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
+      '@typescript-eslint/utils': 8.43.0(eslint@9.9.1)(typescript@5.5.4)
+      enhanced-resolve: 5.18.3
       eslint: 9.9.1
       eslint-plugin-es-x: 7.8.0(eslint@9.9.1)
-      get-tsconfig: 4.10.0
+      get-tsconfig: 4.10.1
       globals: 15.15.0
       ignore: 5.3.2
       minimatch: 9.0.5
@@ -3575,6 +3646,8 @@ snapshots:
 
   eslint-visitor-keys@4.2.0: {}
 
+  eslint-visitor-keys@4.2.1: {}
+
   eslint@9.9.1:
     dependencies:
       '@eslint-community/eslint-utils': 4.4.1(eslint@9.9.1)
@@ -3624,8 +3697,8 @@ snapshots:
 
   espree@9.6.1:
     dependencies:
-      acorn: 8.14.1
-      acorn-jsx: 5.3.2(acorn@8.14.1)
+      acorn: 8.15.0
+      acorn-jsx: 5.3.2(acorn@8.15.0)
       eslint-visitor-keys: 3.4.3
 
   esprima@4.0.1: {}
@@ -3754,7 +3827,7 @@ snapshots:
 
   function-bind@1.1.2: {}
 
-  get-tsconfig@4.10.0:
+  get-tsconfig@4.10.1:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
@@ -4195,6 +4268,8 @@ snapshots:
 
   picomatch@4.0.2: {}
 
+  picomatch@4.0.3: {}
+
   pify@4.0.1: {}
 
   playwright-core@1.46.1: {}
@@ -4221,9 +4296,9 @@ snapshots:
     dependencies:
       postcss: 8.5.3
 
-  postcss-scss@4.0.9(postcss@8.5.3):
+  postcss-scss@4.0.9(postcss@8.5.6):
     dependencies:
-      postcss: 8.5.3
+      postcss: 8.5.6
 
   postcss-selector-parser@7.1.0:
     dependencies:
@@ -4236,6 +4311,12 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
+  postcss@8.5.6:
+    dependencies:
+      nanoid: 3.3.11
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
   prelude-ls@1.2.1: {}
 
   prettier-plugin-svelte@3.4.0(prettier@3.2.4)(svelte@packages+svelte):
@@ -4309,30 +4390,31 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.22.4
       fsevents: 2.3.3
 
-  rollup@4.40.2:
+  rollup@4.50.1:
     dependencies:
-      '@types/estree': 1.0.7
+      '@types/estree': 1.0.8
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.40.2
-      '@rollup/rollup-android-arm64': 4.40.2
-      '@rollup/rollup-darwin-arm64': 4.40.2
-      '@rollup/rollup-darwin-x64': 4.40.2
-      '@rollup/rollup-freebsd-arm64': 4.40.2
-      '@rollup/rollup-freebsd-x64': 4.40.2
-      '@rollup/rollup-linux-arm-gnueabihf': 4.40.2
-      '@rollup/rollup-linux-arm-musleabihf': 4.40.2
-      '@rollup/rollup-linux-arm64-gnu': 4.40.2
-      '@rollup/rollup-linux-arm64-musl': 4.40.2
-      '@rollup/rollup-linux-loongarch64-gnu': 4.40.2
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.40.2
-      '@rollup/rollup-linux-riscv64-gnu': 4.40.2
-      '@rollup/rollup-linux-riscv64-musl': 4.40.2
-      '@rollup/rollup-linux-s390x-gnu': 4.40.2
-      '@rollup/rollup-linux-x64-gnu': 4.40.2
-      '@rollup/rollup-linux-x64-musl': 4.40.2
-      '@rollup/rollup-win32-arm64-msvc': 4.40.2
-      '@rollup/rollup-win32-ia32-msvc': 4.40.2
-      '@rollup/rollup-win32-x64-msvc': 4.40.2
+      '@rollup/rollup-android-arm-eabi': 4.50.1
+      '@rollup/rollup-android-arm64': 4.50.1
+      '@rollup/rollup-darwin-arm64': 4.50.1
+      '@rollup/rollup-darwin-x64': 4.50.1
+      '@rollup/rollup-freebsd-arm64': 4.50.1
+      '@rollup/rollup-freebsd-x64': 4.50.1
+      '@rollup/rollup-linux-arm-gnueabihf': 4.50.1
+      '@rollup/rollup-linux-arm-musleabihf': 4.50.1
+      '@rollup/rollup-linux-arm64-gnu': 4.50.1
+      '@rollup/rollup-linux-arm64-musl': 4.50.1
+      '@rollup/rollup-linux-loongarch64-gnu': 4.50.1
+      '@rollup/rollup-linux-ppc64-gnu': 4.50.1
+      '@rollup/rollup-linux-riscv64-gnu': 4.50.1
+      '@rollup/rollup-linux-riscv64-musl': 4.50.1
+      '@rollup/rollup-linux-s390x-gnu': 4.50.1
+      '@rollup/rollup-linux-x64-gnu': 4.50.1
+      '@rollup/rollup-linux-x64-musl': 4.50.1
+      '@rollup/rollup-openharmony-arm64': 4.50.1
+      '@rollup/rollup-win32-arm64-msvc': 4.50.1
+      '@rollup/rollup-win32-ia32-msvc': 4.50.1
+      '@rollup/rollup-win32-x64-msvc': 4.50.1
       fsevents: 2.3.3
 
   rrweb-cssom@0.7.1: {}
@@ -4455,15 +4537,15 @@ snapshots:
       eslint-scope: 8.4.0
       eslint-visitor-keys: 4.2.0
       espree: 10.1.0
-      postcss: 8.5.3
-      postcss-scss: 4.0.9(postcss@8.5.3)
+      postcss: 8.5.6
+      postcss-scss: 4.0.9(postcss@8.5.6)
       postcss-selector-parser: 7.1.0
     optionalDependencies:
       svelte: link:packages/svelte
 
   symbol-tree@3.2.4: {}
 
-  tapable@2.2.1: {}
+  tapable@2.2.3: {}
 
   term-size@2.2.1: {}
 
@@ -4543,7 +4625,7 @@ snapshots:
 
   ts-declaration-location@1.0.7(typescript@5.5.4):
     dependencies:
-      picomatch: 4.0.2
+      picomatch: 4.0.3
       typescript: 5.5.4
 
   type-check@0.4.0:
@@ -4582,7 +4664,7 @@ snapshots:
       debug: 4.4.0
       es-module-lexer: 1.6.0
       pathe: 1.1.2
-      vite: 5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -4594,10 +4676,10 @@ snapshots:
       - supports-color
       - terser
 
-  vite-plugin-inspect@0.8.4(rollup@4.40.2)(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
+  vite-plugin-inspect@0.8.4(rollup@4.50.1)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
     dependencies:
       '@antfu/utils': 0.7.8
-      '@rollup/pluginutils': 5.1.0(rollup@4.40.2)
+      '@rollup/pluginutils': 5.1.0(rollup@4.50.1)
       debug: 4.4.0
       error-stack-parser-es: 0.1.1
       fs-extra: 11.2.0
@@ -4605,7 +4687,7 @@ snapshots:
       perfect-debounce: 1.0.0
       picocolors: 1.1.1
       sirv: 2.0.4
-      vite: 5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -4613,7 +4695,7 @@ snapshots:
   vite@5.4.14(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
       esbuild: 0.21.5
-      postcss: 8.5.3
+      postcss: 8.5.6
       rollup: 4.22.4
     optionalDependencies:
       '@types/node': 20.12.7
@@ -4622,11 +4704,11 @@ snapshots:
       sass: 1.70.0
       terser: 5.27.0
 
-  vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
+  vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
       esbuild: 0.21.5
-      postcss: 8.5.3
-      rollup: 4.40.2
+      postcss: 8.5.6
+      rollup: 4.50.1
     optionalDependencies:
       '@types/node': 20.12.7
       fsevents: 2.3.3
@@ -4634,9 +4716,9 @@ snapshots:
       sass: 1.70.0
       terser: 5.27.0
 
-  vitefu@0.2.5(vite@5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
+  vitefu@0.2.5(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
     optionalDependencies:
-      vite: 5.4.19(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
 
   vitest@2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:

From 72ce753278a3e1f0046d1d13171d3b86445a241a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 11 Sep 2025 10:58:56 -0400
Subject: [PATCH 14/68] fix: flush effects scheduled during boundary's pending
 phase (#16738)

Alternative to #16721, partial alternative to #16709. Closes #16691, closes #16627, closes #16582 and #16651 as well.
---
 .changeset/ninety-pandas-move.md               |  5 +++++
 .../src/internal/client/dom/blocks/boundary.js |  2 +-
 .../src/internal/client/reactivity/batch.js    |  2 +-
 .../samples/async-attachment/Inner.svelte      | 10 ++++++++++
 .../samples/async-attachment/_config.js        | 18 ++++++++++++++++++
 .../samples/async-attachment/main.svelte       | 16 ++++++++++++++++
 .../async-effect-after-await/Child.svelte      |  7 +++++++
 .../async-effect-after-await/_config.js        |  9 +++++++++
 .../async-effect-after-await/main.svelte       |  9 +++++++++
 9 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/ninety-pandas-move.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-attachment/Inner.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-attachment/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-attachment/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-effect-after-await/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-effect-after-await/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-effect-after-await/main.svelte

diff --git a/.changeset/ninety-pandas-move.md b/.changeset/ninety-pandas-move.md
new file mode 100644
index 0000000000..65f57ddbbf
--- /dev/null
+++ b/.changeset/ninety-pandas-move.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: flush effects scheduled during boundary's pending phase
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index d4582024f7..2a9736553c 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -23,7 +23,7 @@ import { queue_micro_task } from '../task.js';
 import * as e from '../../errors.js';
 import * as w from '../../warnings.js';
 import { DEV } from 'esm-env';
-import { Batch, effect_pending_updates } from '../../reactivity/batch.js';
+import { Batch, current_batch, effect_pending_updates } from '../../reactivity/batch.js';
 import { internal_set, source } from '../../reactivity/sources.js';
 import { tag } from '../../dev/tracing.js';
 import { createSubscriber } from '../../../../reactivity/create-subscriber.js';
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index c28617608e..e504ae2e3f 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -668,7 +668,7 @@ export function suspend() {
 			batch.activate();
 			batch.decrement();
 		} else {
-			batch.deactivate();
+			batch.flush();
 		}
 
 		unset_context();
diff --git a/packages/svelte/tests/runtime-runes/samples/async-attachment/Inner.svelte b/packages/svelte/tests/runtime-runes/samples/async-attachment/Inner.svelte
new file mode 100644
index 0000000000..b9b9d7a3d0
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-attachment/Inner.svelte
@@ -0,0 +1,10 @@
+<script>
+	function renderContent(node) {
+		node.textContent = 'foo';
+	}
+ 
+	const test = await Promise.resolve('foo');
+</script>
+
+<p>{test}</p>
+<div {@attach renderContent}></div>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-attachment/_config.js b/packages/svelte/tests/runtime-runes/samples/async-attachment/_config.js
new file mode 100644
index 0000000000..f6b48b38b1
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-attachment/_config.js
@@ -0,0 +1,18 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<button>toggle</button> <p>foo</p><div>foo</div>');
+
+		const [toggle] = target.querySelectorAll('button');
+		toggle.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<button>toggle</button>');
+
+		toggle.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<button>toggle</button> <p>foo</p><div>foo</div>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-attachment/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-attachment/main.svelte
new file mode 100644
index 0000000000..6cef6e8f5c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-attachment/main.svelte
@@ -0,0 +1,16 @@
+<script>
+	import Inner from './Inner.svelte';
+
+	let show = $state(true);
+</script>
+
+<svelte:boundary>
+	<button onclick={() => show = !show}>toggle</button>
+	{#if show}
+		<Inner />
+	{/if}
+
+	{#snippet pending()}
+		<p>pending</p>
+	{/snippet}
+</svelte:boundary>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-after-await/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-effect-after-await/Child.svelte
new file mode 100644
index 0000000000..682f7a0631
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-after-await/Child.svelte
@@ -0,0 +1,7 @@
+<script>
+	await 1;
+
+	$effect(() => {
+		console.log('hello');
+	});
+</script>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-after-await/_config.js b/packages/svelte/tests/runtime-runes/samples/async-effect-after-await/_config.js
new file mode 100644
index 0000000000..81548a25ea
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-after-await/_config.js
@@ -0,0 +1,9 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, logs }) {
+		await tick();
+		assert.deepEqual(logs, ['hello']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-after-await/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-effect-after-await/main.svelte
new file mode 100644
index 0000000000..d4b67f8803
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-after-await/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	import Child from './Child.svelte';
+</script>
+
+<svelte:boundary>
+	<Child />
+
+	{#snippet pending()}{/snippet}
+</svelte:boundary>

From df13be8727ab16319a4f01ac39ff2ab195e953ae Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 11 Sep 2025 11:30:50 -0400
Subject: [PATCH 15/68] Version Packages (#16754)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/ninety-pandas-move.md | 5 -----
 packages/svelte/CHANGELOG.md     | 6 ++++++
 packages/svelte/package.json     | 2 +-
 packages/svelte/src/version.js   | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 .changeset/ninety-pandas-move.md

diff --git a/.changeset/ninety-pandas-move.md b/.changeset/ninety-pandas-move.md
deleted file mode 100644
index 65f57ddbbf..0000000000
--- a/.changeset/ninety-pandas-move.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: flush effects scheduled during boundary's pending phase
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 4e384d5697..62f109c82f 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.38.10
+
+### Patch Changes
+
+- fix: flush effects scheduled during boundary's pending phase ([#16738](https://github.com/sveltejs/svelte/pull/16738))
+
 ## 5.38.9
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index d445e0acf8..6c91ec6bbb 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.38.9",
+  "version": "5.38.10",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index edb787c00c..9bfa7a5421 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.38.9';
+export const VERSION = '5.38.10';
 export const PUBLIC_VERSION = '5';

From 808fbb4989d0e1687577cb4534e4d8350fb8971d Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 11 Sep 2025 11:49:14 -0400
Subject: [PATCH 16/68] chore: inline `suspend` (#16755)

* chore: inline `suspend`

* invert condition
---
 packages/svelte/src/internal/client/index.js  |  2 +-
 .../src/internal/client/reactivity/async.js   | 21 +++++++++++++++---
 .../src/internal/client/reactivity/batch.js   | 22 -------------------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index dbff5c4599..3c5409bcfe 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -103,7 +103,7 @@ export {
 	save,
 	track_reactivity_loss
 } from './reactivity/async.js';
-export { flushSync as flush, suspend } from './reactivity/batch.js';
+export { flushSync as flush } from './reactivity/batch.js';
 export {
 	async_derived,
 	user_derived as derived,
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index b7a5d5cdb7..a109a1f4d8 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -11,7 +11,7 @@ import {
 	set_active_effect,
 	set_active_reaction
 } from '../runtime.js';
-import { current_batch, suspend } from './batch.js';
+import { Batch, current_batch } from './batch.js';
 import {
 	async_derived,
 	current_async_effect,
@@ -178,7 +178,13 @@ export function unset_context() {
  * @param {() => Promise<void>} fn
  */
 export async function async_body(fn) {
-	var unsuspend = suspend();
+	var boundary = get_boundary();
+	var batch = /** @type {Batch} */ (current_batch);
+	var pending = boundary.is_pending();
+
+	boundary.update_pending_count(1);
+	if (!pending) batch.increment();
+
 	var active = /** @type {Effect} */ (active_effect);
 
 	try {
@@ -188,6 +194,15 @@ export async function async_body(fn) {
 			invoke_error_boundary(error, active);
 		}
 	} finally {
-		unsuspend();
+		boundary.update_pending_count(-1);
+
+		if (pending) {
+			batch.flush();
+		} else {
+			batch.activate();
+			batch.decrement();
+		}
+
+		unset_context();
 	}
 }
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index e504ae2e3f..3d234f5bba 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -653,28 +653,6 @@ export function schedule_effect(signal) {
 	queued_root_effects.push(effect);
 }
 
-export function suspend() {
-	var boundary = get_boundary();
-	var batch = /** @type {Batch} */ (current_batch);
-	var pending = boundary.is_pending();
-
-	boundary.update_pending_count(1);
-	if (!pending) batch.increment();
-
-	return function unsuspend() {
-		boundary.update_pending_count(-1);
-
-		if (!pending) {
-			batch.activate();
-			batch.decrement();
-		} else {
-			batch.flush();
-		}
-
-		unset_context();
-	};
-}
-
 /**
  * Forcibly remove all current batches, to prevent cross-talk between tests
  */

From a0598014d2b634566d8a62acca6b0c7601054e18 Mon Sep 17 00:00:00 2001
From: Aaron Ajose <aaronajosee@gmail.com>
Date: Sun, 14 Sep 2025 22:09:40 +0300
Subject: [PATCH 17/68] docs: Fix some inaccuracies (#16759)

* docs: Fix some inaccuracies

* Apply suggestions from code review

---------

Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0653b08b76..e940252892 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ The [Open Source Guides](https://opensource.guide/) website has a collection of
 
 ## Get involved
 
-There are many ways to contribute to Svelte, and many of them do not involve writing any code. Here's a few ideas to get started:
+There are many ways to contribute to Svelte, and many of them do not involve writing any code. Here are a few ideas to get started:
 
 - Simply start using Svelte. Go through the [Getting Started](https://svelte.dev/docs#getting-started) guide. Does everything work as expected? If not, we're always looking for improvements. Let us know by [opening an issue](#reporting-new-issues).
 - Look through the [open issues](https://github.com/sveltejs/svelte/issues). A good starting point would be issues tagged [good first issue](https://github.com/sveltejs/svelte/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22). Provide workarounds, ask for clarification, or suggest labels. Help [triage issues](#triaging-issues-and-pull-requests).
@@ -90,9 +90,9 @@ A good test plan has the exact commands you ran and their output, provides scree
 
 #### Writing tests
 
-All tests are located in `/test` folder.
+All tests are located in the `/tests` folder.
 
-Test samples are kept in `/test/xxx/samples` folder.
+Test samples are kept in `/tests/xxx/samples` folders.
 
 #### Running tests
 

From 8b4e1fcb7aa321c15382652b60d430bcd0bda960 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 15 Sep 2025 10:00:45 -0400
Subject: [PATCH 18/68] chore: extract a couple of drive-by fixes from other
 branch (#16772)

* chore: extract a couple of drive-by fixes from other branch

* more
---
 packages/svelte/src/internal/client/dom/operations.js   | 6 +++---
 packages/svelte/src/internal/client/dom/template.js     | 3 +++
 packages/svelte/src/internal/client/reactivity/batch.js | 3 ---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/operations.js b/packages/svelte/src/internal/client/dom/operations.js
index abc29a7670..c527ca23e3 100644
--- a/packages/svelte/src/internal/client/dom/operations.js
+++ b/packages/svelte/src/internal/client/dom/operations.js
@@ -130,11 +130,11 @@ export function child(node, is_text) {
 
 /**
  * Don't mark this as side-effect-free, hydration needs to walk all nodes
- * @param {DocumentFragment | TemplateNode[]} fragment
- * @param {boolean} is_text
+ * @param {DocumentFragment | TemplateNode | TemplateNode[]} fragment
+ * @param {boolean} [is_text]
  * @returns {Node | null}
  */
-export function first_child(fragment, is_text) {
+export function first_child(fragment, is_text = false) {
 	if (!hydrating) {
 		// when not hydrating, `fragment` is a `DocumentFragment` (the result of calling `open_frag`)
 		var first = /** @type {DocumentFragment} */ (get_first_child(/** @type {Node} */ (fragment)));
diff --git a/packages/svelte/src/internal/client/dom/template.js b/packages/svelte/src/internal/client/dom/template.js
index 265a52262f..135ca86610 100644
--- a/packages/svelte/src/internal/client/dom/template.js
+++ b/packages/svelte/src/internal/client/dom/template.js
@@ -316,6 +316,9 @@ export function text(value = '') {
 	return node;
 }
 
+/**
+ * @returns {TemplateNode | DocumentFragment}
+ */
 export function comment() {
 	// we're not delegating to `template` here for performance reasons
 	if (hydrating) {
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 3d234f5bba..35aff7d4c9 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -10,12 +10,10 @@ import {
 	INERT,
 	RENDER_EFFECT,
 	ROOT_EFFECT,
-	USER_EFFECT,
 	MAYBE_DIRTY
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
-import { get_boundary } from '../dom/blocks/boundary.js';
 import {
 	active_effect,
 	is_dirty,
@@ -30,7 +28,6 @@ import { DEV } from 'esm-env';
 import { invoke_error_boundary } from '../error-handling.js';
 import { old_values } from './sources.js';
 import { unlink_effect } from './effects.js';
-import { unset_context } from './async.js';
 
 /** @type {Set<Batch>} */
 const batches = new Set();

From 8b106b94f41a87ebfff251f70d602dda70265dc9 Mon Sep 17 00:00:00 2001
From: 7nik <kifiranet@gmail.com>
Date: Mon, 15 Sep 2025 20:24:31 +0300
Subject: [PATCH 19/68] fix: correctly SSR hidden="until-found" (#16773)

---
 .changeset/pink-gifts-sell.md                                | 5 +++++
 packages/svelte/src/internal/shared/attributes.js            | 4 ++++
 packages/svelte/src/utils.js                                 | 1 -
 .../samples/attribute-spread-hidden-2/_expected.html         | 1 +
 .../samples/attribute-spread-hidden-2/main.svelte            | 3 +++
 5 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/pink-gifts-sell.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/_expected.html
 create mode 100644 packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/main.svelte

diff --git a/.changeset/pink-gifts-sell.md b/.changeset/pink-gifts-sell.md
new file mode 100644
index 0000000000..f3f91ff7d9
--- /dev/null
+++ b/.changeset/pink-gifts-sell.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly SSR hidden="until-found"
diff --git a/packages/svelte/src/internal/shared/attributes.js b/packages/svelte/src/internal/shared/attributes.js
index c8758c1d4d..a96e71ff6f 100644
--- a/packages/svelte/src/internal/shared/attributes.js
+++ b/packages/svelte/src/internal/shared/attributes.js
@@ -23,6 +23,10 @@ const replacements = {
  */
 export function attr(name, value, is_boolean = false) {
 	if (value == null || (!value && is_boolean)) return '';
+	// attribute hidden for values other than "until-found" behaves like a boolean attribute
+	if (name === 'hidden' && value !== 'until-found') {
+		is_boolean = true;
+	}
 	const normalized = (name in replacements && replacements[name].get(value)) || value;
 	const assignment = is_boolean ? '' : `="${escape_html(normalized, true)}"`;
 	return ` ${name}${assignment}`;
diff --git a/packages/svelte/src/utils.js b/packages/svelte/src/utils.js
index f8c39253ac..f8a7e8d46d 100644
--- a/packages/svelte/src/utils.js
+++ b/packages/svelte/src/utils.js
@@ -154,7 +154,6 @@ const DOM_BOOLEAN_ATTRIBUTES = [
 	'default',
 	'disabled',
 	'formnovalidate',
-	'hidden',
 	'indeterminate',
 	'inert',
 	'ismap',
diff --git a/packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/_expected.html b/packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/_expected.html
new file mode 100644
index 0000000000..80937efaee
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/_expected.html
@@ -0,0 +1 @@
+<!--[--><div>A</div><div hidden>B</div><div hidden="until-found">C</div><!--]-->
diff --git a/packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/main.svelte
new file mode 100644
index 0000000000..6738b34054
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/main.svelte
@@ -0,0 +1,3 @@
+<div {...{ hidden: false }}>A</div>
+<div {...{ hidden: true }}>B</div>
+<div {...{ hidden: 'until-found' }}>C</div>
\ No newline at end of file

From 8c982f61013a517bec2edf68a82ce1a1188fcd8f Mon Sep 17 00:00:00 2001
From: 7nik <kifiranet@gmail.com>
Date: Tue, 16 Sep 2025 11:45:18 +0300
Subject: [PATCH 20/68] fix: correct wrong fix, get test to actually do
 something (#16779)

#16773 added a test with _expected.html to a wrong suit, so it was ignored, and this allowed to slip in a new bug of printing the falsy hidden attribute as hidden (shortened enabled form).
That fix wasn't released yet, so no changeset.
---
 packages/svelte/src/internal/shared/attributes.js               | 2 +-
 .../samples/attribute-spread-hidden}/_expected.html             | 0
 .../samples/attribute-spread-hidden}/main.svelte                | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/svelte/tests/{runtime-runes/samples/attribute-spread-hidden-2 => server-side-rendering/samples/attribute-spread-hidden}/_expected.html (100%)
 rename packages/svelte/tests/{runtime-runes/samples/attribute-spread-hidden-2 => server-side-rendering/samples/attribute-spread-hidden}/main.svelte (100%)

diff --git a/packages/svelte/src/internal/shared/attributes.js b/packages/svelte/src/internal/shared/attributes.js
index a96e71ff6f..4ad550e8d6 100644
--- a/packages/svelte/src/internal/shared/attributes.js
+++ b/packages/svelte/src/internal/shared/attributes.js
@@ -22,11 +22,11 @@ const replacements = {
  * @returns {string}
  */
 export function attr(name, value, is_boolean = false) {
-	if (value == null || (!value && is_boolean)) return '';
 	// attribute hidden for values other than "until-found" behaves like a boolean attribute
 	if (name === 'hidden' && value !== 'until-found') {
 		is_boolean = true;
 	}
+	if (value == null || (!value && is_boolean)) return '';
 	const normalized = (name in replacements && replacements[name].get(value)) || value;
 	const assignment = is_boolean ? '' : `="${escape_html(normalized, true)}"`;
 	return ` ${name}${assignment}`;
diff --git a/packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/_expected.html b/packages/svelte/tests/server-side-rendering/samples/attribute-spread-hidden/_expected.html
similarity index 100%
rename from packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/_expected.html
rename to packages/svelte/tests/server-side-rendering/samples/attribute-spread-hidden/_expected.html
diff --git a/packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/main.svelte b/packages/svelte/tests/server-side-rendering/samples/attribute-spread-hidden/main.svelte
similarity index 100%
rename from packages/svelte/tests/runtime-runes/samples/attribute-spread-hidden-2/main.svelte
rename to packages/svelte/tests/server-side-rendering/samples/attribute-spread-hidden/main.svelte

From b8fd326d96c3a57feff3a4fafcd2d1651001b109 Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Wed, 17 Sep 2025 15:49:57 -0600
Subject: [PATCH 21/68] feat: async SSR (#16748)

* feat: First pass at payload

* first crack

* snapshots

* checkpoint

* fix: cloning

* add test option

* big dumb

* today's hard work; few tests left to fix

* improve

* tests passing no wayyyyy yo

* lots of progress, couple of failing tests around selects

* meh

* solve async tree stuff

* fix select/option stuff

* whoop, tests

* simplify

* feat: hoisting

* fix: `$effect.pending` sends updates to incorrect boundary

* changeset

* stuff from upstream

* feat: first hydrationgaa

* remove docs

* snapshots

* silly fix

* checkpoint

* meh

* ALKASJDFALSKDFJ the test passes

* chore: Update a bunch of tests for hydration markers

* chore: remove snippet and is_async

* naming

* better errors for sync-in-async

* test improvements

* idk man

* merge local branches (#16757)

* use fragment as async hoist boundary

* remove async_hoist_boundary

* only dewaterfall when necessary

* unused

* simplify/fix

* de-waterfall awaits in separate elements

* update snapshots

* remove unnecessary wrapper

* fix

* fix

* remove suspends_without_fallback

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>

* Update payload.js

Co-authored-by: Rich Harris <rich.harris@vercel.com>

* checkpoint

* got the extra children to go away

* just gonna go ahead and merge this as the review comments take up too much space

* chore: remove hoisted_promises (#16766)

* chore: remove hoisted_promises

* WIP optimise promises

* WIP

* fix <slot> with await in prop

* tweak

* fix type error

* Update packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteHead.js

* chore: fix hydration treeshaking (#16767)

* chore: fix hydration treeshaking

* fix

* remove await_outside_boundary error (#16762)

* chore: remove unused analysis.boundary (#16763)

* chore: simplify slots (#16765)

* chore: simplify slots

* unused

* Apply suggestions from code review

* chore: remove metadata.pending (#16764)

* Update packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js

* put this back where it was, keep the diff small

* Update packages/svelte/src/compiler/phases/types.d.ts

Co-authored-by: Rich Harris <rich.harris@vercel.com>

* chore: remove analysis.state.title (#16771)

* chore: remove analysis.state.title

* unused

* chore: remove is_async (#16769)

* chore: remove is_async

* unused

* Apply suggestions from code review

Co-authored-by: Rich Harris <rich.harris@vercel.com>

* cleanup

* lint

* clean up payload a bit

* compiler work

* run ssr on sync and async

* prettier

* inline capture

* Update packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js

* chore: simplify build_template (#16780)

* small tweak to aid greppability

* chore: fix SSR context (#16781)

* at least passing

* cleanup

* fix

* remove push/pop from exports, not needed with payload

* I think this is better but tbh not sure

* async SSR

* qualification

* errors:

* I have lost the plot

* finally

* ugh

* tweak error codes to better align with existing conventions, such as they are

* tweak messages

* remove unused args

* DRY out a bit

* unused

* unused

* unused

* simplify - we can enforce readonly at a type level

* unused

* simplify

* avoid magical accessors

* simplify algorithm

* unused

* unused

* reduce indirection

* TreeState -> SSRState

* mark deprecated methods

* grab this.local from parent directly

* rename render -> fn per conventions (fn indicates 'arbitrary code')

* reduce indirection

* Revert "reduce indirection"

This reverts commit 3ec461baad451654db6d518734aeeb7b366f7c2e.

* tweak

* okay works this time

* no way chat, it works

* fix context stuff

* tweak

* make it chainable

* lint

* clean up

* lint

* Update packages/svelte/src/internal/server/types.d.ts

Co-authored-by: Rich Harris <rich.harris@vercel.com>

* sunset html for async

* types

* we use 'deprecated' in other messages

* oops

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/forty-insects-cheat.md             |   5 +
 .prettierignore                               |   1 +
 .../98-reference/.generated/server-errors.md  |  14 +
 .../.generated/server-warnings.md             |   9 +
 .../98-reference/.generated/shared-errors.md  |  20 -
 eslint.config.js                              |   1 +
 .../svelte/messages/server-errors/errors.md   |  15 +
 .../messages/server-errors/lifecycle.md       |   5 -
 .../messages/server-warnings/warnings.md      |   5 +
 .../svelte/messages/shared-errors/errors.md   |  18 -
 .../svelte/scripts/process-messages/index.js  |   1 +
 .../templates/server-warnings.js              |  20 +
 .../compiler/phases/1-parse/state/element.js  |   3 +-
 .../src/compiler/phases/2-analyze/index.js    |  15 +-
 .../src/compiler/phases/2-analyze/types.d.ts  |   5 +
 .../2-analyze/visitors/AwaitExpression.js     | 122 +++-
 .../2-analyze/visitors/CallExpression.js      |   1 +
 .../phases/2-analyze/visitors/ConstTag.js     |   6 +-
 .../2-analyze/visitors/RegularElement.js      |   2 +-
 .../2-analyze/visitors/VariableDeclarator.js  |   6 +
 .../3-transform/client/transform-client.js    |   2 -
 .../phases/3-transform/client/types.d.ts      |   8 +-
 .../client/visitors/AwaitExpression.js        | 106 +--
 .../client/visitors/CallExpression.js         |   4 +-
 .../3-transform/client/visitors/ConstTag.js   |   9 +-
 .../client/visitors/RegularElement.js         |  41 +-
 .../client/visitors/VariableDeclaration.js    |  14 +-
 .../3-transform/server/transform-server.js    |  26 +-
 .../3-transform/server/visitors/AwaitBlock.js |  38 +-
 .../server/visitors/AwaitExpression.js        |  22 +-
 .../3-transform/server/visitors/EachBlock.js  |  27 +-
 .../3-transform/server/visitors/IfBlock.js    |  22 +-
 .../server/visitors/RegularElement.js         |  76 ++-
 .../server/visitors/SlotElement.js            |  27 +-
 .../server/visitors/SvelteBoundary.js         |  26 +-
 .../server/visitors/TitleElement.js           |   4 +-
 .../server/visitors/shared/component.js       |  60 +-
 .../server/visitors/shared/utils.js           | 149 +++--
 .../svelte/src/compiler/phases/types.d.ts     |   4 +-
 .../svelte/src/compiler/types/template.d.ts   |   2 +
 packages/svelte/src/compiler/utils/ast.js     |  16 +
 .../svelte/src/compiler/utils/builders.js     |  12 +-
 packages/svelte/src/index-server.js           |   8 +-
 .../internal/client/dom/blocks/boundary.js    | 106 +--
 .../src/internal/client/reactivity/async.js   |   3 +-
 packages/svelte/src/internal/client/render.js |  55 +-
 .../src/internal/server/blocks/snippet.js     |   2 +-
 .../svelte/src/internal/server/context.js     |  58 +-
 packages/svelte/src/internal/server/dev.js    |  46 +-
 packages/svelte/src/internal/server/errors.js |  24 +
 packages/svelte/src/internal/server/index.js  | 232 ++++---
 .../svelte/src/internal/server/payload.js     | 625 ++++++++++++++++--
 .../src/internal/server/payload.test.ts       | 364 ++++++++++
 .../svelte/src/internal/server/types.d.ts     |  23 +-
 .../svelte/src/internal/server/warnings.js    |  17 +
 packages/svelte/src/internal/shared/errors.js |  16 -
 packages/svelte/src/legacy/legacy-server.js   |   1 +
 .../samples/binding-input/_expected.html      |   2 +-
 .../_override.html                            |   2 +-
 .../dynamic-text-changed/_expected.html       |   2 +-
 .../_expected.html                            |   2 +-
 .../_expected.html                            |   2 +-
 .../_expected.html                            |   2 +-
 .../_expected.html                            |   2 +-
 .../element-attribute-added/_expected.html    |   2 +-
 .../element-attribute-changed/_expected.html  |   2 +-
 .../element-attribute-removed/_expected.html  |   2 +-
 .../if-block-mismatch-2/_expected.html        |   2 +-
 .../samples/if-block-mismatch/_expected.html  |   2 +-
 .../_expected.html                            |   2 +-
 .../input-value-changed/_expected.html        |   2 +-
 .../hydration/samples/noscript/_expected.html |   2 +-
 .../pre-first-node-newline/_expected.html     |   4 +-
 .../_expected.html                            |   2 +-
 .../repair-mismatched-a-href/_expected.html   |   2 +-
 .../samples/safari-borking/_override.html     |   2 +-
 .../hydration/samples/script/_expected.html   |   2 +-
 .../snippet-raw-hydrate/_expected.html        |   2 +-
 .../standalone-component/_expected.html       |   2 +-
 .../samples/standalone-snippet/_expected.html |   2 +-
 .../surrounding-whitespace/_expected.html     |   2 +-
 .../surrounding-whitespace/_override.html     |   2 +-
 .../samples/text-empty-2/_expected.html       |   2 +-
 .../samples/text-empty/_expected.html         |   2 +-
 .../whitespace-at-block-start/_override.html  |   4 +-
 .../tests/runtime-browser/driver-ssr.js       |   6 +-
 .../after-render-prevents-loop/_config.js     |   2 +-
 .../after-render-triggers-update/_config.js   |   2 +-
 .../before-render-prevents-loop/_config.js    |   2 +-
 .../_config.js                                |  18 +-
 .../_config.js                                |   6 +-
 .../samples/binding-select-late-2/_config.js  |   6 +-
 .../samples/binding-select-late-3/_config.js  |   6 +-
 .../samples/binding-select-late/_config.js    |   6 +-
 .../binding-select-unmatched-2/_config.js     |  30 +-
 .../binding-select-unmatched-3/_config.js     |   4 +-
 .../_config.js                                |   2 +-
 .../samples/textarea-content/_config.js       |   4 +-
 .../svelte/tests/runtime-legacy/shared.ts     |  53 +-
 .../async-no-pending-throws-sync/_config.js   |   7 +
 .../async-no-pending-throws-sync/main.svelte  |   1 +
 .../samples/async-no-pending/_config.js       |  17 +
 .../samples/async-no-pending/main.svelte      |   1 +
 .../samples/async-ondestroy-ordering/A.svelte |   9 +
 .../samples/async-ondestroy-ordering/B.svelte |   9 +
 .../samples/async-ondestroy-ordering/C.svelte |   5 +
 .../async-ondestroy-ordering/_config.js       |  14 +
 .../async-ondestroy-ordering/destroyed.js     |   4 +
 .../async-ondestroy-ordering/main.svelte      |  13 +
 .../samples/snippet-slot-let-error/_config.js |   1 +
 .../_config.js                                |   6 +
 .../main.svelte                               |   7 +
 .../_expected.html                            |   1 +
 .../async-each-fallback-hoisting/main.svelte  |   5 +
 .../async-each-hoisting/_expected.html        |   1 +
 .../samples/async-each-hoisting/main.svelte   |   9 +
 .../A.svelte                                  |   9 +
 .../B.svelte                                  |   7 +
 .../_config.js                                |   3 +
 .../_expected.html                            |   0
 .../_expected_head.html                       |   1 +
 .../main.svelte                               |  27 +
 .../_expected.html                            |   1 +
 .../async-if-alternate-hoisting/main.svelte   |   5 +
 .../samples/async-if-hoisting/_expected.html  |   1 +
 .../samples/async-if-hoisting/main.svelte     |   5 +
 .../_expected.html                            |   3 +
 .../main.svelte                               |   3 +
 .../_expected.html                            |   3 +
 .../main.svelte                               |   3 +
 .../Option.svelte                             |   5 +
 .../_expected.html                            |   1 +
 .../async-select-value-component/main.svelte  |   8 +
 .../_expected.html                            |   1 +
 .../main.svelte                               |  13 +
 .../_expected.html                            |   1 +
 .../main.svelte                               |   5 +
 .../samples/comment-preserve/_expected.html   |   2 +-
 .../samples/context/Child.svelte              |   8 +
 .../samples/context/_config.js                |   5 +
 .../samples/context/_expected.html            |   3 +
 .../samples/context/main.svelte               |  11 +
 .../_expected.html                            |   2 +-
 .../_expected.html                            |   2 +
 .../invalid-nested-svelte-element/_config.js  |   4 +-
 .../tests/server-side-rendering/test.ts       | 146 ++--
 .../async-each-fallback-hoisting/_config.js   |   3 +
 .../_expected/client/index.svelte.js          |  35 +
 .../_expected/server/index.svelte.js          |  25 +
 .../async-each-fallback-hoisting/index.svelte |   5 +
 .../samples/async-each-hoisting/_config.js    |   3 +
 .../_expected/client/index.svelte.js          |  24 +
 .../_expected/server/index.svelte.js          |  23 +
 .../samples/async-each-hoisting/index.svelte  |   9 +
 .../async-if-alternate-hoisting/_config.js    |   3 +
 .../_expected/client/index.svelte.js          |  30 +
 .../_expected/server/index.svelte.js          |  16 +
 .../async-if-alternate-hoisting/index.svelte  |   5 +
 .../samples/async-if-hoisting/_config.js      |   3 +
 .../_expected/client/index.svelte.js          |  30 +
 .../_expected/server/index.svelte.js          |  16 +
 .../samples/async-if-hoisting/index.svelte    |   5 +
 .../_expected/server/index.svelte.js          |   4 +-
 .../_expected/server/index.svelte.js          |   8 +-
 .../_expected/server/index.svelte.js          |  64 +-
 .../_expected/server/index.svelte.js          |   8 +-
 .../_expected/server/main.svelte.js           |   2 +-
 .../_expected/server/index.svelte.js          |   8 +-
 .../_expected/server/index.svelte.js          |   8 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../hmr/_expected/server/index.svelte.js      |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |  21 +-
 .../purity/_expected/server/index.svelte.js   |   4 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 packages/svelte/types/index.d.ts              |   4 +-
 playgrounds/sandbox/package.json              |   3 +-
 181 files changed, 2638 insertions(+), 901 deletions(-)
 create mode 100644 .changeset/forty-insects-cheat.md
 create mode 100644 documentation/docs/98-reference/.generated/server-warnings.md
 create mode 100644 packages/svelte/messages/server-errors/errors.md
 delete mode 100644 packages/svelte/messages/server-errors/lifecycle.md
 create mode 100644 packages/svelte/messages/server-warnings/warnings.md
 create mode 100644 packages/svelte/scripts/process-messages/templates/server-warnings.js
 create mode 100644 packages/svelte/src/internal/server/payload.test.ts
 create mode 100644 packages/svelte/src/internal/server/warnings.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-throws-sync/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-throws-sync/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/A.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/B.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/C.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/destroyed.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-context-throws-after-await/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-context-throws-after-await/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-each-fallback-hoisting/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-each-fallback-hoisting/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-each-hoisting/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-each-hoisting/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/A.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/B.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_expected_head.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-if-alternate-hoisting/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-if-alternate-hoisting/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-if-hoisting/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-if-hoisting/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-option-implicit-complex-value/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-option-implicit-complex-value/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-option-implicit-simple-value/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-option-implicit-simple-value/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-select-value-component/Option.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-select-value-component/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-select-value-component/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value-complex/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value-complex/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/context/Child.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/context/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/context/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/context/main.svelte
 create mode 100644 packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_config.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/client/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/index.svelte
 create mode 100644 packages/svelte/tests/snapshot/samples/async-each-hoisting/_config.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/client/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-each-hoisting/index.svelte
 create mode 100644 packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_config.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/client/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/index.svelte
 create mode 100644 packages/svelte/tests/snapshot/samples/async-if-hoisting/_config.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/client/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-if-hoisting/index.svelte

diff --git a/.changeset/forty-insects-cheat.md b/.changeset/forty-insects-cheat.md
new file mode 100644
index 0000000000..993a8fdb24
--- /dev/null
+++ b/.changeset/forty-insects-cheat.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: experimental async SSR
diff --git a/.prettierignore b/.prettierignore
index 5e1d9b1aa7..9cf9a4bfe1 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -15,6 +15,7 @@ packages/svelte/src/internal/client/warnings.js
 packages/svelte/src/internal/shared/errors.js
 packages/svelte/src/internal/shared/warnings.js
 packages/svelte/src/internal/server/errors.js
+packages/svelte/src/internal/server/warnings.js
 packages/svelte/tests/migrate/samples/*/output.svelte
 packages/svelte/tests/**/*.svelte
 packages/svelte/tests/**/_expected*
diff --git a/documentation/docs/98-reference/.generated/server-errors.md b/documentation/docs/98-reference/.generated/server-errors.md
index c3e8b53c31..6263032212 100644
--- a/documentation/docs/98-reference/.generated/server-errors.md
+++ b/documentation/docs/98-reference/.generated/server-errors.md
@@ -1,5 +1,19 @@
 <!-- This file is generated by scripts/process-messages/index.js. Do not edit! -->
 
+### await_invalid
+
+```
+Encountered asynchronous work while rendering synchronously.
+```
+
+You (or the framework you're using) called [`render(...)`](svelte-server#render) with a component containing an `await` expression. Either `await` the result of `render` or wrap the `await` (or the component containing it) in a [`<svelte:boundary>`](svelte-boundary) with a `pending` snippet.
+
+### html_deprecated
+
+```
+The `html` property of server render results has been deprecated. Use `body` instead.
+```
+
 ### lifecycle_function_unavailable
 
 ```
diff --git a/documentation/docs/98-reference/.generated/server-warnings.md b/documentation/docs/98-reference/.generated/server-warnings.md
new file mode 100644
index 0000000000..26b3628be9
--- /dev/null
+++ b/documentation/docs/98-reference/.generated/server-warnings.md
@@ -0,0 +1,9 @@
+<!-- This file is generated by scripts/process-messages/index.js. Do not edit! -->
+
+### experimental_async_ssr
+
+```
+Attempted to use asynchronous rendering without `experimental.async` enabled
+```
+
+Set `experimental.async: true` in your compiler options (usually in `svelte.config.js`) to use async server rendering. This render ran synchronously.
diff --git a/documentation/docs/98-reference/.generated/shared-errors.md b/documentation/docs/98-reference/.generated/shared-errors.md
index de34b3f5da..6c31aaafd0 100644
--- a/documentation/docs/98-reference/.generated/shared-errors.md
+++ b/documentation/docs/98-reference/.generated/shared-errors.md
@@ -1,25 +1,5 @@
 <!-- This file is generated by scripts/process-messages/index.js. Do not edit! -->
 
-### await_outside_boundary
-
-```
-Cannot await outside a `<svelte:boundary>` with a `pending` snippet
-```
-
-The `await` keyword can only appear in a `$derived(...)` or template expression, or at the top level of a component's `<script>` block, if it is inside a [`<svelte:boundary>`](/docs/svelte/svelte-boundary) that has a `pending` snippet:
-
-```svelte
-<svelte:boundary>
-	<p>{await getData()}</p>
-
-	{#snippet pending()}
-		<p>loading...</p>
-	{/snippet}
-</svelte:boundary>
-```
-
-This restriction may be lifted in a future version of Svelte.
-
 ### invalid_default_snippet
 
 ```
diff --git a/eslint.config.js b/eslint.config.js
index 5241cb43a6..0e0e0bc729 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -94,6 +94,7 @@ export default [
 			'packages/svelte/src/internal/client/errors.js',
 			'packages/svelte/src/internal/client/warnings.js',
 			'packages/svelte/src/internal/shared/warnings.js',
+			'packages/svelte/src/internal/server/warnings.js',
 			'packages/svelte/compiler/index.js',
 			// stuff we don't want to lint
 			'benchmarking/**',
diff --git a/packages/svelte/messages/server-errors/errors.md b/packages/svelte/messages/server-errors/errors.md
new file mode 100644
index 0000000000..49d2a310f6
--- /dev/null
+++ b/packages/svelte/messages/server-errors/errors.md
@@ -0,0 +1,15 @@
+## await_invalid
+
+> Encountered asynchronous work while rendering synchronously.
+
+You (or the framework you're using) called [`render(...)`](svelte-server#render) with a component containing an `await` expression. Either `await` the result of `render` or wrap the `await` (or the component containing it) in a [`<svelte:boundary>`](svelte-boundary) with a `pending` snippet.
+
+## html_deprecated
+
+> The `html` property of server render results has been deprecated. Use `body` instead.
+
+## lifecycle_function_unavailable
+
+> `%name%(...)` is not available on the server
+
+Certain methods such as `mount` cannot be invoked while running in a server context. Avoid calling them eagerly, i.e. not during render.
diff --git a/packages/svelte/messages/server-errors/lifecycle.md b/packages/svelte/messages/server-errors/lifecycle.md
deleted file mode 100644
index c3acdedf3d..0000000000
--- a/packages/svelte/messages/server-errors/lifecycle.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## lifecycle_function_unavailable
-
-> `%name%(...)` is not available on the server
-
-Certain methods such as `mount` cannot be invoked while running in a server context. Avoid calling them eagerly, i.e. not during render.
diff --git a/packages/svelte/messages/server-warnings/warnings.md b/packages/svelte/messages/server-warnings/warnings.md
new file mode 100644
index 0000000000..4df89d0176
--- /dev/null
+++ b/packages/svelte/messages/server-warnings/warnings.md
@@ -0,0 +1,5 @@
+## experimental_async_ssr
+
+> Attempted to use asynchronous rendering without `experimental.async` enabled
+
+Set `experimental.async: true` in your compiler options (usually in `svelte.config.js`) to use async server rendering. This render ran synchronously.
diff --git a/packages/svelte/messages/shared-errors/errors.md b/packages/svelte/messages/shared-errors/errors.md
index f9160671d3..4b4d332202 100644
--- a/packages/svelte/messages/shared-errors/errors.md
+++ b/packages/svelte/messages/shared-errors/errors.md
@@ -1,21 +1,3 @@
-## await_outside_boundary
-
-> Cannot await outside a `<svelte:boundary>` with a `pending` snippet
-
-The `await` keyword can only appear in a `$derived(...)` or template expression, or at the top level of a component's `<script>` block, if it is inside a [`<svelte:boundary>`](/docs/svelte/svelte-boundary) that has a `pending` snippet:
-
-```svelte
-<svelte:boundary>
-	<p>{await getData()}</p>
-
-	{#snippet pending()}
-		<p>loading...</p>
-	{/snippet}
-</svelte:boundary>
-```
-
-This restriction may be lifted in a future version of Svelte.
-
 ## invalid_default_snippet
 
 > Cannot use `{@render children(...)}` if the parent component uses `let:` directives. Consider using a named snippet instead
diff --git a/packages/svelte/scripts/process-messages/index.js b/packages/svelte/scripts/process-messages/index.js
index e705a1c921..1904f1dfb4 100644
--- a/packages/svelte/scripts/process-messages/index.js
+++ b/packages/svelte/scripts/process-messages/index.js
@@ -401,6 +401,7 @@ function run() {
 
 	transform('client-warnings', 'src/internal/client/warnings.js');
 	transform('client-errors', 'src/internal/client/errors.js');
+	transform('server-warnings', 'src/internal/server/warnings.js');
 	transform('server-errors', 'src/internal/server/errors.js');
 	transform('shared-errors', 'src/internal/shared/errors.js');
 	transform('shared-warnings', 'src/internal/shared/warnings.js');
diff --git a/packages/svelte/scripts/process-messages/templates/server-warnings.js b/packages/svelte/scripts/process-messages/templates/server-warnings.js
new file mode 100644
index 0000000000..8a9b87b760
--- /dev/null
+++ b/packages/svelte/scripts/process-messages/templates/server-warnings.js
@@ -0,0 +1,20 @@
+import { DEV } from 'esm-env';
+
+var bold = 'font-weight: bold';
+var normal = 'font-weight: normal';
+
+/**
+ * MESSAGE
+ * @param {string} PARAMETER
+ */
+export function CODE(PARAMETER) {
+	if (DEV) {
+		console.warn(
+			`%c[svelte] ${'CODE'}\n%c${MESSAGE}\nhttps://svelte.dev/e/${'CODE'}`,
+			bold,
+			normal
+		);
+	} else {
+		console.warn(`https://svelte.dev/e/${'CODE'}`);
+	}
+}
diff --git a/packages/svelte/src/compiler/phases/1-parse/state/element.js b/packages/svelte/src/compiler/phases/1-parse/state/element.js
index ed1b047d55..b0db9ce178 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/element.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/element.js
@@ -177,7 +177,8 @@ export default function element(parser) {
 						mathml: false,
 						scoped: false,
 						has_spread: false,
-						path: []
+						path: [],
+						synthetic_value_node: null
 					}
 				}
 			: /** @type {AST.ElementLike} */ ({
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index de27c4623b..47fe37c44d 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -278,7 +278,8 @@ export function analyze_module(source, options) {
 		tracing: false,
 		async_deriveds: new Set(),
 		comments,
-		classes: new Map()
+		classes: new Map(),
+		pickled_awaits: new Set()
 	};
 
 	state.adjust({
@@ -304,7 +305,8 @@ export function analyze_module(source, options) {
 			options: /** @type {ValidatedCompileOptions} */ (options),
 			fragment: null,
 			parent_element: null,
-			reactive_statement: null
+			reactive_statement: null,
+			in_derived: false
 		},
 		visitors
 	);
@@ -540,7 +542,8 @@ export function analyze_component(root, source, options) {
 		source,
 		snippet_renderers: new Map(),
 		snippets: new Set(),
-		async_deriveds: new Set()
+		async_deriveds: new Set(),
+		pickled_awaits: new Set()
 	};
 
 	if (!runes) {
@@ -699,7 +702,8 @@ export function analyze_component(root, source, options) {
 				expression: null,
 				state_fields: new Map(),
 				function_depth: scope.function_depth,
-				reactive_statement: null
+				reactive_statement: null,
+				in_derived: false
 			};
 
 			walk(/** @type {AST.SvelteNode} */ (ast), state, visitors);
@@ -766,7 +770,8 @@ export function analyze_component(root, source, options) {
 				component_slots: new Set(),
 				expression: null,
 				state_fields: new Map(),
-				function_depth: scope.function_depth
+				function_depth: scope.function_depth,
+				in_derived: false
 			};
 
 			walk(/** @type {AST.SvelteNode} */ (ast), state, visitors);
diff --git a/packages/svelte/src/compiler/phases/2-analyze/types.d.ts b/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
index 2d99a2e155..ae9c5911f6 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
+++ b/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
@@ -27,6 +27,11 @@ export interface AnalysisState {
 
 	// legacy stuff
 	reactive_statement: null | ReactiveStatement;
+
+	/**
+	 * True if we're directly inside a `$derived(...)` expression (but not `$derived.by(...)`)
+	 */
+	in_derived: boolean;
 }
 
 export type Context<State extends AnalysisState = AnalysisState> = import('zimmerframe').Context<
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
index b2f59b849b..9018623570 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
@@ -1,5 +1,6 @@
-/** @import { AwaitExpression } from 'estree' */
+/** @import { AwaitExpression, Expression, SpreadElement, Property } from 'estree' */
 /** @import { Context } from '../types' */
+/** @import { AST } from '#compiler' */
 import * as e from '../../../errors.js';
 
 /**
@@ -7,16 +8,25 @@ import * as e from '../../../errors.js';
  * @param {Context} context
  */
 export function AwaitExpression(node, context) {
-	let suspend = context.state.ast_type === 'instance' && context.state.function_depth === 1;
+	const tla = context.state.ast_type === 'instance' && context.state.function_depth === 1;
+
+	// preserve context for
+	//   a) top-level await and
+	//   b) awaits that precede other expressions in template or `$derived(...)`
+	if (
+		tla ||
+		(is_reactive_expression(context.path, context.state.in_derived) &&
+			!is_last_evaluated_expression(context.path, node))
+	) {
+		context.state.analysis.pickled_awaits.add(node);
+	}
+
+	let suspend = tla;
 
 	if (context.state.expression) {
 		context.state.expression.has_await = true;
 
-		if (
-			context.state.fragment &&
-			// TODO there's probably a better way to do this
-			context.path.some((node) => node.type === 'ConstTag')
-		) {
+		if (context.state.fragment && context.path.some((node) => node.type === 'ConstTag')) {
 			context.state.fragment.metadata.has_await = true;
 		}
 
@@ -37,3 +47,101 @@ export function AwaitExpression(node, context) {
 
 	context.next();
 }
+
+/**
+ * @param {AST.SvelteNode[]} path
+ * @param {boolean} in_derived
+ */
+export function is_reactive_expression(path, in_derived) {
+	if (in_derived) {
+		return true;
+	}
+
+	let i = path.length;
+
+	while (i--) {
+		const parent = path[i];
+
+		if (
+			parent.type === 'ArrowFunctionExpression' ||
+			parent.type === 'FunctionExpression' ||
+			parent.type === 'FunctionDeclaration'
+		) {
+			return false;
+		}
+
+		// @ts-expect-error we could probably use a neater/more robust mechanism
+		if (parent.metadata) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * @param {AST.SvelteNode[]} path
+ * @param {Expression | SpreadElement | Property} node
+ */
+export function is_last_evaluated_expression(path, node) {
+	let i = path.length;
+
+	while (i--) {
+		const parent = /** @type {Expression | Property | SpreadElement} */ (path[i]);
+
+		// @ts-expect-error we could probably use a neater/more robust mechanism
+		if (parent.metadata) {
+			return true;
+		}
+
+		switch (parent.type) {
+			case 'ArrayExpression':
+				if (node !== parent.elements.at(-1)) return false;
+				break;
+
+			case 'AssignmentExpression':
+			case 'BinaryExpression':
+			case 'LogicalExpression':
+				if (node === parent.left) return false;
+				break;
+
+			case 'CallExpression':
+			case 'NewExpression':
+				if (node !== parent.arguments.at(-1)) return false;
+				break;
+
+			case 'ConditionalExpression':
+				if (node === parent.test) return false;
+				break;
+
+			case 'MemberExpression':
+				if (parent.computed && node === parent.object) return false;
+				break;
+
+			case 'ObjectExpression':
+				if (node !== parent.properties.at(-1)) return false;
+				break;
+
+			case 'Property':
+				if (node === parent.key) return false;
+				break;
+
+			case 'SequenceExpression':
+				if (node !== parent.expressions.at(-1)) return false;
+				break;
+
+			case 'TaggedTemplateExpression':
+				if (node !== parent.quasi.expressions.at(-1)) return false;
+				break;
+
+			case 'TemplateLiteral':
+				if (node !== parent.expressions.at(-1)) return false;
+				break;
+
+			default:
+				return false;
+		}
+
+		node = parent;
+	}
+}
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
index 9b6337b9ed..53a89125a2 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
@@ -241,6 +241,7 @@ export function CallExpression(node, context) {
 		context.next({
 			...context.state,
 			function_depth: context.state.function_depth + 1,
+			in_derived: true,
 			expression
 		});
 
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/ConstTag.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/ConstTag.js
index d5f5f7b2e0..5849d828a3 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/ConstTag.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/ConstTag.js
@@ -35,5 +35,9 @@ export function ConstTag(node, context) {
 	const declaration = node.declaration.declarations[0];
 
 	context.visit(declaration.id);
-	context.visit(declaration.init, { ...context.state, expression: node.metadata.expression });
+	context.visit(declaration.init, {
+		...context.state,
+		expression: node.metadata.expression,
+		in_derived: true
+	});
 }
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
index fab5d46e1b..4f41621db3 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
@@ -70,7 +70,7 @@ export function RegularElement(node, context) {
 		)
 	) {
 		const child = node.fragment.nodes[0];
-		node.attributes.push(create_attribute('value', child.start, child.end, [child]));
+		node.metadata.synthetic_value_node = child;
 	}
 
 	const binding = context.state.scope.get(node.name);
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js
index 89320f3962..f56a665de8 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js
@@ -49,6 +49,12 @@ export function VariableDeclarator(node, context) {
 			}
 		}
 
+		if (rune === '$derived') {
+			context.visit(node.id);
+			context.visit(/** @type {Expression} */ (node.init), { ...context.state, in_derived: true });
+			return;
+		}
+
 		if (rune === '$props') {
 			if (node.id.type !== 'ObjectPattern' && node.id.type !== 'Identifier') {
 				e.props_invalid_identifier(node);
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
index 706d2b4e10..2629379f63 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
@@ -166,7 +166,6 @@ export function client_component(analysis, options) {
 		state_fields: new Map(),
 		transform: {},
 		in_constructor: false,
-		in_derived: false,
 		instance_level_snippets: [],
 		module_level_snippets: [],
 
@@ -712,7 +711,6 @@ export function client_module(analysis, options) {
 		state_fields: new Map(),
 		transform: {},
 		in_constructor: false,
-		in_derived: false,
 		is_instance: false
 	};
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts b/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts
index 59c024dfb7..932d353671 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts
+++ b/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts
@@ -6,8 +6,7 @@ import type {
 	Expression,
 	AssignmentExpression,
 	UpdateExpression,
-	VariableDeclaration,
-	Declaration
+	VariableDeclaration
 } from 'estree';
 import type { AST, Namespace, ValidatedCompileOptions } from '#compiler';
 import type { TransformState } from '../types.js';
@@ -22,11 +21,6 @@ export interface ClientTransformState extends TransformState {
 	 */
 	readonly in_constructor: boolean;
 
-	/**
-	 * True if we're directly inside a `$derived(...)` expression (but not `$derived.by(...)`)
-	 */
-	readonly in_derived: boolean;
-
 	/** `true` if we're transforming the contents of `<script>` */
 	readonly is_instance: boolean;
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
index 803d317ad4..798d1bcdac 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
@@ -1,4 +1,4 @@
-/** @import { AwaitExpression, Expression, Property, SpreadElement } from 'estree' */
+/** @import { AwaitExpression, Expression } from 'estree' */
 /** @import { Context } from '../types' */
 import { dev, is_ignored } from '../../../../state.js';
 import * as b from '../../../../utils/builders.js';
@@ -10,12 +10,7 @@ import * as b from '../../../../utils/builders.js';
 export function AwaitExpression(node, context) {
 	const argument = /** @type {Expression} */ (context.visit(node.argument));
 
-	const tla = context.state.is_instance && context.state.scope.function_depth === 1;
-
-	// preserve context for
-	//   a) top-level await and
-	//   b) awaits that precede other expressions in template or `$derived(...)`
-	if (tla || (is_reactive_expression(context) && !is_last_evaluated_expression(context, node))) {
+	if (context.state.analysis.pickled_awaits.has(node)) {
 		return b.call(b.await(b.call('$.save', argument)));
 	}
 
@@ -27,100 +22,3 @@ export function AwaitExpression(node, context) {
 
 	return argument === node.argument ? node : { ...node, argument };
 }
-
-/**
- * @param {Context} context
- */
-function is_reactive_expression(context) {
-	if (context.state.in_derived) {
-		return true;
-	}
-
-	let i = context.path.length;
-
-	while (i--) {
-		const parent = context.path[i];
-
-		if (
-			parent.type === 'ArrowFunctionExpression' ||
-			parent.type === 'FunctionExpression' ||
-			parent.type === 'FunctionDeclaration'
-		) {
-			return false;
-		}
-
-		// @ts-expect-error we could probably use a neater/more robust mechanism
-		if (parent.metadata) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-/**
- * @param {Context} context
- * @param {Expression | SpreadElement | Property} node
- */
-function is_last_evaluated_expression(context, node) {
-	let i = context.path.length;
-
-	while (i--) {
-		const parent = /** @type {Expression | Property | SpreadElement} */ (context.path[i]);
-
-		// @ts-expect-error we could probably use a neater/more robust mechanism
-		if (parent.metadata) {
-			return true;
-		}
-
-		switch (parent.type) {
-			case 'ArrayExpression':
-				if (node !== parent.elements.at(-1)) return false;
-				break;
-
-			case 'AssignmentExpression':
-			case 'BinaryExpression':
-			case 'LogicalExpression':
-				if (node === parent.left) return false;
-				break;
-
-			case 'CallExpression':
-			case 'NewExpression':
-				if (node !== parent.arguments.at(-1)) return false;
-				break;
-
-			case 'ConditionalExpression':
-				if (node === parent.test) return false;
-				break;
-
-			case 'MemberExpression':
-				if (parent.computed && node === parent.object) return false;
-				break;
-
-			case 'ObjectExpression':
-				if (node !== parent.properties.at(-1)) return false;
-				break;
-
-			case 'Property':
-				if (node === parent.key) return false;
-				break;
-
-			case 'SequenceExpression':
-				if (node !== parent.expressions.at(-1)) return false;
-				break;
-
-			case 'TaggedTemplateExpression':
-				if (node !== parent.quasi.expressions.at(-1)) return false;
-				break;
-
-			case 'TemplateLiteral':
-				if (node !== parent.expressions.at(-1)) return false;
-				break;
-
-			default:
-				return false;
-		}
-
-		node = parent;
-	}
-}
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js
index c126742d3c..fcc385c2ba 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/CallExpression.js
@@ -44,9 +44,7 @@ export function CallExpression(node, context) {
 
 		case '$derived':
 		case '$derived.by': {
-			let fn = /** @type {Expression} */ (
-				context.visit(node.arguments[0], { ...context.state, in_derived: rune === '$derived' })
-			);
+			let fn = /** @type {Expression} */ (context.visit(node.arguments[0]));
 
 			return b.call('$.derived', rune === '$derived' ? b.thunk(fn) : fn);
 		}
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ConstTag.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ConstTag.js
index b550dae890..81dd9e07ed 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ConstTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ConstTag.js
@@ -16,11 +16,7 @@ export function ConstTag(node, context) {
 	const declaration = node.declaration.declarations[0];
 	// TODO we can almost certainly share some code with $derived(...)
 	if (declaration.id.type === 'Identifier') {
-		const init = build_expression(
-			{ ...context, state: { ...context.state, in_derived: true } },
-			declaration.init,
-			node.metadata.expression
-		);
+		const init = build_expression(context, declaration.init, node.metadata.expression);
 
 		let expression = create_derived(context.state, init, node.metadata.expression.has_await);
 
@@ -51,8 +47,7 @@ export function ConstTag(node, context) {
 
 		const child_state = /** @type {ComponentContext['state']} */ ({
 			...context.state,
-			transform,
-			in_derived: true
+			transform
 		});
 
 		// TODO optimise the simple `{ x } = y` case — we can just return `y`
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js
index e906061650..e35b7cbe5a 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RegularElement.js
@@ -11,7 +11,7 @@ import {
 import { is_ignored } from '../../../../state.js';
 import { is_event_attribute, is_text_attribute } from '../../../../utils/ast.js';
 import * as b from '#compiler/builders';
-import { is_custom_element_node } from '../../../nodes.js';
+import { create_attribute, is_custom_element_node } from '../../../nodes.js';
 import { clean_nodes, determine_namespace_for_children } from '../../utils.js';
 import { build_getter } from '../utils.js';
 import {
@@ -406,10 +406,24 @@ export function RegularElement(node, context) {
 	}
 
 	if (!has_spread && needs_special_value_handling) {
-		for (const attribute of /** @type {AST.Attribute[]} */ (attributes)) {
-			if (attribute.name === 'value') {
-				build_element_special_value_attribute(node.name, node_id, attribute, context);
-				break;
+		if (node.metadata.synthetic_value_node) {
+			const synthetic_node = node.metadata.synthetic_value_node;
+			const synthetic_attribute = create_attribute(
+				'value',
+				synthetic_node.start,
+				synthetic_node.end,
+				[synthetic_node]
+			);
+			// this node is an `option` that didn't have a `value` attribute, but had
+			// a single-expression child, so we treat the value of that expression as
+			// the value of the option
+			build_element_special_value_attribute(node.name, node_id, synthetic_attribute, context, true);
+		} else {
+			for (const attribute of /** @type {AST.Attribute[]} */ (attributes)) {
+				if (attribute.name === 'value') {
+					build_element_special_value_attribute(node.name, node_id, attribute, context);
+					break;
+				}
 			}
 		}
 	}
@@ -645,8 +659,15 @@ function build_custom_element_attribute_update_assignment(node_id, attribute, co
  * @param {Identifier} node_id
  * @param {AST.Attribute} attribute
  * @param {ComponentContext} context
+ * @param {boolean} [synthetic] - true if this should not sync to the DOM
  */
-function build_element_special_value_attribute(element, node_id, attribute, context) {
+function build_element_special_value_attribute(
+	element,
+	node_id,
+	attribute,
+	context,
+	synthetic = false
+) {
 	const state = context.state;
 	const is_select_with_value =
 		// attribute.metadata.dynamic would give false negatives because even if the value does not change,
@@ -660,7 +681,7 @@ function build_element_special_value_attribute(element, node_id, attribute, cont
 	const evaluated = context.state.scope.evaluate(value);
 	const assignment = b.assignment('=', b.member(node_id, '__value'), value);
 
-	const inner_assignment = b.assignment(
+	const set_value_assignment = b.assignment(
 		'=',
 		b.member(node_id, 'value'),
 		evaluated.is_defined ? assignment : b.logical('??', assignment, b.literal(''))
@@ -669,14 +690,16 @@ function build_element_special_value_attribute(element, node_id, attribute, cont
 	const update = b.stmt(
 		is_select_with_value
 			? b.sequence([
-					inner_assignment,
+					set_value_assignment,
 					// This ensures a one-way street to the DOM in case it's <select {value}>
 					// and not <select bind:value>. We need it in addition to $.init_select
 					// because the select value is not reflected as an attribute, so the
 					// mutation observer wouldn't notice.
 					b.call('$.select_option', node_id, value)
 				])
-			: inner_assignment
+			: synthetic
+				? assignment
+				: set_value_assignment
 	);
 
 	if (has_state) {
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
index 0998dc4778..db5fe5252e 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
@@ -202,12 +202,7 @@ export function VariableDeclaration(node, context) {
 				);
 
 				if (declarator.id.type === 'Identifier') {
-					let expression = /** @type {Expression} */ (
-						context.visit(value, {
-							...context.state,
-							in_derived: rune === '$derived'
-						})
-					);
+					let expression = /** @type {Expression} */ (context.visit(value));
 
 					if (is_async) {
 						const location = dev && !is_ignored(init, 'await_waterfall') && locate_node(init);
@@ -231,12 +226,7 @@ export function VariableDeclaration(node, context) {
 					}
 				} else {
 					const init = /** @type {CallExpression} */ (declarator.init);
-					let expression = /** @type {Expression} */ (
-						context.visit(value, {
-							...context.state,
-							in_derived: rune === '$derived'
-						})
-					);
+					let expression = /** @type {Expression} */ (context.visit(value));
 
 					let rhs = value;
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index 10c92242d4..4486c6e7a3 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -6,7 +6,7 @@ import { walk } from 'zimmerframe';
 import { set_scope } from '../../scope.js';
 import { extract_identifiers } from '../../../utils/ast.js';
 import * as b from '#compiler/builders';
-import { dev, filename } from '../../../state.js';
+import { component_name, dev, filename } from '../../../state.js';
 import { render_stylesheet } from '../css/index.js';
 import { AssignmentExpression } from './visitors/AssignmentExpression.js';
 import { AwaitBlock } from './visitors/AwaitBlock.js';
@@ -40,6 +40,7 @@ import { TitleElement } from './visitors/TitleElement.js';
 import { UpdateExpression } from './visitors/UpdateExpression.js';
 import { VariableDeclaration } from './visitors/VariableDeclaration.js';
 import { SvelteBoundary } from './visitors/SvelteBoundary.js';
+import { call_child_payload, call_component_payload } from './visitors/shared/utils.js';
 
 /** @type {Visitors} */
 const global_visitors = {
@@ -197,13 +198,11 @@ export function server_component(analysis, options) {
 				b.unary('!', b.id('$$settled')),
 				b.block([
 					b.stmt(b.assignment('=', b.id('$$settled'), b.true)),
-					b.stmt(
-						b.assignment('=', b.id('$$inner_payload'), b.call('$.copy_payload', b.id('$$payload')))
-					),
+					b.stmt(b.assignment('=', b.id('$$inner_payload'), b.call('$$payload.copy'))),
 					b.stmt(b.call('$$render_inner', b.id('$$inner_payload')))
 				])
 			),
-			b.stmt(b.call('$.assign_payload', b.id('$$payload'), b.id('$$inner_payload')))
+			b.stmt(b.call('$$payload.subsume', b.id('$$inner_payload')))
 		];
 	}
 
@@ -239,11 +238,15 @@ export function server_component(analysis, options) {
 		template.body.push(b.stmt(b.call('$.bind_props', b.id('$$props'), b.object(props))));
 	}
 
-	const component_block = b.block([
+	let component_block = b.block([
 		.../** @type {Statement[]} */ (instance.body),
 		.../** @type {Statement[]} */ (template.body)
 	]);
 
+	if (analysis.instance.has_await) {
+		component_block = b.block([call_child_payload(component_block, true)]);
+	}
+
 	// trick esrap into including comments
 	component_block.loc = instance.loc;
 
@@ -257,8 +260,9 @@ export function server_component(analysis, options) {
 	let should_inject_context = dev || analysis.needs_context;
 
 	if (should_inject_context) {
-		component_block.body.unshift(b.stmt(b.call('$.push', dev && b.id(analysis.name))));
-		component_block.body.push(b.stmt(b.call('$.pop')));
+		component_block = b.block([
+			call_component_payload(component_block, dev && b.id(component_name))
+		]);
 	}
 
 	if (analysis.uses_rest_props) {
@@ -297,7 +301,7 @@ export function server_component(analysis, options) {
 		const code = b.literal(render_stylesheet(analysis.source, analysis, options).code);
 
 		body.push(b.const('$$css', b.object([b.init('hash', hash), b.init('code', code)])));
-		component_block.body.unshift(b.stmt(b.call('$$payload.css.add', b.id('$$css'))));
+		component_block.body.unshift(b.stmt(b.call('$$payload.global.css.add', b.id('$$css'))));
 	}
 
 	let should_inject_props =
@@ -377,6 +381,10 @@ export function server_component(analysis, options) {
 		);
 	}
 
+	if (options.experimental.async) {
+		body.unshift(b.imports([], 'svelte/internal/flags/async'));
+	}
+
 	return {
 		type: 'Program',
 		sourceType: 'module',
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
index 35e431f43d..ea60c95f68 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
@@ -1,29 +1,33 @@
-/** @import { BlockStatement, Expression, Pattern } from 'estree' */
+/** @import { BlockStatement, Expression, Pattern, Statement } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
-import { block_close } from './shared/utils.js';
+import { block_close, call_child_payload } from './shared/utils.js';
 
 /**
  * @param {AST.AwaitBlock} node
  * @param {ComponentContext} context
  */
 export function AwaitBlock(node, context) {
-	context.state.template.push(
-		b.stmt(
-			b.call(
-				'$.await',
-				b.id('$$payload'),
-				/** @type {Expression} */ (context.visit(node.expression)),
-				b.thunk(
-					node.pending ? /** @type {BlockStatement} */ (context.visit(node.pending)) : b.block([])
-				),
-				b.arrow(
-					node.value ? [/** @type {Pattern} */ (context.visit(node.value))] : [],
-					node.then ? /** @type {BlockStatement} */ (context.visit(node.then)) : b.block([])
-				)
+	/** @type {Statement} */
+	let statement = b.stmt(
+		b.call(
+			'$.await',
+			b.id('$$payload'),
+			/** @type {Expression} */ (context.visit(node.expression)),
+			b.thunk(
+				node.pending ? /** @type {BlockStatement} */ (context.visit(node.pending)) : b.block([])
+			),
+			b.arrow(
+				node.value ? [/** @type {Pattern} */ (context.visit(node.value))] : [],
+				node.then ? /** @type {BlockStatement} */ (context.visit(node.then)) : b.block([])
 			)
-		),
-		block_close
+		)
 	);
+
+	if (node.metadata.expression.has_await) {
+		statement = call_child_payload(b.block([statement]), true);
+	}
+
+	context.state.template.push(statement, block_close);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js
index 9135892dbd..6384a6d4e7 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js
@@ -1,5 +1,5 @@
-/** @import { AwaitExpression } from 'estree' */
-/** @import { Context } from '../types.js' */
+/** @import { AwaitExpression, Expression } from 'estree' */
+/** @import { Context } from '../types' */
 import * as b from '../../../../utils/builders.js';
 
 /**
@@ -7,19 +7,11 @@ import * as b from '../../../../utils/builders.js';
  * @param {Context} context
  */
 export function AwaitExpression(node, context) {
-	// if `await` is inside a function, or inside `<script module>`,
-	// allow it, otherwise error
-	if (
-		context.state.scope.function_depth === 0 ||
-		context.path.some(
-			(node) =>
-				node.type === 'ArrowFunctionExpression' ||
-				node.type === 'FunctionDeclaration' ||
-				node.type === 'FunctionExpression'
-		)
-	) {
-		return context.next();
+	const argument = /** @type {Expression} */ (context.visit(node.argument));
+
+	if (context.state.analysis.pickled_awaits.has(node)) {
+		return b.call(b.await(b.call('$.save', argument)));
 	}
 
-	return b.call('$.await_outside_boundary');
+	return argument === node.argument ? node : { ...node, argument };
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
index ee0086de2e..eb0da55657 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
@@ -1,9 +1,8 @@
 /** @import { BlockStatement, Expression, Statement } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
-import { BLOCK_OPEN_ELSE } from '../../../../../internal/server/hydration.js';
 import * as b from '#compiler/builders';
-import { block_close, block_open } from './shared/utils.js';
+import { block_close, block_open, block_open_else, call_child_payload } from './shared/utils.js';
 
 /**
  * @param {AST.EachBlock} node
@@ -18,7 +17,9 @@ export function EachBlock(node, context) {
 		each_node_meta.contains_group_binding || !node.index ? each_node_meta.index : b.id(node.index);
 
 	const array_id = state.scope.root.unique('each_array');
-	state.init.push(b.const(array_id, b.call('$.ensure_array_like', collection)));
+
+	/** @type {Statement} */
+	let block = b.block([b.const(array_id, b.call('$.ensure_array_like', collection))]);
 
 	/** @type {Statement[]} */
 	const each = [];
@@ -44,23 +45,27 @@ export function EachBlock(node, context) {
 	);
 
 	if (node.fallback) {
-		const open = b.stmt(b.call(b.member(b.id('$$payload.out'), b.id('push')), block_open));
+		const open = b.stmt(b.call(b.id('$$payload.push'), block_open));
 
 		const fallback = /** @type {BlockStatement} */ (context.visit(node.fallback));
 
-		fallback.body.unshift(
-			b.stmt(b.call(b.member(b.id('$$payload.out'), b.id('push')), b.literal(BLOCK_OPEN_ELSE)))
-		);
+		fallback.body.unshift(b.stmt(b.call(b.id('$$payload.push'), block_open_else)));
 
-		state.template.push(
+		block.body.push(
 			b.if(
 				b.binary('!==', b.member(array_id, 'length'), b.literal(0)),
 				b.block([open, for_loop]),
 				fallback
-			),
-			block_close
+			)
 		);
 	} else {
-		state.template.push(block_open, for_loop, block_close);
+		state.template.push(block_open);
+		block.body.push(for_loop);
+	}
+
+	if (node.metadata.expression.has_await) {
+		state.template.push(call_child_payload(block, true), block_close);
+	} else {
+		state.template.push(...block.body, block_close);
 	}
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
index 8c082f38d5..37d4585900 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
@@ -1,9 +1,8 @@
-/** @import { BlockStatement, Expression } from 'estree' */
+/** @import { BlockStatement, Expression, Statement } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
-import { BLOCK_OPEN_ELSE } from '../../../../../internal/server/hydration.js';
 import * as b from '#compiler/builders';
-import { block_close, block_open } from './shared/utils.js';
+import { block_close, block_open, block_open_else, call_child_payload } from './shared/utils.js';
 
 /**
  * @param {AST.IfBlock} node
@@ -17,13 +16,16 @@ export function IfBlock(node, context) {
 		? /** @type {BlockStatement} */ (context.visit(node.alternate))
 		: b.block([]);
 
-	consequent.body.unshift(
-		b.stmt(b.call(b.member(b.id('$$payload.out'), b.id('push')), block_open))
-	);
+	consequent.body.unshift(b.stmt(b.call(b.id('$$payload.push'), block_open)));
 
-	alternate.body.unshift(
-		b.stmt(b.call(b.member(b.id('$$payload.out'), b.id('push')), b.literal(BLOCK_OPEN_ELSE)))
-	);
+	alternate.body.unshift(b.stmt(b.call(b.id('$$payload.push'), block_open_else)));
 
-	context.state.template.push(b.if(test, consequent, alternate), block_close);
+	/** @type {Statement} */
+	let statement = b.if(test, consequent, alternate);
+
+	if (node.metadata.expression.has_await) {
+		statement = call_child_payload(b.block([statement]), true);
+	}
+
+	context.state.template.push(statement, block_close);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
index 0779195e2e..29aad94a31 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
@@ -1,4 +1,4 @@
-/** @import { Expression } from 'estree' */
+/** @import { Expression, Statement } from 'estree' */
 /** @import { Location } from 'locate-character' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext, ComponentServerTransformState } from '../types.js' */
@@ -8,7 +8,12 @@ import { dev, locator } from '../../../../state.js';
 import * as b from '#compiler/builders';
 import { clean_nodes, determine_namespace_for_children } from '../../utils.js';
 import { build_element_attributes, build_spread_object } from './shared/element.js';
-import { process_children, build_template, build_attribute_value } from './shared/utils.js';
+import {
+	process_children,
+	build_template,
+	build_attribute_value,
+	call_child_payload
+} from './shared/utils.js';
 
 /**
  * @param {AST.RegularElement} node
@@ -73,6 +78,8 @@ export function RegularElement(node, context) {
 	}
 
 	let select_with_value = false;
+	let select_with_value_async = false;
+	const template_start = state.template.length;
 
 	if (node.name === 'select') {
 		const value = node.attributes.find(
@@ -80,13 +87,17 @@ export function RegularElement(node, context) {
 				(attribute.type === 'Attribute' || attribute.type === 'BindDirective') &&
 				attribute.name === 'value'
 		);
-		if (node.attributes.some((attribute) => attribute.type === 'SpreadAttribute')) {
+
+		const spread = node.attributes.find((attribute) => attribute.type === 'SpreadAttribute');
+		if (spread) {
 			select_with_value = true;
+			select_with_value_async ||= spread.metadata.expression.has_await;
+
 			state.template.push(
 				b.stmt(
 					b.assignment(
 						'=',
-						b.id('$$payload.select_value'),
+						b.id('$$payload.local.select_value'),
 						b.member(
 							build_spread_object(
 								node,
@@ -107,7 +118,14 @@ export function RegularElement(node, context) {
 			);
 		} else if (value) {
 			select_with_value = true;
-			const left = b.id('$$payload.select_value');
+
+			if (value.type === 'Attribute' && value.value !== true) {
+				select_with_value_async ||= (Array.isArray(value.value) ? value.value : [value.value]).some(
+					(tag) => tag.type === 'ExpressionTag' && tag.metadata.expression.has_await
+				);
+			}
+
+			const left = b.id('$$payload.local.select_value');
 			if (value.type === 'Attribute') {
 				state.template.push(
 					b.stmt(b.assignment('=', left, build_attribute_value(value.value, context)))
@@ -137,18 +155,35 @@ export function RegularElement(node, context) {
 					attribute.name === 'value')
 		)
 	) {
-		const inner_state = { ...state, template: [], init: [] };
-		process_children(trimmed, { ...context, state: inner_state });
-
-		state.template.push(
-			b.stmt(
-				b.call(
-					'$.valueless_option',
-					b.id('$$payload'),
-					b.thunk(b.block([...inner_state.init, ...build_template(inner_state.template)]))
+		if (node.metadata.synthetic_value_node) {
+			state.template.push(
+				b.stmt(
+					b.call(
+						'$.simple_valueless_option',
+						b.id('$$payload'),
+						b.thunk(
+							node.metadata.synthetic_value_node.expression,
+							node.metadata.synthetic_value_node.metadata.expression.has_await
+						)
+					)
 				)
-			)
-		);
+			);
+		} else {
+			const inner_state = { ...state, template: [], init: [] };
+			process_children(trimmed, { ...context, state: inner_state });
+			state.template.push(
+				b.stmt(
+					b.call(
+						'$.valueless_option',
+						b.id('$$payload'),
+						b.arrow(
+							[b.id('$$payload')],
+							b.block([...inner_state.init, ...build_template(inner_state.template)])
+						)
+					)
+				)
+			);
+		}
 	} else if (body !== null) {
 		// if this is a `<textarea>` value or a contenteditable binding, we only add
 		// the body if the attribute/binding is falsy
@@ -175,7 +210,14 @@ export function RegularElement(node, context) {
 	}
 
 	if (select_with_value) {
-		state.template.push(b.stmt(b.assignment('=', b.id('$$payload.select_value'), b.void0)));
+		// we need to create a child scope so that the `select_value` only applies children of this select element
+		// in an async world, we could technically have two adjacent select elements with async children, in which case
+		// the second element's select_value would override the first element's select_value if the children of the first
+		// element hadn't resolved prior to hitting the second element.
+		const elements = state.template.splice(template_start, Infinity);
+		state.template.push(
+			call_child_payload(b.block(build_template(elements)), select_with_value_async)
+		);
 	}
 
 	if (!node_is_void) {
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
index fee7cb6e02..2d16a07b4e 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
@@ -2,7 +2,12 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
-import { empty_comment, build_attribute_value } from './shared/utils.js';
+import {
+	empty_comment,
+	build_attribute_value,
+	PromiseOptimiser,
+	call_child_payload
+} from './shared/utils.js';
 
 /**
  * @param {AST.SlotElement} node
@@ -15,13 +20,22 @@ export function SlotElement(node, context) {
 	/** @type {Expression[]} */
 	const spreads = [];
 
+	const optimiser = new PromiseOptimiser();
+
 	let name = b.literal('default');
 
 	for (const attribute of node.attributes) {
 		if (attribute.type === 'SpreadAttribute') {
-			spreads.push(/** @type {Expression} */ (context.visit(attribute)));
+			let expression = /** @type {Expression} */ (context.visit(attribute));
+			spreads.push(optimiser.transform(expression, attribute.metadata.expression));
 		} else if (attribute.type === 'Attribute') {
-			const value = build_attribute_value(attribute.value, context, false, true);
+			const value = build_attribute_value(
+				attribute.value,
+				context,
+				false,
+				true,
+				optimiser.transform
+			);
 
 			if (attribute.name === 'name') {
 				name = /** @type {Literal} */ (value);
@@ -50,5 +64,10 @@ export function SlotElement(node, context) {
 		fallback
 	);
 
-	context.state.template.push(empty_comment, b.stmt(slot), empty_comment);
+	const statement =
+		optimiser.expressions.length > 0
+			? call_child_payload(b.block([optimiser.apply(), b.stmt(slot)]), true)
+			: b.stmt(slot);
+
+	context.state.template.push(empty_comment, statement, empty_comment);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
index 6e814d6384..355b33aea7 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
@@ -1,17 +1,14 @@
 /** @import { BlockStatement } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
-import { BLOCK_CLOSE, BLOCK_OPEN } from '../../../../../internal/server/hydration.js';
 import * as b from '#compiler/builders';
-import { build_attribute_value } from './shared/utils.js';
+import { block_close, block_open, block_open_else, build_attribute_value } from './shared/utils.js';
 
 /**
  * @param {AST.SvelteBoundary} node
  * @param {ComponentContext} context
  */
 export function SvelteBoundary(node, context) {
-	context.state.template.push(b.literal(BLOCK_OPEN));
-
 	// if this has a `pending` snippet, render it
 	const pending_attribute = /** @type {AST.Attribute} */ (
 		node.attributes.find((node) => node.type === 'Attribute' && node.name === 'pending')
@@ -23,16 +20,17 @@ export function SvelteBoundary(node, context) {
 		)
 	);
 
-	if (pending_attribute) {
-		const value = build_attribute_value(pending_attribute.value, context, false, true);
-		context.state.template.push(b.call(value, b.id('$$payload')));
-	} else if (pending_snippet) {
-		context.state.template.push(
-			/** @type {BlockStatement} */ (context.visit(pending_snippet.body))
-		);
+	if (pending_attribute || pending_snippet) {
+		const pending = pending_attribute
+			? b.call(
+					build_attribute_value(pending_attribute.value, context, false, true),
+					b.id('$$payload')
+				)
+			: /** @type {BlockStatement} */ (context.visit(pending_snippet.body));
+
+		context.state.template.push(block_open_else, pending, block_close);
 	} else {
-		context.state.template.push(/** @type {BlockStatement} */ (context.visit(node.fragment)));
+		const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
+		context.state.template.push(block_open, block, block_close);
 	}
-
-	context.state.template.push(b.literal(BLOCK_CLOSE));
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
index c42df4c646..a3ffb2df3d 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
@@ -13,5 +13,7 @@ export function TitleElement(node, context) {
 	process_children(node.fragment.nodes, { ...context, state: { ...context.state, template } });
 	template.push(b.literal('</title>'));
 
-	context.state.init.push(...build_template(template, b.id('$$payload.title'), '='));
+	context.state.init.push(
+		b.stmt(b.call('$.build_title', b.id('$$payload'), b.thunk(b.block(build_template(template)))))
+	);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
index 9bccf9e05e..614a2ed258 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
@@ -1,7 +1,12 @@
 /** @import { BlockStatement, Expression, Pattern, Property, SequenceExpression, Statement } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../../types.js' */
-import { empty_comment, build_attribute_value } from './utils.js';
+import {
+	empty_comment,
+	build_attribute_value,
+	call_child_payload,
+	PromiseOptimiser
+} from './utils.js';
 import * as b from '#compiler/builders';
 import { is_element_node } from '../../../../nodes.js';
 import { dev } from '../../../../../state.js';
@@ -72,16 +77,26 @@ export function build_inline_component(node, expression, context) {
 		}
 	}
 
+	const optimiser = new PromiseOptimiser();
+
 	for (const attribute of node.attributes) {
 		if (attribute.type === 'LetDirective') {
 			if (!slot_scope_applies_to_itself) {
 				lets.default.push(attribute);
 			}
 		} else if (attribute.type === 'SpreadAttribute') {
-			props_and_spreads.push(/** @type {Expression} */ (context.visit(attribute)));
+			let expression = /** @type {Expression} */ (context.visit(attribute));
+			props_and_spreads.push(optimiser.transform(expression, attribute.metadata.expression));
 		} else if (attribute.type === 'Attribute') {
+			const value = build_attribute_value(
+				attribute.value,
+				context,
+				false,
+				true,
+				optimiser.transform
+			);
+
 			if (attribute.name.startsWith('--')) {
-				const value = build_attribute_value(attribute.value, context, false, true);
 				custom_css_props.push(b.init(attribute.name, value));
 				continue;
 			}
@@ -90,7 +105,6 @@ export function build_inline_component(node, expression, context) {
 				has_children_prop = true;
 			}
 
-			const value = build_attribute_value(attribute.value, context, false, true);
 			push_prop(b.prop('init', b.key(attribute.name), value));
 		} else if (attribute.type === 'BindDirective' && attribute.name !== 'this') {
 			if (attribute.expression.type === 'SequenceExpression') {
@@ -291,27 +305,29 @@ export function build_inline_component(node, expression, context) {
 		node.type === 'SvelteComponent' || (node.type === 'Component' && node.metadata.dynamic);
 
 	if (custom_css_props.length > 0) {
-		context.state.template.push(
-			b.stmt(
-				b.call(
-					'$.css_props',
-					b.id('$$payload'),
-					b.literal(context.state.namespace === 'svg' ? false : true),
-					b.object(custom_css_props),
-					b.thunk(b.block([statement])),
-					dynamic && b.true
-				)
+		statement = b.stmt(
+			b.call(
+				'$.css_props',
+				b.id('$$payload'),
+				b.literal(context.state.namespace === 'svg' ? false : true),
+				b.object(custom_css_props),
+				b.thunk(b.block([statement])),
+				dynamic && b.true
 			)
 		);
-	} else {
-		if (dynamic) {
-			context.state.template.push(empty_comment);
-		}
+	}
 
-		context.state.template.push(statement);
+	if (optimiser.expressions.length > 0) {
+		statement = call_child_payload(b.block([optimiser.apply(), statement]), true);
+	}
 
-		if (!context.state.skip_hydration_boundaries) {
-			context.state.template.push(empty_comment);
-		}
+	if (dynamic && custom_css_props.length === 0) {
+		context.state.template.push(empty_comment);
+	}
+
+	context.state.template.push(statement);
+
+	if (!context.state.skip_hydration_boundaries && custom_css_props.length === 0) {
+		context.state.template.push(empty_comment);
 	}
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
index 8a8633dd1a..a48c19ae7c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
@@ -1,20 +1,25 @@
-/** @import { AssignmentOperator, Expression, Identifier, Node, Statement } from 'estree' */
-/** @import { AST } from '#compiler' */
+/** @import { AssignmentOperator, Expression, Identifier, Node, Statement, BlockStatement } from 'estree' */
+/** @import { AST, ExpressionMetadata } from '#compiler' */
 /** @import { ComponentContext, ServerTransformState } from '../../types.js' */
 
 import { escape_html } from '../../../../../../escaping.js';
 import {
 	BLOCK_CLOSE,
 	BLOCK_OPEN,
+	BLOCK_OPEN_ELSE,
 	EMPTY_COMMENT
 } from '../../../../../../internal/server/hydration.js';
 import * as b from '#compiler/builders';
 import { sanitize_template_string } from '../../../../../utils/sanitize_template_string.js';
 import { regex_whitespaces_strict } from '../../../../patterns.js';
+import { has_await } from '../../../../../utils/ast.js';
 
 /** Opens an if/each block, so that we can remove nodes in the case of a mismatch */
 export const block_open = b.literal(BLOCK_OPEN);
 
+/** Opens an if/each block, so that we can remove nodes in the case of a mismatch */
+export const block_open_else = b.literal(BLOCK_OPEN_ELSE);
+
 /** Closes an if/each block, so that we can remove nodes in the case of a mismatch. Also serves as an anchor for these blocks */
 export const block_close = b.literal(BLOCK_CLOSE);
 
@@ -32,6 +37,10 @@ export function process_children(nodes, { visit, state }) {
 	let sequence = [];
 
 	function flush() {
+		if (sequence.length === 0) {
+			return;
+		}
+
 		let quasi = b.quasi('', false);
 		const quasis = [quasi];
 
@@ -63,26 +72,25 @@ export function process_children(nodes, { visit, state }) {
 		}
 
 		state.template.push(b.template(quasis, expressions));
+		sequence = [];
 	}
 
-	for (let i = 0; i < nodes.length; i += 1) {
-		const node = nodes[i];
-
-		if (node.type === 'Text' || node.type === 'Comment' || node.type === 'ExpressionTag') {
+	for (const node of nodes) {
+		if (node.type === 'ExpressionTag' && node.metadata.expression.has_await) {
+			flush();
+			const visited = /** @type {Expression} */ (visit(node.expression));
+			state.template.push(
+				b.stmt(b.call('$$payload.push', b.thunk(b.call('$.escape', visited), true)))
+			);
+		} else if (node.type === 'Text' || node.type === 'Comment' || node.type === 'ExpressionTag') {
 			sequence.push(node);
 		} else {
-			if (sequence.length > 0) {
-				flush();
-				sequence = [];
-			}
-
+			flush();
 			visit(node, { ...state });
 		}
 	}
 
-	if (sequence.length > 0) {
-		flush();
-	}
+	flush();
 }
 
 /**
@@ -95,11 +103,9 @@ function is_statement(node) {
 
 /**
  * @param {Array<Statement | Expression>} template
- * @param {Identifier} out
- * @param {AssignmentOperator | 'push'} operator
  * @returns {Statement[]}
  */
-export function build_template(template, out = b.id('$$payload.out'), operator = 'push') {
+export function build_template(template) {
 	/** @type {string[]} */
 	let strings = [];
 
@@ -110,32 +116,18 @@ export function build_template(template, out = b.id('$$payload.out'), operator =
 	const statements = [];
 
 	const flush = () => {
-		if (operator === 'push') {
-			statements.push(
-				b.stmt(
-					b.call(
-						b.member(out, b.id('push')),
-						b.template(
-							strings.map((cooked, i) => b.quasi(cooked, i === strings.length - 1)),
-							expressions
-						)
+		statements.push(
+			b.stmt(
+				b.call(
+					b.id('$$payload.push'),
+					b.template(
+						strings.map((cooked, i) => b.quasi(cooked, i === strings.length - 1)),
+						expressions
 					)
 				)
-			);
-		} else {
-			statements.push(
-				b.stmt(
-					b.assignment(
-						operator,
-						out,
-						b.template(
-							strings.map((cooked, i) => b.quasi(cooked, i === strings.length - 1)),
-							expressions
-						)
-					)
-				)
-			);
-		}
+			)
+		);
+
 		strings = [];
 		expressions = [];
 	};
@@ -180,13 +172,15 @@ export function build_template(template, out = b.id('$$payload.out'), operator =
  * @param {ComponentContext} context
  * @param {boolean} trim_whitespace
  * @param {boolean} is_component
+ * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
  * @returns {Expression}
  */
 export function build_attribute_value(
 	value,
 	context,
 	trim_whitespace = false,
-	is_component = false
+	is_component = false,
+	transform = (expression) => expression
 ) {
 	if (value === true) {
 		return b.true;
@@ -203,7 +197,10 @@ export function build_attribute_value(
 			return b.literal(is_component ? data : escape_html(data, true));
 		}
 
-		return /** @type {Expression} */ (context.visit(chunk.expression));
+		return transform(
+			/** @type {Expression} */ (context.visit(chunk.expression)),
+			chunk.metadata.expression
+		);
 	}
 
 	let quasi = b.quasi('', false);
@@ -221,7 +218,13 @@ export function build_attribute_value(
 				: node.data;
 		} else {
 			expressions.push(
-				b.call('$.stringify', /** @type {Expression} */ (context.visit(node.expression)))
+				b.call(
+					'$.stringify',
+					transform(
+						/** @type {Expression} */ (context.visit(node.expression)),
+						node.metadata.expression
+					)
+				)
 			);
 
 			quasi = b.quasi('', i + 1 === value.length);
@@ -257,3 +260,61 @@ export function build_getter(node, state) {
 
 	return node;
 }
+
+/**
+ * @param {BlockStatement | Expression} body
+ * @param {boolean} async
+ * @returns {Statement}
+ */
+export function call_child_payload(body, async) {
+	return b.stmt(b.call('$$payload.child', b.arrow([b.id('$$payload')], body, async)));
+}
+
+/**
+ * @param {BlockStatement | Expression} body
+ * @param {Identifier | false} component_fn_id
+ * @returns {Statement}
+ */
+export function call_component_payload(body, component_fn_id) {
+	return b.stmt(
+		b.call('$$payload.component', b.arrow([b.id('$$payload')], body, false), component_fn_id)
+	);
+}
+
+export class PromiseOptimiser {
+	/** @type {Expression[]} */
+	expressions = [];
+
+	/**
+	 *
+	 * @param {Expression} expression
+	 * @param {ExpressionMetadata} metadata
+	 */
+	transform = (expression, metadata) => {
+		if (metadata.has_await) {
+			const length = this.expressions.push(expression);
+			return b.id(`$$${length - 1}`);
+		}
+
+		return expression;
+	};
+
+	apply() {
+		if (this.expressions.length === 1) {
+			return b.const('$$0', this.expressions[0]);
+		}
+
+		const promises = b.array(
+			this.expressions.map((expression) => {
+				return expression.type === 'AwaitExpression' && !has_await(expression.argument)
+					? expression.argument
+					: b.call(b.thunk(expression, true));
+			})
+		);
+
+		return b.const(
+			b.array_pattern(this.expressions.map((_, i) => b.id(`$$${i}`))),
+			b.await(b.call('Promise.all', promises))
+		);
+	}
+}
diff --git a/packages/svelte/src/compiler/phases/types.d.ts b/packages/svelte/src/compiler/phases/types.d.ts
index 4da78f1482..4e287fd199 100644
--- a/packages/svelte/src/compiler/phases/types.d.ts
+++ b/packages/svelte/src/compiler/phases/types.d.ts
@@ -1,10 +1,10 @@
 import type { AST, Binding, StateField } from '#compiler';
 import type {
+	AwaitExpression,
 	CallExpression,
 	ClassBody,
 	Identifier,
 	LabeledStatement,
-	Node,
 	Program
 } from 'estree';
 import type { Scope, ScopeRoot } from './scope.js';
@@ -47,6 +47,8 @@ export interface Analysis {
 
 	/** A set of deriveds that contain `await` expressions */
 	async_deriveds: Set<CallExpression>;
+	/** Awaits needing context preservation */
+	pickled_awaits: Set<AwaitExpression>;
 }
 
 export interface ComponentAnalysis extends Analysis {
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index 060df2dcb2..42048c3525 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -344,6 +344,8 @@ export namespace AST {
 			has_spread: boolean;
 			scoped: boolean;
 			path: SvelteNode[];
+			/** Synthetic value attribute for <option> with single expression child, used for client-only handling */
+			synthetic_value_node: ExpressionTag | null;
 		};
 	}
 
diff --git a/packages/svelte/src/compiler/utils/ast.js b/packages/svelte/src/compiler/utils/ast.js
index a20b6888c7..d988cd98fb 100644
--- a/packages/svelte/src/compiler/utils/ast.js
+++ b/packages/svelte/src/compiler/utils/ast.js
@@ -609,3 +609,19 @@ export function build_assignment_value(operator, left, right) {
 			? b.logical(/** @type {ESTree.LogicalOperator} */ (operator.slice(0, -1)), left, right)
 			: b.binary(/** @type {ESTree.BinaryOperator} */ (operator.slice(0, -1)), left, right);
 }
+
+/**
+ * @param {ESTree.Expression} expression
+ */
+export function has_await(expression) {
+	let has_await = false;
+
+	walk(expression, null, {
+		AwaitExpression(_node, context) {
+			has_await = true;
+			context.stop();
+		}
+	});
+
+	return has_await;
+}
diff --git a/packages/svelte/src/compiler/utils/builders.js b/packages/svelte/src/compiler/utils/builders.js
index 03a946ff9c..f69beed509 100644
--- a/packages/svelte/src/compiler/utils/builders.js
+++ b/packages/svelte/src/compiler/utils/builders.js
@@ -2,6 +2,7 @@
 import { walk } from 'zimmerframe';
 import { regex_is_valid_identifier } from '../phases/patterns.js';
 import { sanitize_template_string } from './sanitize_template_string.js';
+import { has_await } from './ast.js';
 
 /**
  * @param {Array<ESTree.Expression | ESTree.SpreadElement | null>} elements
@@ -443,16 +444,7 @@ export function thunk(expression, async = false) {
 export function unthunk(expression) {
 	// optimize `async () => await x()`, but not `async () => await x(await y)`
 	if (expression.async && expression.body.type === 'AwaitExpression') {
-		let has_await = false;
-
-		walk(expression.body.argument, null, {
-			AwaitExpression(_node, context) {
-				has_await = true;
-				context.stop();
-			}
-		});
-
-		if (!has_await) {
+		if (!has_await(expression.body.argument)) {
 			return unthunk(arrow(expression.params, expression.body.argument));
 		}
 	}
diff --git a/packages/svelte/src/index-server.js b/packages/svelte/src/index-server.js
index 1342e502d7..0b05fb6d12 100644
--- a/packages/svelte/src/index-server.js
+++ b/packages/svelte/src/index-server.js
@@ -1,12 +1,12 @@
-/** @import { Component } from '#server' */
-import { current_component } from './internal/server/context.js';
+/** @import { SSRContext } from '#server' */
+/** @import { Payload } from './internal/server/payload.js' */
+import { ssr_context } from './internal/server/context.js';
 import { noop } from './internal/shared/utils.js';
 import * as e from './internal/server/errors.js';
 
 /** @param {() => void} fn */
 export function onDestroy(fn) {
-	var context = /** @type {Component} */ (current_component);
-	(context.d ??= []).push(fn);
+	/** @type {Payload} */ (/** @type {SSRContext} */ (ssr_context).r).on_destroy(fn);
 }
 
 export {
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 2a9736553c..0532f2ca1b 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -1,5 +1,11 @@
 /** @import { Effect, Source, TemplateNode, } from '#client' */
-import { BOUNDARY_EFFECT, EFFECT_PRESERVED, EFFECT_TRANSPARENT } from '#client/constants';
+import {
+	BOUNDARY_EFFECT,
+	COMMENT_NODE,
+	EFFECT_PRESERVED,
+	EFFECT_TRANSPARENT
+} from '#client/constants';
+import { HYDRATION_START_ELSE } from '../../../../constants.js';
 import { component_context, set_component_context } from '../../context.js';
 import { handle_error, invoke_error_boundary } from '../../error-handling.js';
 import { block, branch, destroy_effect, pause_effect } from '../../reactivity/effects.js';
@@ -57,8 +63,8 @@ export class Boundary {
 	/** @type {TemplateNode} */
 	#anchor;
 
-	/** @type {TemplateNode} */
-	#hydrate_open;
+	/** @type {TemplateNode | null} */
+	#hydrate_open = hydrating ? hydrate_node : null;
 
 	/** @type {BoundaryProps} */
 	#props;
@@ -83,6 +89,7 @@ export class Boundary {
 
 	#local_pending_count = 0;
 	#pending_count = 0;
+
 	#is_creating_fallback = false;
 
 	/**
@@ -122,8 +129,6 @@ export class Boundary {
 		this.#props = props;
 		this.#children = children;
 
-		this.#hydrate_open = hydrate_node;
-
 		this.parent = /** @type {Effect} */ (active_effect).b;
 
 		this.#pending = !!this.#props.pending;
@@ -132,34 +137,18 @@ export class Boundary {
 			/** @type {Effect} */ (active_effect).b = this;
 
 			if (hydrating) {
+				const comment = this.#hydrate_open;
 				hydrate_next();
-			}
 
-			const pending = this.#props.pending;
-
-			if (hydrating && pending) {
-				this.#pending_effect = branch(() => pending(this.#anchor));
-
-				// future work: when we have some form of async SSR, we will
-				// need to use hydration boundary comments to report whether
-				// the pending or main block was rendered for a given
-				// boundary, and hydrate accordingly
-				Batch.enqueue(() => {
-					this.#main_effect = this.#run(() => {
-						Batch.ensure();
-						return branch(() => this.#children(this.#anchor));
-					});
-
-					if (this.#pending_count > 0) {
-						this.#show_pending_snippet();
-					} else {
-						pause_effect(/** @type {Effect} */ (this.#pending_effect), () => {
-							this.#pending_effect = null;
-						});
+				const server_rendered_pending =
+					/** @type {Comment} */ (comment).nodeType === COMMENT_NODE &&
+					/** @type {Comment} */ (comment).data === HYDRATION_START_ELSE;
 
-						this.#pending = false;
-					}
-				});
+				if (server_rendered_pending) {
+					this.#hydrate_pending_content();
+				} else {
+					this.#hydrate_resolved_content();
+				}
 			} else {
 				try {
 					this.#main_effect = branch(() => children(this.#anchor));
@@ -180,6 +169,43 @@ export class Boundary {
 		}
 	}
 
+	#hydrate_resolved_content() {
+		try {
+			this.#main_effect = branch(() => this.#children(this.#anchor));
+		} catch (error) {
+			this.error(error);
+		}
+
+		// Since server rendered resolved content, we never show pending state
+		// Even if client-side async operations are still running, the content is already displayed
+		this.#pending = false;
+	}
+
+	#hydrate_pending_content() {
+		const pending = this.#props.pending;
+		if (!pending) {
+			return;
+		}
+		this.#pending_effect = branch(() => pending(this.#anchor));
+
+		Batch.enqueue(() => {
+			this.#main_effect = this.#run(() => {
+				Batch.ensure();
+				return branch(() => this.#children(this.#anchor));
+			});
+
+			if (this.#pending_count > 0) {
+				this.#show_pending_snippet();
+			} else {
+				pause_effect(/** @type {Effect} */ (this.#pending_effect), () => {
+					this.#pending_effect = null;
+				});
+
+				this.#pending = false;
+			}
+		});
+	}
+
 	/**
 	 * Returns `true` if the effect exists inside a boundary whose pending snippet is shown
 	 * @returns {boolean}
@@ -238,10 +264,10 @@ export class Boundary {
 		if (!this.has_pending_snippet()) {
 			if (this.parent) {
 				this.parent.#update_pending_count(d);
-				return;
 			}
 
-			e.await_outside_boundary();
+			// if there's no parent, we're in a scope with no pending snippet
+			return;
 		}
 
 		this.#pending_count += d;
@@ -307,7 +333,7 @@ export class Boundary {
 		}
 
 		if (hydrating) {
-			set_hydrate_node(this.#hydrate_open);
+			set_hydrate_node(/** @type {TemplateNode} */ (this.#hydrate_open));
 			next();
 			set_hydrate_node(remove_nodes());
 		}
@@ -330,7 +356,7 @@ export class Boundary {
 			// If the failure happened while flushing effects, current_batch can be null
 			Batch.ensure();
 
-			this.#pending_count = 0;
+			this.#local_pending_count = 0;
 
 			if (this.#failed_effect !== null) {
 				pause_effect(this.#failed_effect, () => {
@@ -338,7 +364,9 @@ export class Boundary {
 				});
 			}
 
-			this.#pending = true;
+			// we intentionally do not try to find the nearest pending boundary. If this boundary has one, we'll render it on reset
+			// but it would be really weird to show the parent's boundary on a child reset.
+			this.#pending = this.has_pending_snippet();
 
 			this.#main_effect = this.#run(() => {
 				this.#is_creating_fallback = false;
@@ -409,13 +437,7 @@ function move_effect(effect, fragment) {
 }
 
 export function get_boundary() {
-	const boundary = /** @type {Effect} */ (active_effect).b;
-
-	if (boundary === null) {
-		e.await_outside_boundary();
-	}
-
-	return boundary;
+	return /** @type {Boundary} */ (/** @type {Effect} */ (active_effect).b);
 }
 
 export function pending() {
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index a109a1f4d8..018ab701f2 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -39,7 +39,6 @@ export function flatten(sync, async, fn) {
 	var parent = /** @type {Effect} */ (active_effect);
 
 	var restore = capture();
-	var boundary = get_boundary();
 
 	Promise.all(async.map((expression) => async_derived(expression)))
 		.then((result) => {
@@ -60,7 +59,7 @@ export function flatten(sync, async, fn) {
 			unset_context();
 		})
 		.catch((error) => {
-			boundary.error(error);
+			invoke_error_boundary(error, parent);
 		});
 }
 
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index c5015875a8..0910c6d06c 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -11,7 +11,7 @@ import {
 import { HYDRATION_END, HYDRATION_ERROR, HYDRATION_START } from '../../constants.js';
 import { active_effect } from './runtime.js';
 import { push, pop, component_context } from './context.js';
-import { component_root, branch } from './reactivity/effects.js';
+import { component_root } from './reactivity/effects.js';
 import {
 	hydrate_next,
 	hydrate_node,
@@ -31,6 +31,7 @@ import * as e from './errors.js';
 import { assign_nodes } from './dom/template.js';
 import { is_passive_event } from '../../utils.js';
 import { COMMENT_NODE } from './constants.js';
+import { boundary } from './dom/blocks/boundary.js';
 
 /**
  * This is normally true — block effects should run their intro transitions —
@@ -218,35 +219,41 @@ function _mount(Component, { target, anchor, props = {}, events, context, intro
 	var unmount = component_root(() => {
 		var anchor_node = anchor ?? target.appendChild(create_text());
 
-		branch(() => {
-			if (context) {
-				push({});
-				var ctx = /** @type {ComponentContext} */ (component_context);
-				ctx.c = context;
-			}
+		boundary(
+			/** @type {TemplateNode} */ (anchor_node),
+			{
+				pending: () => {}
+			},
+			(anchor_node) => {
+				if (context) {
+					push({});
+					var ctx = /** @type {ComponentContext} */ (component_context);
+					ctx.c = context;
+				}
 
-			if (events) {
-				// We can't spread the object or else we'd lose the state proxy stuff, if it is one
-				/** @type {any} */ (props).$$events = events;
-			}
+				if (events) {
+					// We can't spread the object or else we'd lose the state proxy stuff, if it is one
+					/** @type {any} */ (props).$$events = events;
+				}
 
-			if (hydrating) {
-				assign_nodes(/** @type {TemplateNode} */ (anchor_node), null);
-			}
+				if (hydrating) {
+					assign_nodes(/** @type {TemplateNode} */ (anchor_node), null);
+				}
 
-			should_intro = intro;
-			// @ts-expect-error the public typings are not what the actual function looks like
-			component = Component(anchor_node, props) || {};
-			should_intro = true;
+				should_intro = intro;
+				// @ts-expect-error the public typings are not what the actual function looks like
+				component = Component(anchor_node, props) || {};
+				should_intro = true;
 
-			if (hydrating) {
-				/** @type {Effect} */ (active_effect).nodes_end = hydrate_node;
-			}
+				if (hydrating) {
+					/** @type {Effect} */ (active_effect).nodes_end = hydrate_node;
+				}
 
-			if (context) {
-				pop();
+				if (context) {
+					pop();
+				}
 			}
-		});
+		);
 
 		return () => {
 			for (var event_name of registered_events) {
diff --git a/packages/svelte/src/internal/server/blocks/snippet.js b/packages/svelte/src/internal/server/blocks/snippet.js
index bb82ca97d0..109dbf683a 100644
--- a/packages/svelte/src/internal/server/blocks/snippet.js
+++ b/packages/svelte/src/internal/server/blocks/snippet.js
@@ -15,7 +15,7 @@ export function createRawSnippet(fn) {
 	// @ts-expect-error the types are a lie
 	return (/** @type {Payload} */ payload, /** @type {Params} */ ...args) => {
 		var getters = /** @type {Getters<Params>} */ (args.map((value) => () => value));
-		payload.out.push(
+		payload.push(
 			fn(...getters)
 				.render()
 				.trim()
diff --git a/packages/svelte/src/internal/server/context.js b/packages/svelte/src/internal/server/context.js
index bae93beb53..c59b2d260a 100644
--- a/packages/svelte/src/internal/server/context.js
+++ b/packages/svelte/src/internal/server/context.js
@@ -1,10 +1,14 @@
-/** @import { Component } from '#server' */
+/** @import { SSRContext } from '#server' */
 import { DEV } from 'esm-env';
-import { on_destroy } from './index.js';
 import * as e from './errors.js';
 
-/** @type {Component | null} */
-export var current_component = null;
+/** @type {SSRContext | null} */
+export var ssr_context = null;
+
+/** @param {SSRContext | null} v */
+export function set_ssr_context(v) {
+	ssr_context = v;
+}
 
 /**
  * @template T
@@ -47,42 +51,35 @@ export function getAllContexts() {
  * @returns {Map<unknown, unknown>}
  */
 function get_or_init_context_map(name) {
-	if (current_component === null) {
+	if (ssr_context === null) {
 		e.lifecycle_outside_component(name);
 	}
 
-	return (current_component.c ??= new Map(get_parent_context(current_component) || undefined));
+	return (ssr_context.c ??= new Map(get_parent_context(ssr_context) || undefined));
 }
 
 /**
  * @param {Function} [fn]
  */
 export function push(fn) {
-	current_component = { p: current_component, c: null, d: null };
+	ssr_context = { p: ssr_context, c: null, r: null };
+
 	if (DEV) {
-		// component function
-		current_component.function = fn;
+		ssr_context.function = fn;
+		ssr_context.element = ssr_context.p?.element;
 	}
 }
 
 export function pop() {
-	var component = /** @type {Component} */ (current_component);
-
-	var ondestroy = component.d;
-
-	if (ondestroy) {
-		on_destroy.push(...ondestroy);
-	}
-
-	current_component = component.p;
+	ssr_context = /** @type {SSRContext} */ (ssr_context).p;
 }
 
 /**
- * @param {Component} component_context
+ * @param {SSRContext} ssr_context
  * @returns {Map<unknown, unknown> | null}
  */
-function get_parent_context(component_context) {
-	let parent = component_context.p;
+function get_parent_context(ssr_context) {
+	let parent = ssr_context.p;
 
 	while (parent !== null) {
 		const context_map = parent.c;
@@ -94,3 +91,22 @@ function get_parent_context(component_context) {
 
 	return null;
 }
+
+/**
+ * Wraps an `await` expression in such a way that the component context that was
+ * active before the expression evaluated can be reapplied afterwards —
+ * `await a + b()` becomes `(await $.save(a))() + b()`, meaning `b()` will have access
+ * to the context of its component.
+ * @template T
+ * @param {Promise<T>} promise
+ * @returns {Promise<() => T>}
+ */
+export async function save(promise) {
+	var previous_context = ssr_context;
+	var value = await promise;
+
+	return () => {
+		ssr_context = previous_context;
+		return value;
+	};
+}
diff --git a/packages/svelte/src/internal/server/dev.js b/packages/svelte/src/internal/server/dev.js
index 2a0cb057a3..cc9f6496c0 100644
--- a/packages/svelte/src/internal/server/dev.js
+++ b/packages/svelte/src/internal/server/dev.js
@@ -1,30 +1,29 @@
-/** @import { Component } from '#server' */
+/** @import { SSRContext } from '#server' */
 import { FILENAME } from '../../constants.js';
 import {
 	is_tag_valid_with_ancestor,
 	is_tag_valid_with_parent
 } from '../../html-tree-validation.js';
-import { current_component } from './context.js';
+import { set_ssr_context, ssr_context } from './context.js';
 import * as e from './errors.js';
-import { HeadPayload, Payload } from './payload.js';
+import { Payload } from './payload.js';
 
+// TODO move this
 /**
  * @typedef {{
  * 	tag: string;
- * 	parent: null | Element;
- *  filename: null | string;
+ * 	parent: undefined | Element;
+ *  filename: undefined | string;
  *  line: number;
  *  column: number;
  * }} Element
  */
 
 /**
- * @type {Element | null}
+ * This is exported so that it can be cleared between tests
+ * @type {Set<string>}
  */
-let parent = null;
-
-/** @type {Set<string>} */
-let seen;
+export let seen;
 
 /**
  * @param {Payload} payload
@@ -40,15 +39,10 @@ function print_error(payload, message) {
 
 	// eslint-disable-next-line no-console
 	console.error(message);
-	payload.head.out.push(`<script>console.error(${JSON.stringify(message)})</script>`);
-}
-
-export function reset_elements() {
-	let old_parent = parent;
-	parent = null;
-	return () => {
-		parent = old_parent;
-	};
+	payload.child(
+		(payload) => payload.push(`<script>console.error(${JSON.stringify(message)})</script>`),
+		'head'
+	);
 }
 
 /**
@@ -58,10 +52,12 @@ export function reset_elements() {
  * @param {number} column
  */
 export function push_element(payload, tag, line, column) {
-	var filename = /** @type {Component} */ (current_component).function[FILENAME];
-	var child = { tag, parent, filename, line, column };
+	var context = /** @type {SSRContext} */ (ssr_context);
+	var filename = context.function[FILENAME];
+	var parent = context.element;
+	var element = { tag, parent, filename, line, column };
 
-	if (parent !== null) {
+	if (parent !== undefined) {
 		var ancestor = parent.parent;
 		var ancestors = [parent.tag];
 
@@ -86,11 +82,11 @@ export function push_element(payload, tag, line, column) {
 		}
 	}
 
-	parent = child;
+	set_ssr_context({ ...context, p: context, element });
 }
 
 export function pop_element() {
-	parent = /** @type {Element} */ (parent).parent;
+	set_ssr_context(/** @type {SSRContext} */ (ssr_context).p);
 }
 
 /**
@@ -100,7 +96,7 @@ export function validate_snippet_args(payload) {
 	if (
 		typeof payload !== 'object' ||
 		// for some reason typescript consider the type of payload as never after the first instanceof
-		!(payload instanceof Payload || /** @type {any} */ (payload) instanceof HeadPayload)
+		!(payload instanceof Payload)
 	) {
 		e.invalid_snippet_arguments();
 	}
diff --git a/packages/svelte/src/internal/server/errors.js b/packages/svelte/src/internal/server/errors.js
index 458937218f..bde49fe935 100644
--- a/packages/svelte/src/internal/server/errors.js
+++ b/packages/svelte/src/internal/server/errors.js
@@ -2,6 +2,30 @@
 
 export *  from '../shared/errors.js';
 
+/**
+ * Encountered asynchronous work while rendering synchronously.
+ * @returns {never}
+ */
+export function await_invalid() {
+	const error = new Error(`await_invalid\nEncountered asynchronous work while rendering synchronously.\nhttps://svelte.dev/e/await_invalid`);
+
+	error.name = 'Svelte error';
+
+	throw error;
+}
+
+/**
+ * The `html` property of server render results has been deprecated. Use `body` instead.
+ * @returns {never}
+ */
+export function html_deprecated() {
+	const error = new Error(`html_deprecated\nThe \`html\` property of server render results has been deprecated. Use \`body\` instead.\nhttps://svelte.dev/e/html_deprecated`);
+
+	error.name = 'Svelte error';
+
+	throw error;
+}
+
 /**
  * `%name%(...)` is not available on the server
  * @param {string} name
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index 3aa44f2daa..a2cf222da6 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -1,6 +1,7 @@
-/** @import { ComponentType, SvelteComponent } from 'svelte' */
-/** @import { Component, RenderOutput } from '#server' */
+/** @import { ComponentType, SvelteComponent, Component } from 'svelte' */
+/** @import { RenderOutput, SSRContext } from '#server' */
 /** @import { Store } from '#shared' */
+/** @import { AccumulatedContent } from './payload.js' */
 export { FILENAME, HMR } from '../../constants.js';
 import { attr, clsx, to_class, to_style } from '../shared/attributes.js';
 import { is_promise, noop } from '../shared/utils.js';
@@ -13,13 +14,14 @@ import {
 } from '../../constants.js';
 import { escape_html } from '../../escaping.js';
 import { DEV } from 'esm-env';
-import { current_component, pop, push } from './context.js';
+import { ssr_context, pop, push, set_ssr_context } from './context.js';
 import { EMPTY_COMMENT, BLOCK_CLOSE, BLOCK_OPEN, BLOCK_OPEN_ELSE } from './hydration.js';
 import { validate_store } from '../shared/validate.js';
 import { is_boolean_attribute, is_raw_text_element, is_void } from '../../utils.js';
-import { reset_elements } from './dev.js';
-import { Payload } from './payload.js';
+import { Payload, SSRState } from './payload.js';
 import { abort } from './abort-signal.js';
+import { async_mode_flag } from '../flags/index.js';
+import * as e from './errors.js';
 
 // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
 // https://infra.spec.whatwg.org/#noncharacter
@@ -34,102 +36,48 @@ const INVALID_ATTR_NAME_CHAR_REGEX =
  * @returns {void}
  */
 export function element(payload, tag, attributes_fn = noop, children_fn = noop) {
-	payload.out.push('<!---->');
+	payload.push('<!---->');
 
 	if (tag) {
-		payload.out.push(`<${tag}`);
+		payload.push(`<${tag}`);
 		attributes_fn();
-		payload.out.push(`>`);
+		payload.push(`>`);
 
 		if (!is_void(tag)) {
 			children_fn();
 			if (!is_raw_text_element(tag)) {
-				payload.out.push(EMPTY_COMMENT);
+				payload.push(EMPTY_COMMENT);
 			}
-			payload.out.push(`</${tag}>`);
+			payload.push(`</${tag}>`);
 		}
 	}
 
-	payload.out.push('<!---->');
+	payload.push('<!---->');
 }
 
-/**
- * Array of `onDestroy` callbacks that should be called at the end of the server render function
- * @type {Function[]}
- */
-export let on_destroy = [];
-
 /**
  * Only available on the server and when compiling with the `server` option.
  * Takes a component and returns an object with `body` and `head` properties on it, which you can use to populate the HTML when server-rendering your app.
  * @template {Record<string, any>} Props
- * @param {import('svelte').Component<Props> | ComponentType<SvelteComponent<Props>>} component
+ * @param {Component<Props> | ComponentType<SvelteComponent<Props>>} component
  * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string }} [options]
  * @returns {RenderOutput}
  */
 export function render(component, options = {}) {
-	try {
-		const payload = new Payload(options.idPrefix ? options.idPrefix + '-' : '');
-
-		const prev_on_destroy = on_destroy;
-		on_destroy = [];
-		payload.out.push(BLOCK_OPEN);
-
-		let reset_reset_element;
-
-		if (DEV) {
-			// prevent parent/child element state being corrupted by a bad render
-			reset_reset_element = reset_elements();
-		}
-
-		if (options.context) {
-			push();
-			/** @type {Component} */ (current_component).c = options.context;
-		}
-
-		// @ts-expect-error
-		component(payload, options.props ?? {}, {}, {});
-
-		if (options.context) {
-			pop();
-		}
-
-		if (reset_reset_element) {
-			reset_reset_element();
-		}
-
-		payload.out.push(BLOCK_CLOSE);
-		for (const cleanup of on_destroy) cleanup();
-		on_destroy = prev_on_destroy;
-
-		let head = payload.head.out.join('') + payload.head.title;
-
-		for (const { hash, code } of payload.css) {
-			head += `<style id="${hash}">${code}</style>`;
-		}
-
-		const body = payload.out.join('');
-
-		return {
-			head,
-			html: body,
-			body: body
-		};
-	} finally {
-		abort();
-	}
+	return Payload.render(/** @type {Component<Props>} */ (component), options);
 }
 
 /**
  * @param {Payload} payload
- * @param {(head_payload: Payload['head']) => void} fn
+ * @param {(payload: Payload) => Promise<void> | void} fn
  * @returns {void}
  */
 export function head(payload, fn) {
-	const head_payload = payload.head;
-	head_payload.out.push(BLOCK_OPEN);
-	fn(head_payload);
-	head_payload.out.push(BLOCK_CLOSE);
+	payload.child((payload) => {
+		payload.push(BLOCK_OPEN);
+		payload.child(fn);
+		payload.push(BLOCK_CLOSE);
+	}, 'head');
 }
 
 /**
@@ -144,21 +92,21 @@ export function css_props(payload, is_html, props, component, dynamic = false) {
 	const styles = style_object_to_string(props);
 
 	if (is_html) {
-		payload.out.push(`<svelte-css-wrapper style="display: contents; ${styles}">`);
+		payload.push(`<svelte-css-wrapper style="display: contents; ${styles}">`);
 	} else {
-		payload.out.push(`<g style="${styles}">`);
+		payload.push(`<g style="${styles}">`);
 	}
 
 	if (dynamic) {
-		payload.out.push('<!---->');
+		payload.push('<!---->');
 	}
 
 	component();
 
 	if (is_html) {
-		payload.out.push(`<!----></svelte-css-wrapper>`);
+		payload.push(`<!----></svelte-css-wrapper>`);
 	} else {
-		payload.out.push(`<!----></g>`);
+		payload.push(`<!----></g>`);
 	}
 }
 
@@ -451,13 +399,13 @@ export function bind_props(props_parent, props_now) {
  */
 function await_block(payload, promise, pending_fn, then_fn) {
 	if (is_promise(promise)) {
-		payload.out.push(BLOCK_OPEN);
+		payload.push(BLOCK_OPEN);
 		promise.then(null, noop);
 		if (pending_fn !== null) {
 			pending_fn();
 		}
 	} else if (then_fn !== null) {
-		payload.out.push(BLOCK_OPEN_ELSE);
+		payload.push(BLOCK_OPEN_ELSE);
 		then_fn(promise);
 	}
 }
@@ -503,8 +451,8 @@ export function once(get_value) {
  * @returns {string}
  */
 export function props_id(payload) {
-	const uid = payload.uid();
-	payload.out.push('<!--#' + uid + '-->');
+	const uid = payload.global.uid();
+	payload.push('<!--#' + uid + '-->');
 	return uid;
 }
 
@@ -512,12 +460,10 @@ export { attr, clsx };
 
 export { html } from './blocks/html.js';
 
-export { push, pop } from './context.js';
+export { save } from './context.js';
 
 export { push_element, pop_element, validate_snippet_args } from './dev.js';
 
-export { assign_payload, copy_payload } from './payload.js';
-
 export { snapshot } from '../shared/clone.js';
 
 export { fallback, to_array } from '../shared/utils.js';
@@ -531,8 +477,6 @@ export {
 
 export { escape_html as escape };
 
-export { await_outside_boundary } from '../shared/errors.js';
-
 /**
  * @template T
  * @param {()=>T} fn
@@ -557,29 +501,117 @@ export function derived(fn) {
 /**
  *
  * @param {Payload} payload
- * @param {*} value
+ * @param {unknown} value
  */
 export function maybe_selected(payload, value) {
-	return value === payload.select_value ? ' selected' : '';
+	return value === payload.local.select_value ? ' selected' : '';
 }
 
 /**
+ * When an `option` element has no `value` attribute, we need to treat the child
+ * content as its `value` to determine whether we should apply the `selected` attribute.
+ * This has to be done at runtime, for hopefully obvious reasons. It is also complicated,
+ * for sad reasons.
  * @param {Payload} payload
- * @param {() => void} children
+ * @param {((payload: Payload) => void | Promise<void>)} children
  * @returns {void}
  */
 export function valueless_option(payload, children) {
-	var i = payload.out.length;
+	const i = payload.length;
+
+	// prior to children, `payload` has some combination of string/unresolved payload that ends in `<option ...>`
+	payload.child(children);
+
+	// post-children, `payload` has child content, possibly also with some number of hydration comments.
+	// we can compact this last chunk of content to see if it matches the select value...
+	payload.compact({
+		start: i,
+		fn: (content) => {
+			if (content.body.replace(/<!---->/g, '') === payload.local.select_value) {
+				// ...and if it does match the select value, we can compact the part of the payload representing the `<option ...>`
+				// to add the `selected` attribute to the end.
+				payload.compact({
+					start: i - 1,
+					end: i,
+					fn: (content) => {
+						return { body: content.body.slice(0, -1) + ' selected>', head: content.head };
+					}
+				});
+			}
+			return content;
+		}
+	});
+}
 
-	children();
+/**
+ * In the special case where an `option` element has no `value` attribute but
+ * the children of the `option` element are a single expression, we can simplify
+ * by running the children and passing the resulting value, which means
+ * we don't have to do all of the same parsing nonsense. It also means we can avoid
+ * coercing everything to a string.
+ * @param {Payload} payload
+ * @param {(() => unknown)} child
+ */
+export function simple_valueless_option(payload, child) {
+	const result = child();
 
-	var body = payload.out.slice(i).join('');
+	/**
+	 * @param {AccumulatedContent} content
+	 * @param {unknown} child_value
+	 * @returns {AccumulatedContent}
+	 */
+	const mark_selected = (content, child_value) => {
+		if (child_value === payload.local.select_value) {
+			return { body: content.body.slice(0, -1) + ' selected>', head: content.head };
+		}
+		return content;
+	};
 
-	if (body.replace(/<!---->/g, '') === payload.select_value) {
-		// replace '>' with ' selected>' (closing tag will be added later)
-		var last_item = payload.out[i - 1];
-		payload.out[i - 1] = last_item.slice(0, -1) + ' selected>';
-		// Remove the old items after position i and add the body as a single item
-		payload.out.splice(i, payload.out.length - i, body);
-	}
+	payload.compact({
+		start: payload.length - 1,
+		fn: (content) => {
+			if (result instanceof Promise) {
+				return result.then((child_value) => mark_selected(content, child_value));
+			}
+			return mark_selected(content, result);
+		}
+	});
+
+	payload.child((child_payload) => {
+		if (result instanceof Promise) {
+			return result.then((child_value) => {
+				child_payload.push(escape_html(child_value));
+			});
+		}
+		child_payload.push(escape_html(result));
+	});
+}
+
+/**
+ * Since your document can only have one `title`, we have to have some sort of algorithm for determining
+ * which one "wins". To do this, we perform a depth-first comparison of where the title was encountered --
+ * later ones "win" over earlier ones, regardless of what order the promises resolve in. To accomodate this, we:
+ * - Figure out where we are in the content tree (`get_path`)
+ * - Render the title in its own child so that it has a defined "slot" in the payload
+ * - Compact that spot so that we get the entire rendered contents of the title
+ * - Attempt to set the global title (this is where the "wins" logic based on the path happens)
+ *
+ * TODO we could optimize this by not even rendering the title if the path wouldn't be accepted
+ *
+ * @param {Payload} payload
+ * @param {((payload: Payload) => void | Promise<void>)} children
+ */
+export function build_title(payload, children) {
+	const path = payload.get_path();
+	const i = payload.length;
+	payload.child(children);
+	payload.compact({
+		start: i,
+		fn: ({ head }) => {
+			payload.global.set_title(head, path);
+			// since we can only ever render the title in this chunk, and title rendering is handled specially,
+			// we can just ditch the results after we've saved them globally
+			return { head: '', body: '' };
+		}
+	});
 }
diff --git a/packages/svelte/src/internal/server/payload.js b/packages/svelte/src/internal/server/payload.js
index a7e40ad1db..ce8f312c21 100644
--- a/packages/svelte/src/internal/server/payload.js
+++ b/packages/svelte/src/internal/server/payload.js
@@ -1,80 +1,573 @@
-export class HeadPayload {
-	/** @type {Set<{ hash: string; code: string }>} */
-	css = new Set();
-	/** @type {string[]} */
-	out = [];
-	uid = () => '';
-	title = '';
-
-	constructor(
-		/** @type {Set<{ hash: string; code: string }>} */ css = new Set(),
-		/** @type {string[]} */ out = [],
-		title = '',
-		uid = () => ''
-	) {
-		this.css = css;
-		this.out = out;
-		this.title = title;
-		this.uid = uid;
+/** @import { Component } from 'svelte' */
+/** @import { RenderOutput, SSRContext, SyncRenderOutput } from './types.js' */
+import { async_mode_flag } from '../flags/index.js';
+import { abort } from './abort-signal.js';
+import { pop, push, set_ssr_context, ssr_context } from './context.js';
+import * as e from './errors.js';
+import * as w from './warnings.js';
+import { BLOCK_CLOSE, BLOCK_OPEN } from './hydration.js';
+
+/** @typedef {'head' | 'body'} PayloadType */
+/** @typedef {{ [key in PayloadType]: string }} AccumulatedContent */
+/**
+ * @template T
+ * @typedef {T | Promise<T>} MaybePromise<T>
+ */
+/**
+ * @typedef {string | Payload} PayloadItem
+ */
+
+/**
+ * Payloads are basically a tree of `string | Payload`s, where each `Payload` in the tree represents
+ * work that may or may not have completed. A payload can be {@link collect}ed to aggregate the
+ * content from itself and all of its children, but this will throw if any of the children are
+ * performing asynchronous work. To asynchronously collect a payload, just `await` it.
+ *
+ * The `string` values within a payload are always associated with the {@link type} of that payload. To switch types,
+ * call {@link child} with a different `type` argument.
+ */
+export class Payload {
+	/**
+	 * The contents of the payload.
+	 * @type {PayloadItem[]}
+	 */
+	#out = [];
+
+	/**
+	 * Any `onDestroy` callbacks registered during execution of this payload.
+	 * @type {(() => void)[] | undefined}
+	 */
+	#on_destroy = undefined;
+
+	/**
+	 * Whether this payload is a component body.
+	 * @type {boolean}
+	 */
+	#is_component_body = false;
+
+	/**
+	 * The type of string content that this payload is accumulating.
+	 * @type {PayloadType}
+	 */
+	type;
+
+	/** @type {Payload | undefined} */
+	#parent;
+
+	/**
+	 * Asynchronous work associated with this payload. `initial` is the promise from the function
+	 * this payload was passed to (if that function was async), and `followup` is any any additional
+	 * work from `compact` calls that needs to complete prior to collecting this payload's content.
+	 * @type {{ initial: Promise<void> | undefined, followup: Promise<void>[] }}
+	 */
+	promises = { initial: undefined, followup: [] };
+
+	/**
+	 * State which is associated with the content tree as a whole.
+	 * It will be re-exposed, uncopied, on all children.
+	 * @type {SSRState}
+	 * @readonly
+	 */
+	global;
+
+	/**
+	 * State that is local to the branch it is declared in.
+	 * It will be shallow-copied to all children.
+	 *
+	 * @type {{ select_value: string | undefined }}
+	 */
+	local;
+
+	/**
+	 * @param {SSRState} global
+	 * @param {Payload | undefined} [parent]
+	 * @param {PayloadType} [type]
+	 */
+	constructor(global, parent, type) {
+		this.global = global;
+		this.local = parent ? { ...parent.local } : { select_value: undefined };
+		this.#parent = parent;
+		this.type = type ?? parent?.type ?? 'body';
+	}
+
+	/**
+	 * Create a child payload. The child payload inherits the state from the parent,
+	 * but has its own content.
+	 * @param {(payload: Payload) => MaybePromise<void>} fn
+	 * @param {PayloadType} [type]
+	 */
+	child(fn, type) {
+		const child = new Payload(this.global, this, type);
+		this.#out.push(child);
+
+		const parent = ssr_context;
+
+		set_ssr_context({
+			...ssr_context,
+			p: parent,
+			c: null,
+			r: child
+		});
+
+		const result = fn(child);
+
+		set_ssr_context(parent);
+
+		if (result instanceof Promise) {
+			if (child.global.mode === 'sync') {
+				e.await_invalid();
+			}
+			// just to avoid unhandled promise rejections -- we'll end up throwing in `collect_async` if something fails
+			result.catch(() => {});
+			child.promises.initial = result;
+		}
+
+		return child;
+	}
+
+	/**
+	 * Create a component payload. The component payload inherits the state from the parent,
+	 * but has its own content. It is treated as an ordering boundary for ondestroy callbacks.
+	 * @param {(payload: Payload) => MaybePromise<void>} fn
+	 * @param {Function} [component_fn]
+	 * @returns {void}
+	 */
+	component(fn, component_fn) {
+		push(component_fn);
+		const child = this.child(fn);
+		child.#is_component_body = true;
+		pop();
+	}
+
+	/**
+	 * @param {string | (() => Promise<string>)} content
+	 */
+	push(content) {
+		if (typeof content === 'function') {
+			this.child(async (payload) => payload.push(await content()));
+		} else {
+			this.#out.push(content);
+		}
+	}
+
+	/**
+	 * Compact everything between `start` and `end` into a single payload, then call `fn` with the result of that payload.
+	 * The compacted payload will be sync if all of the children are sync and {@link fn} is sync, otherwise it will be async.
+	 * @param {{ start: number, end?: number, fn: (content: AccumulatedContent) => AccumulatedContent | Promise<AccumulatedContent> }} args
+	 */
+	compact({ start, end = this.#out.length, fn }) {
+		const child = new Payload(this.global, this);
+		const to_compact = this.#out.splice(start, end - start, child);
+
+		if (this.global.mode === 'sync') {
+			Payload.#compact(fn, child, to_compact, this.type);
+		} else {
+			this.promises.followup.push(Payload.#compact_async(fn, child, to_compact, this.type));
+		}
+	}
+
+	/**
+	 * @param {() => void} fn
+	 */
+	on_destroy(fn) {
+		(this.#on_destroy ??= []).push(fn);
+	}
+
+	/**
+	 * @returns {number[]}
+	 */
+	get_path() {
+		return this.#parent ? [...this.#parent.get_path(), this.#parent.#out.indexOf(this)] : [];
+	}
+
+	/**
+	 * @deprecated this is needed for legacy component bindings
+	 */
+	copy() {
+		const copy = new Payload(this.global, this.#parent, this.type);
+		copy.#out = this.#out.map((item) => (item instanceof Payload ? item.copy() : item));
+		copy.promises = this.promises;
+		return copy;
+	}
+
+	/**
+	 * @param {Payload} other
+	 * @deprecated this is needed for legacy component bindings
+	 */
+	subsume(other) {
+		if (this.global.mode !== other.global.mode) {
+			throw new Error(
+				"invariant: A payload cannot switch modes. If you're seeing this, there's a compiler bug. File an issue!"
+			);
+		}
+
+		this.local = other.local;
+		this.#out = other.#out.map((item) => {
+			if (item instanceof Payload) {
+				item.subsume(item);
+			}
+			return item;
+		});
+		this.promises = other.promises;
+		this.type = other.type;
+	}
+
+	get length() {
+		return this.#out.length;
+	}
+
+	/**
+	 * Only available on the server and when compiling with the `server` option.
+	 * Takes a component and returns an object with `body` and `head` properties on it, which you can use to populate the HTML when server-rendering your app.
+	 * @template {Record<string, any>} Props
+	 * @param {Component<Props>} component
+	 * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string }} [options]
+	 * @returns {RenderOutput}
+	 */
+	static render(component, options = {}) {
+		/** @type {AccumulatedContent | undefined} */
+		let sync;
+		/** @type {Promise<AccumulatedContent> | undefined} */
+		let async;
+
+		const result = /** @type {RenderOutput} */ ({});
+		// making these properties non-enumerable so that console.logging
+		// doesn't trigger a sync render
+		Object.defineProperties(result, {
+			html: {
+				get: () => {
+					return (sync ??= Payload.#render(component, options)).body;
+				}
+			},
+			head: {
+				get: () => {
+					return (sync ??= Payload.#render(component, options)).head;
+				}
+			},
+			body: {
+				get: () => {
+					return (sync ??= Payload.#render(component, options)).body;
+				}
+			},
+			then: {
+				value:
+					/**
+					 * this is not type-safe, but honestly it's the best I can do right now, and it's a straightforward function.
+					 *
+					 * @template TResult1
+					 * @template [TResult2=never]
+					 * @param { (value: SyncRenderOutput) => TResult1 } onfulfilled
+					 * @param { (reason: unknown) => TResult2 } onrejected
+					 */
+					(onfulfilled, onrejected) => {
+						if (!async_mode_flag) {
+							w.experimental_async_ssr();
+							const result = (sync ??= Payload.#render(component, options));
+							const user_result = onfulfilled({
+								head: result.head,
+								body: result.body,
+								html: result.body
+							});
+							return Promise.resolve(user_result);
+						}
+						async ??= Payload.#render_async(component, options);
+						return async.then((result) => {
+							Object.defineProperty(result, 'html', {
+								// eslint-disable-next-line getter-return
+								get: () => {
+									e.html_deprecated();
+								}
+							});
+							return onfulfilled(/** @type {SyncRenderOutput} */ (result));
+						}, onrejected);
+					}
+			}
+		});
+
+		return result;
+	}
+
+	/**
+	 * Collect all of the `onDestroy` callbacks regsitered during rendering. In an async context, this is only safe to call
+	 * after awaiting `collect_async`.
+	 *
+	 * Child payloads are "porous" and don't affect execution order, but component body payloads
+	 * create ordering boundaries. Within a payload, callbacks run in order until hitting a component boundary.
+	 * @returns {Iterable<() => void>}
+	 */
+	*#collect_on_destroy() {
+		for (const component of this.#traverse_components()) {
+			yield* component.#collect_ondestroy();
+		}
+	}
+
+	/**
+	 * Performs a depth-first search of payloads, yielding the deepest components first, then additional components as we backtrack up the tree.
+	 * @returns {Iterable<Payload>}
+	 */
+	*#traverse_components() {
+		for (const child of this.#out) {
+			if (typeof child !== 'string') {
+				yield* child.#traverse_components();
+			}
+		}
+		if (this.#is_component_body) {
+			yield this;
+		}
+	}
+
+	/**
+	 * @returns {Iterable<() => void>}
+	 */
+	*#collect_ondestroy() {
+		if (this.#on_destroy) {
+			for (const fn of this.#on_destroy) {
+				yield fn;
+			}
+		}
+		for (const child of this.#out) {
+			if (child instanceof Payload && !child.#is_component_body) {
+				yield* child.#collect_ondestroy();
+			}
+		}
+	}
+
+	/**
+	 * Render a component. Throws if any of the children are performing asynchronous work.
+	 *
+	 * @template {Record<string, any>} Props
+	 * @param {Component<Props>} component
+	 * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string }} options
+	 * @returns {AccumulatedContent}
+	 */
+	static #render(component, options) {
+		var previous_context = ssr_context;
+		try {
+			const payload = Payload.#open_render('sync', component, options);
+
+			const content = Payload.#collect_content([payload], payload.type);
+			return Payload.#close_render(content, payload);
+		} finally {
+			abort();
+			set_ssr_context(previous_context);
+		}
+	}
+
+	/**
+	 * Render a component.
+	 *
+	 * @template {Record<string, any>} Props
+	 * @param {Component<Props>} component
+	 * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string }} options
+	 * @returns {Promise<AccumulatedContent>}
+	 */
+	static async #render_async(component, options) {
+		var previous_context = ssr_context;
+		try {
+			const payload = Payload.#open_render('async', component, options);
+
+			const content = await Payload.#collect_content_async([payload], payload.type);
+			return Payload.#close_render(content, payload);
+		} finally {
+			abort();
+			set_ssr_context(previous_context);
+		}
+	}
+
+	/**
+	 * @param {(content: AccumulatedContent) => AccumulatedContent | Promise<AccumulatedContent>} fn
+	 * @param {Payload} child
+	 * @param {PayloadItem[]} to_compact
+	 * @param {PayloadType} type
+	 */
+	static #compact(fn, child, to_compact, type) {
+		const content = Payload.#collect_content(to_compact, type);
+		const transformed_content = fn(content);
+		if (transformed_content instanceof Promise) {
+			throw new Error(
+				"invariant: Somehow you've encountered asynchronous work while rendering synchronously. If you're seeing this, there's a compiler bug. File an issue!"
+			);
+		} else {
+			Payload.#push_accumulated_content(child, transformed_content);
+		}
+	}
+
+	/**
+	 * @param {(content: AccumulatedContent) => AccumulatedContent | Promise<AccumulatedContent>} fn
+	 * @param {Payload} child
+	 * @param {PayloadItem[]} to_compact
+	 * @param {PayloadType} type
+	 */
+	static async #compact_async(fn, child, to_compact, type) {
+		const content = await Payload.#collect_content_async(to_compact, type);
+		const transformed_content = await fn(content);
+		Payload.#push_accumulated_content(child, transformed_content);
+	}
+
+	/**
+	 * Collect all of the code from the `out` array and return it as a string, or a promise resolving to a string.
+	 * @param {PayloadItem[]} items
+	 * @param {PayloadType} current_type
+	 * @param {AccumulatedContent} content
+	 * @returns {AccumulatedContent}
+	 */
+	static #collect_content(items, current_type, content = { head: '', body: '' }) {
+		for (const item of items) {
+			if (typeof item === 'string') {
+				content[current_type] += item;
+			} else if (item instanceof Payload) {
+				Payload.#collect_content(item.#out, item.type, content);
+			}
+		}
+		return content;
+	}
+
+	/**
+	 * Collect all of the code from the `out` array and return it as a string.
+	 * @param {PayloadItem[]} items
+	 * @param {PayloadType} current_type
+	 * @param {AccumulatedContent} content
+	 * @returns {Promise<AccumulatedContent>}
+	 */
+	static async #collect_content_async(items, current_type, content = { head: '', body: '' }) {
+		// no danger to sequentially awaiting stuff in here; all of the work is already kicked off
+		for (const item of items) {
+			if (typeof item === 'string') {
+				content[current_type] += item;
+			} else {
+				if (item.promises.initial) {
+					// this represents the async function that's modifying this payload.
+					// we can't do anything until it's done and we know our `out` array is complete.
+					await item.promises.initial;
+				}
+				for (const followup of item.promises.followup) {
+					// this is sequential because `compact` could synchronously queue up additional followup work
+					await followup;
+				}
+				await Payload.#collect_content_async(item.#out, item.type, content);
+			}
+		}
+		return content;
+	}
+
+	/**
+	 * @param {Payload} tree
+	 * @param {AccumulatedContent} accumulated_content
+	 */
+	static #push_accumulated_content(tree, accumulated_content) {
+		for (const [type, content] of Object.entries(accumulated_content)) {
+			if (!content) continue;
+			const child = new Payload(tree.global, tree, /** @type {PayloadType} */ (type));
+			child.push(content);
+			tree.#out.push(child);
+		}
+	}
+
+	/**
+	 * @template {Record<string, any>} Props
+	 * @param {'sync' | 'async'} mode
+	 * @param {import('svelte').Component<Props>} component
+	 * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string }} options
+	 * @returns {Payload}
+	 */
+	static #open_render(mode, component, options) {
+		const payload = new Payload(new SSRState(mode, options.idPrefix ? options.idPrefix + '-' : ''));
+
+		payload.push(BLOCK_OPEN);
+
+		if (options.context) {
+			push();
+			/** @type {SSRContext} */ (ssr_context).c = options.context;
+			/** @type {SSRContext} */ (ssr_context).r = payload;
+		}
+
+		// @ts-expect-error
+		component(payload, options.props ?? {});
+
+		if (options.context) {
+			pop();
+		}
+
+		payload.push(BLOCK_CLOSE);
+
+		return payload;
+	}
+
+	/**
+	 * @param {AccumulatedContent} content
+	 * @param {Payload} payload
+	 */
+	static #close_render(content, payload) {
+		for (const cleanup of payload.#collect_on_destroy()) {
+			cleanup();
+		}
+
+		let head = content.head + payload.global.get_title();
+
+		const body = BLOCK_OPEN + content.body + BLOCK_CLOSE; // this inserts a fake boundary so hydration matches
+
+		for (const { hash, code } of payload.global.css) {
+			head += `<style id="${hash}">${code}</style>`;
+		}
+
+		return {
+			head,
+			body
+		};
 	}
 }
 
-export class Payload {
-	/** @type {Set<{ hash: string; code: string }>} */
+export class SSRState {
+	/** @readonly @type {'sync' | 'async'} */
+	mode;
+
+	/** @readonly @type {() => string} */
+	uid;
+
+	/** @readonly @type {Set<{ hash: string; code: string }>} */
 	css = new Set();
-	/** @type {string[]} */
-	out = [];
-	uid = () => '';
-	select_value = undefined;
 
-	head = new HeadPayload();
+	/** @type {{ path: number[], value: string }} */
+	#title = { path: [], value: '' };
 
-	constructor(id_prefix = '') {
-		this.uid = props_id_generator(id_prefix);
-		this.head.uid = this.uid;
+	/**
+	 * @param {'sync' | 'async'} mode
+	 * @param {string} [id_prefix]
+	 */
+	constructor(mode, id_prefix = '') {
+		this.mode = mode;
+
+		let uid = 1;
+		this.uid = () => `${id_prefix}s${uid++}`;
 	}
-}
 
-/**
- * Used in legacy mode to handle bindings
- * @param {Payload} to_copy
- * @returns {Payload}
- */
-export function copy_payload({ out, css, head, uid }) {
-	const payload = new Payload();
+	get_title() {
+		return this.#title.value;
+	}
 
-	payload.out = [...out];
-	payload.css = new Set(css);
-	payload.uid = uid;
+	/**
+	 * Performs a depth-first (lexicographic) comparison using the path. Rejects sets
+	 * from earlier than or equal to the current value.
+	 * @param {string} value
+	 * @param {number[]} path
+	 */
+	set_title(value, path) {
+		const current = this.#title.path;
 
-	payload.head = new HeadPayload();
-	payload.head.out = [...head.out];
-	payload.head.css = new Set(head.css);
-	payload.head.title = head.title;
-	payload.head.uid = head.uid;
+		let i = 0;
+		let l = Math.min(path.length, current.length);
 
-	return payload;
-}
+		// skip identical prefixes - [1, 2, 3, ...] === [1, 2, 3, ...]
+		while (i < l && path[i] === current[i]) i += 1;
 
-/**
- * Assigns second payload to first
- * @param {Payload} p1
- * @param {Payload} p2
- * @returns {void}
- */
-export function assign_payload(p1, p2) {
-	p1.out = [...p2.out];
-	p1.css = p2.css;
-	p1.head = p2.head;
-	p1.uid = p2.uid;
-}
+		if (path[i] === undefined) return;
 
-/**
- * Creates an ID generator
- * @param {string} prefix
- * @returns {() => string}
- */
-function props_id_generator(prefix) {
-	let uid = 1;
-	return () => `${prefix}s${uid++}`;
+		// replace title if
+		// - incoming path is longer - [7, 8, 9] > [7, 8]
+		// - incoming path is later  - [7, 8, 9] > [7, 8, 8]
+		if (current[i] === undefined || path[i] > current[i]) {
+			this.#title.path = path;
+			this.#title.value = value;
+		}
+	}
 }
diff --git a/packages/svelte/src/internal/server/payload.test.ts b/packages/svelte/src/internal/server/payload.test.ts
new file mode 100644
index 0000000000..9bf1028817
--- /dev/null
+++ b/packages/svelte/src/internal/server/payload.test.ts
@@ -0,0 +1,364 @@
+import { afterAll, beforeAll, describe, expect, test } from 'vitest';
+import { Payload, SSRState } from './payload.js';
+import type { Component } from 'svelte';
+import { disable_async_mode_flag, enable_async_mode_flag } from '../flags/index.js';
+
+test('collects synchronous body content by default', () => {
+	const component = (payload: Payload) => {
+		payload.push('a');
+		payload.child(($$payload) => {
+			$$payload.push('b');
+		});
+		payload.push('c');
+	};
+
+	const { head, body } = Payload.render(component as unknown as Component);
+	expect(head).toBe('');
+	expect(body).toBe('<!--[--><!--[-->abc<!--]--><!--]-->');
+});
+
+test('child type switches content area (head vs body)', () => {
+	const component = (payload: Payload) => {
+		payload.push('a');
+		payload.child(($$payload) => {
+			$$payload.push('<title>T</title>');
+		}, 'head');
+		payload.push('b');
+	};
+
+	const { head, body } = Payload.render(component as unknown as Component);
+	expect(head).toBe('<title>T</title>');
+	expect(body).toBe('<!--[--><!--[-->ab<!--]--><!--]-->');
+});
+
+test('child inherits parent type when not specified', () => {
+	const component = (payload: Payload) => {
+		payload.child((payload) => {
+			payload.push('<meta name="x"/>');
+			payload.child((payload) => {
+				payload.push('<style>/* css */</style>');
+			});
+		}, 'head');
+	};
+
+	const { head, body } = Payload.render(component as unknown as Component);
+	expect(body).toBe('<!--[--><!--[--><!--]--><!--]-->');
+	expect(head).toBe('<meta name="x"/><style>/* css */</style>');
+});
+
+test('get_path returns the path indexes to a payload', () => {
+	const root = new Payload(new SSRState('sync'));
+	let child_a: InstanceType<typeof Payload> | undefined;
+	let child_b: InstanceType<typeof Payload> | undefined;
+	let child_b_0: InstanceType<typeof Payload> | undefined;
+
+	root.child(($$payload) => {
+		child_a = $$payload;
+		$$payload.push('A');
+	});
+	root.child(($$payload) => {
+		child_b = $$payload;
+		$$payload.child(($$inner) => {
+			child_b_0 = $$inner;
+			$$inner.push('B0');
+		});
+		$$payload.push('B1');
+	});
+
+	expect(child_a!.get_path()).toEqual([0]);
+	expect(child_b!.get_path()).toEqual([1]);
+	expect(child_b_0!.get_path()).toEqual([1, 0]);
+});
+
+test('creating an async child in a sync context throws', () => {
+	const component = (payload: Payload) => {
+		payload.push('a');
+		payload.child(async ($$payload) => {
+			await Promise.resolve();
+			$$payload.push('x');
+		});
+	};
+
+	expect(() => Payload.render(component as unknown as Component).head).toThrow('await_invalid');
+	expect(() => Payload.render(component as unknown as Component).html).toThrow('await_invalid');
+	expect(() => Payload.render(component as unknown as Component).body).toThrow('await_invalid');
+});
+
+test('compact synchronously aggregates a range and can transform into head/body', () => {
+	const component = (payload: Payload) => {
+		const start = payload.length;
+		payload.push('a');
+		payload.push('b');
+		payload.push('c');
+		payload.compact({
+			start,
+			end: start + 2,
+			fn: (content) => {
+				return { head: '<h>H</h>', body: content.body + 'd' };
+			}
+		});
+	};
+
+	const { head, body } = Payload.render(component as unknown as Component);
+	expect(head).toBe('<h>H</h>');
+	expect(body).toBe('<!--[--><!--[-->abdc<!--]--><!--]-->');
+});
+
+test('local state is shallow-copied to children', () => {
+	const root = new Payload(new SSRState('sync'));
+	root.local.select_value = 'A';
+	let child: InstanceType<typeof Payload> | undefined;
+	root.child(($$payload) => {
+		child = $$payload;
+	});
+
+	expect(child!.local.select_value).toBe('A');
+	child!.local.select_value = 'B';
+	expect(root.local.select_value).toBe('A');
+});
+
+test('subsume replaces tree content and state from other', () => {
+	const a = new Payload(new SSRState('async'), undefined, 'head');
+	a.push('<meta />');
+	a.local.select_value = 'A';
+
+	const b = new Payload(new SSRState('async'));
+	b.child(async ($$payload) => {
+		await Promise.resolve();
+		$$payload.push('body');
+	});
+	b.global.css.add({ hash: 'h', code: 'c' });
+	b.global.set_title('Title', [1]);
+	b.local.select_value = 'B';
+	b.promises.initial = Promise.resolve();
+
+	a.subsume(b);
+
+	expect(a.type).toBe('body');
+	expect(a.local.select_value).toBe('B');
+	expect(a.promises).toBe(b.promises);
+});
+
+test('subsume refuses to switch modes', () => {
+	const a = new Payload(new SSRState('sync'), undefined, 'head');
+	a.push('<meta />');
+	a.local.select_value = 'A';
+
+	const b = new Payload(new SSRState('async'));
+	b.child(async ($$payload) => {
+		await Promise.resolve();
+		$$payload.push('body');
+	});
+	b.global.css.add({ hash: 'h', code: 'c' });
+	b.global.set_title('Title', [1]);
+	b.local.select_value = 'B';
+	b.promises.initial = Promise.resolve();
+
+	expect(() => a.subsume(b)).toThrow(
+		"invariant: A payload cannot switch modes. If you're seeing this, there's a compiler bug. File an issue!"
+	);
+});
+
+test('SSRState uid generator uses prefix', () => {
+	const state = new SSRState('sync', 'id-');
+	expect(state.uid()).toBe('id-s1');
+});
+
+test('SSRState title ordering favors later lexicographic paths', () => {
+	const state = new SSRState('sync');
+
+	state.set_title('A', [1]);
+	expect(state.get_title()).toBe('A');
+
+	// equal path -> unchanged
+	state.set_title('B', [1]);
+	expect(state.get_title()).toBe('A');
+
+	// earlier -> unchanged
+	state.set_title('C', [0, 9]);
+	expect(state.get_title()).toBe('A');
+
+	// later -> update
+	state.set_title('D', [2]);
+	expect(state.get_title()).toBe('D');
+
+	// longer but same prefix -> update
+	state.set_title('E', [2, 0]);
+	expect(state.get_title()).toBe('E');
+
+	// shorter (earlier) than current with same prefix -> unchanged
+	state.set_title('F', [2]);
+	expect(state.get_title()).toBe('E');
+});
+
+describe('async', () => {
+	beforeAll(() => {
+		enable_async_mode_flag();
+	});
+
+	afterAll(() => {
+		disable_async_mode_flag();
+	});
+
+	test('awaiting payload gets async content', async () => {
+		const component = (payload: Payload) => {
+			payload.push('1');
+			payload.child(async ($$payload) => {
+				await Promise.resolve();
+				$$payload.push('2');
+			});
+			payload.push('3');
+		};
+
+		const result = await Payload.render(component as unknown as Component);
+		expect(result.head).toBe('');
+		expect(result.body).toBe('<!--[--><!--[-->123<!--]--><!--]-->');
+		expect(() => result.html).toThrow('html_deprecated');
+	});
+
+	test('compact schedules followup when compaction input is async', async () => {
+		const component = (payload: Payload) => {
+			payload.push('a');
+			payload.child(async ($$payload) => {
+				await Promise.resolve();
+				$$payload.push('X');
+			});
+			payload.push('b');
+			payload.compact({
+				start: 0,
+				fn: async (content) => ({
+					body: content.body.toLowerCase(),
+					head: await Promise.resolve('')
+				})
+			});
+		};
+
+		const { body, head } = await Payload.render(component as unknown as Component);
+		expect(head).toBe('');
+		expect(body).toBe('<!--[--><!--[-->axb<!--]--><!--]-->');
+	});
+
+	test('push accepts async functions in async context', async () => {
+		const component = (payload: Payload) => {
+			payload.push('a');
+			payload.push(async () => {
+				await Promise.resolve();
+				return 'b';
+			});
+			payload.push('c');
+		};
+
+		const { head, body } = await Payload.render(component as unknown as Component);
+		expect(head).toBe('');
+		expect(body).toBe('<!--[--><!--[-->abc<!--]--><!--]-->');
+	});
+
+	test('push handles async functions with different timing', async () => {
+		const component = (payload: Payload) => {
+			payload.push(async () => {
+				await Promise.resolve();
+				return 'fast';
+			});
+			payload.push(async () => {
+				await new Promise((resolve) => setTimeout(resolve, 10));
+				return 'slow';
+			});
+			payload.push('sync');
+		};
+
+		const { head, body } = await Payload.render(component as unknown as Component);
+		expect(head).toBe('');
+		expect(body).toBe('<!--[--><!--[-->fastslowsync<!--]--><!--]-->');
+	});
+
+	test('push async functions work with head content type', async () => {
+		const component = (payload: Payload) => {
+			payload.child(($$payload) => {
+				$$payload.push(async () => {
+					await Promise.resolve();
+					return '<title>Async Title</title>';
+				});
+			}, 'head');
+		};
+
+		const { head, body } = await Payload.render(component as unknown as Component);
+		expect(body).toBe('<!--[--><!--[--><!--]--><!--]-->');
+		expect(head).toBe('<title>Async Title</title>');
+	});
+
+	test('push async functions can be mixed with child payloads', async () => {
+		const component = (payload: Payload) => {
+			payload.push('start-');
+			payload.push(async () => {
+				await Promise.resolve();
+				return 'async-';
+			});
+			payload.child(($$payload) => {
+				$$payload.push('child-');
+			});
+			payload.push('-end');
+		};
+
+		const { head, body } = await Payload.render(component as unknown as Component);
+		expect(head).toBe('');
+		expect(body).toBe('<!--[--><!--[-->start-async-child--end<!--]--><!--]-->');
+	});
+
+	test('push async functions work with compact operations', async () => {
+		const component = (payload: Payload) => {
+			payload.push('a');
+			payload.push(async () => {
+				await Promise.resolve();
+				return 'b';
+			});
+			payload.push('c');
+			payload.compact({
+				start: 0,
+				fn: (content) => ({ head: '', body: content.body.toUpperCase() })
+			});
+		};
+
+		const { head, body } = await Payload.render(component as unknown as Component);
+		expect(head).toBe('');
+		expect(body).toBe('<!--[--><!--[-->ABC<!--]--><!--]-->');
+	});
+
+	test('push async functions are not supported in sync context', () => {
+		const component = (payload: Payload) => {
+			payload.push('a');
+			payload.push(() => Promise.resolve('b'));
+		};
+
+		expect(() => Payload.render(component as unknown as Component).body).toThrow('await_invalid');
+		expect(() => Payload.render(component as unknown as Component).html).toThrow('await_invalid');
+		expect(() => Payload.render(component as unknown as Component).head).toThrow('await_invalid');
+	});
+
+	test('on_destroy yields callbacks in the correct order', async () => {
+		const destroyed: string[] = [];
+		const component = (payload: Payload) => {
+			payload.component((payload) => {
+				payload.on_destroy(() => destroyed.push('a'));
+				// children should not alter relative order
+				payload.child(async (payload) => {
+					await Promise.resolve();
+					payload.on_destroy(() => destroyed.push('b'));
+					payload.on_destroy(() => destroyed.push('b*'));
+				});
+				// but child components should
+				payload.component((payload) => {
+					payload.on_destroy(() => destroyed.push('c'));
+				});
+				payload.child((payload) => {
+					payload.on_destroy(() => destroyed.push('d'));
+				});
+				payload.component((payload) => {
+					payload.on_destroy(() => destroyed.push('e'));
+				});
+			});
+		};
+
+		await Payload.render(component as unknown as Component);
+		expect(destroyed).toEqual(['c', 'e', 'a', 'b', 'b*', 'd']);
+	});
+});
diff --git a/packages/svelte/src/internal/server/types.d.ts b/packages/svelte/src/internal/server/types.d.ts
index 6b0fc146c4..be27ea7bd3 100644
--- a/packages/svelte/src/internal/server/types.d.ts
+++ b/packages/svelte/src/internal/server/types.d.ts
@@ -1,17 +1,20 @@
-export interface Component {
+import type { Element } from './dev';
+import type { Payload } from './payload';
+
+export interface SSRContext {
 	/** parent */
-	p: null | Component;
-	/** context */
+	p: null | SSRContext;
+	/** component context */
 	c: null | Map<unknown, unknown>;
-	/** ondestroy */
-	d: null | Array<() => void>;
-	/**
-	 * dev mode only: the component function
-	 */
+	/** payload (renderer) */
+	r: null | Payload;
+	/** dev mode only: the current component function */
 	function?: any;
+	/** dev mode only: the current element */
+	element?: Element;
 }
 
-export interface RenderOutput {
+export interface SyncRenderOutput {
 	/** HTML that goes into the `<head>` */
 	head: string;
 	/** @deprecated use `body` instead */
@@ -19,3 +22,5 @@ export interface RenderOutput {
 	/** HTML that goes somewhere into the `<body>` */
 	body: string;
 }
+
+export type RenderOutput = SyncRenderOutput & PromiseLike<SyncRenderOutput>;
diff --git a/packages/svelte/src/internal/server/warnings.js b/packages/svelte/src/internal/server/warnings.js
new file mode 100644
index 0000000000..d8d9cd6d43
--- /dev/null
+++ b/packages/svelte/src/internal/server/warnings.js
@@ -0,0 +1,17 @@
+/* This file is generated by scripts/process-messages/index.js. Do not edit! */
+
+import { DEV } from 'esm-env';
+
+var bold = 'font-weight: bold';
+var normal = 'font-weight: normal';
+
+/**
+ * Attempted to use asynchronous rendering without `experimental.async` enabled
+ */
+export function experimental_async_ssr() {
+	if (DEV) {
+		console.warn(`%c[svelte] experimental_async_ssr\n%cAttempted to use asynchronous rendering without \`experimental.async\` enabled\nhttps://svelte.dev/e/experimental_async_ssr`, bold, normal);
+	} else {
+		console.warn(`https://svelte.dev/e/experimental_async_ssr`);
+	}
+}
\ No newline at end of file
diff --git a/packages/svelte/src/internal/shared/errors.js b/packages/svelte/src/internal/shared/errors.js
index 66685cb00b..6bcc35016a 100644
--- a/packages/svelte/src/internal/shared/errors.js
+++ b/packages/svelte/src/internal/shared/errors.js
@@ -2,22 +2,6 @@
 
 import { DEV } from 'esm-env';
 
-/**
- * Cannot await outside a `<svelte:boundary>` with a `pending` snippet
- * @returns {never}
- */
-export function await_outside_boundary() {
-	if (DEV) {
-		const error = new Error(`await_outside_boundary\nCannot await outside a \`<svelte:boundary>\` with a \`pending\` snippet\nhttps://svelte.dev/e/await_outside_boundary`);
-
-		error.name = 'Svelte error';
-
-		throw error;
-	} else {
-		throw new Error(`https://svelte.dev/e/await_outside_boundary`);
-	}
-}
-
 /**
  * Cannot use `{@render children(...)}` if the parent component uses `let:` directives. Consider using a named snippet instead
  * @returns {never}
diff --git a/packages/svelte/src/legacy/legacy-server.js b/packages/svelte/src/legacy/legacy-server.js
index 60bd8c9fc6..92f8757d7a 100644
--- a/packages/svelte/src/legacy/legacy-server.js
+++ b/packages/svelte/src/legacy/legacy-server.js
@@ -31,6 +31,7 @@ export function asClassComponent(component) {
 			html: result.body
 		};
 	};
+
 	// @ts-expect-error this is present for SSR
 	component_constructor.render = _render;
 
diff --git a/packages/svelte/tests/hydration/samples/binding-input/_expected.html b/packages/svelte/tests/hydration/samples/binding-input/_expected.html
index e36735dc6b..7a73053b82 100644
--- a/packages/svelte/tests/hydration/samples/binding-input/_expected.html
+++ b/packages/svelte/tests/hydration/samples/binding-input/_expected.html
@@ -1 +1 @@
-<!--[--><input> <p>Hello world!</p><!--]-->
+<!--[--><!--[--><input> <p>Hello world!</p><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/cloudflare-mirage-borking-2/_override.html b/packages/svelte/tests/hydration/samples/cloudflare-mirage-borking-2/_override.html
index 2a1c323288..117d83d8eb 100644
--- a/packages/svelte/tests/hydration/samples/cloudflare-mirage-borking-2/_override.html
+++ b/packages/svelte/tests/hydration/samples/cloudflare-mirage-borking-2/_override.html
@@ -1 +1 @@
-<!--[--> <p>start</p><!--[--><p>cond</p><!--]--><!--]-->
+<!--[--><!--[--> <p>start</p><!--[--><p>cond</p><!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/dynamic-text-changed/_expected.html b/packages/svelte/tests/hydration/samples/dynamic-text-changed/_expected.html
index 11e3f55d6b..04266bf7f3 100644
--- a/packages/svelte/tests/hydration/samples/dynamic-text-changed/_expected.html
+++ b/packages/svelte/tests/hydration/samples/dynamic-text-changed/_expected.html
@@ -1 +1 @@
-<!--[--><h1>Hello everybody!</h1><!--]-->
+<!--[--><!--[--><h1>Hello everybody!</h1><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/each-block-0-on-server-more-on-client/_expected.html b/packages/svelte/tests/hydration/samples/each-block-0-on-server-more-on-client/_expected.html
index 2b2a31b926..4b28b305d5 100644
--- a/packages/svelte/tests/hydration/samples/each-block-0-on-server-more-on-client/_expected.html
+++ b/packages/svelte/tests/hydration/samples/each-block-0-on-server-more-on-client/_expected.html
@@ -1 +1 @@
-<!--[--><ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--><!--]-->
+<!--[--><!--[--><ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/each-block-fallback-mismatch/_expected.html b/packages/svelte/tests/hydration/samples/each-block-fallback-mismatch/_expected.html
index af66d98b25..8ace6d0373 100644
--- a/packages/svelte/tests/hydration/samples/each-block-fallback-mismatch/_expected.html
+++ b/packages/svelte/tests/hydration/samples/each-block-fallback-mismatch/_expected.html
@@ -1 +1 @@
-<!--[--><!--[!--><p>a</p><!--]--> <!--[--><p>empty</p><!--]--><!--]-->
+<!--[--><!--[--><!--[!--><p>a</p><!--]--> <!--[--><p>empty</p><!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/each-block-less-nodes-on-client/_expected.html b/packages/svelte/tests/hydration/samples/each-block-less-nodes-on-client/_expected.html
index 2b2a31b926..4b28b305d5 100644
--- a/packages/svelte/tests/hydration/samples/each-block-less-nodes-on-client/_expected.html
+++ b/packages/svelte/tests/hydration/samples/each-block-less-nodes-on-client/_expected.html
@@ -1 +1 @@
-<!--[--><ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--><!--]-->
+<!--[--><!--[--><ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/each-block-more-nodes-on-client/_expected.html b/packages/svelte/tests/hydration/samples/each-block-more-nodes-on-client/_expected.html
index fa72a80dcd..89cbd0b466 100644
--- a/packages/svelte/tests/hydration/samples/each-block-more-nodes-on-client/_expected.html
+++ b/packages/svelte/tests/hydration/samples/each-block-more-nodes-on-client/_expected.html
@@ -1 +1 @@
-<!--[--><ul><!--[--><li>a</li><li>b</li><!--]--></ul> <ul><!--[--><li>a</li><li>b</li><!--]--></ul> <ul><!--[--><li>a</li><li>b</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--><!--]-->
+<!--[--><!--[--><ul><!--[--><li>a</li><li>b</li><!--]--></ul> <ul><!--[--><li>a</li><li>b</li><!--]--></ul> <ul><!--[--><li>a</li><li>b</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/element-attribute-added/_expected.html b/packages/svelte/tests/hydration/samples/element-attribute-added/_expected.html
index 7d8e91c757..27f9299c54 100644
--- a/packages/svelte/tests/hydration/samples/element-attribute-added/_expected.html
+++ b/packages/svelte/tests/hydration/samples/element-attribute-added/_expected.html
@@ -1 +1 @@
-<!--[--><div class="bar"></div><!--]-->
+<!--[--><!--[--><div class="bar"></div><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/element-attribute-changed/_expected.html b/packages/svelte/tests/hydration/samples/element-attribute-changed/_expected.html
index 7d8e91c757..27f9299c54 100644
--- a/packages/svelte/tests/hydration/samples/element-attribute-changed/_expected.html
+++ b/packages/svelte/tests/hydration/samples/element-attribute-changed/_expected.html
@@ -1 +1 @@
-<!--[--><div class="bar"></div><!--]-->
+<!--[--><!--[--><div class="bar"></div><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/element-attribute-removed/_expected.html b/packages/svelte/tests/hydration/samples/element-attribute-removed/_expected.html
index a6c1be8b49..1a69c9fa30 100644
--- a/packages/svelte/tests/hydration/samples/element-attribute-removed/_expected.html
+++ b/packages/svelte/tests/hydration/samples/element-attribute-removed/_expected.html
@@ -1 +1 @@
-<!--[--><div></div> <!--[--><div></div> <div></div><!--]--><!--]-->
+<!--[--><!--[--><div></div> <!--[--><div></div> <div></div><!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html b/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html
index 08a3809de9..5620250623 100644
--- a/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html
+++ b/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!--]--> <div><!----><!----></div> hello<!--]-->
+<!--[--><!--[--><!--[--><!--]--> <div><!----><!----></div> hello<!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/if-block-mismatch/_expected.html b/packages/svelte/tests/hydration/samples/if-block-mismatch/_expected.html
index 79cf2cf35f..5ace45d895 100644
--- a/packages/svelte/tests/hydration/samples/if-block-mismatch/_expected.html
+++ b/packages/svelte/tests/hydration/samples/if-block-mismatch/_expected.html
@@ -1 +1 @@
-<!--[--><!--[!--><p>foo</p><!--]--><!--]-->
+<!--[--><!--[--><!--[!--><p>foo</p><!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/input-checked-attribute-sibling/_expected.html b/packages/svelte/tests/hydration/samples/input-checked-attribute-sibling/_expected.html
index bcd53f8783..521f9c52b8 100644
--- a/packages/svelte/tests/hydration/samples/input-checked-attribute-sibling/_expected.html
+++ b/packages/svelte/tests/hydration/samples/input-checked-attribute-sibling/_expected.html
@@ -1 +1 @@
-<!--[--><!---->.<input><!--]-->
+<!--[--><!--[--><!---->.<input><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/input-value-changed/_expected.html b/packages/svelte/tests/hydration/samples/input-value-changed/_expected.html
index c5384e717e..c9bc1409d7 100644
--- a/packages/svelte/tests/hydration/samples/input-value-changed/_expected.html
+++ b/packages/svelte/tests/hydration/samples/input-value-changed/_expected.html
@@ -1 +1 @@
-<!--[--><input type="text"><!--]-->
+<!--[--><!--[--><input type="text"><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/noscript/_expected.html b/packages/svelte/tests/hydration/samples/noscript/_expected.html
index 990ce87303..a587a13af1 100644
--- a/packages/svelte/tests/hydration/samples/noscript/_expected.html
+++ b/packages/svelte/tests/hydration/samples/noscript/_expected.html
@@ -1 +1 @@
-<!--[--><noscript>JavaScript is required for this site.</noscript> <h1>Hello!</h1><p>Count: 1</p><!--]-->
+<!--[--><!--[--><noscript>JavaScript is required for this site.</noscript> <h1>Hello!</h1><p>Count: 1</p><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/pre-first-node-newline/_expected.html b/packages/svelte/tests/hydration/samples/pre-first-node-newline/_expected.html
index 26de34d1ed..a4d2df2147 100644
--- a/packages/svelte/tests/hydration/samples/pre-first-node-newline/_expected.html
+++ b/packages/svelte/tests/hydration/samples/pre-first-node-newline/_expected.html
@@ -1,7 +1,7 @@
-<!--[--><pre>static content no line</pre> <pre>	static content ignored line
+<!--[--><!--[--><pre>static content no line</pre> <pre>	static content ignored line
 </pre> <pre>
 	static content relevant line
 </pre> <pre><div><span></span></div>
 </pre> <pre>
 <div><span></span></div>
-</pre><!--]-->
+</pre><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/removes-undefined-attributes/_expected.html b/packages/svelte/tests/hydration/samples/removes-undefined-attributes/_expected.html
index cc789c8f51..4af6885faf 100644
--- a/packages/svelte/tests/hydration/samples/removes-undefined-attributes/_expected.html
+++ b/packages/svelte/tests/hydration/samples/removes-undefined-attributes/_expected.html
@@ -1 +1 @@
-<!--[--><div></div><!--]-->
+<!--[--><!--[--><div></div><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/repair-mismatched-a-href/_expected.html b/packages/svelte/tests/hydration/samples/repair-mismatched-a-href/_expected.html
index e1076af2ec..1755e9bfe2 100644
--- a/packages/svelte/tests/hydration/samples/repair-mismatched-a-href/_expected.html
+++ b/packages/svelte/tests/hydration/samples/repair-mismatched-a-href/_expected.html
@@ -1 +1 @@
-<!--[--><a href="/foo">foo</a> <a href="/foo">foo</a><!--]-->
+<!--[--><!--[--><a href="/foo">foo</a> <a href="/foo">foo</a><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/safari-borking/_override.html b/packages/svelte/tests/hydration/samples/safari-borking/_override.html
index 876815e7a9..b3665d1f80 100644
--- a/packages/svelte/tests/hydration/samples/safari-borking/_override.html
+++ b/packages/svelte/tests/hydration/samples/safari-borking/_override.html
@@ -1 +1 @@
-<!--[--><h1>call <a href="tel:+636-555-3226">+636-555-3226</a> now<span>!</span></h1><!--]-->
+<!--[--><!--[--><h1>call <a href="tel:+636-555-3226">+636-555-3226</a> now<span>!</span></h1><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/script/_expected.html b/packages/svelte/tests/hydration/samples/script/_expected.html
index b3a4d92219..ab881a6197 100644
--- a/packages/svelte/tests/hydration/samples/script/_expected.html
+++ b/packages/svelte/tests/hydration/samples/script/_expected.html
@@ -1 +1 @@
-<!--[--><!----><script>{}<!----></script><!----><!--]-->
+<!--[--><!--[--><!----><script>{}<!----></script><!----><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/snippet-raw-hydrate/_expected.html b/packages/svelte/tests/hydration/samples/snippet-raw-hydrate/_expected.html
index 8d9dde52c1..0629ab64c2 100644
--- a/packages/svelte/tests/hydration/samples/snippet-raw-hydrate/_expected.html
+++ b/packages/svelte/tests/hydration/samples/snippet-raw-hydrate/_expected.html
@@ -1 +1 @@
-<!--[--><p>hydrated</p><!--]-->
+<!--[--><!--[--><p>hydrated</p><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/standalone-component/_expected.html b/packages/svelte/tests/hydration/samples/standalone-component/_expected.html
index 96850f7bdf..119576aa73 100644
--- a/packages/svelte/tests/hydration/samples/standalone-component/_expected.html
+++ b/packages/svelte/tests/hydration/samples/standalone-component/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><p>child</p><!--]--> <!--[--><p>child</p><p>child</p><p>child</p><!--]--><!--]-->
+<!--[--><!--[--><!--[--><p>child</p><!--]--> <!--[--><p>child</p><p>child</p><p>child</p><!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/standalone-snippet/_expected.html b/packages/svelte/tests/hydration/samples/standalone-snippet/_expected.html
index acb14818c2..61fc31a95e 100644
--- a/packages/svelte/tests/hydration/samples/standalone-snippet/_expected.html
+++ b/packages/svelte/tests/hydration/samples/standalone-snippet/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><p>thing</p><!--]--> <!--[--><p>thing</p><p>thing</p><p>thing</p><!--]--><!--]-->
+<!--[--><!--[--><!--[--><p>thing</p><!--]--> <!--[--><p>thing</p><p>thing</p><p>thing</p><!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/surrounding-whitespace/_expected.html b/packages/svelte/tests/hydration/samples/surrounding-whitespace/_expected.html
index e728b682d0..7b51bed662 100644
--- a/packages/svelte/tests/hydration/samples/surrounding-whitespace/_expected.html
+++ b/packages/svelte/tests/hydration/samples/surrounding-whitespace/_expected.html
@@ -1,2 +1,2 @@
 		<!-- unrelated comment -->
-		<!--[--><!--[-->hello<!--]--><!--]-->
+		<!--[--><!--[--><!--[-->hello<!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/surrounding-whitespace/_override.html b/packages/svelte/tests/hydration/samples/surrounding-whitespace/_override.html
index e728b682d0..7b51bed662 100644
--- a/packages/svelte/tests/hydration/samples/surrounding-whitespace/_override.html
+++ b/packages/svelte/tests/hydration/samples/surrounding-whitespace/_override.html
@@ -1,2 +1,2 @@
 		<!-- unrelated comment -->
-		<!--[--><!--[-->hello<!--]--><!--]-->
+		<!--[--><!--[--><!--[-->hello<!--]--><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/text-empty-2/_expected.html b/packages/svelte/tests/hydration/samples/text-empty-2/_expected.html
index ff12f10bfb..e14014c2f0 100644
--- a/packages/svelte/tests/hydration/samples/text-empty-2/_expected.html
+++ b/packages/svelte/tests/hydration/samples/text-empty-2/_expected.html
@@ -1 +1 @@
-<!--[--><span><span></span></span><!--]-->
+<!--[--><!--[--><span><span></span></span><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/text-empty/_expected.html b/packages/svelte/tests/hydration/samples/text-empty/_expected.html
index 2e03580f42..c4d823410f 100644
--- a/packages/svelte/tests/hydration/samples/text-empty/_expected.html
+++ b/packages/svelte/tests/hydration/samples/text-empty/_expected.html
@@ -1 +1 @@
-<!--[--><!---->x<!--]-->
+<!--[--><!--[--><!---->x<!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/whitespace-at-block-start/_override.html b/packages/svelte/tests/hydration/samples/whitespace-at-block-start/_override.html
index 90ca4ef4b8..7402247877 100644
--- a/packages/svelte/tests/hydration/samples/whitespace-at-block-start/_override.html
+++ b/packages/svelte/tests/hydration/samples/whitespace-at-block-start/_override.html
@@ -1,2 +1,2 @@
-<!--[-->
-<main><p>nested</p><!----></main><!--]-->
\ No newline at end of file
+<!--[--><!--[-->
+<main><p>nested</p><!----></main><!--]--><!--]-->
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-browser/driver-ssr.js b/packages/svelte/tests/runtime-browser/driver-ssr.js
index 7067e48a1f..35aaca3ad3 100644
--- a/packages/svelte/tests/runtime-browser/driver-ssr.js
+++ b/packages/svelte/tests/runtime-browser/driver-ssr.js
@@ -6,5 +6,9 @@ import config from '__CONFIG__';
 import { render } from 'svelte/server';
 
 export default function () {
-	return render(SvelteComponent, { props: config.props || {}, idPrefix: config?.id_prefix });
+	const { head, body, html } = render(SvelteComponent, {
+		props: config.props || {},
+		idPrefix: config?.id_prefix
+	});
+	return { head, body, html };
 }
diff --git a/packages/svelte/tests/runtime-legacy/samples/after-render-prevents-loop/_config.js b/packages/svelte/tests/runtime-legacy/samples/after-render-prevents-loop/_config.js
index 39c0ef7f53..7a0943c3f4 100644
--- a/packages/svelte/tests/runtime-legacy/samples/after-render-prevents-loop/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/after-render-prevents-loop/_config.js
@@ -1,7 +1,7 @@
 import { test } from '../../test';
 
 export default test({
-	skip_mode: ['server'],
+	skip_mode: ['server', 'async-server'],
 
 	get props() {
 		return { value: 'hello!' };
diff --git a/packages/svelte/tests/runtime-legacy/samples/after-render-triggers-update/_config.js b/packages/svelte/tests/runtime-legacy/samples/after-render-triggers-update/_config.js
index 39c0ef7f53..7a0943c3f4 100644
--- a/packages/svelte/tests/runtime-legacy/samples/after-render-triggers-update/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/after-render-triggers-update/_config.js
@@ -1,7 +1,7 @@
 import { test } from '../../test';
 
 export default test({
-	skip_mode: ['server'],
+	skip_mode: ['server', 'async-server'],
 
 	get props() {
 		return { value: 'hello!' };
diff --git a/packages/svelte/tests/runtime-legacy/samples/before-render-prevents-loop/_config.js b/packages/svelte/tests/runtime-legacy/samples/before-render-prevents-loop/_config.js
index 39c0ef7f53..7a0943c3f4 100644
--- a/packages/svelte/tests/runtime-legacy/samples/before-render-prevents-loop/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/before-render-prevents-loop/_config.js
@@ -1,7 +1,7 @@
 import { test } from '../../test';
 
 export default test({
-	skip_mode: ['server'],
+	skip_mode: ['server', 'async-server'],
 
 	get props() {
 		return { value: 'hello!' };
diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-select-implicit-option-value/_config.js b/packages/svelte/tests/runtime-legacy/samples/binding-select-implicit-option-value/_config.js
index dd88c10c71..2b866bc8ce 100644
--- a/packages/svelte/tests/runtime-legacy/samples/binding-select-implicit-option-value/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/binding-select-implicit-option-value/_config.js
@@ -8,9 +8,9 @@ export default test({
 
 	ssrHtml: `
 		<select>
-			<option value="1">1</option>
-			<option selected value="2">2</option>
-			<option value="3">3</option>
+			<option>1</option>
+			<option selected>2</option>
+			<option>3</option>
 		</select>
 
 		<p>foo: 2</p>
@@ -21,9 +21,9 @@ export default test({
 			target.innerHTML,
 			`
 			<select>
-				<option value="1">1</option>
-				<option ${variant === 'hydrate' ? 'selected ' : ''}value="2">2</option>
-				<option value="3">3</option>
+				<option>1</option>
+				<option ${variant === 'hydrate' ? 'selected ' : ''}>2</option>
+				<option>3</option>
 			</select>
 
 			<p>foo: 2</p>
@@ -47,9 +47,9 @@ export default test({
 			target.innerHTML,
 			`
 			<select>
-				<option value="1">1</option>
-				<option ${variant === 'hydrate' ? 'selected ' : ''}value="2">2</option>
-				<option value="3">3</option>
+				<option>1</option>
+				<option ${variant === 'hydrate' ? 'selected ' : ''}>2</option>
+				<option>3</option>
 			</select>
 
 			<p>foo: 3</p>
diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-select-initial-value-undefined-3/_config.js b/packages/svelte/tests/runtime-legacy/samples/binding-select-initial-value-undefined-3/_config.js
index 9b25c0bc58..c48298229e 100644
--- a/packages/svelte/tests/runtime-legacy/samples/binding-select-initial-value-undefined-3/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/binding-select-initial-value-undefined-3/_config.js
@@ -8,9 +8,9 @@ export default test({
 
 		<select>
 			<option disabled=''>x</option>
-			<option value="a">a</option>
-			<option value="b">b</option>
-			<option value="c">c</option>
+			<option>a</option>
+			<option>b</option>
+			<option>c</option>
 		</select>
 	`,
 
diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-select-late-2/_config.js b/packages/svelte/tests/runtime-legacy/samples/binding-select-late-2/_config.js
index ab2db4b07d..72e06190ba 100644
--- a/packages/svelte/tests/runtime-legacy/samples/binding-select-late-2/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/binding-select-late-2/_config.js
@@ -28,9 +28,9 @@ export default test({
 			target.innerHTML,
 			`
 			<select>
-				<option value="one">one</option>
-				<option value="two">two</option>
-				<option value="three">three</option>
+				<option>one</option>
+				<option>two</option>
+				<option>three</option>
 			</select>
 			<p>selected: two</p>
 		`
diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-select-late-3/_config.js b/packages/svelte/tests/runtime-legacy/samples/binding-select-late-3/_config.js
index 234c2a1040..72e06190ba 100644
--- a/packages/svelte/tests/runtime-legacy/samples/binding-select-late-3/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/binding-select-late-3/_config.js
@@ -28,9 +28,9 @@ export default test({
 			target.innerHTML,
 			`
 			<select>
-				<option value='one'>one</option>
-				<option value='two'>two</option>
-				<option value='three'>three</option>
+				<option>one</option>
+				<option>two</option>
+				<option>three</option>
 			</select>
 			<p>selected: two</p>
 		`
diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-select-late/_config.js b/packages/svelte/tests/runtime-legacy/samples/binding-select-late/_config.js
index 9c3cd8765a..6c7662def3 100644
--- a/packages/svelte/tests/runtime-legacy/samples/binding-select-late/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/binding-select-late/_config.js
@@ -28,9 +28,9 @@ export default test({
 			target.innerHTML,
 			`
 			<select>
-				<option value="one">one</option>
-				<option value="two">two</option>
-				<option value="three">three</option>
+				<option>one</option>
+				<option>two</option>
+				<option>three</option>
 			</select>
 			<p>selected: two</p>
 		`
diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-select-unmatched-2/_config.js b/packages/svelte/tests/runtime-legacy/samples/binding-select-unmatched-2/_config.js
index 85d61eeeec..b0bbed9c92 100644
--- a/packages/svelte/tests/runtime-legacy/samples/binding-select-unmatched-2/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/binding-select-unmatched-2/_config.js
@@ -6,9 +6,9 @@ export default test({
 		<p>selected: </p>
 
 		<select>
-			<option value="a">a</option>
-			<option value="b">b</option>
-			<option value="c">c</option>
+			<option>a</option>
+			<option>b</option>
+			<option>c</option>
 		</select>
 
 		<p>selected: </p>
@@ -37,9 +37,9 @@ export default test({
 			<p>selected: a</p>
 
 			<select>
-				<option value="a">a</option>
-				<option value="b">b</option>
-				<option value="c">c</option>
+				<option>a</option>
+				<option>b</option>
+				<option>c</option>
 			</select>
 
 			<p>selected: a</p>
@@ -59,9 +59,9 @@ export default test({
 			<p>selected: d</p>
 
 			<select>
-				<option value="a">a</option>
-				<option value="b">b</option>
-				<option value="c">c</option>
+				<option>a</option>
+				<option>b</option>
+				<option>c</option>
 			</select>
 
 			<p>selected: d</p>
@@ -78,9 +78,9 @@ export default test({
 			<p>selected: b</p>
 
 			<select>
-				<option value="a">a</option>
-				<option value="b">b</option>
-				<option value="c">c</option>
+				<option>a</option>
+				<option>b</option>
+				<option>c</option>
 			</select>
 
 			<p>selected: b</p>
@@ -100,9 +100,9 @@ export default test({
 			<p>selected: </p>
 
 			<select>
-				<option value="a">a</option>
-				<option value="b">b</option>
-				<option value="c">c</option>
+				<option>a</option>
+				<option>b</option>
+				<option>c</option>
 			</select>
 
 			<p>selected: </p>
diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-select-unmatched-3/_config.js b/packages/svelte/tests/runtime-legacy/samples/binding-select-unmatched-3/_config.js
index c0e64521d1..d616d9bc26 100644
--- a/packages/svelte/tests/runtime-legacy/samples/binding-select-unmatched-3/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/binding-select-unmatched-3/_config.js
@@ -4,7 +4,7 @@ import { ok, test } from '../../test';
 export default test({
 	mode: ['client', 'hydrate'],
 
-	html: `<p>selected: a</p><select><option value="a">a</option><option value="b">b</option><option value="c">c</option></select>`,
+	html: `<p>selected: a</p><select><option>a</option><option>b</option><option>c</option></select>`,
 
 	async test({ assert, component, target }) {
 		const select = target.querySelector('select');
@@ -29,7 +29,7 @@ export default test({
 		// model of selected value should be kept around, even if it is not in the list
 		assert.htmlEqual(
 			target.innerHTML,
-			`<p>selected: a</p><select><option value="b">b</option><option value="c">c</option></select>`
+			`<p>selected: a</p><select><option>b</option><option>c</option></select>`
 		);
 	}
 });
diff --git a/packages/svelte/tests/runtime-legacy/samples/constructor-prefer-passed-context/_config.js b/packages/svelte/tests/runtime-legacy/samples/constructor-prefer-passed-context/_config.js
index e05bb35637..7c49960afd 100644
--- a/packages/svelte/tests/runtime-legacy/samples/constructor-prefer-passed-context/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/constructor-prefer-passed-context/_config.js
@@ -1,7 +1,7 @@
 import { test } from '../../test';
 
 export default test({
-	skip_mode: ['server'],
+	skip_mode: ['server', 'async-server'],
 
 	html: `
 		<div><div>Value in child component: </div></div>
diff --git a/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js b/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js
index 7cd7c553e0..dac6ee4fb8 100644
--- a/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js
@@ -4,7 +4,7 @@ export default test({
 	withoutNormalizeHtml: true,
 	// Unable to test `html` with `<textarea>` content
 	// as the textarea#value will not show within `innerHtml`
-	ssrHtml: `<!--[--><textarea id="textarea">  A
+	ssrHtml: `<!--[--><!--[--><textarea id="textarea">  A
   B
 </textarea> <div id="div-with-textarea"><textarea>    A
     B
@@ -14,7 +14,7 @@ newline after leading space</textarea></div> <textarea id="textarea-with-multipl
 
 multiple leading newlines</textarea> <div id="div-with-textarea-with-multiple-leading-newlines"><textarea>
 
-multiple leading newlines</textarea></div><!--]-->`,
+multiple leading newlines</textarea></div><!--]--><!--]-->`,
 	test({ assert, target }) {
 		// Test for <textarea> tag
 		const elementTextarea = /** @type {HTMLTextAreaElement} */ (target.querySelector('#textarea'));
diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts
index 05c1a982ec..7144543242 100644
--- a/packages/svelte/tests/runtime-legacy/shared.ts
+++ b/packages/svelte/tests/runtime-legacy/shared.ts
@@ -43,9 +43,9 @@ Promise.withResolvers = () => {
 export interface RuntimeTest<Props extends Record<string, any> = Record<string, any>>
 	extends BaseTest {
 	/** Use e.g. `mode: ['client']` to indicate that this test should never run in server/hydrate modes */
-	mode?: Array<'server' | 'client' | 'hydrate'>;
+	mode?: Array<'server' | 'async-server' | 'client' | 'hydrate'>;
 	/** Temporarily skip specific modes, without skipping the entire test */
-	skip_mode?: Array<'server' | 'client' | 'hydrate'>;
+	skip_mode?: Array<'server' | 'async-server' | 'client' | 'hydrate'>;
 	/** Skip if running with process.env.NO_ASYNC */
 	skip_no_async?: boolean;
 	/** Skip if running without process.env.NO_ASYNC */
@@ -83,7 +83,11 @@ export interface RuntimeTest<Props extends Record<string, any> = Record<string,
 		errors: any[];
 		hydrate: Function;
 	}) => void | Promise<void>;
-	test_ssr?: (args: { logs: any[]; assert: Assert }) => void | Promise<void>;
+	test_ssr?: (args: {
+		logs: any[];
+		assert: Assert;
+		variant: 'ssr' | 'async-ssr';
+	}) => void | Promise<void>;
 	accessors?: boolean;
 	immutable?: boolean;
 	intro?: boolean;
@@ -124,8 +128,8 @@ let console_warn = console.warn;
 let console_error = console.error;
 
 export function runtime_suite(runes: boolean) {
-	return suite_with_variants<RuntimeTest, 'hydrate' | 'ssr' | 'dom', CompileOptions>(
-		['dom', 'hydrate', 'ssr'],
+	return suite_with_variants<RuntimeTest, 'hydrate' | 'ssr' | 'async-ssr' | 'dom', CompileOptions>(
+		['dom', 'hydrate', 'ssr', 'async-ssr'],
 		(variant, config, test_name) => {
 			if (!async_mode && (config.skip_no_async || test_name.startsWith('async-'))) {
 				return true;
@@ -162,6 +166,22 @@ export function runtime_suite(runes: boolean) {
 				if (config.skip_mode?.includes('server')) return true;
 			}
 
+			if (variant === 'async-ssr') {
+				if (!runes || !async_mode) return 'no-test';
+				if (
+					(config.mode && !config.mode.includes('async-server')) ||
+					(!config.test_ssr &&
+						config.html === undefined &&
+						config.ssrHtml === undefined &&
+						config.error === undefined &&
+						config.runtime_error === undefined &&
+						!config.mode?.includes('async-server'))
+				) {
+					return 'no-test';
+				}
+				if (config.skip_mode?.includes('async-server')) return true;
+			}
+
 			return false;
 		},
 		(config, cwd) => {
@@ -207,7 +227,7 @@ async function common_setup(cwd: string, runes: boolean | undefined, config: Run
 async function run_test_variant(
 	cwd: string,
 	config: RuntimeTest,
-	variant: 'dom' | 'hydrate' | 'ssr',
+	variant: 'dom' | 'hydrate' | 'ssr' | 'async-ssr',
 	compileOptions: CompileOptions,
 	runes: boolean
 ) {
@@ -310,20 +330,26 @@ async function run_test_variant(
 
 		let snapshot = undefined;
 
-		if (variant === 'hydrate' || variant === 'ssr') {
+		if (variant === 'hydrate' || variant === 'ssr' || variant === 'async-ssr') {
 			config.before_test?.();
 			// ssr into target
 			const SsrSvelteComponent = (await import(`${cwd}/_output/server/main.svelte.js`)).default;
-			const { html, head } = render(SsrSvelteComponent, {
+			const render_result = render(SsrSvelteComponent, {
 				props: config.server_props ?? config.props ?? {},
 				idPrefix: config.id_prefix
 			});
+			const rendered =
+				variant === 'async-ssr' || (variant === 'hydrate' && compileOptions.experimental?.async)
+					? await render_result
+					: render_result;
+			const { body, head } = rendered;
 
-			fs.writeFileSync(`${cwd}/_output/rendered.html`, html);
-			target.innerHTML = html;
+			const prefix = variant === 'async-ssr' ? 'async_' : '';
+			fs.writeFileSync(`${cwd}/_output/${prefix}rendered.html`, body);
+			target.innerHTML = body;
 
 			if (head) {
-				fs.writeFileSync(`${cwd}/_output/rendered_head.html`, head);
+				fs.writeFileSync(`${cwd}/_output/${prefix}rendered_head.html`, head);
 				window.document.head.innerHTML = window.document.head.innerHTML + head;
 			}
 
@@ -338,7 +364,7 @@ async function run_test_variant(
 			target.innerHTML = '';
 		}
 
-		if (variant === 'ssr') {
+		if (variant === 'ssr' || variant === 'async-ssr') {
 			if (config.ssrHtml) {
 				assert_html_equal_with_options(target.innerHTML, config.ssrHtml, {
 					preserveComments:
@@ -361,7 +387,8 @@ async function run_test_variant(
 						...assert,
 						htmlEqual: assert_html_equal,
 						htmlEqualWithOptions: assert_html_equal_with_options
-					}
+					},
+					variant
 				});
 			}
 		} else {
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-throws-sync/_config.js b/packages/svelte/tests/runtime-runes/samples/async-no-pending-throws-sync/_config.js
new file mode 100644
index 0000000000..366477d197
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-throws-sync/_config.js
@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['server'],
+
+	error: 'await_invalid'
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-throws-sync/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-no-pending-throws-sync/main.svelte
new file mode 100644
index 0000000000..4b8cd7203b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-throws-sync/main.svelte
@@ -0,0 +1 @@
+<p>{await Promise.resolve('hello')}</p>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending/_config.js b/packages/svelte/tests/runtime-runes/samples/async-no-pending/_config.js
new file mode 100644
index 0000000000..91b516e7c9
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending/_config.js
@@ -0,0 +1,17 @@
+import { tick } from 'svelte';
+import { ok, test } from '../../test';
+
+export default test({
+	skip_mode: ['server'],
+
+	ssrHtml: '<p>hello</p>',
+
+	html: '',
+
+	async test({ assert, target }) {
+		await tick();
+		const p = target.querySelector('p');
+		ok(p);
+		assert.htmlEqual(p.outerHTML, '<p>hello</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-no-pending/main.svelte
new file mode 100644
index 0000000000..4b8cd7203b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending/main.svelte
@@ -0,0 +1 @@
+<p>{await Promise.resolve('hello')}</p>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/A.svelte b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/A.svelte
new file mode 100644
index 0000000000..f73e368fc8
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/A.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+	import { onDestroy } from 'svelte';
+	import { destroyed } from './destroyed.js';
+	import C from './C.svelte';
+	onDestroy(() => destroyed.push('A'));
+</script>
+
+<div>A</div>
+<C/>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/B.svelte b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/B.svelte
new file mode 100644
index 0000000000..8b107601c4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/B.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+	import { onDestroy } from 'svelte';
+	import { destroyed } from './destroyed.js';
+
+	onDestroy(() => destroyed.push('B'));
+  onDestroy(() => destroyed.push('B*'))
+</script>
+
+<div>B</div>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/C.svelte b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/C.svelte
new file mode 100644
index 0000000000..8b616d6e94
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/C.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+	import { onDestroy } from 'svelte';
+	import { destroyed } from './destroyed.js';
+	onDestroy(() => destroyed.push('C'));
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/_config.js b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/_config.js
new file mode 100644
index 0000000000..32def88537
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/_config.js
@@ -0,0 +1,14 @@
+import { test } from '../../test';
+import { destroyed, reset } from './destroyed.js';
+
+export default test({
+	mode: ['async-server'],
+
+	before_test() {
+		reset();
+	},
+
+	test_ssr({ assert }) {
+		assert.deepEqual(destroyed, ['C', 'A', 'B', 'B*', 'root']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/destroyed.js b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/destroyed.js
new file mode 100644
index 0000000000..1afebed3bd
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/destroyed.js
@@ -0,0 +1,4 @@
+/** @type {string[]} */
+export const destroyed = [];
+
+export const reset = () => (destroyed.length = 0);
diff --git a/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/main.svelte
new file mode 100644
index 0000000000..8503a54681
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-ondestroy-ordering/main.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import { onDestroy } from 'svelte';
+	import { destroyed } from './destroyed.js';
+	import A from './A.svelte';
+	import B from './B.svelte';
+
+	onDestroy(() => destroyed.push('root'));
+</script>
+
+{#if await Promise.resolve(true)}
+	<A/>
+{/if}
+<B/>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-slot-let-error/_config.js b/packages/svelte/tests/runtime-runes/samples/snippet-slot-let-error/_config.js
index e8adfb38f2..4d892bd140 100644
--- a/packages/svelte/tests/runtime-runes/samples/snippet-slot-let-error/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/snippet-slot-let-error/_config.js
@@ -1,6 +1,7 @@
 import { test } from '../../test';
 
 export default test({
+	skip_mode: ['hydrate', 'server'],
 	compileOptions: {
 		dev: true
 	},
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-context-throws-after-await/_config.js b/packages/svelte/tests/server-side-rendering/samples/async-context-throws-after-await/_config.js
new file mode 100644
index 0000000000..a1b52a2df9
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-context-throws-after-await/_config.js
@@ -0,0 +1,6 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['async'],
+	error: 'lifecycle_outside_component'
+});
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-context-throws-after-await/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-context-throws-after-await/main.svelte
new file mode 100644
index 0000000000..8e770c214b
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-context-throws-after-await/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { setContext } from 'svelte';
+
+	await Promise.resolve('hi');
+
+	setContext('key', 'value');
+</script>
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-each-fallback-hoisting/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-each-fallback-hoisting/_expected.html
new file mode 100644
index 0000000000..bf0d87ab1b
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-each-fallback-hoisting/_expected.html
@@ -0,0 +1 @@
+4
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-each-fallback-hoisting/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-each-fallback-hoisting/main.svelte
new file mode 100644
index 0000000000..e580345a2e
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-each-fallback-hoisting/main.svelte
@@ -0,0 +1,5 @@
+{#each await Promise.resolve([]) as item}
+  {await Promise.reject('This should never be reached')}
+{:else}
+  {await Promise.resolve(4)}
+{/each}
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-each-hoisting/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-each-hoisting/_expected.html
new file mode 100644
index 0000000000..d800886d9c
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-each-hoisting/_expected.html
@@ -0,0 +1 @@
+123
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-each-hoisting/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-each-hoisting/main.svelte
new file mode 100644
index 0000000000..4b6bf7eadc
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-each-hoisting/main.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+  const first = Promise.resolve(1);
+  const second = Promise.resolve(2);
+  const third = Promise.resolve(3);
+</script>
+
+{#each await Promise.resolve([first, second, third]) as item}
+  {await item}
+{/each}
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/A.svelte b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/A.svelte
new file mode 100644
index 0000000000..5ddccbe17c
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/A.svelte
@@ -0,0 +1,9 @@
+<script>
+	let { promise } = $props();
+</script>
+
+<svelte:head>
+	{#if await promise}
+		<title>A</title>
+	{/if}
+</svelte:head>
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/B.svelte b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/B.svelte
new file mode 100644
index 0000000000..95b102e680
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/B.svelte
@@ -0,0 +1,7 @@
+<script>
+	let { promise } = $props();
+</script>
+
+<svelte:head>
+		<title>{(await promise) && 'B'}</title>
+</svelte:head>
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_config.js b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_config.js
new file mode 100644
index 0000000000..f47bee71df
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_config.js
@@ -0,0 +1,3 @@
+import { test } from '../../test';
+
+export default test({});
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_expected.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_expected_head.html b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_expected_head.html
new file mode 100644
index 0000000000..af5c5feba4
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/_expected_head.html
@@ -0,0 +1 @@
+<title>B</title>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/main.svelte
new file mode 100644
index 0000000000..9b49cf1c22
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-head-multiple-title-order-preserved/main.svelte
@@ -0,0 +1,27 @@
+<script>
+	import { tick } from 'svelte';
+	import A from './A.svelte';
+	import B from './B.svelte';
+
+	const main = Promise.withResolvers();
+	const a = Promise.withResolvers();
+	const b = Promise.withResolvers();
+
+	// regardless of resolution order, title should be the result of B, because it's the last-encountered
+	tick().then(() => {
+		main.resolve(true);
+		tick().then(() => {
+			b.resolve(true);
+		}).then(() => {
+			a.resolve(true);
+		});
+	})
+</script>
+
+<svelte:head>
+	{#if await main.promise}
+		<title>Main</title>
+	{/if}
+</svelte:head>
+<A promise={a.promise}/>
+<B promise={b.promise}/>
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-if-alternate-hoisting/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-if-alternate-hoisting/_expected.html
new file mode 100644
index 0000000000..c3b0e19566
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-if-alternate-hoisting/_expected.html
@@ -0,0 +1 @@
+yes yes yes
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-if-alternate-hoisting/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-if-alternate-hoisting/main.svelte
new file mode 100644
index 0000000000..a97f32f034
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-if-alternate-hoisting/main.svelte
@@ -0,0 +1,5 @@
+{#if await Promise.resolve(false)}
+  {await Promise.reject('no no no')}
+{:else}
+  {await Promise.resolve('yes yes yes')}
+{/if}
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-if-hoisting/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-if-hoisting/_expected.html
new file mode 100644
index 0000000000..c3b0e19566
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-if-hoisting/_expected.html
@@ -0,0 +1 @@
+yes yes yes
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-if-hoisting/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-if-hoisting/main.svelte
new file mode 100644
index 0000000000..4ca3462771
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-if-hoisting/main.svelte
@@ -0,0 +1,5 @@
+{#if await Promise.resolve(true)}
+  {await Promise.resolve('yes yes yes')}
+{:else}
+  {await Promise.reject('no no no')}
+{/if}
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-complex-value/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-complex-value/_expected.html
new file mode 100644
index 0000000000..f2fd8e71b9
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-complex-value/_expected.html
@@ -0,0 +1,3 @@
+<select>
+  <option selected>421</option>
+</select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-complex-value/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-complex-value/main.svelte
new file mode 100644
index 0000000000..2ad9b64509
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-complex-value/main.svelte
@@ -0,0 +1,3 @@
+<select value="421">
+  <option>{await Promise.resolve(42)}1</option>
+</select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-simple-value/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-simple-value/_expected.html
new file mode 100644
index 0000000000..f642109218
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-simple-value/_expected.html
@@ -0,0 +1,3 @@
+<select>
+  <option selected>42</option>
+</select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-simple-value/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-simple-value/main.svelte
new file mode 100644
index 0000000000..a5d91424cb
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-option-implicit-simple-value/main.svelte
@@ -0,0 +1,3 @@
+<select value={42}>
+  <option>{await Promise.resolve(42)}</option>
+</select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-select-value-component/Option.svelte b/packages/svelte/tests/server-side-rendering/samples/async-select-value-component/Option.svelte
new file mode 100644
index 0000000000..a17413bd8d
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-select-value-component/Option.svelte
@@ -0,0 +1,5 @@
+<script>
+	let props = $props();
+</script>
+
+<option {...props}>{@render props.children?.()}</option>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-select-value-component/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-select-value-component/_expected.html
new file mode 100644
index 0000000000..96d1d8b233
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-select-value-component/_expected.html
@@ -0,0 +1 @@
+<select><option value="">--Please choose an option--</option><option value="dog" selected>Dog</option><option value="cat">Cat</option></select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-select-value-component/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-select-value-component/main.svelte
new file mode 100644
index 0000000000..aaf10c2cb3
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-select-value-component/main.svelte
@@ -0,0 +1,8 @@
+<script lang="ts">
+	import Option from './Option.svelte';
+</script>
+<select value={await Promise.resolve('dog')}>
+	<Option value="">--Please choose an option--</Option>
+	<Option value={await Promise.resolve('dog')}>Dog</Option>
+	<Option value="cat">Cat</Option>
+</select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value-complex/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value-complex/_expected.html
new file mode 100644
index 0000000000..de7cba8837
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value-complex/_expected.html
@@ -0,0 +1 @@
+<select><option>--Please choose an option--</option><option selected>dog</option><option>cat</option></select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value-complex/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value-complex/main.svelte
new file mode 100644
index 0000000000..2cc4065eb6
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value-complex/main.svelte
@@ -0,0 +1,13 @@
+<select value={await Promise.resolve('dog')}>
+	<option>
+		{@render option("--Please choose an option--")}
+	</option>
+	<option>
+		{@render option(Promise.resolve('dog'))}
+	</option>
+	<option>
+		{@render option(Promise.resolve('cat'))}
+	</option>
+</select>
+
+{#snippet option(val)}{await val}{/snippet}
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value/_expected.html
new file mode 100644
index 0000000000..de7cba8837
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value/_expected.html
@@ -0,0 +1 @@
+<select><option>--Please choose an option--</option><option selected>dog</option><option>cat</option></select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value/main.svelte
new file mode 100644
index 0000000000..8d9393cf6c
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-select-value-implicit-value/main.svelte
@@ -0,0 +1,5 @@
+<select value={await Promise.resolve('dog')}>
+	<option>--Please choose an option--</option>
+	<option>{await Promise.resolve('dog')}</option>
+	<option>cat</option>
+</select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html b/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html
index 3eb11afc34..df372583b1 100644
--- a/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html
@@ -1 +1 @@
-<!--[--><p>before</p><!-- a comment --><p>after</p><!--]-->
+<!--[--><!--[--><p>before</p><!-- a comment --><p>after</p><!--]--><!--]-->
diff --git a/packages/svelte/tests/server-side-rendering/samples/context/Child.svelte b/packages/svelte/tests/server-side-rendering/samples/context/Child.svelte
new file mode 100644
index 0000000000..fab18ea195
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/context/Child.svelte
@@ -0,0 +1,8 @@
+<script>
+	import { setContext, getContext } from 'svelte';
+
+	setContext('key', 'child value');
+	await Promise.resolve();
+</script>
+
+<div>{getContext('key')}</div>
diff --git a/packages/svelte/tests/server-side-rendering/samples/context/_config.js b/packages/svelte/tests/server-side-rendering/samples/context/_config.js
new file mode 100644
index 0000000000..05de37a8bd
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/context/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['async']
+});
diff --git a/packages/svelte/tests/server-side-rendering/samples/context/_expected.html b/packages/svelte/tests/server-side-rendering/samples/context/_expected.html
new file mode 100644
index 0000000000..554133d8d9
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/context/_expected.html
@@ -0,0 +1,3 @@
+<div>value</div>
+<div>value</div>
+<div>child value</div>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/context/main.svelte b/packages/svelte/tests/server-side-rendering/samples/context/main.svelte
new file mode 100644
index 0000000000..fd75a6cbae
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/context/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	import { getContext, setContext } from 'svelte';
+	import Child from './Child.svelte';
+
+	setContext('key', 'value');
+	await Promise.resolve();
+</script>
+
+<div>{getContext('key')}</div>
+<div>{(await Promise.resolve(true)) && getContext('key')}</div>
+<Child />
diff --git a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
index 8fb1be347c..0919060246 100644
--- a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
@@ -1 +1 @@
-<!--[--><div>Just a dummy page.</div><!--]-->
+<!--[--><!--[--><div>Just a dummy page.</div><!--]--><!--]-->
diff --git a/packages/svelte/tests/server-side-rendering/samples/head-svelte-components-raw-content/_expected.html b/packages/svelte/tests/server-side-rendering/samples/head-svelte-components-raw-content/_expected.html
index 290179a702..8c9e75c033 100644
--- a/packages/svelte/tests/server-side-rendering/samples/head-svelte-components-raw-content/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/head-svelte-components-raw-content/_expected.html
@@ -1,4 +1,5 @@
 <!--[-->
+<!--[-->
 <!---->
 <title>lorem</title>
 <!---->
@@ -15,3 +16,4 @@
 </script>
 <!---->
 <!--]-->
+<!--]-->
diff --git a/packages/svelte/tests/server-side-rendering/samples/invalid-nested-svelte-element/_config.js b/packages/svelte/tests/server-side-rendering/samples/invalid-nested-svelte-element/_config.js
index 71edff6a68..6325ea7d0e 100644
--- a/packages/svelte/tests/server-side-rendering/samples/invalid-nested-svelte-element/_config.js
+++ b/packages/svelte/tests/server-side-rendering/samples/invalid-nested-svelte-element/_config.js
@@ -4,8 +4,6 @@ export default test({
 	compileOptions: {
 		dev: true
 	},
-
-	errors: [
+	error:
 		'node_invalid_placement_ssr: `<p>` (packages/svelte/tests/server-side-rendering/samples/invalid-nested-svelte-element/main.svelte:2:1) cannot be a child of `<p>` (packages/svelte/tests/server-side-rendering/samples/invalid-nested-svelte-element/main.svelte:1:0)\n\nThis can cause content to shift around as the browser repairs the HTML, and will likely result in a `hydration_mismatch` warning.'
-	]
 });
diff --git a/packages/svelte/tests/server-side-rendering/test.ts b/packages/svelte/tests/server-side-rendering/test.ts
index 3e57539427..7eede332a7 100644
--- a/packages/svelte/tests/server-side-rendering/test.ts
+++ b/packages/svelte/tests/server-side-rendering/test.ts
@@ -9,79 +9,133 @@ import { assert } from 'vitest';
 import { render } from 'svelte/server';
 import { compile_directory, should_update_expected, try_read_file } from '../helpers.js';
 import { assert_html_equal_with_options } from '../html_equal.js';
-import { suite, type BaseTest } from '../suite.js';
+import { suite_with_variants, type BaseTest } from '../suite.js';
 import type { CompileOptions } from '#compiler';
+import { seen } from '../../src/internal/server/dev.js';
 
 interface SSRTest extends BaseTest {
+	mode?: ('sync' | 'async')[];
 	compileOptions?: Partial<CompileOptions>;
+	load_compiled?: boolean;
 	props?: Record<string, any>;
 	id_prefix?: string;
 	withoutNormalizeHtml?: boolean;
-	errors?: string[];
+	error?: string;
 }
 
-// eslint-disable-next-line no-console
-let console_error = console.error;
+// TODO remove this shim when we can
+// @ts-expect-error
+Promise.withResolvers = () => {
+	let resolve;
+	let reject;
+
+	const promise = new Promise((f, r) => {
+		resolve = f;
+		reject = r;
+	});
+
+	return { promise, resolve, reject };
+};
+
+const { test, run } = suite_with_variants<SSRTest, 'sync' | 'async', CompileOptions>(
+	['sync', 'async'],
+	(variant, config, test_name) => {
+		if (config.mode && !config.mode.includes(variant)) {
+			return 'no-test';
+		}
 
-const { test, run } = suite<SSRTest>(async (config, test_dir) => {
-	await compile_directory(test_dir, 'server', config.compileOptions);
+		if (test_name.startsWith('async') && variant === 'sync') {
+			return 'no-test';
+		}
 
-	const errors: string[] = [];
+		return false;
+	},
+	async (config, test_dir) => {
+		const compile_options = {
+			experimental: {
+				async: true,
+				...config.compileOptions?.experimental
+			},
+			...config.compileOptions
+		};
+
+		if (!config.load_compiled) {
+			await compile_directory(test_dir, 'server', compile_options);
+		}
 
-	console.error = (...args) => {
-		errors.push(...args);
-	};
+		return compile_options;
+	},
+	async (config, test_dir, variant, compile_options) => {
+		const Component = (await import(`${test_dir}/_output/server/main.svelte.js`)).default;
+		const expected_html = try_read_file(`${test_dir}/_expected.html`);
+		const is_async = variant === 'async';
 
-	const Component = (await import(`${test_dir}/_output/server/main.svelte.js`)).default;
-	const expected_html = try_read_file(`${test_dir}/_expected.html`);
-	const rendered = render(Component, { props: config.props || {}, idPrefix: config.id_prefix });
-	const { body, head } = rendered;
+		seen?.clear();
+
+		let rendered;
+		try {
+			const render_result = render(Component, {
+				props: config.props || {},
+				idPrefix: config.id_prefix
+			});
+			rendered = is_async ? await render_result : render_result;
+		} catch (error) {
+			if (config.error) {
+				assert.deepEqual((error as Error).message, config.error);
+				return;
+			} else {
+				throw error;
+			}
+		}
 
-	fs.writeFileSync(`${test_dir}/_output/rendered.html`, body);
+		const { body, head } = rendered;
 
-	if (head) {
-		fs.writeFileSync(`${test_dir}/_output/rendered_head.html`, head);
-	}
+		fs.writeFileSync(
+			`${test_dir}/_output/${is_async ? 'async_rendered.html' : 'rendered.html'}`,
+			body
+		);
 
-	try {
-		assert_html_equal_with_options(body, expected_html || '', {
-			preserveComments: config.compileOptions?.preserveComments,
-			withoutNormalizeHtml: config.withoutNormalizeHtml
-		});
-	} catch (error: any) {
-		if (should_update_expected()) {
-			fs.writeFileSync(`${test_dir}/_expected.html`, body);
-			console.log(`Updated ${test_dir}/_expected.html.`);
-		} else {
-			error.message += '\n' + `${test_dir}/main.svelte`;
-			throw error;
+		if (head) {
+			fs.writeFileSync(
+				`${test_dir}/_output/${is_async ? 'async_rendered_head.html' : 'rendered_head.html'}`,
+				head
+			);
 		}
-	}
 
-	if (fs.existsSync(`${test_dir}/_expected_head.html`)) {
 		try {
-			assert_html_equal_with_options(
-				head,
-				fs.readFileSync(`${test_dir}/_expected_head.html`, 'utf-8'),
-				{}
-			);
+			assert_html_equal_with_options(body, expected_html || '', {
+				preserveComments: compile_options.preserveComments,
+				withoutNormalizeHtml: config.withoutNormalizeHtml
+			});
 		} catch (error: any) {
 			if (should_update_expected()) {
-				fs.writeFileSync(`${test_dir}/_expected_head.html`, head);
-				console.log(`Updated ${test_dir}/_expected_head.html.`);
-				error.message += '\n' + `${test_dir}/main.svelte`;
+				fs.writeFileSync(`${test_dir}/_expected.html`, body);
+				console.log(`Updated ${test_dir}/_expected.html.`);
 			} else {
+				error.message += '\n' + `${test_dir}/main.svelte`;
 				throw error;
 			}
 		}
-	}
 
-	if (errors.length > 0) {
-		assert.deepEqual(config.errors, errors);
+		if (fs.existsSync(`${test_dir}/_expected_head.html`)) {
+			try {
+				assert_html_equal_with_options(
+					head,
+					fs.readFileSync(`${test_dir}/_expected_head.html`, 'utf-8'),
+					{}
+				);
+			} catch (error: any) {
+				if (should_update_expected()) {
+					fs.writeFileSync(`${test_dir}/_expected_head.html`, head);
+					console.log(`Updated ${test_dir}/_expected_head.html.`);
+					error.message += '\n' + `${test_dir}/main.svelte`;
+				} else {
+					throw error;
+				}
+			}
+		}
 	}
-
-	console.error = console_error;
-});
+);
 
 export { test };
 
diff --git a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_config.js b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_config.js
new file mode 100644
index 0000000000..2e30bbeb16
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_config.js
@@ -0,0 +1,3 @@
+import { test } from '../../test';
+
+export default test({ compileOptions: { experimental: { async: true } } });
diff --git a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/client/index.svelte.js
new file mode 100644
index 0000000000..cf667e1624
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/client/index.svelte.js
@@ -0,0 +1,35 @@
+import 'svelte/internal/disclose-version';
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/client';
+
+export default function Async_each_fallback_hoisting($$anchor) {
+	var fragment = $.comment();
+	var node = $.first_child(fragment);
+
+	$.async(node, [() => Promise.resolve([])], (node, $$collection) => {
+		$.each(
+			node,
+			16,
+			() => $.get($$collection),
+			$.index,
+			($$anchor, item) => {
+				$.next();
+
+				var text = $.text();
+
+				$.template_effect(($0) => $.set_text(text, $0), void 0, [() => Promise.reject('This should never be reached')]);
+				$.append($$anchor, text);
+			},
+			($$anchor) => {
+				$.next();
+
+				var text_1 = $.text();
+
+				$.template_effect(($0) => $.set_text(text_1, $0), void 0, [() => Promise.resolve(4)]);
+				$.append($$anchor, text_1);
+			}
+		);
+	});
+
+	$.append($$anchor, fragment);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
new file mode 100644
index 0000000000..808818cc9e
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
@@ -0,0 +1,25 @@
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/server';
+
+export default function Async_each_fallback_hoisting($$payload) {
+	$$payload.child(async ($$payload) => {
+		const each_array = $.ensure_array_like(await Promise.resolve([]));
+
+		if (each_array.length !== 0) {
+			$$payload.push('<!--[-->');
+
+			for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
+				let item = each_array[$$index];
+
+				$$payload.push(`<!---->`);
+				$$payload.push(async () => $.escape(await Promise.reject('This should never be reached')));
+			}
+		} else {
+			$$payload.push('<!--[!-->');
+			$$payload.push(`<!---->`);
+			$$payload.push(async () => $.escape(await Promise.resolve(4)));
+		}
+	});
+
+	$$payload.push(`<!--]-->`);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/index.svelte b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/index.svelte
new file mode 100644
index 0000000000..e580345a2e
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/index.svelte
@@ -0,0 +1,5 @@
+{#each await Promise.resolve([]) as item}
+  {await Promise.reject('This should never be reached')}
+{:else}
+  {await Promise.resolve(4)}
+{/each}
diff --git a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_config.js b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_config.js
new file mode 100644
index 0000000000..2e30bbeb16
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_config.js
@@ -0,0 +1,3 @@
+import { test } from '../../test';
+
+export default test({ compileOptions: { experimental: { async: true } } });
diff --git a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/client/index.svelte.js
new file mode 100644
index 0000000000..a1535d6886
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/client/index.svelte.js
@@ -0,0 +1,24 @@
+import 'svelte/internal/disclose-version';
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/client';
+
+export default function Async_each_hoisting($$anchor) {
+	const first = Promise.resolve(1);
+	const second = Promise.resolve(2);
+	const third = Promise.resolve(3);
+	var fragment = $.comment();
+	var node = $.first_child(fragment);
+
+	$.async(node, [() => Promise.resolve([first, second, third])], (node, $$collection) => {
+		$.each(node, 17, () => $.get($$collection), $.index, ($$anchor, item) => {
+			$.next();
+
+			var text = $.text();
+
+			$.template_effect(($0) => $.set_text(text, $0), void 0, [() => $.get(item)]);
+			$.append($$anchor, text);
+		});
+	});
+
+	$.append($$anchor, fragment);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
new file mode 100644
index 0000000000..6c2f837954
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
@@ -0,0 +1,23 @@
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/server';
+
+export default function Async_each_hoisting($$payload) {
+	const first = Promise.resolve(1);
+	const second = Promise.resolve(2);
+	const third = Promise.resolve(3);
+
+	$$payload.push(`<!--[-->`);
+
+	$$payload.child(async ($$payload) => {
+		const each_array = $.ensure_array_like(await Promise.resolve([first, second, third]));
+
+		for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
+			let item = each_array[$$index];
+
+			$$payload.push(`<!---->`);
+			$$payload.push(async () => $.escape(await item));
+		}
+	});
+
+	$$payload.push(`<!--]-->`);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-each-hoisting/index.svelte b/packages/svelte/tests/snapshot/samples/async-each-hoisting/index.svelte
new file mode 100644
index 0000000000..4b6bf7eadc
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-each-hoisting/index.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+  const first = Promise.resolve(1);
+  const second = Promise.resolve(2);
+  const third = Promise.resolve(3);
+</script>
+
+{#each await Promise.resolve([first, second, third]) as item}
+  {await item}
+{/each}
diff --git a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_config.js b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_config.js
new file mode 100644
index 0000000000..2e30bbeb16
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_config.js
@@ -0,0 +1,3 @@
+import { test } from '../../test';
+
+export default test({ compileOptions: { experimental: { async: true } } });
diff --git a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/client/index.svelte.js
new file mode 100644
index 0000000000..e385f5d234
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/client/index.svelte.js
@@ -0,0 +1,30 @@
+import 'svelte/internal/disclose-version';
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/client';
+
+export default function Async_if_alternate_hoisting($$anchor) {
+	var fragment = $.comment();
+	var node = $.first_child(fragment);
+
+	$.async(node, [() => Promise.resolve(false)], (node, $$condition) => {
+		var consequent = ($$anchor) => {
+			var text = $.text();
+
+			$.template_effect(($0) => $.set_text(text, $0), void 0, [() => Promise.reject('no no no')]);
+			$.append($$anchor, text);
+		};
+
+		var alternate = ($$anchor) => {
+			var text_1 = $.text();
+
+			$.template_effect(($0) => $.set_text(text_1, $0), void 0, [() => Promise.resolve('yes yes yes')]);
+			$.append($$anchor, text_1);
+		};
+
+		$.if(node, ($$render) => {
+			if ($.get($$condition)) $$render(consequent); else $$render(alternate, false);
+		});
+	});
+
+	$.append($$anchor, fragment);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
new file mode 100644
index 0000000000..a645882a54
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
@@ -0,0 +1,16 @@
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/server';
+
+export default function Async_if_alternate_hoisting($$payload) {
+	$$payload.child(async ($$payload) => {
+		if (await Promise.resolve(false)) {
+			$$payload.push('<!--[-->');
+			$$payload.push(async () => $.escape(await Promise.reject('no no no')));
+		} else {
+			$$payload.push('<!--[!-->');
+			$$payload.push(async () => $.escape(await Promise.resolve('yes yes yes')));
+		}
+	});
+
+	$$payload.push(`<!--]-->`);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/index.svelte b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/index.svelte
new file mode 100644
index 0000000000..a97f32f034
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/index.svelte
@@ -0,0 +1,5 @@
+{#if await Promise.resolve(false)}
+  {await Promise.reject('no no no')}
+{:else}
+  {await Promise.resolve('yes yes yes')}
+{/if}
diff --git a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_config.js b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_config.js
new file mode 100644
index 0000000000..2e30bbeb16
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_config.js
@@ -0,0 +1,3 @@
+import { test } from '../../test';
+
+export default test({ compileOptions: { experimental: { async: true } } });
diff --git a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/client/index.svelte.js
new file mode 100644
index 0000000000..356e8e9607
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/client/index.svelte.js
@@ -0,0 +1,30 @@
+import 'svelte/internal/disclose-version';
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/client';
+
+export default function Async_if_hoisting($$anchor) {
+	var fragment = $.comment();
+	var node = $.first_child(fragment);
+
+	$.async(node, [() => Promise.resolve(true)], (node, $$condition) => {
+		var consequent = ($$anchor) => {
+			var text = $.text();
+
+			$.template_effect(($0) => $.set_text(text, $0), void 0, [() => Promise.resolve('yes yes yes')]);
+			$.append($$anchor, text);
+		};
+
+		var alternate = ($$anchor) => {
+			var text_1 = $.text();
+
+			$.template_effect(($0) => $.set_text(text_1, $0), void 0, [() => Promise.reject('no no no')]);
+			$.append($$anchor, text_1);
+		};
+
+		$.if(node, ($$render) => {
+			if ($.get($$condition)) $$render(consequent); else $$render(alternate, false);
+		});
+	});
+
+	$.append($$anchor, fragment);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
new file mode 100644
index 0000000000..1d75b5ad96
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
@@ -0,0 +1,16 @@
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/server';
+
+export default function Async_if_hoisting($$payload) {
+	$$payload.child(async ($$payload) => {
+		if (await Promise.resolve(true)) {
+			$$payload.push('<!--[-->');
+			$$payload.push(async () => $.escape(await Promise.resolve('yes yes yes')));
+		} else {
+			$$payload.push('<!--[!-->');
+			$$payload.push(async () => $.escape(await Promise.reject('no no no')));
+		}
+	});
+
+	$$payload.push(`<!--]-->`);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-if-hoisting/index.svelte b/packages/svelte/tests/snapshot/samples/async-if-hoisting/index.svelte
new file mode 100644
index 0000000000..4ca3462771
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-if-hoisting/index.svelte
@@ -0,0 +1,5 @@
+{#if await Promise.resolve(true)}
+  {await Promise.resolve('yes yes yes')}
+{:else}
+  {await Promise.reject('no no no')}
+{/if}
diff --git a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
index cc2628c852..c0e3512178 100644
--- a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
@@ -8,7 +8,7 @@ export default function Await_block_scope($$payload) {
 		counter.count += 1;
 	}
 
-	$$payload.out.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
+	$$payload.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
 	$.await($$payload, promise, () => {}, (counter) => {});
-	$$payload.out.push(`<!--]--> ${$.escape(counter.count)}`);
+	$$payload.push(`<!--]--> ${$.escape(counter.count)}`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
index c0db7d2fd5..f2b687489b 100644
--- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
@@ -2,7 +2,7 @@ import * as $ from 'svelte/internal/server';
 import TextInput from './Child.svelte';
 
 function snippet($$payload) {
-	$$payload.out.push(`<!---->Something`);
+	$$payload.push(`<!---->Something`);
 }
 
 export default function Bind_component_snippet($$payload) {
@@ -23,14 +23,14 @@ export default function Bind_component_snippet($$payload) {
 			}
 		});
 
-		$$payload.out.push(`<!----> value: ${$.escape(value)}`);
+		$$payload.push(`<!----> value: ${$.escape(value)}`);
 	}
 
 	do {
 		$$settled = true;
-		$$inner_payload = $.copy_payload($$payload);
+		$$inner_payload = $$payload.copy();
 		$$render_inner($$inner_payload);
 	} while (!$$settled);
 
-	$.assign_payload($$payload, $$inner_payload);
+	$$payload.subsume($$inner_payload);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
index abfc264fea..e426a08989 100644
--- a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
@@ -1,38 +1,36 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Class_state_field_constructor_assignment($$payload, $$props) {
-	$.push();
-
-	class Foo {
-		a = 0;
-		#b;
-		#foo = $.derived(() => ({ bar: this.a * 2 }));
-
-		get foo() {
-			return this.#foo();
-		}
-
-		set foo($$value) {
-			return this.#foo($$value);
-		}
-
-		#bar = $.derived(() => ({ baz: this.foo }));
-
-		get bar() {
-			return this.#bar();
-		}
-
-		set bar($$value) {
-			return this.#bar($$value);
+	$$payload.component(($$payload) => {
+		class Foo {
+			a = 0;
+			#b;
+			#foo = $.derived(() => ({ bar: this.a * 2 }));
+
+			get foo() {
+				return this.#foo();
+			}
+
+			set foo($$value) {
+				return this.#foo($$value);
+			}
+
+			#bar = $.derived(() => ({ baz: this.foo }));
+
+			get bar() {
+				return this.#bar();
+			}
+
+			set bar($$value) {
+				return this.#bar($$value);
+			}
+
+			constructor() {
+				this.a = 1;
+				this.#b = 2;
+				this.foo.bar = 3;
+				this.bar = 4;
+			}
 		}
-
-		constructor() {
-			this.a = 1;
-			this.#b = 2;
-			this.foo.bar = 3;
-			this.bar = 4;
-		}
-	}
-
-	$.pop();
+	});
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
index ac3dfcd2cb..a17c437cd9 100644
--- a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
@@ -1,13 +1,13 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Delegated_locally_declared_shadowed($$payload) {
-	const each_array = $.ensure_array_like({ length: 1 });
+	$$payload.push(`<!--[-->`);
 
-	$$payload.out.push(`<!--[-->`);
+	const each_array = $.ensure_array_like({ length: 1 });
 
 	for (let index = 0, $$length = each_array.length; index < $$length; index++) {
-		$$payload.out.push(`<button type="button"${$.attr('data-index', index)}>B</button>`);
+		$$payload.push(`<button type="button"${$.attr('data-index', index)}>B</button>`);
 	}
 
-	$$payload.out.push(`<!--]-->`);
+	$$payload.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
index 9c837d4e1d..deaeaf6bfa 100644
--- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
@@ -6,5 +6,5 @@ export default function Main($$payload) {
 
 	let y = () => 'test';
 
-	$$payload.out.push(`<div${$.attr('foobar', x)}></div> <svg${$.attr('viewBox', x)}></svg> <custom-element${$.attr('foobar', x)}></custom-element> <div${$.attr('foobar', y())}></div> <svg${$.attr('viewBox', y())}></svg> <custom-element${$.attr('foobar', y())}></custom-element>`);
+	$$payload.push(`<div${$.attr('foobar', x)}></div> <svg${$.attr('viewBox', x)}></svg> <custom-element${$.attr('foobar', x)}></custom-element> <div${$.attr('foobar', y())}></div> <svg${$.attr('viewBox', y())}></svg> <custom-element${$.attr('foobar', y())}></custom-element>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
index 8fa0c5f28c..abec4f42fa 100644
--- a/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
@@ -1,13 +1,13 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Each_index_non_null($$payload) {
-	const each_array = $.ensure_array_like(Array(10));
+	$$payload.push(`<!--[-->`);
 
-	$$payload.out.push(`<!--[-->`);
+	const each_array = $.ensure_array_like(Array(10));
 
 	for (let i = 0, $$length = each_array.length; i < $$length; i++) {
-		$$payload.out.push(`<p>index: ${$.escape(i)}</p>`);
+		$$payload.push(`<p>index: ${$.escape(i)}</p>`);
 	}
 
-	$$payload.out.push(`<!--]-->`);
+	$$payload.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
index 6dbe8130da..fda6e5fbb3 100644
--- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
@@ -1,15 +1,15 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Each_string_template($$payload) {
-	const each_array = $.ensure_array_like(['foo', 'bar', 'baz']);
+	$$payload.push(`<!--[-->`);
 
-	$$payload.out.push(`<!--[-->`);
+	const each_array = $.ensure_array_like(['foo', 'bar', 'baz']);
 
 	for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
 		let thing = each_array[$$index];
 
-		$$payload.out.push(`<!---->${$.escape(thing)}, `);
+		$$payload.push(`<!---->${$.escape(thing)}, `);
 	}
 
-	$$payload.out.push(`<!--]-->`);
+	$$payload.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
index ce4f09ed1d..a9fa4efd50 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
@@ -15,7 +15,7 @@ export default function Function_prop_no_getter($$payload) {
 		onmouseenter: () => count = plusOne(count),
 
 		children: ($$payload) => {
-			$$payload.out.push(`<!---->clicks: ${$.escape(count)}`);
+			$$payload.push(`<!---->clicks: ${$.escape(count)}`);
 		},
 
 		$$slots: { default: true }
diff --git a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
index b1a0a5f9e6..e23a50cff5 100644
--- a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Functional_templating($$payload) {
-	$$payload.out.push(`<h1>hello</h1> <div class="potato"><p>child element</p> <p>another child element</p></div>`);
+	$$payload.push(`<h1>hello</h1> <div class="potato"><p>child element</p> <p>another child element</p></div>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
index 30f6d6b74a..6bdf5b4495 100644
--- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Hello_world($$payload) {
-	$$payload.out.push(`<h1>hello world</h1>`);
+	$$payload.push(`<h1>hello world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
index ea1d12c83b..99813a32b1 100644
--- a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Hmr($$payload) {
-	$$payload.out.push(`<h1>hello world</h1>`);
+	$$payload.push(`<h1>hello world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
index 18e01b4f72..f096ddd3ba 100644
--- a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
@@ -4,5 +4,5 @@ export default function Nullish_coallescence_omittance($$payload) {
 	let name = 'world';
 	let count = 0;
 
-	$$payload.out.push(`<h1>Hello, world!</h1> <b>123</b> <button>Count is ${$.escape(count)}</button> <h1>Hello, world</h1>`);
+	$$payload.push(`<h1>Hello, world!</h1> <b>123</b> <button>Count is ${$.escape(count)}</button> <h1>Hello, world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
index 33a3633939..7871172433 100644
--- a/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
@@ -1,16 +1,15 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Props_identifier($$payload, $$props) {
-	$.push();
+	$$payload.component(($$payload) => {
+		let { $$slots, $$events, ...props } = $$props;
 
-	let { $$slots, $$events, ...props } = $$props;
-
-	props.a;
-	props[a];
-	props.a.b;
-	props.a.b = true;
-	props.a = true;
-	props[a] = true;
-	props;
-	$.pop();
+		props.a;
+		props[a];
+		props.a.b;
+		props.a.b = true;
+		props.a = true;
+		props[a] = true;
+		props;
+	});
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
index 29b0d0d594..b19e3aac52 100644
--- a/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Purity($$payload) {
-	$$payload.out.push(`<p>0</p> <p>${$.escape(location.href)}</p> `);
+	$$payload.push(`<p>0</p> <p>${$.escape(location.href)}</p> `);
 	Child($$payload, { prop: encodeURIComponent('hello') });
-	$$payload.out.push(`<!---->`);
+	$$payload.push(`<!---->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
index bad475ec86..e49480f682 100644
--- a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
@@ -3,5 +3,5 @@ import * as $ from 'svelte/internal/server';
 export default function Skip_static_subtree($$payload, $$props) {
 	let { title, content } = $$props;
 
-	$$payload.out.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected($$payload, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
+	$$payload.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected($$payload, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
index c2736b0f43..2c66dc5759 100644
--- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
@@ -11,5 +11,5 @@ export default function State_proxy_literal($$payload) {
 		tpl = ``;
 	}
 
-	$$payload.out.push(`<input${$.attr('value', str)}/> <input${$.attr('value', tpl)}/> <button>reset</button>`);
+	$$payload.push(`<input${$.attr('value', str)}/> <input${$.attr('value', tpl)}/> <button>reset</button>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
index f7dc586026..1ed2b812db 100644
--- a/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
@@ -12,5 +12,5 @@ export default function Text_nodes_deriveds($$payload) {
 		return count2;
 	}
 
-	$$payload.out.push(`<p>${$.escape(text1())}${$.escape(text2())}</p>`);
+	$$payload.push(`<p>${$.escape(text1())}${$.escape(text2())}</p>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 9888de59b2..2c015b5a10 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -2493,7 +2493,7 @@ declare module 'svelte/server' {
 					}
 				]
 	): RenderOutput;
-	interface RenderOutput {
+	interface SyncRenderOutput {
 		/** HTML that goes into the `<head>` */
 		head: string;
 		/** @deprecated use `body` instead */
@@ -2502,6 +2502,8 @@ declare module 'svelte/server' {
 		body: string;
 	}
 
+	type RenderOutput = SyncRenderOutput & PromiseLike<SyncRenderOutput>;
+
 	export {};
 }
 
diff --git a/playgrounds/sandbox/package.json b/playgrounds/sandbox/package.json
index 8100084832..a5a28879e0 100644
--- a/playgrounds/sandbox/package.json
+++ b/playgrounds/sandbox/package.json
@@ -12,7 +12,8 @@
     "preview": "vite preview",
     "download": "node scripts/download.js",
     "hash": "node scripts/hash.js",
-    "create-test": "node scripts/create-test.js"
+    "create-test": "node scripts/create-test.js",
+    "start": "node run.js"
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",

From eaf4d40f5135e7c05068c4d4ea4a98b4552840a1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 17:54:19 -0400
Subject: [PATCH 22/68] Version Packages (#16774)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/forty-insects-cheat.md |  5 -----
 .changeset/pink-gifts-sell.md     |  5 -----
 packages/svelte/CHANGELOG.md      | 10 ++++++++++
 packages/svelte/package.json      |  2 +-
 packages/svelte/src/version.js    |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/forty-insects-cheat.md
 delete mode 100644 .changeset/pink-gifts-sell.md

diff --git a/.changeset/forty-insects-cheat.md b/.changeset/forty-insects-cheat.md
deleted file mode 100644
index 993a8fdb24..0000000000
--- a/.changeset/forty-insects-cheat.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': minor
----
-
-feat: experimental async SSR
diff --git a/.changeset/pink-gifts-sell.md b/.changeset/pink-gifts-sell.md
deleted file mode 100644
index f3f91ff7d9..0000000000
--- a/.changeset/pink-gifts-sell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: correctly SSR hidden="until-found"
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 62f109c82f..57ee2565c4 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.39.0
+
+### Minor Changes
+
+- feat: experimental async SSR ([#16748](https://github.com/sveltejs/svelte/pull/16748))
+
+### Patch Changes
+
+- fix: correctly SSR hidden="until-found" ([#16773](https://github.com/sveltejs/svelte/pull/16773))
+
 ## 5.38.10
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 6c91ec6bbb..24e9aa27e8 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.38.10",
+  "version": "5.39.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 9bfa7a5421..5b682ef1d3 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.38.10';
+export const VERSION = '5.39.0';
 export const PUBLIC_VERSION = '5';

From 037314a4c0017dd2ed4262c1a8218fa0935046e0 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 17 Sep 2025 18:05:31 -0400
Subject: [PATCH 23/68] chore: remove actions-permissions monitor (#16745)

---
 .github/workflows/ecosystem-ci-trigger.yml | 1 -
 .github/workflows/pkg.pr.new-comment.yml   | 1 -
 .github/workflows/release.yml              | 1 -
 3 files changed, 3 deletions(-)

diff --git a/.github/workflows/ecosystem-ci-trigger.yml b/.github/workflows/ecosystem-ci-trigger.yml
index 9be1f00104..7753b606e1 100644
--- a/.github/workflows/ecosystem-ci-trigger.yml
+++ b/.github/workflows/ecosystem-ci-trigger.yml
@@ -15,7 +15,6 @@ jobs:
       contents: read # to clone the repo
     steps:
       - name: monitor action permissions
-        uses: GitHubSecurityLab/actions-permissions/monitor@v1
       - name: check user authorization # user needs triage permission
         uses: actions/github-script@v7
         id: check-permissions
diff --git a/.github/workflows/pkg.pr.new-comment.yml b/.github/workflows/pkg.pr.new-comment.yml
index 3f1fca5a0b..8bf13bb8f1 100644
--- a/.github/workflows/pkg.pr.new-comment.yml
+++ b/.github/workflows/pkg.pr.new-comment.yml
@@ -14,7 +14,6 @@ jobs:
     name: 'Update comment'
     runs-on: ubuntu-latest
     steps:
-      - uses: GitHubSecurityLab/actions-permissions/monitor@v1
       - name: Download artifact
         uses: actions/download-artifact@v4
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f9d683a2ae..b78346d883 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,6 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - uses: GitHubSecurityLab/actions-permissions/monitor@v1
       - name: Checkout Repo
         uses: actions/checkout@v4
         with:

From fc35d9fab8440a90c57368103f4a5e0bbd215381 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 17 Sep 2025 19:21:23 -0400
Subject: [PATCH 24/68] fix: add `then` to class component `render` output
 (#16783)

* fix: add `then` to class component `render` output

* drive-by tidy up

* fix types
---
 .changeset/sixty-crabs-laugh.md              |  5 ++
 packages/svelte/src/internal/server/index.js |  8 +--
 packages/svelte/src/legacy/legacy-server.js  | 57 +++++++++++++++++---
 3 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/sixty-crabs-laugh.md

diff --git a/.changeset/sixty-crabs-laugh.md b/.changeset/sixty-crabs-laugh.md
new file mode 100644
index 0000000000..1780ddc166
--- /dev/null
+++ b/.changeset/sixty-crabs-laugh.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: add `then` to class component `render` output
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index a2cf222da6..13a0706549 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -1,5 +1,5 @@
 /** @import { ComponentType, SvelteComponent, Component } from 'svelte' */
-/** @import { RenderOutput, SSRContext } from '#server' */
+/** @import { RenderOutput } from '#server' */
 /** @import { Store } from '#shared' */
 /** @import { AccumulatedContent } from './payload.js' */
 export { FILENAME, HMR } from '../../constants.js';
@@ -14,14 +14,10 @@ import {
 } from '../../constants.js';
 import { escape_html } from '../../escaping.js';
 import { DEV } from 'esm-env';
-import { ssr_context, pop, push, set_ssr_context } from './context.js';
 import { EMPTY_COMMENT, BLOCK_CLOSE, BLOCK_OPEN, BLOCK_OPEN_ELSE } from './hydration.js';
 import { validate_store } from '../shared/validate.js';
 import { is_boolean_attribute, is_raw_text_element, is_void } from '../../utils.js';
-import { Payload, SSRState } from './payload.js';
-import { abort } from './abort-signal.js';
-import { async_mode_flag } from '../flags/index.js';
-import * as e from './errors.js';
+import { Payload } from './payload.js';
 
 // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
 // https://infra.spec.whatwg.org/#noncharacter
diff --git a/packages/svelte/src/legacy/legacy-server.js b/packages/svelte/src/legacy/legacy-server.js
index 92f8757d7a..b7d3e673bc 100644
--- a/packages/svelte/src/legacy/legacy-server.js
+++ b/packages/svelte/src/legacy/legacy-server.js
@@ -1,11 +1,15 @@
 /** @import { SvelteComponent } from '../index.js' */
 import { asClassComponent as as_class_component, createClassComponent } from './legacy-client.js';
 import { render } from '../internal/server/index.js';
+import { async_mode_flag } from '../internal/flags/index.js';
+import * as w from '../internal/server/warnings.js';
 
 // By having this as a separate entry point for server environments, we save the client bundle from having to include the server runtime
 
 export { createClassComponent };
 
+/** @typedef {{ head: string, html: string, css: { code: string, map: null }}} LegacyRenderResult */
+
 /**
  * Takes a Svelte 5 component and returns a Svelte 4 compatible component constructor.
  *
@@ -21,15 +25,56 @@ export { createClassComponent };
  */
 export function asClassComponent(component) {
 	const component_constructor = as_class_component(component);
-	/** @type {(props?: {}, opts?: { $$slots?: {}; context?: Map<any, any>; }) => { html: any; css: { code: string; map: any; }; head: string; } } */
+	/** @type {(props?: {}, opts?: { $$slots?: {}; context?: Map<any, any>; }) => LegacyRenderResult & PromiseLike<LegacyRenderResult> } */
 	const _render = (props, { context } = {}) => {
 		// @ts-expect-error the typings are off, but this will work if the component is compiled in SSR mode
 		const result = render(component, { props, context });
-		return {
-			css: { code: '', map: null },
-			head: result.head,
-			html: result.body
-		};
+
+		const munged = Object.defineProperties(
+			/** @type {LegacyRenderResult & PromiseLike<LegacyRenderResult>} */ ({}),
+			{
+				css: {
+					value: { code: '', map: null }
+				},
+				head: {
+					get: () => result.head
+				},
+				html: {
+					get: () => result.body
+				},
+				then: {
+					/**
+					 * this is not type-safe, but honestly it's the best I can do right now, and it's a straightforward function.
+					 *
+					 * @template TResult1
+					 * @template [TResult2=never]
+					 * @param { (value: LegacyRenderResult) => TResult1 } onfulfilled
+					 * @param { (reason: unknown) => TResult2 } onrejected
+					 */
+					value: (onfulfilled, onrejected) => {
+						if (!async_mode_flag) {
+							w.experimental_async_ssr();
+							const user_result = onfulfilled({
+								css: munged.css,
+								head: munged.head,
+								html: munged.html
+							});
+							return Promise.resolve(user_result);
+						}
+
+						return result.then((result) => {
+							return onfulfilled({
+								css: munged.css,
+								head: result.head,
+								html: result.body
+							});
+						}, onrejected);
+					}
+				}
+			}
+		);
+
+		return munged;
 	};
 
 	// @ts-expect-error this is present for SSR

From 6798efacb2045356e5630b1a6dffcf6ab5a1161d Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Wed, 17 Sep 2025 17:30:23 -0600
Subject: [PATCH 25/68] chore: Rename Payload to Renderer (#16786)

---
 .../3-transform/server/transform-server.js    |  22 +-
 .../3-transform/server/visitors/AwaitBlock.js |   6 +-
 .../3-transform/server/visitors/EachBlock.js  |   8 +-
 .../3-transform/server/visitors/IfBlock.js    |   8 +-
 .../server/visitors/RegularElement.js         |  16 +-
 .../3-transform/server/visitors/RenderTag.js  |   2 +-
 .../server/visitors/SlotElement.js            |   6 +-
 .../server/visitors/SnippetBlock.js           |   4 +-
 .../server/visitors/SvelteBoundary.js         |   2 +-
 .../server/visitors/SvelteElement.js          |   4 +-
 .../3-transform/server/visitors/SvelteHead.js |   2 +-
 .../server/visitors/TitleElement.js           |   2 +-
 .../server/visitors/shared/component.js       |  10 +-
 .../server/visitors/shared/element.js         |   6 +-
 .../server/visitors/shared/utils.js           |  12 +-
 packages/svelte/src/index-server.js           |   4 +-
 .../src/internal/server/blocks/snippet.js     |   6 +-
 packages/svelte/src/internal/server/dev.js    |  28 +--
 packages/svelte/src/internal/server/index.js  | 134 +++++-----
 .../server/{payload.js => renderer.js}        | 172 ++++++-------
 .../{payload.test.ts => renderer.test.ts}     | 238 +++++++++---------
 .../svelte/src/internal/server/types.d.ts     |   6 +-
 .../_expected/server/index.svelte.js          |  18 +-
 .../_expected/server/index.svelte.js          |  12 +-
 .../_expected/server/index.svelte.js          |  14 +-
 .../_expected/server/index.svelte.js          |  14 +-
 .../_expected/server/index.svelte.js          |   8 +-
 .../_expected/server/index.svelte.js          |  20 +-
 .../_expected/server/index.svelte.js          |   4 +-
 .../_expected/server/index.svelte.js          |   4 +-
 .../_expected/server/index.svelte.js          |   8 +-
 .../_expected/server/main.svelte.js           |   4 +-
 .../_expected/server/index.svelte.js          |   8 +-
 .../_expected/server/index.svelte.js          |   8 +-
 .../_expected/server/index.svelte.js          |   8 +-
 .../_expected/server/index.svelte.js          |   4 +-
 .../_expected/server/index.svelte.js          |   4 +-
 .../hmr/_expected/server/index.svelte.js      |   4 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   4 +-
 .../_expected/server/index.svelte.js          |   4 +-
 .../purity/_expected/server/index.svelte.js   |   8 +-
 .../_expected/server/index.svelte.js          |   4 +-
 .../_expected/server/index.svelte.js          |   4 +-
 .../_expected/server/index.svelte.js          |   4 +-
 .../_expected/server/index.svelte.js          |   4 +-
 46 files changed, 438 insertions(+), 436 deletions(-)
 rename packages/svelte/src/internal/server/{payload.js => renderer.js} (70%)
 rename packages/svelte/src/internal/server/{payload.test.ts => renderer.test.ts} (52%)

diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index 4486c6e7a3..4a1ba17238 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -40,7 +40,7 @@ import { TitleElement } from './visitors/TitleElement.js';
 import { UpdateExpression } from './visitors/UpdateExpression.js';
 import { VariableDeclaration } from './visitors/VariableDeclaration.js';
 import { SvelteBoundary } from './visitors/SvelteBoundary.js';
-import { call_child_payload, call_component_payload } from './visitors/shared/utils.js';
+import { call_child_renderer, call_component_renderer } from './visitors/shared/utils.js';
 
 /** @type {Visitors} */
 const global_visitors = {
@@ -188,21 +188,21 @@ export function server_component(analysis, options) {
 		template.body = [
 			...snippets,
 			b.let('$$settled', b.true),
-			b.let('$$inner_payload'),
+			b.let('$$inner_renderer'),
 			b.function_declaration(
 				b.id('$$render_inner'),
-				[b.id('$$payload')],
+				[b.id(' $$renderer')],
 				b.block(/** @type {Statement[]} */ (rest))
 			),
 			b.do_while(
 				b.unary('!', b.id('$$settled')),
 				b.block([
 					b.stmt(b.assignment('=', b.id('$$settled'), b.true)),
-					b.stmt(b.assignment('=', b.id('$$inner_payload'), b.call('$$payload.copy'))),
-					b.stmt(b.call('$$render_inner', b.id('$$inner_payload')))
+					b.stmt(b.assignment('=', b.id('$$inner_renderer'), b.call(' $$renderer.copy'))),
+					b.stmt(b.call('$$render_inner', b.id('$$inner_renderer')))
 				])
 			),
-			b.stmt(b.call('$$payload.subsume', b.id('$$inner_payload')))
+			b.stmt(b.call(' $$renderer.subsume', b.id('$$inner_renderer')))
 		];
 	}
 
@@ -244,7 +244,7 @@ export function server_component(analysis, options) {
 	]);
 
 	if (analysis.instance.has_await) {
-		component_block = b.block([call_child_payload(component_block, true)]);
+		component_block = b.block([call_child_renderer(component_block, true)]);
 	}
 
 	// trick esrap into including comments
@@ -253,7 +253,7 @@ export function server_component(analysis, options) {
 	if (analysis.props_id) {
 		// need to be placed on first line of the component for hydration
 		component_block.body.unshift(
-			b.const(analysis.props_id, b.call('$.props_id', b.id('$$payload')))
+			b.const(analysis.props_id, b.call('$.props_id', b.id(' $$renderer')))
 		);
 	}
 
@@ -261,7 +261,7 @@ export function server_component(analysis, options) {
 
 	if (should_inject_context) {
 		component_block = b.block([
-			call_component_payload(component_block, dev && b.id(component_name))
+			call_component_renderer(component_block, dev && b.id(component_name))
 		]);
 	}
 
@@ -301,7 +301,7 @@ export function server_component(analysis, options) {
 		const code = b.literal(render_stylesheet(analysis.source, analysis, options).code);
 
 		body.push(b.const('$$css', b.object([b.init('hash', hash), b.init('code', code)])));
-		component_block.body.unshift(b.stmt(b.call('$$payload.global.css.add', b.id('$$css'))));
+		component_block.body.unshift(b.stmt(b.call(' $$renderer.global.css.add', b.id('$$css'))));
 	}
 
 	let should_inject_props =
@@ -315,7 +315,7 @@ export function server_component(analysis, options) {
 
 	const component_function = b.function_declaration(
 		b.id(analysis.name),
-		should_inject_props ? [b.id('$$payload'), b.id('$$props')] : [b.id('$$payload')],
+		should_inject_props ? [b.id(' $$renderer'), b.id('$$props')] : [b.id(' $$renderer')],
 		component_block
 	);
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
index ea60c95f68..1de64c62f5 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
@@ -2,7 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
-import { block_close, call_child_payload } from './shared/utils.js';
+import { block_close, call_child_renderer } from './shared/utils.js';
 
 /**
  * @param {AST.AwaitBlock} node
@@ -13,7 +13,7 @@ export function AwaitBlock(node, context) {
 	let statement = b.stmt(
 		b.call(
 			'$.await',
-			b.id('$$payload'),
+			b.id(' $$renderer'),
 			/** @type {Expression} */ (context.visit(node.expression)),
 			b.thunk(
 				node.pending ? /** @type {BlockStatement} */ (context.visit(node.pending)) : b.block([])
@@ -26,7 +26,7 @@ export function AwaitBlock(node, context) {
 	);
 
 	if (node.metadata.expression.has_await) {
-		statement = call_child_payload(b.block([statement]), true);
+		statement = call_child_renderer(b.block([statement]), true);
 	}
 
 	context.state.template.push(statement, block_close);
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
index eb0da55657..dc7cf3e73a 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
@@ -2,7 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
-import { block_close, block_open, block_open_else, call_child_payload } from './shared/utils.js';
+import { block_close, block_open, block_open_else, call_child_renderer } from './shared/utils.js';
 
 /**
  * @param {AST.EachBlock} node
@@ -45,11 +45,11 @@ export function EachBlock(node, context) {
 	);
 
 	if (node.fallback) {
-		const open = b.stmt(b.call(b.id('$$payload.push'), block_open));
+		const open = b.stmt(b.call(b.id(' $$renderer.push'), block_open));
 
 		const fallback = /** @type {BlockStatement} */ (context.visit(node.fallback));
 
-		fallback.body.unshift(b.stmt(b.call(b.id('$$payload.push'), block_open_else)));
+		fallback.body.unshift(b.stmt(b.call(b.id(' $$renderer.push'), block_open_else)));
 
 		block.body.push(
 			b.if(
@@ -64,7 +64,7 @@ export function EachBlock(node, context) {
 	}
 
 	if (node.metadata.expression.has_await) {
-		state.template.push(call_child_payload(block, true), block_close);
+		state.template.push(call_child_renderer(block, true), block_close);
 	} else {
 		state.template.push(...block.body, block_close);
 	}
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
index 37d4585900..d16f13092b 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
@@ -2,7 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
-import { block_close, block_open, block_open_else, call_child_payload } from './shared/utils.js';
+import { block_close, block_open, block_open_else, call_child_renderer } from './shared/utils.js';
 
 /**
  * @param {AST.IfBlock} node
@@ -16,15 +16,15 @@ export function IfBlock(node, context) {
 		? /** @type {BlockStatement} */ (context.visit(node.alternate))
 		: b.block([]);
 
-	consequent.body.unshift(b.stmt(b.call(b.id('$$payload.push'), block_open)));
+	consequent.body.unshift(b.stmt(b.call(b.id(' $$renderer.push'), block_open)));
 
-	alternate.body.unshift(b.stmt(b.call(b.id('$$payload.push'), block_open_else)));
+	alternate.body.unshift(b.stmt(b.call(b.id(' $$renderer.push'), block_open_else)));
 
 	/** @type {Statement} */
 	let statement = b.if(test, consequent, alternate);
 
 	if (node.metadata.expression.has_await) {
-		statement = call_child_payload(b.block([statement]), true);
+		statement = call_child_renderer(b.block([statement]), true);
 	}
 
 	context.state.template.push(statement, block_close);
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
index 29aad94a31..52e06612c7 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
@@ -12,7 +12,7 @@ import {
 	process_children,
 	build_template,
 	build_attribute_value,
-	call_child_payload
+	call_child_renderer
 } from './shared/utils.js';
 
 /**
@@ -68,7 +68,7 @@ export function RegularElement(node, context) {
 			b.stmt(
 				b.call(
 					'$.push_element',
-					b.id('$$payload'),
+					b.id(' $$renderer'),
 					b.literal(node.name),
 					b.literal(location.line),
 					b.literal(location.column)
@@ -97,7 +97,7 @@ export function RegularElement(node, context) {
 				b.stmt(
 					b.assignment(
 						'=',
-						b.id('$$payload.local.select_value'),
+						b.id(' $$renderer.local.select_value'),
 						b.member(
 							build_spread_object(
 								node,
@@ -125,7 +125,7 @@ export function RegularElement(node, context) {
 				);
 			}
 
-			const left = b.id('$$payload.local.select_value');
+			const left = b.id(' $$renderer.local.select_value');
 			if (value.type === 'Attribute') {
 				state.template.push(
 					b.stmt(b.assignment('=', left, build_attribute_value(value.value, context)))
@@ -160,7 +160,7 @@ export function RegularElement(node, context) {
 				b.stmt(
 					b.call(
 						'$.simple_valueless_option',
-						b.id('$$payload'),
+						b.id(' $$renderer'),
 						b.thunk(
 							node.metadata.synthetic_value_node.expression,
 							node.metadata.synthetic_value_node.metadata.expression.has_await
@@ -175,9 +175,9 @@ export function RegularElement(node, context) {
 				b.stmt(
 					b.call(
 						'$.valueless_option',
-						b.id('$$payload'),
+						b.id(' $$renderer'),
 						b.arrow(
-							[b.id('$$payload')],
+							[b.id(' $$renderer')],
 							b.block([...inner_state.init, ...build_template(inner_state.template)])
 						)
 					)
@@ -216,7 +216,7 @@ export function RegularElement(node, context) {
 		// element hadn't resolved prior to hitting the second element.
 		const elements = state.template.splice(template_start, Infinity);
 		state.template.push(
-			call_child_payload(b.block(build_template(elements)), select_with_value_async)
+			call_child_renderer(b.block(build_template(elements)), select_with_value_async)
 		);
 	}
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RenderTag.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RenderTag.js
index dd2ede3ba3..591f95cc6f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RenderTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RenderTag.js
@@ -23,7 +23,7 @@ export function RenderTag(node, context) {
 		b.stmt(
 			(node.expression.type === 'CallExpression' ? b.call : b.maybe_call)(
 				snippet_function,
-				b.id('$$payload'),
+				b.id(' $$renderer'),
 				...snippet_args
 			)
 		)
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
index 2d16a07b4e..9865317daf 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
@@ -6,7 +6,7 @@ import {
 	empty_comment,
 	build_attribute_value,
 	PromiseOptimiser,
-	call_child_payload
+	call_child_renderer
 } from './shared/utils.js';
 
 /**
@@ -57,7 +57,7 @@ export function SlotElement(node, context) {
 
 	const slot = b.call(
 		'$.slot',
-		b.id('$$payload'),
+		b.id(' $$renderer'),
 		b.id('$$props'),
 		name,
 		props_expression,
@@ -66,7 +66,7 @@ export function SlotElement(node, context) {
 
 	const statement =
 		optimiser.expressions.length > 0
-			? call_child_payload(b.block([optimiser.apply(), b.stmt(slot)]), true)
+			? call_child_renderer(b.block([optimiser.apply(), b.stmt(slot)]), true)
 			: b.stmt(slot);
 
 	context.state.template.push(empty_comment, statement, empty_comment);
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js
index 238485e665..38cf38deaf 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js
@@ -11,7 +11,7 @@ import * as b from '#compiler/builders';
 export function SnippetBlock(node, context) {
 	let fn = b.function_declaration(
 		node.expression,
-		[b.id('$$payload'), ...node.parameters],
+		[b.id(' $$renderer'), ...node.parameters],
 		/** @type {BlockStatement} */ (context.visit(node.body))
 	);
 
@@ -21,7 +21,7 @@ export function SnippetBlock(node, context) {
 	const statements = node.metadata.can_hoist ? context.state.hoisted : context.state.init;
 
 	if (dev) {
-		fn.body.body.unshift(b.stmt(b.call('$.validate_snippet_args', b.id('$$payload'))));
+		fn.body.body.unshift(b.stmt(b.call('$.validate_snippet_args', b.id(' $$renderer'))));
 		statements.push(b.stmt(b.call('$.prevent_snippet_stringification', fn.id)));
 	}
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
index 355b33aea7..44114a5b2c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
@@ -24,7 +24,7 @@ export function SvelteBoundary(node, context) {
 		const pending = pending_attribute
 			? b.call(
 					build_attribute_value(pending_attribute.value, context, false, true),
-					b.id('$$payload')
+					b.id(' $$renderer')
 				)
 			: /** @type {BlockStatement} */ (context.visit(pending_snippet.body));
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js
index fd16219860..5fa842a9af 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js
@@ -45,7 +45,7 @@ export function SvelteElement(node, context) {
 			b.stmt(
 				b.call(
 					'$.push_element',
-					b.id('$$payload'),
+					b.id(' $$renderer'),
 					tag,
 					b.literal(location.line),
 					b.literal(location.column)
@@ -61,7 +61,7 @@ export function SvelteElement(node, context) {
 		b.stmt(
 			b.call(
 				'$.element',
-				b.id('$$payload'),
+				b.id(' $$renderer'),
 				tag,
 				attributes.body.length > 0 && b.thunk(attributes),
 				children.body.length > 0 && b.thunk(children)
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteHead.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteHead.js
index 7d064ffbf5..6ca797669c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteHead.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteHead.js
@@ -11,6 +11,6 @@ export function SvelteHead(node, context) {
 	const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
 
 	context.state.template.push(
-		b.stmt(b.call('$.head', b.id('$$payload'), b.arrow([b.id('$$payload')], block)))
+		b.stmt(b.call('$.head', b.id(' $$renderer'), b.arrow([b.id(' $$renderer')], block)))
 	);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
index a3ffb2df3d..06e0a3b4c0 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
@@ -14,6 +14,6 @@ export function TitleElement(node, context) {
 	template.push(b.literal('</title>'));
 
 	context.state.init.push(
-		b.stmt(b.call('$.build_title', b.id('$$payload'), b.thunk(b.block(build_template(template)))))
+		b.stmt(b.call('$.build_title', b.id(' $$renderer'), b.thunk(b.block(build_template(template)))))
 	);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
index 614a2ed258..5eeb5e3a0f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
@@ -4,7 +4,7 @@
 import {
 	empty_comment,
 	build_attribute_value,
-	call_child_payload,
+	call_child_renderer,
 	PromiseOptimiser
 } from './utils.js';
 import * as b from '#compiler/builders';
@@ -215,7 +215,7 @@ export function build_inline_component(node, expression, context) {
 		if (block.body.length === 0) continue;
 
 		/** @type {Pattern[]} */
-		const params = [b.id('$$payload')];
+		const params = [b.id(' $$renderer')];
 
 		if (lets[slot_name].length > 0) {
 			const pattern = b.object_pattern(
@@ -292,7 +292,7 @@ export function build_inline_component(node, expression, context) {
 	let statement = b.stmt(
 		(node.type === 'SvelteComponent' ? b.maybe_call : b.call)(
 			expression,
-			b.id('$$payload'),
+			b.id(' $$renderer'),
 			props_expression
 		)
 	);
@@ -308,7 +308,7 @@ export function build_inline_component(node, expression, context) {
 		statement = b.stmt(
 			b.call(
 				'$.css_props',
-				b.id('$$payload'),
+				b.id(' $$renderer'),
 				b.literal(context.state.namespace === 'svg' ? false : true),
 				b.object(custom_css_props),
 				b.thunk(b.block([statement])),
@@ -318,7 +318,7 @@ export function build_inline_component(node, expression, context) {
 	}
 
 	if (optimiser.expressions.length > 0) {
-		statement = call_child_payload(b.block([optimiser.apply(), statement]), true);
+		statement = call_child_renderer(b.block([optimiser.apply(), statement]), true);
 	}
 
 	if (dynamic && custom_css_props.length === 0) {
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
index 84692fca9c..ddcc5f7901 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
@@ -207,7 +207,7 @@ export function build_element_attributes(node, context) {
 			context.state.template.push(
 				b.call(
 					'$.maybe_selected',
-					b.id('$$payload'),
+					b.id(' $$renderer'),
 					b.member(
 						build_spread_object(
 							node,
@@ -264,7 +264,7 @@ export function build_element_attributes(node, context) {
 					context.state.template.push(
 						b.call(
 							'$.maybe_selected',
-							b.id('$$payload'),
+							b.id(' $$renderer'),
 							literal_value != null ? b.literal(/** @type {any} */ (literal_value)) : b.void0
 						)
 					);
@@ -296,7 +296,7 @@ export function build_element_attributes(node, context) {
 			}
 
 			if (name === 'value' && node.name === 'option') {
-				context.state.template.push(b.call('$.maybe_selected', b.id('$$payload'), value));
+				context.state.template.push(b.call('$.maybe_selected', b.id(' $$renderer'), value));
 			}
 		}
 	}
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
index a48c19ae7c..971df1de93 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
@@ -80,7 +80,7 @@ export function process_children(nodes, { visit, state }) {
 			flush();
 			const visited = /** @type {Expression} */ (visit(node.expression));
 			state.template.push(
-				b.stmt(b.call('$$payload.push', b.thunk(b.call('$.escape', visited), true)))
+				b.stmt(b.call(' $$renderer.push', b.thunk(b.call('$.escape', visited), true)))
 			);
 		} else if (node.type === 'Text' || node.type === 'Comment' || node.type === 'ExpressionTag') {
 			sequence.push(node);
@@ -119,7 +119,7 @@ export function build_template(template) {
 		statements.push(
 			b.stmt(
 				b.call(
-					b.id('$$payload.push'),
+					b.id(' $$renderer.push'),
 					b.template(
 						strings.map((cooked, i) => b.quasi(cooked, i === strings.length - 1)),
 						expressions
@@ -266,8 +266,8 @@ export function build_getter(node, state) {
  * @param {boolean} async
  * @returns {Statement}
  */
-export function call_child_payload(body, async) {
-	return b.stmt(b.call('$$payload.child', b.arrow([b.id('$$payload')], body, async)));
+export function call_child_renderer(body, async) {
+	return b.stmt(b.call(' $$renderer.child', b.arrow([b.id(' $$renderer')], body, async)));
 }
 
 /**
@@ -275,9 +275,9 @@ export function call_child_payload(body, async) {
  * @param {Identifier | false} component_fn_id
  * @returns {Statement}
  */
-export function call_component_payload(body, component_fn_id) {
+export function call_component_renderer(body, component_fn_id) {
 	return b.stmt(
-		b.call('$$payload.component', b.arrow([b.id('$$payload')], body, false), component_fn_id)
+		b.call(' $$renderer.component', b.arrow([b.id(' $$renderer')], body, false), component_fn_id)
 	);
 }
 
diff --git a/packages/svelte/src/index-server.js b/packages/svelte/src/index-server.js
index 0b05fb6d12..f193c46894 100644
--- a/packages/svelte/src/index-server.js
+++ b/packages/svelte/src/index-server.js
@@ -1,12 +1,12 @@
 /** @import { SSRContext } from '#server' */
-/** @import { Payload } from './internal/server/payload.js' */
+/** @import { Renderer } from './internal/server/renderer.js' */
 import { ssr_context } from './internal/server/context.js';
 import { noop } from './internal/shared/utils.js';
 import * as e from './internal/server/errors.js';
 
 /** @param {() => void} fn */
 export function onDestroy(fn) {
-	/** @type {Payload} */ (/** @type {SSRContext} */ (ssr_context).r).on_destroy(fn);
+	/** @type {Renderer} */ (/** @type {SSRContext} */ (ssr_context).r).on_destroy(fn);
 }
 
 export {
diff --git a/packages/svelte/src/internal/server/blocks/snippet.js b/packages/svelte/src/internal/server/blocks/snippet.js
index 109dbf683a..80a5f7f467 100644
--- a/packages/svelte/src/internal/server/blocks/snippet.js
+++ b/packages/svelte/src/internal/server/blocks/snippet.js
@@ -1,5 +1,5 @@
 /** @import { Snippet } from 'svelte' */
-/** @import { Payload } from '../payload' */
+/** @import { Renderer } from '../renderer' */
 /** @import { Getters } from '#shared' */
 
 /**
@@ -13,9 +13,9 @@
  */
 export function createRawSnippet(fn) {
 	// @ts-expect-error the types are a lie
-	return (/** @type {Payload} */ payload, /** @type {Params} */ ...args) => {
+	return (/** @type {Renderer} */ renderer, /** @type {Params} */ ...args) => {
 		var getters = /** @type {Getters<Params>} */ (args.map((value) => () => value));
-		payload.push(
+		renderer.push(
 			fn(...getters)
 				.render()
 				.trim()
diff --git a/packages/svelte/src/internal/server/dev.js b/packages/svelte/src/internal/server/dev.js
index cc9f6496c0..66dff0fde2 100644
--- a/packages/svelte/src/internal/server/dev.js
+++ b/packages/svelte/src/internal/server/dev.js
@@ -6,7 +6,7 @@ import {
 } from '../../html-tree-validation.js';
 import { set_ssr_context, ssr_context } from './context.js';
 import * as e from './errors.js';
-import { Payload } from './payload.js';
+import { Renderer } from './renderer.js';
 
 // TODO move this
 /**
@@ -26,10 +26,10 @@ import { Payload } from './payload.js';
 export let seen;
 
 /**
- * @param {Payload} payload
+ * @param {Renderer} renderer
  * @param {string} message
  */
-function print_error(payload, message) {
+function print_error(renderer, message) {
 	message =
 		`node_invalid_placement_ssr: ${message}\n\n` +
 		'This can cause content to shift around as the browser repairs the HTML, and will likely result in a `hydration_mismatch` warning.';
@@ -39,19 +39,19 @@ function print_error(payload, message) {
 
 	// eslint-disable-next-line no-console
 	console.error(message);
-	payload.child(
-		(payload) => payload.push(`<script>console.error(${JSON.stringify(message)})</script>`),
+	renderer.child(
+		(renderer) => renderer.push(`<script>console.error(${JSON.stringify(message)})</script>`),
 		'head'
 	);
 }
 
 /**
- * @param {Payload} payload
+ * @param {Renderer} renderer
  * @param {string} tag
  * @param {number} line
  * @param {number} column
  */
-export function push_element(payload, tag, line, column) {
+export function push_element(renderer, tag, line, column) {
 	var context = /** @type {SSRContext} */ (ssr_context);
 	var filename = context.function[FILENAME];
 	var parent = context.element;
@@ -67,7 +67,7 @@ export function push_element(payload, tag, line, column) {
 			: undefined;
 
 		const message = is_tag_valid_with_parent(tag, parent.tag, child_loc, parent_loc);
-		if (message) print_error(payload, message);
+		if (message) print_error(renderer, message);
 
 		while (ancestor != null) {
 			ancestors.push(ancestor.tag);
@@ -76,7 +76,7 @@ export function push_element(payload, tag, line, column) {
 				: undefined;
 
 			const message = is_tag_valid_with_ancestor(tag, ancestors, child_loc, ancestor_loc);
-			if (message) print_error(payload, message);
+			if (message) print_error(renderer, message);
 
 			ancestor = ancestor.parent;
 		}
@@ -90,13 +90,13 @@ export function pop_element() {
 }
 
 /**
- * @param {Payload} payload
+ * @param {Renderer} renderer
  */
-export function validate_snippet_args(payload) {
+export function validate_snippet_args(renderer) {
 	if (
-		typeof payload !== 'object' ||
-		// for some reason typescript consider the type of payload as never after the first instanceof
-		!(payload instanceof Payload)
+		typeof renderer !== 'object' ||
+		// for some reason typescript consider the type of renderer as never after the first instanceof
+		!(renderer instanceof Renderer)
 	) {
 		e.invalid_snippet_arguments();
 	}
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index 13a0706549..618e75f932 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -1,7 +1,7 @@
 /** @import { ComponentType, SvelteComponent, Component } from 'svelte' */
 /** @import { RenderOutput } from '#server' */
 /** @import { Store } from '#shared' */
-/** @import { AccumulatedContent } from './payload.js' */
+/** @import { AccumulatedContent } from './renderer.js' */
 export { FILENAME, HMR } from '../../constants.js';
 import { attr, clsx, to_class, to_style } from '../shared/attributes.js';
 import { is_promise, noop } from '../shared/utils.js';
@@ -17,7 +17,7 @@ import { DEV } from 'esm-env';
 import { EMPTY_COMMENT, BLOCK_CLOSE, BLOCK_OPEN, BLOCK_OPEN_ELSE } from './hydration.js';
 import { validate_store } from '../shared/validate.js';
 import { is_boolean_attribute, is_raw_text_element, is_void } from '../../utils.js';
-import { Payload } from './payload.js';
+import { Renderer } from './renderer.js';
 
 // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
 // https://infra.spec.whatwg.org/#noncharacter
@@ -25,30 +25,30 @@ const INVALID_ATTR_NAME_CHAR_REGEX =
 	/[\s'">/=\u{FDD0}-\u{FDEF}\u{FFFE}\u{FFFF}\u{1FFFE}\u{1FFFF}\u{2FFFE}\u{2FFFF}\u{3FFFE}\u{3FFFF}\u{4FFFE}\u{4FFFF}\u{5FFFE}\u{5FFFF}\u{6FFFE}\u{6FFFF}\u{7FFFE}\u{7FFFF}\u{8FFFE}\u{8FFFF}\u{9FFFE}\u{9FFFF}\u{AFFFE}\u{AFFFF}\u{BFFFE}\u{BFFFF}\u{CFFFE}\u{CFFFF}\u{DFFFE}\u{DFFFF}\u{EFFFE}\u{EFFFF}\u{FFFFE}\u{FFFFF}\u{10FFFE}\u{10FFFF}]/u;
 
 /**
- * @param {Payload} payload
+ * @param {Renderer} renderer
  * @param {string} tag
  * @param {() => void} attributes_fn
  * @param {() => void} children_fn
  * @returns {void}
  */
-export function element(payload, tag, attributes_fn = noop, children_fn = noop) {
-	payload.push('<!---->');
+export function element(renderer, tag, attributes_fn = noop, children_fn = noop) {
+	renderer.push('<!---->');
 
 	if (tag) {
-		payload.push(`<${tag}`);
+		renderer.push(`<${tag}`);
 		attributes_fn();
-		payload.push(`>`);
+		renderer.push(`>`);
 
 		if (!is_void(tag)) {
 			children_fn();
 			if (!is_raw_text_element(tag)) {
-				payload.push(EMPTY_COMMENT);
+				renderer.push(EMPTY_COMMENT);
 			}
-			payload.push(`</${tag}>`);
+			renderer.push(`</${tag}>`);
 		}
 	}
 
-	payload.push('<!---->');
+	renderer.push('<!---->');
 }
 
 /**
@@ -60,49 +60,49 @@ export function element(payload, tag, attributes_fn = noop, children_fn = noop)
  * @returns {RenderOutput}
  */
 export function render(component, options = {}) {
-	return Payload.render(/** @type {Component<Props>} */ (component), options);
+	return Renderer.render(/** @type {Component<Props>} */ (component), options);
 }
 
 /**
- * @param {Payload} payload
- * @param {(payload: Payload) => Promise<void> | void} fn
+ * @param {Renderer} renderer
+ * @param {(renderer: Renderer) => Promise<void> | void} fn
  * @returns {void}
  */
-export function head(payload, fn) {
-	payload.child((payload) => {
-		payload.push(BLOCK_OPEN);
-		payload.child(fn);
-		payload.push(BLOCK_CLOSE);
+export function head(renderer, fn) {
+	renderer.child((renderer) => {
+		renderer.push(BLOCK_OPEN);
+		renderer.child(fn);
+		renderer.push(BLOCK_CLOSE);
 	}, 'head');
 }
 
 /**
- * @param {Payload} payload
+ * @param {Renderer} renderer
  * @param {boolean} is_html
  * @param {Record<string, string>} props
  * @param {() => void} component
  * @param {boolean} dynamic
  * @returns {void}
  */
-export function css_props(payload, is_html, props, component, dynamic = false) {
+export function css_props(renderer, is_html, props, component, dynamic = false) {
 	const styles = style_object_to_string(props);
 
 	if (is_html) {
-		payload.push(`<svelte-css-wrapper style="display: contents; ${styles}">`);
+		renderer.push(`<svelte-css-wrapper style="display: contents; ${styles}">`);
 	} else {
-		payload.push(`<g style="${styles}">`);
+		renderer.push(`<g style="${styles}">`);
 	}
 
 	if (dynamic) {
-		payload.push('<!---->');
+		renderer.push('<!---->');
 	}
 
 	component();
 
 	if (is_html) {
-		payload.push(`<!----></svelte-css-wrapper>`);
+		renderer.push(`<!----></svelte-css-wrapper>`);
 	} else {
-		payload.push(`<!----></g>`);
+		renderer.push(`<!----></g>`);
 	}
 }
 
@@ -304,14 +304,14 @@ export function unsubscribe_stores(store_values) {
 }
 
 /**
- * @param {Payload} payload
+ * @param {Renderer} renderer
  * @param {Record<string, any>} $$props
  * @param {string} name
  * @param {Record<string, unknown>} slot_props
  * @param {null | (() => void)} fallback_fn
  * @returns {void}
  */
-export function slot(payload, $$props, name, slot_props, fallback_fn) {
+export function slot(renderer, $$props, name, slot_props, fallback_fn) {
 	var slot_fn = $$props.$$slots?.[name];
 	// Interop: Can use snippets to fill slots
 	if (slot_fn === true) {
@@ -319,7 +319,7 @@ export function slot(payload, $$props, name, slot_props, fallback_fn) {
 	}
 
 	if (slot_fn !== undefined) {
-		slot_fn(payload, slot_props);
+		slot_fn(renderer, slot_props);
 	} else {
 		fallback_fn?.();
 	}
@@ -387,21 +387,21 @@ export function bind_props(props_parent, props_now) {
 
 /**
  * @template V
- * @param {Payload} payload
+ * @param {Renderer} renderer
  * @param {Promise<V>} promise
  * @param {null | (() => void)} pending_fn
  * @param {(value: V) => void} then_fn
  * @returns {void}
  */
-function await_block(payload, promise, pending_fn, then_fn) {
+function await_block(renderer, promise, pending_fn, then_fn) {
 	if (is_promise(promise)) {
-		payload.push(BLOCK_OPEN);
+		renderer.push(BLOCK_OPEN);
 		promise.then(null, noop);
 		if (pending_fn !== null) {
 			pending_fn();
 		}
 	} else if (then_fn !== null) {
-		payload.push(BLOCK_OPEN_ELSE);
+		renderer.push(BLOCK_OPEN_ELSE);
 		then_fn(promise);
 	}
 }
@@ -443,12 +443,12 @@ export function once(get_value) {
 
 /**
  * Create an unique ID
- * @param {Payload} payload
+ * @param {Renderer} renderer
  * @returns {string}
  */
-export function props_id(payload) {
-	const uid = payload.global.uid();
-	payload.push('<!--#' + uid + '-->');
+export function props_id(renderer) {
+	const uid = renderer.global.uid();
+	renderer.push('<!--#' + uid + '-->');
 	return uid;
 }
 
@@ -496,11 +496,11 @@ export function derived(fn) {
 
 /**
  *
- * @param {Payload} payload
+ * @param {Renderer} renderer
  * @param {unknown} value
  */
-export function maybe_selected(payload, value) {
-	return value === payload.local.select_value ? ' selected' : '';
+export function maybe_selected(renderer, value) {
+	return value === renderer.local.select_value ? ' selected' : '';
 }
 
 /**
@@ -508,25 +508,25 @@ export function maybe_selected(payload, value) {
  * content as its `value` to determine whether we should apply the `selected` attribute.
  * This has to be done at runtime, for hopefully obvious reasons. It is also complicated,
  * for sad reasons.
- * @param {Payload} payload
- * @param {((payload: Payload) => void | Promise<void>)} children
+ * @param {Renderer} renderer
+ * @param {((renderer: Renderer) => void | Promise<void>)} children
  * @returns {void}
  */
-export function valueless_option(payload, children) {
-	const i = payload.length;
+export function valueless_option(renderer, children) {
+	const i = renderer.length;
 
-	// prior to children, `payload` has some combination of string/unresolved payload that ends in `<option ...>`
-	payload.child(children);
+	// prior to children, `renderer` has some combination of string/unresolved renderer that ends in `<option ...>`
+	renderer.child(children);
 
-	// post-children, `payload` has child content, possibly also with some number of hydration comments.
+	// post-children, `renderer` has child content, possibly also with some number of hydration comments.
 	// we can compact this last chunk of content to see if it matches the select value...
-	payload.compact({
+	renderer.compact({
 		start: i,
 		fn: (content) => {
-			if (content.body.replace(/<!---->/g, '') === payload.local.select_value) {
-				// ...and if it does match the select value, we can compact the part of the payload representing the `<option ...>`
+			if (content.body.replace(/<!---->/g, '') === renderer.local.select_value) {
+				// ...and if it does match the select value, we can compact the part of the renderer representing the `<option ...>`
 				// to add the `selected` attribute to the end.
-				payload.compact({
+				renderer.compact({
 					start: i - 1,
 					end: i,
 					fn: (content) => {
@@ -545,10 +545,10 @@ export function valueless_option(payload, children) {
  * by running the children and passing the resulting value, which means
  * we don't have to do all of the same parsing nonsense. It also means we can avoid
  * coercing everything to a string.
- * @param {Payload} payload
+ * @param {Renderer} renderer
  * @param {(() => unknown)} child
  */
-export function simple_valueless_option(payload, child) {
+export function simple_valueless_option(renderer, child) {
 	const result = child();
 
 	/**
@@ -557,14 +557,14 @@ export function simple_valueless_option(payload, child) {
 	 * @returns {AccumulatedContent}
 	 */
 	const mark_selected = (content, child_value) => {
-		if (child_value === payload.local.select_value) {
+		if (child_value === renderer.local.select_value) {
 			return { body: content.body.slice(0, -1) + ' selected>', head: content.head };
 		}
 		return content;
 	};
 
-	payload.compact({
-		start: payload.length - 1,
+	renderer.compact({
+		start: renderer.length - 1,
 		fn: (content) => {
 			if (result instanceof Promise) {
 				return result.then((child_value) => mark_selected(content, child_value));
@@ -573,13 +573,13 @@ export function simple_valueless_option(payload, child) {
 		}
 	});
 
-	payload.child((child_payload) => {
+	renderer.child((child_renderer) => {
 		if (result instanceof Promise) {
 			return result.then((child_value) => {
-				child_payload.push(escape_html(child_value));
+				child_renderer.push(escape_html(child_value));
 			});
 		}
-		child_payload.push(escape_html(result));
+		child_renderer.push(escape_html(result));
 	});
 }
 
@@ -588,23 +588,23 @@ export function simple_valueless_option(payload, child) {
  * which one "wins". To do this, we perform a depth-first comparison of where the title was encountered --
  * later ones "win" over earlier ones, regardless of what order the promises resolve in. To accomodate this, we:
  * - Figure out where we are in the content tree (`get_path`)
- * - Render the title in its own child so that it has a defined "slot" in the payload
+ * - Render the title in its own child so that it has a defined "slot" in the renderer
  * - Compact that spot so that we get the entire rendered contents of the title
  * - Attempt to set the global title (this is where the "wins" logic based on the path happens)
  *
  * TODO we could optimize this by not even rendering the title if the path wouldn't be accepted
  *
- * @param {Payload} payload
- * @param {((payload: Payload) => void | Promise<void>)} children
+ * @param {Renderer} renderer
+ * @param {((renderer: Renderer) => void | Promise<void>)} children
  */
-export function build_title(payload, children) {
-	const path = payload.get_path();
-	const i = payload.length;
-	payload.child(children);
-	payload.compact({
+export function build_title(renderer, children) {
+	const path = renderer.get_path();
+	const i = renderer.length;
+	renderer.child(children);
+	renderer.compact({
 		start: i,
 		fn: ({ head }) => {
-			payload.global.set_title(head, path);
+			renderer.global.set_title(head, path);
 			// since we can only ever render the title in this chunk, and title rendering is handled specially,
 			// we can just ditch the results after we've saved them globally
 			return { head: '', body: '' };
diff --git a/packages/svelte/src/internal/server/payload.js b/packages/svelte/src/internal/server/renderer.js
similarity index 70%
rename from packages/svelte/src/internal/server/payload.js
rename to packages/svelte/src/internal/server/renderer.js
index ce8f312c21..26f7ac2b3c 100644
--- a/packages/svelte/src/internal/server/payload.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -7,57 +7,57 @@ import * as e from './errors.js';
 import * as w from './warnings.js';
 import { BLOCK_CLOSE, BLOCK_OPEN } from './hydration.js';
 
-/** @typedef {'head' | 'body'} PayloadType */
-/** @typedef {{ [key in PayloadType]: string }} AccumulatedContent */
+/** @typedef {'head' | 'body'} RendererType */
+/** @typedef {{ [key in RendererType]: string }} AccumulatedContent */
 /**
  * @template T
  * @typedef {T | Promise<T>} MaybePromise<T>
  */
 /**
- * @typedef {string | Payload} PayloadItem
+ * @typedef {string | Renderer} RendererItem
  */
 
 /**
- * Payloads are basically a tree of `string | Payload`s, where each `Payload` in the tree represents
- * work that may or may not have completed. A payload can be {@link collect}ed to aggregate the
+ * Renderers are basically a tree of `string | Renderer`s, where each `Renderer` in the tree represents
+ * work that may or may not have completed. A renderer can be {@link collect}ed to aggregate the
  * content from itself and all of its children, but this will throw if any of the children are
- * performing asynchronous work. To asynchronously collect a payload, just `await` it.
+ * performing asynchronous work. To asynchronously collect a renderer, just `await` it.
  *
- * The `string` values within a payload are always associated with the {@link type} of that payload. To switch types,
+ * The `string` values within a renderer are always associated with the {@link type} of that renderer. To switch types,
  * call {@link child} with a different `type` argument.
  */
-export class Payload {
+export class Renderer {
 	/**
-	 * The contents of the payload.
-	 * @type {PayloadItem[]}
+	 * The contents of the renderer.
+	 * @type {RendererItem[]}
 	 */
 	#out = [];
 
 	/**
-	 * Any `onDestroy` callbacks registered during execution of this payload.
+	 * Any `onDestroy` callbacks registered during execution of this renderer.
 	 * @type {(() => void)[] | undefined}
 	 */
 	#on_destroy = undefined;
 
 	/**
-	 * Whether this payload is a component body.
+	 * Whether this renderer is a component body.
 	 * @type {boolean}
 	 */
 	#is_component_body = false;
 
 	/**
-	 * The type of string content that this payload is accumulating.
-	 * @type {PayloadType}
+	 * The type of string content that this renderer is accumulating.
+	 * @type {RendererType}
 	 */
 	type;
 
-	/** @type {Payload | undefined} */
+	/** @type {Renderer | undefined} */
 	#parent;
 
 	/**
-	 * Asynchronous work associated with this payload. `initial` is the promise from the function
-	 * this payload was passed to (if that function was async), and `followup` is any any additional
-	 * work from `compact` calls that needs to complete prior to collecting this payload's content.
+	 * Asynchronous work associated with this renderer. `initial` is the promise from the function
+	 * this renderer was passed to (if that function was async), and `followup` is any any additional
+	 * work from `compact` calls that needs to complete prior to collecting this renderer's content.
 	 * @type {{ initial: Promise<void> | undefined, followup: Promise<void>[] }}
 	 */
 	promises = { initial: undefined, followup: [] };
@@ -80,8 +80,8 @@ export class Payload {
 
 	/**
 	 * @param {SSRState} global
-	 * @param {Payload | undefined} [parent]
-	 * @param {PayloadType} [type]
+	 * @param {Renderer | undefined} [parent]
+	 * @param {RendererType} [type]
 	 */
 	constructor(global, parent, type) {
 		this.global = global;
@@ -91,13 +91,13 @@ export class Payload {
 	}
 
 	/**
-	 * Create a child payload. The child payload inherits the state from the parent,
+	 * Create a child renderer. The child renderer inherits the state from the parent,
 	 * but has its own content.
-	 * @param {(payload: Payload) => MaybePromise<void>} fn
-	 * @param {PayloadType} [type]
+	 * @param {(renderer: Renderer) => MaybePromise<void>} fn
+	 * @param {RendererType} [type]
 	 */
 	child(fn, type) {
-		const child = new Payload(this.global, this, type);
+		const child = new Renderer(this.global, this, type);
 		this.#out.push(child);
 
 		const parent = ssr_context;
@@ -126,9 +126,9 @@ export class Payload {
 	}
 
 	/**
-	 * Create a component payload. The component payload inherits the state from the parent,
+	 * Create a component renderer. The component renderer inherits the state from the parent,
 	 * but has its own content. It is treated as an ordering boundary for ondestroy callbacks.
-	 * @param {(payload: Payload) => MaybePromise<void>} fn
+	 * @param {(renderer: Renderer) => MaybePromise<void>} fn
 	 * @param {Function} [component_fn]
 	 * @returns {void}
 	 */
@@ -144,25 +144,25 @@ export class Payload {
 	 */
 	push(content) {
 		if (typeof content === 'function') {
-			this.child(async (payload) => payload.push(await content()));
+			this.child(async (renderer) => renderer.push(await content()));
 		} else {
 			this.#out.push(content);
 		}
 	}
 
 	/**
-	 * Compact everything between `start` and `end` into a single payload, then call `fn` with the result of that payload.
-	 * The compacted payload will be sync if all of the children are sync and {@link fn} is sync, otherwise it will be async.
+	 * Compact everything between `start` and `end` into a single renderer, then call `fn` with the result of that renderer.
+	 * The compacted renderer will be sync if all of the children are sync and {@link fn} is sync, otherwise it will be async.
 	 * @param {{ start: number, end?: number, fn: (content: AccumulatedContent) => AccumulatedContent | Promise<AccumulatedContent> }} args
 	 */
 	compact({ start, end = this.#out.length, fn }) {
-		const child = new Payload(this.global, this);
+		const child = new Renderer(this.global, this);
 		const to_compact = this.#out.splice(start, end - start, child);
 
 		if (this.global.mode === 'sync') {
-			Payload.#compact(fn, child, to_compact, this.type);
+			Renderer.#compact(fn, child, to_compact, this.type);
 		} else {
-			this.promises.followup.push(Payload.#compact_async(fn, child, to_compact, this.type));
+			this.promises.followup.push(Renderer.#compact_async(fn, child, to_compact, this.type));
 		}
 	}
 
@@ -184,26 +184,26 @@ export class Payload {
 	 * @deprecated this is needed for legacy component bindings
 	 */
 	copy() {
-		const copy = new Payload(this.global, this.#parent, this.type);
-		copy.#out = this.#out.map((item) => (item instanceof Payload ? item.copy() : item));
+		const copy = new Renderer(this.global, this.#parent, this.type);
+		copy.#out = this.#out.map((item) => (item instanceof Renderer ? item.copy() : item));
 		copy.promises = this.promises;
 		return copy;
 	}
 
 	/**
-	 * @param {Payload} other
+	 * @param {Renderer} other
 	 * @deprecated this is needed for legacy component bindings
 	 */
 	subsume(other) {
 		if (this.global.mode !== other.global.mode) {
 			throw new Error(
-				"invariant: A payload cannot switch modes. If you're seeing this, there's a compiler bug. File an issue!"
+				"invariant: A renderer cannot switch modes. If you're seeing this, there's a compiler bug. File an issue!"
 			);
 		}
 
 		this.local = other.local;
 		this.#out = other.#out.map((item) => {
-			if (item instanceof Payload) {
+			if (item instanceof Renderer) {
 				item.subsume(item);
 			}
 			return item;
@@ -236,17 +236,17 @@ export class Payload {
 		Object.defineProperties(result, {
 			html: {
 				get: () => {
-					return (sync ??= Payload.#render(component, options)).body;
+					return (sync ??= Renderer.#render(component, options)).body;
 				}
 			},
 			head: {
 				get: () => {
-					return (sync ??= Payload.#render(component, options)).head;
+					return (sync ??= Renderer.#render(component, options)).head;
 				}
 			},
 			body: {
 				get: () => {
-					return (sync ??= Payload.#render(component, options)).body;
+					return (sync ??= Renderer.#render(component, options)).body;
 				}
 			},
 			then: {
@@ -262,7 +262,7 @@ export class Payload {
 					(onfulfilled, onrejected) => {
 						if (!async_mode_flag) {
 							w.experimental_async_ssr();
-							const result = (sync ??= Payload.#render(component, options));
+							const result = (sync ??= Renderer.#render(component, options));
 							const user_result = onfulfilled({
 								head: result.head,
 								body: result.body,
@@ -270,7 +270,7 @@ export class Payload {
 							});
 							return Promise.resolve(user_result);
 						}
-						async ??= Payload.#render_async(component, options);
+						async ??= Renderer.#render_async(component, options);
 						return async.then((result) => {
 							Object.defineProperty(result, 'html', {
 								// eslint-disable-next-line getter-return
@@ -291,8 +291,8 @@ export class Payload {
 	 * Collect all of the `onDestroy` callbacks regsitered during rendering. In an async context, this is only safe to call
 	 * after awaiting `collect_async`.
 	 *
-	 * Child payloads are "porous" and don't affect execution order, but component body payloads
-	 * create ordering boundaries. Within a payload, callbacks run in order until hitting a component boundary.
+	 * Child renderers are "porous" and don't affect execution order, but component body renderers
+	 * create ordering boundaries. Within a renderer, callbacks run in order until hitting a component boundary.
 	 * @returns {Iterable<() => void>}
 	 */
 	*#collect_on_destroy() {
@@ -302,8 +302,8 @@ export class Payload {
 	}
 
 	/**
-	 * Performs a depth-first search of payloads, yielding the deepest components first, then additional components as we backtrack up the tree.
-	 * @returns {Iterable<Payload>}
+	 * Performs a depth-first search of renderers, yielding the deepest components first, then additional components as we backtrack up the tree.
+	 * @returns {Iterable<Renderer>}
 	 */
 	*#traverse_components() {
 		for (const child of this.#out) {
@@ -326,7 +326,7 @@ export class Payload {
 			}
 		}
 		for (const child of this.#out) {
-			if (child instanceof Payload && !child.#is_component_body) {
+			if (child instanceof Renderer && !child.#is_component_body) {
 				yield* child.#collect_ondestroy();
 			}
 		}
@@ -343,10 +343,10 @@ export class Payload {
 	static #render(component, options) {
 		var previous_context = ssr_context;
 		try {
-			const payload = Payload.#open_render('sync', component, options);
+			const renderer = Renderer.#open_render('sync', component, options);
 
-			const content = Payload.#collect_content([payload], payload.type);
-			return Payload.#close_render(content, payload);
+			const content = Renderer.#collect_content([renderer], renderer.type);
+			return Renderer.#close_render(content, renderer);
 		} finally {
 			abort();
 			set_ssr_context(previous_context);
@@ -364,10 +364,10 @@ export class Payload {
 	static async #render_async(component, options) {
 		var previous_context = ssr_context;
 		try {
-			const payload = Payload.#open_render('async', component, options);
+			const renderer = Renderer.#open_render('async', component, options);
 
-			const content = await Payload.#collect_content_async([payload], payload.type);
-			return Payload.#close_render(content, payload);
+			const content = await Renderer.#collect_content_async([renderer], renderer.type);
+			return Renderer.#close_render(content, renderer);
 		} finally {
 			abort();
 			set_ssr_context(previous_context);
@@ -376,38 +376,38 @@ export class Payload {
 
 	/**
 	 * @param {(content: AccumulatedContent) => AccumulatedContent | Promise<AccumulatedContent>} fn
-	 * @param {Payload} child
-	 * @param {PayloadItem[]} to_compact
-	 * @param {PayloadType} type
+	 * @param {Renderer} child
+	 * @param {RendererItem[]} to_compact
+	 * @param {RendererType} type
 	 */
 	static #compact(fn, child, to_compact, type) {
-		const content = Payload.#collect_content(to_compact, type);
+		const content = Renderer.#collect_content(to_compact, type);
 		const transformed_content = fn(content);
 		if (transformed_content instanceof Promise) {
 			throw new Error(
 				"invariant: Somehow you've encountered asynchronous work while rendering synchronously. If you're seeing this, there's a compiler bug. File an issue!"
 			);
 		} else {
-			Payload.#push_accumulated_content(child, transformed_content);
+			Renderer.#push_accumulated_content(child, transformed_content);
 		}
 	}
 
 	/**
 	 * @param {(content: AccumulatedContent) => AccumulatedContent | Promise<AccumulatedContent>} fn
-	 * @param {Payload} child
-	 * @param {PayloadItem[]} to_compact
-	 * @param {PayloadType} type
+	 * @param {Renderer} child
+	 * @param {RendererItem[]} to_compact
+	 * @param {RendererType} type
 	 */
 	static async #compact_async(fn, child, to_compact, type) {
-		const content = await Payload.#collect_content_async(to_compact, type);
+		const content = await Renderer.#collect_content_async(to_compact, type);
 		const transformed_content = await fn(content);
-		Payload.#push_accumulated_content(child, transformed_content);
+		Renderer.#push_accumulated_content(child, transformed_content);
 	}
 
 	/**
 	 * Collect all of the code from the `out` array and return it as a string, or a promise resolving to a string.
-	 * @param {PayloadItem[]} items
-	 * @param {PayloadType} current_type
+	 * @param {RendererItem[]} items
+	 * @param {RendererType} current_type
 	 * @param {AccumulatedContent} content
 	 * @returns {AccumulatedContent}
 	 */
@@ -415,8 +415,8 @@ export class Payload {
 		for (const item of items) {
 			if (typeof item === 'string') {
 				content[current_type] += item;
-			} else if (item instanceof Payload) {
-				Payload.#collect_content(item.#out, item.type, content);
+			} else if (item instanceof Renderer) {
+				Renderer.#collect_content(item.#out, item.type, content);
 			}
 		}
 		return content;
@@ -424,8 +424,8 @@ export class Payload {
 
 	/**
 	 * Collect all of the code from the `out` array and return it as a string.
-	 * @param {PayloadItem[]} items
-	 * @param {PayloadType} current_type
+	 * @param {RendererItem[]} items
+	 * @param {RendererType} current_type
 	 * @param {AccumulatedContent} content
 	 * @returns {Promise<AccumulatedContent>}
 	 */
@@ -436,7 +436,7 @@ export class Payload {
 				content[current_type] += item;
 			} else {
 				if (item.promises.initial) {
-					// this represents the async function that's modifying this payload.
+					// this represents the async function that's modifying this renderer.
 					// we can't do anything until it's done and we know our `out` array is complete.
 					await item.promises.initial;
 				}
@@ -444,20 +444,20 @@ export class Payload {
 					// this is sequential because `compact` could synchronously queue up additional followup work
 					await followup;
 				}
-				await Payload.#collect_content_async(item.#out, item.type, content);
+				await Renderer.#collect_content_async(item.#out, item.type, content);
 			}
 		}
 		return content;
 	}
 
 	/**
-	 * @param {Payload} tree
+	 * @param {Renderer} tree
 	 * @param {AccumulatedContent} accumulated_content
 	 */
 	static #push_accumulated_content(tree, accumulated_content) {
 		for (const [type, content] of Object.entries(accumulated_content)) {
 			if (!content) continue;
-			const child = new Payload(tree.global, tree, /** @type {PayloadType} */ (type));
+			const child = new Renderer(tree.global, tree, /** @type {RendererType} */ (type));
 			child.push(content);
 			tree.#out.push(child);
 		}
@@ -468,45 +468,47 @@ export class Payload {
 	 * @param {'sync' | 'async'} mode
 	 * @param {import('svelte').Component<Props>} component
 	 * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string }} options
-	 * @returns {Payload}
+	 * @returns {Renderer}
 	 */
 	static #open_render(mode, component, options) {
-		const payload = new Payload(new SSRState(mode, options.idPrefix ? options.idPrefix + '-' : ''));
+		const renderer = new Renderer(
+			new SSRState(mode, options.idPrefix ? options.idPrefix + '-' : '')
+		);
 
-		payload.push(BLOCK_OPEN);
+		renderer.push(BLOCK_OPEN);
 
 		if (options.context) {
 			push();
 			/** @type {SSRContext} */ (ssr_context).c = options.context;
-			/** @type {SSRContext} */ (ssr_context).r = payload;
+			/** @type {SSRContext} */ (ssr_context).r = renderer;
 		}
 
 		// @ts-expect-error
-		component(payload, options.props ?? {});
+		component(renderer, options.props ?? {});
 
 		if (options.context) {
 			pop();
 		}
 
-		payload.push(BLOCK_CLOSE);
+		renderer.push(BLOCK_CLOSE);
 
-		return payload;
+		return renderer;
 	}
 
 	/**
 	 * @param {AccumulatedContent} content
-	 * @param {Payload} payload
+	 * @param {Renderer} renderer
 	 */
-	static #close_render(content, payload) {
-		for (const cleanup of payload.#collect_on_destroy()) {
+	static #close_render(content, renderer) {
+		for (const cleanup of renderer.#collect_on_destroy()) {
 			cleanup();
 		}
 
-		let head = content.head + payload.global.get_title();
+		let head = content.head + renderer.global.get_title();
 
 		const body = BLOCK_OPEN + content.body + BLOCK_CLOSE; // this inserts a fake boundary so hydration matches
 
-		for (const { hash, code } of payload.global.css) {
+		for (const { hash, code } of renderer.global.css) {
 			head += `<style id="${hash}">${code}</style>`;
 		}
 
diff --git a/packages/svelte/src/internal/server/payload.test.ts b/packages/svelte/src/internal/server/renderer.test.ts
similarity index 52%
rename from packages/svelte/src/internal/server/payload.test.ts
rename to packages/svelte/src/internal/server/renderer.test.ts
index 9bf1028817..fb14654d5d 100644
--- a/packages/svelte/src/internal/server/payload.test.ts
+++ b/packages/svelte/src/internal/server/renderer.test.ts
@@ -1,68 +1,68 @@
 import { afterAll, beforeAll, describe, expect, test } from 'vitest';
-import { Payload, SSRState } from './payload.js';
+import { Renderer, SSRState } from './renderer.js';
 import type { Component } from 'svelte';
 import { disable_async_mode_flag, enable_async_mode_flag } from '../flags/index.js';
 
 test('collects synchronous body content by default', () => {
-	const component = (payload: Payload) => {
-		payload.push('a');
-		payload.child(($$payload) => {
-			$$payload.push('b');
+	const component = (renderer: Renderer) => {
+		renderer.push('a');
+		renderer.child(($$renderer) => {
+			$$renderer.push('b');
 		});
-		payload.push('c');
+		renderer.push('c');
 	};
 
-	const { head, body } = Payload.render(component as unknown as Component);
+	const { head, body } = Renderer.render(component as unknown as Component);
 	expect(head).toBe('');
 	expect(body).toBe('<!--[--><!--[-->abc<!--]--><!--]-->');
 });
 
 test('child type switches content area (head vs body)', () => {
-	const component = (payload: Payload) => {
-		payload.push('a');
-		payload.child(($$payload) => {
-			$$payload.push('<title>T</title>');
+	const component = (renderer: Renderer) => {
+		renderer.push('a');
+		renderer.child(($$renderer) => {
+			$$renderer.push('<title>T</title>');
 		}, 'head');
-		payload.push('b');
+		renderer.push('b');
 	};
 
-	const { head, body } = Payload.render(component as unknown as Component);
+	const { head, body } = Renderer.render(component as unknown as Component);
 	expect(head).toBe('<title>T</title>');
 	expect(body).toBe('<!--[--><!--[-->ab<!--]--><!--]-->');
 });
 
 test('child inherits parent type when not specified', () => {
-	const component = (payload: Payload) => {
-		payload.child((payload) => {
-			payload.push('<meta name="x"/>');
-			payload.child((payload) => {
-				payload.push('<style>/* css */</style>');
+	const component = (renderer: Renderer) => {
+		renderer.child((renderer) => {
+			renderer.push('<meta name="x"/>');
+			renderer.child((renderer) => {
+				renderer.push('<style>/* css */</style>');
 			});
 		}, 'head');
 	};
 
-	const { head, body } = Payload.render(component as unknown as Component);
+	const { head, body } = Renderer.render(component as unknown as Component);
 	expect(body).toBe('<!--[--><!--[--><!--]--><!--]-->');
 	expect(head).toBe('<meta name="x"/><style>/* css */</style>');
 });
 
-test('get_path returns the path indexes to a payload', () => {
-	const root = new Payload(new SSRState('sync'));
-	let child_a: InstanceType<typeof Payload> | undefined;
-	let child_b: InstanceType<typeof Payload> | undefined;
-	let child_b_0: InstanceType<typeof Payload> | undefined;
+test('get_path returns the path indexes to a renderer', () => {
+	const root = new Renderer(new SSRState('sync'));
+	let child_a: InstanceType<typeof Renderer> | undefined;
+	let child_b: InstanceType<typeof Renderer> | undefined;
+	let child_b_0: InstanceType<typeof Renderer> | undefined;
 
-	root.child(($$payload) => {
-		child_a = $$payload;
-		$$payload.push('A');
+	root.child(($$renderer) => {
+		child_a = $$renderer;
+		$$renderer.push('A');
 	});
-	root.child(($$payload) => {
-		child_b = $$payload;
-		$$payload.child(($$inner) => {
+	root.child(($$renderer) => {
+		child_b = $$renderer;
+		$$renderer.child(($$inner) => {
 			child_b_0 = $$inner;
 			$$inner.push('B0');
 		});
-		$$payload.push('B1');
+		$$renderer.push('B1');
 	});
 
 	expect(child_a!.get_path()).toEqual([0]);
@@ -71,26 +71,26 @@ test('get_path returns the path indexes to a payload', () => {
 });
 
 test('creating an async child in a sync context throws', () => {
-	const component = (payload: Payload) => {
-		payload.push('a');
-		payload.child(async ($$payload) => {
+	const component = (renderer: Renderer) => {
+		renderer.push('a');
+		renderer.child(async ($$renderer) => {
 			await Promise.resolve();
-			$$payload.push('x');
+			$$renderer.push('x');
 		});
 	};
 
-	expect(() => Payload.render(component as unknown as Component).head).toThrow('await_invalid');
-	expect(() => Payload.render(component as unknown as Component).html).toThrow('await_invalid');
-	expect(() => Payload.render(component as unknown as Component).body).toThrow('await_invalid');
+	expect(() => Renderer.render(component as unknown as Component).head).toThrow('await_invalid');
+	expect(() => Renderer.render(component as unknown as Component).html).toThrow('await_invalid');
+	expect(() => Renderer.render(component as unknown as Component).body).toThrow('await_invalid');
 });
 
 test('compact synchronously aggregates a range and can transform into head/body', () => {
-	const component = (payload: Payload) => {
-		const start = payload.length;
-		payload.push('a');
-		payload.push('b');
-		payload.push('c');
-		payload.compact({
+	const component = (renderer: Renderer) => {
+		const start = renderer.length;
+		renderer.push('a');
+		renderer.push('b');
+		renderer.push('c');
+		renderer.compact({
 			start,
 			end: start + 2,
 			fn: (content) => {
@@ -99,17 +99,17 @@ test('compact synchronously aggregates a range and can transform into head/body'
 		});
 	};
 
-	const { head, body } = Payload.render(component as unknown as Component);
+	const { head, body } = Renderer.render(component as unknown as Component);
 	expect(head).toBe('<h>H</h>');
 	expect(body).toBe('<!--[--><!--[-->abdc<!--]--><!--]-->');
 });
 
 test('local state is shallow-copied to children', () => {
-	const root = new Payload(new SSRState('sync'));
+	const root = new Renderer(new SSRState('sync'));
 	root.local.select_value = 'A';
-	let child: InstanceType<typeof Payload> | undefined;
-	root.child(($$payload) => {
-		child = $$payload;
+	let child: InstanceType<typeof Renderer> | undefined;
+	root.child(($$renderer) => {
+		child = $$renderer;
 	});
 
 	expect(child!.local.select_value).toBe('A');
@@ -118,14 +118,14 @@ test('local state is shallow-copied to children', () => {
 });
 
 test('subsume replaces tree content and state from other', () => {
-	const a = new Payload(new SSRState('async'), undefined, 'head');
+	const a = new Renderer(new SSRState('async'), undefined, 'head');
 	a.push('<meta />');
 	a.local.select_value = 'A';
 
-	const b = new Payload(new SSRState('async'));
-	b.child(async ($$payload) => {
+	const b = new Renderer(new SSRState('async'));
+	b.child(async ($$renderer) => {
 		await Promise.resolve();
-		$$payload.push('body');
+		$$renderer.push('body');
 	});
 	b.global.css.add({ hash: 'h', code: 'c' });
 	b.global.set_title('Title', [1]);
@@ -140,14 +140,14 @@ test('subsume replaces tree content and state from other', () => {
 });
 
 test('subsume refuses to switch modes', () => {
-	const a = new Payload(new SSRState('sync'), undefined, 'head');
+	const a = new Renderer(new SSRState('sync'), undefined, 'head');
 	a.push('<meta />');
 	a.local.select_value = 'A';
 
-	const b = new Payload(new SSRState('async'));
-	b.child(async ($$payload) => {
+	const b = new Renderer(new SSRState('async'));
+	b.child(async ($$renderer) => {
 		await Promise.resolve();
-		$$payload.push('body');
+		$$renderer.push('body');
 	});
 	b.global.css.add({ hash: 'h', code: 'c' });
 	b.global.set_title('Title', [1]);
@@ -155,7 +155,7 @@ test('subsume refuses to switch modes', () => {
 	b.promises.initial = Promise.resolve();
 
 	expect(() => a.subsume(b)).toThrow(
-		"invariant: A payload cannot switch modes. If you're seeing this, there's a compiler bug. File an issue!"
+		"invariant: A renderer cannot switch modes. If you're seeing this, there's a compiler bug. File an issue!"
 	);
 });
 
@@ -200,31 +200,31 @@ describe('async', () => {
 		disable_async_mode_flag();
 	});
 
-	test('awaiting payload gets async content', async () => {
-		const component = (payload: Payload) => {
-			payload.push('1');
-			payload.child(async ($$payload) => {
+	test('awaiting renderer gets async content', async () => {
+		const component = (renderer: Renderer) => {
+			renderer.push('1');
+			renderer.child(async ($$renderer) => {
 				await Promise.resolve();
-				$$payload.push('2');
+				$$renderer.push('2');
 			});
-			payload.push('3');
+			renderer.push('3');
 		};
 
-		const result = await Payload.render(component as unknown as Component);
+		const result = await Renderer.render(component as unknown as Component);
 		expect(result.head).toBe('');
 		expect(result.body).toBe('<!--[--><!--[-->123<!--]--><!--]-->');
 		expect(() => result.html).toThrow('html_deprecated');
 	});
 
 	test('compact schedules followup when compaction input is async', async () => {
-		const component = (payload: Payload) => {
-			payload.push('a');
-			payload.child(async ($$payload) => {
+		const component = (renderer: Renderer) => {
+			renderer.push('a');
+			renderer.child(async ($$renderer) => {
 				await Promise.resolve();
-				$$payload.push('X');
+				$$renderer.push('X');
 			});
-			payload.push('b');
-			payload.compact({
+			renderer.push('b');
+			renderer.compact({
 				start: 0,
 				fn: async (content) => ({
 					body: content.body.toLowerCase(),
@@ -233,132 +233,132 @@ describe('async', () => {
 			});
 		};
 
-		const { body, head } = await Payload.render(component as unknown as Component);
+		const { body, head } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
 		expect(body).toBe('<!--[--><!--[-->axb<!--]--><!--]-->');
 	});
 
 	test('push accepts async functions in async context', async () => {
-		const component = (payload: Payload) => {
-			payload.push('a');
-			payload.push(async () => {
+		const component = (renderer: Renderer) => {
+			renderer.push('a');
+			renderer.push(async () => {
 				await Promise.resolve();
 				return 'b';
 			});
-			payload.push('c');
+			renderer.push('c');
 		};
 
-		const { head, body } = await Payload.render(component as unknown as Component);
+		const { head, body } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
 		expect(body).toBe('<!--[--><!--[-->abc<!--]--><!--]-->');
 	});
 
 	test('push handles async functions with different timing', async () => {
-		const component = (payload: Payload) => {
-			payload.push(async () => {
+		const component = (renderer: Renderer) => {
+			renderer.push(async () => {
 				await Promise.resolve();
 				return 'fast';
 			});
-			payload.push(async () => {
+			renderer.push(async () => {
 				await new Promise((resolve) => setTimeout(resolve, 10));
 				return 'slow';
 			});
-			payload.push('sync');
+			renderer.push('sync');
 		};
 
-		const { head, body } = await Payload.render(component as unknown as Component);
+		const { head, body } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
 		expect(body).toBe('<!--[--><!--[-->fastslowsync<!--]--><!--]-->');
 	});
 
 	test('push async functions work with head content type', async () => {
-		const component = (payload: Payload) => {
-			payload.child(($$payload) => {
-				$$payload.push(async () => {
+		const component = (renderer: Renderer) => {
+			renderer.child(($$renderer) => {
+				$$renderer.push(async () => {
 					await Promise.resolve();
 					return '<title>Async Title</title>';
 				});
 			}, 'head');
 		};
 
-		const { head, body } = await Payload.render(component as unknown as Component);
+		const { head, body } = await Renderer.render(component as unknown as Component);
 		expect(body).toBe('<!--[--><!--[--><!--]--><!--]-->');
 		expect(head).toBe('<title>Async Title</title>');
 	});
 
-	test('push async functions can be mixed with child payloads', async () => {
-		const component = (payload: Payload) => {
-			payload.push('start-');
-			payload.push(async () => {
+	test('push async functions can be mixed with child renderers', async () => {
+		const component = (renderer: Renderer) => {
+			renderer.push('start-');
+			renderer.push(async () => {
 				await Promise.resolve();
 				return 'async-';
 			});
-			payload.child(($$payload) => {
-				$$payload.push('child-');
+			renderer.child(($$renderer) => {
+				$$renderer.push('child-');
 			});
-			payload.push('-end');
+			renderer.push('-end');
 		};
 
-		const { head, body } = await Payload.render(component as unknown as Component);
+		const { head, body } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
 		expect(body).toBe('<!--[--><!--[-->start-async-child--end<!--]--><!--]-->');
 	});
 
 	test('push async functions work with compact operations', async () => {
-		const component = (payload: Payload) => {
-			payload.push('a');
-			payload.push(async () => {
+		const component = (renderer: Renderer) => {
+			renderer.push('a');
+			renderer.push(async () => {
 				await Promise.resolve();
 				return 'b';
 			});
-			payload.push('c');
-			payload.compact({
+			renderer.push('c');
+			renderer.compact({
 				start: 0,
 				fn: (content) => ({ head: '', body: content.body.toUpperCase() })
 			});
 		};
 
-		const { head, body } = await Payload.render(component as unknown as Component);
+		const { head, body } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
 		expect(body).toBe('<!--[--><!--[-->ABC<!--]--><!--]-->');
 	});
 
 	test('push async functions are not supported in sync context', () => {
-		const component = (payload: Payload) => {
-			payload.push('a');
-			payload.push(() => Promise.resolve('b'));
+		const component = (renderer: Renderer) => {
+			renderer.push('a');
+			renderer.push(() => Promise.resolve('b'));
 		};
 
-		expect(() => Payload.render(component as unknown as Component).body).toThrow('await_invalid');
-		expect(() => Payload.render(component as unknown as Component).html).toThrow('await_invalid');
-		expect(() => Payload.render(component as unknown as Component).head).toThrow('await_invalid');
+		expect(() => Renderer.render(component as unknown as Component).body).toThrow('await_invalid');
+		expect(() => Renderer.render(component as unknown as Component).html).toThrow('await_invalid');
+		expect(() => Renderer.render(component as unknown as Component).head).toThrow('await_invalid');
 	});
 
 	test('on_destroy yields callbacks in the correct order', async () => {
 		const destroyed: string[] = [];
-		const component = (payload: Payload) => {
-			payload.component((payload) => {
-				payload.on_destroy(() => destroyed.push('a'));
+		const component = (renderer: Renderer) => {
+			renderer.component((renderer) => {
+				renderer.on_destroy(() => destroyed.push('a'));
 				// children should not alter relative order
-				payload.child(async (payload) => {
+				renderer.child(async (renderer) => {
 					await Promise.resolve();
-					payload.on_destroy(() => destroyed.push('b'));
-					payload.on_destroy(() => destroyed.push('b*'));
+					renderer.on_destroy(() => destroyed.push('b'));
+					renderer.on_destroy(() => destroyed.push('b*'));
 				});
 				// but child components should
-				payload.component((payload) => {
-					payload.on_destroy(() => destroyed.push('c'));
+				renderer.component((renderer) => {
+					renderer.on_destroy(() => destroyed.push('c'));
 				});
-				payload.child((payload) => {
-					payload.on_destroy(() => destroyed.push('d'));
+				renderer.child((renderer) => {
+					renderer.on_destroy(() => destroyed.push('d'));
 				});
-				payload.component((payload) => {
-					payload.on_destroy(() => destroyed.push('e'));
+				renderer.component((renderer) => {
+					renderer.on_destroy(() => destroyed.push('e'));
 				});
 			});
 		};
 
-		await Payload.render(component as unknown as Component);
+		await Renderer.render(component as unknown as Component);
 		expect(destroyed).toEqual(['c', 'e', 'a', 'b', 'b*', 'd']);
 	});
 });
diff --git a/packages/svelte/src/internal/server/types.d.ts b/packages/svelte/src/internal/server/types.d.ts
index be27ea7bd3..53cefabc69 100644
--- a/packages/svelte/src/internal/server/types.d.ts
+++ b/packages/svelte/src/internal/server/types.d.ts
@@ -1,13 +1,13 @@
 import type { Element } from './dev';
-import type { Payload } from './payload';
+import type { Renderer } from './renderer';
 
 export interface SSRContext {
 	/** parent */
 	p: null | SSRContext;
 	/** component context */
 	c: null | Map<unknown, unknown>;
-	/** payload (renderer) */
-	r: null | Payload;
+	/** renderer */
+	r: null | Renderer;
 	/** dev mode only: the current component function */
 	function?: any;
 	/** dev mode only: the current element */
diff --git a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
index 808818cc9e..599ef30233 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
@@ -1,25 +1,25 @@
 import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
-export default function Async_each_fallback_hoisting($$payload) {
-	$$payload.child(async ($$payload) => {
+export default function Async_each_fallback_hoisting( $$renderer) {
+	 $$renderer.child(async ( $$renderer) => {
 		const each_array = $.ensure_array_like(await Promise.resolve([]));
 
 		if (each_array.length !== 0) {
-			$$payload.push('<!--[-->');
+			 $$renderer.push('<!--[-->');
 
 			for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
 				let item = each_array[$$index];
 
-				$$payload.push(`<!---->`);
-				$$payload.push(async () => $.escape(await Promise.reject('This should never be reached')));
+				 $$renderer.push(`<!---->`);
+				 $$renderer.push(async () => $.escape(await Promise.reject('This should never be reached')));
 			}
 		} else {
-			$$payload.push('<!--[!-->');
-			$$payload.push(`<!---->`);
-			$$payload.push(async () => $.escape(await Promise.resolve(4)));
+			 $$renderer.push('<!--[!-->');
+			 $$renderer.push(`<!---->`);
+			 $$renderer.push(async () => $.escape(await Promise.resolve(4)));
 		}
 	});
 
-	$$payload.push(`<!--]-->`);
+	 $$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
index 6c2f837954..e021115677 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
@@ -1,23 +1,23 @@
 import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
-export default function Async_each_hoisting($$payload) {
+export default function Async_each_hoisting( $$renderer) {
 	const first = Promise.resolve(1);
 	const second = Promise.resolve(2);
 	const third = Promise.resolve(3);
 
-	$$payload.push(`<!--[-->`);
+	 $$renderer.push(`<!--[-->`);
 
-	$$payload.child(async ($$payload) => {
+	 $$renderer.child(async ( $$renderer) => {
 		const each_array = $.ensure_array_like(await Promise.resolve([first, second, third]));
 
 		for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
 			let item = each_array[$$index];
 
-			$$payload.push(`<!---->`);
-			$$payload.push(async () => $.escape(await item));
+			 $$renderer.push(`<!---->`);
+			 $$renderer.push(async () => $.escape(await item));
 		}
 	});
 
-	$$payload.push(`<!--]-->`);
+	 $$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
index a645882a54..021f6b113e 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
@@ -1,16 +1,16 @@
 import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
-export default function Async_if_alternate_hoisting($$payload) {
-	$$payload.child(async ($$payload) => {
+export default function Async_if_alternate_hoisting( $$renderer) {
+	 $$renderer.child(async ( $$renderer) => {
 		if (await Promise.resolve(false)) {
-			$$payload.push('<!--[-->');
-			$$payload.push(async () => $.escape(await Promise.reject('no no no')));
+			 $$renderer.push('<!--[-->');
+			 $$renderer.push(async () => $.escape(await Promise.reject('no no no')));
 		} else {
-			$$payload.push('<!--[!-->');
-			$$payload.push(async () => $.escape(await Promise.resolve('yes yes yes')));
+			 $$renderer.push('<!--[!-->');
+			 $$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
 		}
 	});
 
-	$$payload.push(`<!--]-->`);
+	 $$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
index 1d75b5ad96..41c919d37f 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
@@ -1,16 +1,16 @@
 import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
-export default function Async_if_hoisting($$payload) {
-	$$payload.child(async ($$payload) => {
+export default function Async_if_hoisting( $$renderer) {
+	 $$renderer.child(async ( $$renderer) => {
 		if (await Promise.resolve(true)) {
-			$$payload.push('<!--[-->');
-			$$payload.push(async () => $.escape(await Promise.resolve('yes yes yes')));
+			 $$renderer.push('<!--[-->');
+			 $$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
 		} else {
-			$$payload.push('<!--[!-->');
-			$$payload.push(async () => $.escape(await Promise.reject('no no no')));
+			 $$renderer.push('<!--[!-->');
+			 $$renderer.push(async () => $.escape(await Promise.reject('no no no')));
 		}
 	});
 
-	$$payload.push(`<!--]-->`);
+	 $$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
index c0e3512178..5b9c864f08 100644
--- a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Await_block_scope($$payload) {
+export default function Await_block_scope( $$renderer) {
 	let counter = { count: 0 };
 	const promise = Promise.resolve(counter);
 
@@ -8,7 +8,7 @@ export default function Await_block_scope($$payload) {
 		counter.count += 1;
 	}
 
-	$$payload.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
-	$.await($$payload, promise, () => {}, (counter) => {});
-	$$payload.push(`<!--]--> ${$.escape(counter.count)}`);
+	 $$renderer.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
+	$.await( $$renderer, promise, () => {}, (counter) => {});
+	 $$renderer.push(`<!--]--> ${$.escape(counter.count)}`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
index f2b687489b..bc4544d854 100644
--- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
@@ -1,18 +1,18 @@
 import * as $ from 'svelte/internal/server';
 import TextInput from './Child.svelte';
 
-function snippet($$payload) {
-	$$payload.push(`<!---->Something`);
+function snippet( $$renderer) {
+	 $$renderer.push(`<!---->Something`);
 }
 
-export default function Bind_component_snippet($$payload) {
+export default function Bind_component_snippet( $$renderer) {
 	let value = '';
 	const _snippet = snippet;
 	let $$settled = true;
-	let $$inner_payload;
+	let $$inner_renderer;
 
-	function $$render_inner($$payload) {
-		TextInput($$payload, {
+	function $$render_inner( $$renderer) {
+		TextInput( $$renderer, {
 			get value() {
 				return value;
 			},
@@ -23,14 +23,14 @@ export default function Bind_component_snippet($$payload) {
 			}
 		});
 
-		$$payload.push(`<!----> value: ${$.escape(value)}`);
+		 $$renderer.push(`<!----> value: ${$.escape(value)}`);
 	}
 
 	do {
 		$$settled = true;
-		$$inner_payload = $$payload.copy();
-		$$render_inner($$inner_payload);
+		$$inner_renderer =  $$renderer.copy();
+		$$render_inner($$inner_renderer);
 	} while (!$$settled);
 
-	$$payload.subsume($$inner_payload);
+	 $$renderer.subsume($$inner_renderer);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js
index 148573766f..0af5d879db 100644
--- a/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Bind_this($$payload) {
-	Foo($$payload, {});
+export default function Bind_this( $$renderer) {
+	Foo( $$renderer, {});
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
index e426a08989..30976c1818 100644
--- a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Class_state_field_constructor_assignment($$payload, $$props) {
-	$$payload.component(($$payload) => {
+export default function Class_state_field_constructor_assignment( $$renderer, $$props) {
+	 $$renderer.component(( $$renderer) => {
 		class Foo {
 			a = 0;
 			#b;
diff --git a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
index a17c437cd9..141721c0d8 100644
--- a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
@@ -1,13 +1,13 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Delegated_locally_declared_shadowed($$payload) {
-	$$payload.push(`<!--[-->`);
+export default function Delegated_locally_declared_shadowed( $$renderer) {
+	 $$renderer.push(`<!--[-->`);
 
 	const each_array = $.ensure_array_like({ length: 1 });
 
 	for (let index = 0, $$length = each_array.length; index < $$length; index++) {
-		$$payload.push(`<button type="button"${$.attr('data-index', index)}>B</button>`);
+		 $$renderer.push(`<button type="button"${$.attr('data-index', index)}>B</button>`);
 	}
 
-	$$payload.push(`<!--]-->`);
+	 $$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
index deaeaf6bfa..764ebf28da 100644
--- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
@@ -1,10 +1,10 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Main($$payload) {
+export default function Main( $$renderer) {
 	// needs to be a snapshot test because jsdom does auto-correct the attribute casing
 	let x = 'test';
 
 	let y = () => 'test';
 
-	$$payload.push(`<div${$.attr('foobar', x)}></div> <svg${$.attr('viewBox', x)}></svg> <custom-element${$.attr('foobar', x)}></custom-element> <div${$.attr('foobar', y())}></div> <svg${$.attr('viewBox', y())}></svg> <custom-element${$.attr('foobar', y())}></custom-element>`);
+	 $$renderer.push(`<div${$.attr('foobar', x)}></div> <svg${$.attr('viewBox', x)}></svg> <custom-element${$.attr('foobar', x)}></custom-element> <div${$.attr('foobar', y())}></div> <svg${$.attr('viewBox', y())}></svg> <custom-element${$.attr('foobar', y())}></custom-element>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
index abec4f42fa..e46b227b69 100644
--- a/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
@@ -1,13 +1,13 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Each_index_non_null($$payload) {
-	$$payload.push(`<!--[-->`);
+export default function Each_index_non_null( $$renderer) {
+	 $$renderer.push(`<!--[-->`);
 
 	const each_array = $.ensure_array_like(Array(10));
 
 	for (let i = 0, $$length = each_array.length; i < $$length; i++) {
-		$$payload.push(`<p>index: ${$.escape(i)}</p>`);
+		 $$renderer.push(`<p>index: ${$.escape(i)}</p>`);
 	}
 
-	$$payload.push(`<!--]-->`);
+	 $$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
index fda6e5fbb3..42d262152c 100644
--- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
@@ -1,15 +1,15 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Each_string_template($$payload) {
-	$$payload.push(`<!--[-->`);
+export default function Each_string_template( $$renderer) {
+	 $$renderer.push(`<!--[-->`);
 
 	const each_array = $.ensure_array_like(['foo', 'bar', 'baz']);
 
 	for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
 		let thing = each_array[$$index];
 
-		$$payload.push(`<!---->${$.escape(thing)}, `);
+		 $$renderer.push(`<!---->${$.escape(thing)}, `);
 	}
 
-	$$payload.push(`<!--]-->`);
+	 $$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
index a9fa4efd50..af9746e60c 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Function_prop_no_getter($$payload) {
+export default function Function_prop_no_getter( $$renderer) {
 	let count = 0;
 
 	function onmouseup() {
@@ -9,13 +9,13 @@ export default function Function_prop_no_getter($$payload) {
 
 	const plusOne = (num) => num + 1;
 
-	Button($$payload, {
+	Button( $$renderer, {
 		onmousedown: () => count += 1,
 		onmouseup,
 		onmouseenter: () => count = plusOne(count),
 
-		children: ($$payload) => {
-			$$payload.push(`<!---->clicks: ${$.escape(count)}`);
+		children: ( $$renderer) => {
+			 $$renderer.push(`<!---->clicks: ${$.escape(count)}`);
 		},
 
 		$$slots: { default: true }
diff --git a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
index e23a50cff5..c2340dbd74 100644
--- a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Functional_templating($$payload) {
-	$$payload.push(`<h1>hello</h1> <div class="potato"><p>child element</p> <p>another child element</p></div>`);
+export default function Functional_templating( $$renderer) {
+	 $$renderer.push(`<h1>hello</h1> <div class="potato"><p>child element</p> <p>another child element</p></div>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
index 6bdf5b4495..07ed88aae1 100644
--- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Hello_world($$payload) {
-	$$payload.push(`<h1>hello world</h1>`);
+export default function Hello_world( $$renderer) {
+	 $$renderer.push(`<h1>hello world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
index 99813a32b1..c7d6aea293 100644
--- a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Hmr($$payload) {
-	$$payload.push(`<h1>hello world</h1>`);
+export default function Hmr( $$renderer) {
+	 $$renderer.push(`<h1>hello world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js
index 2ed863d68f..ae755b3702 100644
--- a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js
@@ -1,4 +1,4 @@
 import * as $ from 'svelte/internal/server';
 import { random } from './module.svelte';
 
-export default function Imports_in_modules($$payload) {}
\ No newline at end of file
+export default function Imports_in_modules( $$renderer) {}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
index f096ddd3ba..3e1d1ca47b 100644
--- a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
@@ -1,8 +1,8 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Nullish_coallescence_omittance($$payload) {
+export default function Nullish_coallescence_omittance( $$renderer) {
 	let name = 'world';
 	let count = 0;
 
-	$$payload.push(`<h1>Hello, world!</h1> <b>123</b> <button>Count is ${$.escape(count)}</button> <h1>Hello, world</h1>`);
+	 $$renderer.push(`<h1>Hello, world!</h1> <b>123</b> <button>Count is ${$.escape(count)}</button> <h1>Hello, world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
index 7871172433..d9727d4623 100644
--- a/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Props_identifier($$payload, $$props) {
-	$$payload.component(($$payload) => {
+export default function Props_identifier( $$renderer, $$props) {
+	 $$renderer.component(( $$renderer) => {
 		let { $$slots, $$events, ...props } = $$props;
 
 		props.a;
diff --git a/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
index b19e3aac52..2c8f83cb26 100644
--- a/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Purity($$payload) {
-	$$payload.push(`<p>0</p> <p>${$.escape(location.href)}</p> `);
-	Child($$payload, { prop: encodeURIComponent('hello') });
-	$$payload.push(`<!---->`);
+export default function Purity( $$renderer) {
+	 $$renderer.push(`<p>0</p> <p>${$.escape(location.href)}</p> `);
+	Child( $$renderer, { prop: encodeURIComponent('hello') });
+	 $$renderer.push(`<!---->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
index e49480f682..68bbf103ba 100644
--- a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Skip_static_subtree($$payload, $$props) {
+export default function Skip_static_subtree( $$renderer, $$props) {
 	let { title, content } = $$props;
 
-	$$payload.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected($$payload, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
+	 $$renderer.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected( $$renderer, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
index 2c66dc5759..a6a53e6396 100644
--- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function State_proxy_literal($$payload) {
+export default function State_proxy_literal( $$renderer) {
 	let str = '';
 	let tpl = ``;
 
@@ -11,5 +11,5 @@ export default function State_proxy_literal($$payload) {
 		tpl = ``;
 	}
 
-	$$payload.push(`<input${$.attr('value', str)}/> <input${$.attr('value', tpl)}/> <button>reset</button>`);
+	 $$renderer.push(`<input${$.attr('value', str)}/> <input${$.attr('value', tpl)}/> <button>reset</button>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js
index 4426ad1164..dcfa3da129 100644
--- a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Svelte_element($$payload, $$props) {
+export default function Svelte_element( $$renderer, $$props) {
 	let { tag = 'hr' } = $$props;
 
-	$.element($$payload, tag);
+	$.element( $$renderer, tag);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
index 1ed2b812db..5310bca90e 100644
--- a/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Text_nodes_deriveds($$payload) {
+export default function Text_nodes_deriveds( $$renderer) {
 	let count1 = 0;
 	let count2 = 0;
 
@@ -12,5 +12,5 @@ export default function Text_nodes_deriveds($$payload) {
 		return count2;
 	}
 
-	$$payload.push(`<p>${$.escape(text1())}${$.escape(text2())}</p>`);
+	 $$renderer.push(`<p>${$.escape(text1())}${$.escape(text2())}</p>`);
 }
\ No newline at end of file

From 6076bab730ee7752898926ac6e10bbaf5e665a22 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 17 Sep 2025 19:30:45 -0400
Subject: [PATCH 26/68] fix: issue `state_proxy_unmount` warning when
 unmounting a state proxy (#16747)

* fix: issue `state_proxy_unmount` warning when unmounting a state proxy

* regenerate
---
 .changeset/fuzzy-pillows-tell.md              |  5 +++++
 .../.generated/client-warnings.md             | 21 +++++++++++++++++++
 .../messages/client-warnings/warnings.md      | 19 +++++++++++++++++
 packages/svelte/src/internal/client/render.js |  8 +++++--
 .../svelte/src/internal/client/warnings.js    | 11 ++++++++++
 5 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/fuzzy-pillows-tell.md

diff --git a/.changeset/fuzzy-pillows-tell.md b/.changeset/fuzzy-pillows-tell.md
new file mode 100644
index 0000000000..9d2e54ac64
--- /dev/null
+++ b/.changeset/fuzzy-pillows-tell.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: issue `state_proxy_unmount` warning when unmounting a state proxy
diff --git a/documentation/docs/98-reference/.generated/client-warnings.md b/documentation/docs/98-reference/.generated/client-warnings.md
index 6f1d677fe9..c95ace2229 100644
--- a/documentation/docs/98-reference/.generated/client-warnings.md
+++ b/documentation/docs/98-reference/.generated/client-warnings.md
@@ -312,6 +312,27 @@ Reactive `$state(...)` proxies and the values they proxy have different identiti
 
 To resolve this, ensure you're comparing values where both values were created with `$state(...)`, or neither were. Note that `$state.raw(...)` will _not_ create a state proxy.
 
+### state_proxy_unmount
+
+```
+Tried to unmount a state proxy, rather than a component
+```
+
+`unmount` was called with a state proxy:
+
+```js
+import { mount, unmount } from 'svelte';
+import Component from './Component.svelte';
+let target = document.body;
+// ---cut---
+let component = $state(mount(Component, { target }));
+
+// later...
+unmount(component);
+```
+
+Avoid using `$state` here. If `component` _does_ need to be reactive for some reason, use `$state.raw` instead.
+
 ### svelte_boundary_reset_noop
 
 ```
diff --git a/packages/svelte/messages/client-warnings/warnings.md b/packages/svelte/messages/client-warnings/warnings.md
index 123c6833e6..9763c8df1a 100644
--- a/packages/svelte/messages/client-warnings/warnings.md
+++ b/packages/svelte/messages/client-warnings/warnings.md
@@ -272,6 +272,25 @@ To silence the warning, ensure that `value`:
 
 To resolve this, ensure you're comparing values where both values were created with `$state(...)`, or neither were. Note that `$state.raw(...)` will _not_ create a state proxy.
 
+## state_proxy_unmount
+
+> Tried to unmount a state proxy, rather than a component
+
+`unmount` was called with a state proxy:
+
+```js
+import { mount, unmount } from 'svelte';
+import Component from './Component.svelte';
+let target = document.body;
+// ---cut---
+let component = $state(mount(Component, { target }));
+
+// later...
+unmount(component);
+```
+
+Avoid using `$state` here. If `component` _does_ need to be reactive for some reason, use `$state.raw` instead.
+
 ## svelte_boundary_reset_noop
 
 > A `<svelte:boundary>` `reset` function only resets the boundary the first time it is called
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index 0910c6d06c..ecd22a1db6 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -30,7 +30,7 @@ import * as w from './warnings.js';
 import * as e from './errors.js';
 import { assign_nodes } from './dom/template.js';
 import { is_passive_event } from '../../utils.js';
-import { COMMENT_NODE } from './constants.js';
+import { COMMENT_NODE, STATE_SYMBOL } from './constants.js';
 import { boundary } from './dom/blocks/boundary.js';
 
 /**
@@ -316,7 +316,11 @@ export function unmount(component, options) {
 	}
 
 	if (DEV) {
-		w.lifecycle_double_unmount();
+		if (STATE_SYMBOL in component) {
+			w.state_proxy_unmount();
+		} else {
+			w.lifecycle_double_unmount();
+		}
 	}
 
 	return Promise.resolve();
diff --git a/packages/svelte/src/internal/client/warnings.js b/packages/svelte/src/internal/client/warnings.js
index dfa2a3752e..1081ef5861 100644
--- a/packages/svelte/src/internal/client/warnings.js
+++ b/packages/svelte/src/internal/client/warnings.js
@@ -224,6 +224,17 @@ export function state_proxy_equality_mismatch(operator) {
 	}
 }
 
+/**
+ * Tried to unmount a state proxy, rather than a component
+ */
+export function state_proxy_unmount() {
+	if (DEV) {
+		console.warn(`%c[svelte] state_proxy_unmount\n%cTried to unmount a state proxy, rather than a component\nhttps://svelte.dev/e/state_proxy_unmount`, bold, normal);
+	} else {
+		console.warn(`https://svelte.dev/e/state_proxy_unmount`);
+	}
+}
+
 /**
  * A `<svelte:boundary>` `reset` function only resets the boundary the first time it is called
  */

From 16e16da1a89ce1176e3931935ba0405bfa5c1bbd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 19:32:27 -0400
Subject: [PATCH 27/68] Version Packages (#16785)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/fuzzy-pillows-tell.md | 5 -----
 .changeset/sixty-crabs-laugh.md  | 5 -----
 packages/svelte/CHANGELOG.md     | 8 ++++++++
 packages/svelte/package.json     | 2 +-
 packages/svelte/src/version.js   | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/fuzzy-pillows-tell.md
 delete mode 100644 .changeset/sixty-crabs-laugh.md

diff --git a/.changeset/fuzzy-pillows-tell.md b/.changeset/fuzzy-pillows-tell.md
deleted file mode 100644
index 9d2e54ac64..0000000000
--- a/.changeset/fuzzy-pillows-tell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: issue `state_proxy_unmount` warning when unmounting a state proxy
diff --git a/.changeset/sixty-crabs-laugh.md b/.changeset/sixty-crabs-laugh.md
deleted file mode 100644
index 1780ddc166..0000000000
--- a/.changeset/sixty-crabs-laugh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: add `then` to class component `render` output
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 57ee2565c4..24b1e2f429 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.39.1
+
+### Patch Changes
+
+- fix: issue `state_proxy_unmount` warning when unmounting a state proxy ([#16747](https://github.com/sveltejs/svelte/pull/16747))
+
+- fix: add `then` to class component `render` output ([#16783](https://github.com/sveltejs/svelte/pull/16783))
+
 ## 5.39.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 24e9aa27e8..1563207957 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.39.0",
+  "version": "5.39.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 5b682ef1d3..d43938dca6 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.39.0';
+export const VERSION = '5.39.1';
 export const PUBLIC_VERSION = '5';

From 88d7e05a2e2447228768bf3dcbbcab735bae0408 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 17 Sep 2025 21:06:10 -0400
Subject: [PATCH 28/68] chore: update sandbox to support async SSR (#16787)

* chore: update sandbox to support async SSR

* dedupe

* fix some stuff

* fix

* bump devDependencies
---
 .changeset/friendly-queens-melt.md            |    5 +
 package.json                                  |    1 +
 packages/svelte/src/compiler/types/index.d.ts |    7 +-
 .../svelte/src/compiler/utils/builders.js     |   12 +-
 .../each-block-destructured/output.json       |    3 +-
 .../output.json                               |    3 +-
 playgrounds/sandbox/Wrapper.svelte            |    9 -
 playgrounds/sandbox/index.html                |    2 +-
 playgrounds/sandbox/package.json              |    8 +-
 playgrounds/sandbox/ssr-dev.js                |    6 +-
 playgrounds/sandbox/ssr-prod.js               |    2 +-
 playgrounds/sandbox/vite.config.js            |    3 +-
 pnpm-lock.yaml                                | 1013 +++++++++--------
 13 files changed, 577 insertions(+), 497 deletions(-)
 create mode 100644 .changeset/friendly-queens-melt.md
 delete mode 100644 playgrounds/sandbox/Wrapper.svelte

diff --git a/.changeset/friendly-queens-melt.md b/.changeset/friendly-queens-melt.md
new file mode 100644
index 0000000000..bbfce12bfb
--- /dev/null
+++ b/.changeset/friendly-queens-melt.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+chore: bump some devDependencies
diff --git a/package.json b/package.json
index 971bd020d1..df882141ac 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "@sveltejs/eslint-config": "^8.3.3",
     "@svitejs/changesets-changelog-github-compact": "^1.1.0",
     "@types/node": "^20.11.5",
+    "@types/picomatch": "^4.0.2",
     "@vitest/coverage-v8": "^2.1.9",
     "eslint": "^9.9.1",
     "eslint-plugin-lube": "^0.4.3",
diff --git a/packages/svelte/src/compiler/types/index.d.ts b/packages/svelte/src/compiler/types/index.d.ts
index e13c9a9e22..9bd4b91d58 100644
--- a/packages/svelte/src/compiler/types/index.d.ts
+++ b/packages/svelte/src/compiler/types/index.d.ts
@@ -283,11 +283,16 @@ export type DeclarationKind =
 	| 'var'
 	| 'let'
 	| 'const'
+	| 'using'
+	| 'await using'
 	| 'function'
 	| 'import'
 	| 'param'
 	| 'rest_param'
-	| 'synthetic';
+	| 'synthetic'
+	// TODO not yet implemented, but needed for TypeScript reasons
+	| 'using'
+	| 'await using';
 
 export interface ExpressionMetadata {
 	/** All the bindings that are referenced eagerly (not inside functions) in this expression */
diff --git a/packages/svelte/src/compiler/utils/builders.js b/packages/svelte/src/compiler/utils/builders.js
index f69beed509..99306ce4d9 100644
--- a/packages/svelte/src/compiler/utils/builders.js
+++ b/packages/svelte/src/compiler/utils/builders.js
@@ -364,7 +364,14 @@ export function prop(kind, key, value, computed = false) {
  * @returns {ESTree.PropertyDefinition}
  */
 export function prop_def(key, value, computed = false, is_static = false) {
-	return { type: 'PropertyDefinition', key, value, computed, static: is_static };
+	return {
+		type: 'PropertyDefinition',
+		decorators: [],
+		key,
+		value,
+		computed,
+		static: is_static
+	};
 }
 
 /**
@@ -565,6 +572,7 @@ function for_builder(init, test, update, body) {
 export function method(kind, key, params, body, computed = false, is_static = false) {
 	return {
 		type: 'MethodDefinition',
+		decorators: [],
 		key,
 		kind,
 		value: function_builder(null, params, block(body)),
@@ -610,6 +618,7 @@ function if_builder(test, consequent, alternate) {
 export function import_all(as, source) {
 	return {
 		type: 'ImportDeclaration',
+		attributes: [],
 		source: literal(source),
 		specifiers: [import_namespace(as)]
 	};
@@ -623,6 +632,7 @@ export function import_all(as, source) {
 export function imports(parts, source) {
 	return {
 		type: 'ImportDeclaration',
+		attributes: [],
 		source: literal(source),
 		specifiers: parts.map((p) => ({
 			type: 'ImportSpecifier',
diff --git a/packages/svelte/tests/parser-legacy/samples/each-block-destructured/output.json b/packages/svelte/tests/parser-legacy/samples/each-block-destructured/output.json
index d19f5cbbfd..637da24aea 100644
--- a/packages/svelte/tests/parser-legacy/samples/each-block-destructured/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/each-block-destructured/output.json
@@ -259,7 +259,8 @@
 						"kind": "let"
 					},
 					"specifiers": [],
-					"source": null
+					"source": null,
+					"attributes": []
 				}
 			],
 			"sourceType": "module"
diff --git a/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/output.json b/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/output.json
index 03a526f04e..64250cb302 100644
--- a/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script-context-module-unquoted/output.json
@@ -169,7 +169,8 @@
 						"kind": "const"
 					},
 					"specifiers": [],
-					"source": null
+					"source": null,
+					"attributes": []
 				}
 			],
 			"sourceType": "module"
diff --git a/playgrounds/sandbox/Wrapper.svelte b/playgrounds/sandbox/Wrapper.svelte
deleted file mode 100644
index 1fe82c1716..0000000000
--- a/playgrounds/sandbox/Wrapper.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-	import App from './src/App.svelte';
-</script>
-
-<svelte:boundary>
-	<App />
-
-	{#snippet pending()}{/snippet}
-</svelte:boundary>
diff --git a/playgrounds/sandbox/index.html b/playgrounds/sandbox/index.html
index 639409b877..d70409ffb6 100644
--- a/playgrounds/sandbox/index.html
+++ b/playgrounds/sandbox/index.html
@@ -12,7 +12,7 @@
 
 		<script type="module">
 			import { mount, hydrate, unmount } from 'svelte';
-			import App from '/Wrapper.svelte';
+			import App from '/src/App.svelte';
 
 			globalThis.delayed = (v, ms = 1000) => {
 				return new Promise((f) => {
diff --git a/playgrounds/sandbox/package.json b/playgrounds/sandbox/package.json
index a5a28879e0..641f91ddfe 100644
--- a/playgrounds/sandbox/package.json
+++ b/playgrounds/sandbox/package.json
@@ -16,11 +16,13 @@
     "start": "node run.js"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^4.0.0-next.6",
+    "@sveltejs/vite-plugin-svelte": "^6.2.0",
+    "@types/node": "^24.5.2",
     "polka": "^1.0.0-next.25",
     "svelte": "workspace:*",
     "tinyglobby": "^0.2.12",
-    "vite": "^5.4.20",
-    "vite-plugin-inspect": "^0.8.4"
+    "vite": "^7.1.5",
+    "vite-plugin-devtools-json": "^1.0.0",
+    "vite-plugin-inspect": "^11.3.3"
   }
 }
diff --git a/playgrounds/sandbox/ssr-dev.js b/playgrounds/sandbox/ssr-dev.js
index e019b234a6..8a0c063d47 100644
--- a/playgrounds/sandbox/ssr-dev.js
+++ b/playgrounds/sandbox/ssr-dev.js
@@ -4,7 +4,6 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import polka from 'polka';
 import { createServer as createViteServer } from 'vite';
-import { render } from 'svelte/server';
 import './ssr-common.js';
 
 const PORT = process.env.PORT || '5173';
@@ -23,8 +22,11 @@ polka()
 	.use(async (req, res) => {
 		const template = fs.readFileSync(path.resolve(__dirname, 'index.html'), 'utf-8');
 		const transformed_template = await vite.transformIndexHtml(req.url, template);
+
+		const { render } = await vite.ssrLoadModule('svelte/server');
 		const { default: App } = await vite.ssrLoadModule('/src/App.svelte');
-		const { head, body } = render(App);
+
+		const { head, body } = await render(App);
 
 		const html = transformed_template
 			.replace(`<!--ssr-head-->`, head)
diff --git a/playgrounds/sandbox/ssr-prod.js b/playgrounds/sandbox/ssr-prod.js
index e8f74ee93a..0c760188d4 100644
--- a/playgrounds/sandbox/ssr-prod.js
+++ b/playgrounds/sandbox/ssr-prod.js
@@ -5,7 +5,7 @@ import { render } from 'svelte/server';
 import App from './src/App.svelte';
 import './ssr-common.js';
 
-const { head, body } = render(App);
+const { head, body } = await render(App);
 
 const rendered = fs
 	.readFileSync(path.resolve('./dist/client/index.html'), 'utf-8')
diff --git a/playgrounds/sandbox/vite.config.js b/playgrounds/sandbox/vite.config.js
index 5ce0204217..4bf19e7dc8 100644
--- a/playgrounds/sandbox/vite.config.js
+++ b/playgrounds/sandbox/vite.config.js
@@ -1,13 +1,14 @@
 import { defineConfig } from 'vite';
 import inspect from 'vite-plugin-inspect';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
+import devtools from 'vite-plugin-devtools-json';
 
 export default defineConfig({
 	build: {
 		minify: false
 	},
 
-	plugins: [inspect(), svelte()],
+	plugins: [devtools(), inspect(), svelte()],
 
 	optimizeDeps: {
 		// svelte is a local workspace package, optimizing it would require dev server restarts with --force for every change
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1f6bff9bd4..39a504e504 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,6 +20,9 @@ importers:
       '@types/node':
         specifier: ^20.11.5
         version: 20.12.7
+      '@types/picomatch':
+        specifier: ^4.0.2
+        version: 4.0.2
       '@vitest/coverage-v8':
         specifier: ^2.1.9
         version: 2.1.9(vitest@2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
@@ -70,13 +73,13 @@ importers:
         version: 1.5.0
       '@sveltejs/acorn-typescript':
         specifier: ^1.0.5
-        version: 1.0.5(acorn@8.14.0)
+        version: 1.0.5(acorn@8.15.0)
       '@types/estree':
         specifier: ^1.0.5
-        version: 1.0.6
+        version: 1.0.8
       acorn:
         specifier: ^8.12.1
-        version: 8.14.0
+        version: 8.15.0
       aria-query:
         specifier: ^5.3.1
         version: 5.3.1
@@ -113,16 +116,16 @@ importers:
         version: 1.46.1
       '@rollup/plugin-commonjs':
         specifier: ^28.0.1
-        version: 28.0.1(rollup@4.22.4)
+        version: 28.0.1(rollup@4.50.1)
       '@rollup/plugin-node-resolve':
         specifier: ^15.3.0
-        version: 15.3.0(rollup@4.22.4)
+        version: 15.3.0(rollup@4.50.1)
       '@rollup/plugin-terser':
         specifier: ^0.4.4
-        version: 0.4.4(rollup@4.22.4)
+        version: 0.4.4(rollup@4.50.1)
       '@rollup/plugin-virtual':
         specifier: ^3.0.2
-        version: 3.0.2(rollup@4.22.4)
+        version: 3.0.2(rollup@4.50.1)
       '@types/aria-query':
         specifier: ^5.0.4
         version: 5.0.4
@@ -137,13 +140,13 @@ importers:
         version: 0.21.5
       rollup:
         specifier: ^4.22.4
-        version: 4.22.4
+        version: 4.50.1
       source-map:
         specifier: ^0.7.4
         version: 0.7.4
       tinyglobby:
         specifier: ^0.2.12
-        version: 0.2.12
+        version: 0.2.15
       typescript:
         specifier: ^5.5.4
         version: 5.5.4
@@ -154,8 +157,11 @@ importers:
   playgrounds/sandbox:
     devDependencies:
       '@sveltejs/vite-plugin-svelte':
-        specifier: ^4.0.0-next.6
-        version: 4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+        specifier: ^6.2.0
+        version: 6.2.0(svelte@packages+svelte)(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+      '@types/node':
+        specifier: ^24.5.2
+        version: 24.5.2
       polka:
         specifier: ^1.0.0-next.25
         version: 1.0.0-next.25
@@ -164,13 +170,16 @@ importers:
         version: link:../../packages/svelte
       tinyglobby:
         specifier: ^0.2.12
-        version: 0.2.12
+        version: 0.2.15
       vite:
-        specifier: ^5.4.20
-        version: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+        specifier: ^7.1.5
+        version: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite-plugin-devtools-json:
+        specifier: ^1.0.0
+        version: 1.0.0(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
       vite-plugin-inspect:
-        specifier: ^0.8.4
-        version: 0.8.4(rollup@4.50.1)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+        specifier: ^11.3.3
+        version: 11.3.3(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
 
 packages:
 
@@ -182,9 +191,6 @@ packages:
     resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
     engines: {node: '>=6.0.0'}
 
-  '@antfu/utils@0.7.8':
-    resolution: {integrity: sha512-rWQkqXRESdjXtc+7NRfK9lASQjpXJu1ayp7qi1d23zZorY+wBHVLHHoVcMsEnkqEBWTFqbztO7/QdJFzyEcLTg==}
-
   '@babel/helper-string-parser@7.24.8':
     resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==}
     engines: {node: '>=6.9.0'}
@@ -273,149 +279,293 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.25.10':
+    resolution: {integrity: sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/android-arm64@0.21.5':
     resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.25.10':
+    resolution: {integrity: sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm@0.21.5':
     resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.25.10':
+    resolution: {integrity: sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-x64@0.21.5':
     resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.25.10':
+    resolution: {integrity: sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/darwin-arm64@0.21.5':
     resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.25.10':
+    resolution: {integrity: sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.21.5':
     resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.25.10':
+    resolution: {integrity: sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/freebsd-arm64@0.21.5':
     resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.25.10':
+    resolution: {integrity: sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.21.5':
     resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.25.10':
+    resolution: {integrity: sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/linux-arm64@0.21.5':
     resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.25.10':
+    resolution: {integrity: sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm@0.21.5':
     resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.25.10':
+    resolution: {integrity: sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.21.5':
     resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.25.10':
+    resolution: {integrity: sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.21.5':
     resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.25.10':
+    resolution: {integrity: sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.21.5':
     resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.25.10':
+    resolution: {integrity: sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.21.5':
     resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.25.10':
+    resolution: {integrity: sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.21.5':
     resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.25.10':
+    resolution: {integrity: sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.21.5':
     resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.25.10':
+    resolution: {integrity: sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-x64@0.21.5':
     resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.25.10':
+    resolution: {integrity: sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.25.10':
+    resolution: {integrity: sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.21.5':
     resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.25.10':
+    resolution: {integrity: sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.25.10':
+    resolution: {integrity: sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.21.5':
     resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.25.10':
+    resolution: {integrity: sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openharmony-arm64@0.25.10':
+    resolution: {integrity: sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@esbuild/sunos-x64@0.21.5':
     resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.25.10':
+    resolution: {integrity: sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/win32-arm64@0.21.5':
     resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.25.10':
+    resolution: {integrity: sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.21.5':
     resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.25.10':
+    resolution: {integrity: sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-x64@0.21.5':
     resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
 
-  '@eslint-community/eslint-utils@4.4.1':
-    resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-
-  '@eslint-community/eslint-utils@4.7.0':
-    resolution: {integrity: sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  '@esbuild/win32-x64@0.25.10':
+    resolution: {integrity: sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
 
   '@eslint-community/eslint-utils@4.9.0':
     resolution: {integrity: sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==}
@@ -558,41 +708,21 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.22.4':
-    resolution: {integrity: sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==}
-    cpu: [arm]
-    os: [android]
-
   '@rollup/rollup-android-arm-eabi@4.50.1':
     resolution: {integrity: sha512-HJXwzoZN4eYTdD8bVV22DN8gsPCAj3V20NHKOs8ezfXanGpmVPR7kalUHd+Y31IJp9stdB87VKPFbsGY3H/2ag==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.22.4':
-    resolution: {integrity: sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==}
-    cpu: [arm64]
-    os: [android]
-
   '@rollup/rollup-android-arm64@4.50.1':
     resolution: {integrity: sha512-PZlsJVcjHfcH53mOImyt3bc97Ep3FJDXRpk9sMdGX0qgLmY0EIWxCag6EigerGhLVuL8lDVYNnSo8qnTElO4xw==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.22.4':
-    resolution: {integrity: sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==}
-    cpu: [arm64]
-    os: [darwin]
-
   '@rollup/rollup-darwin-arm64@4.50.1':
     resolution: {integrity: sha512-xc6i2AuWh++oGi4ylOFPmzJOEeAa2lJeGUGb4MudOtgfyyjr4UPNK+eEWTPLvmPJIY/pgw6ssFIox23SyrkkJw==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.22.4':
-    resolution: {integrity: sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==}
-    cpu: [x64]
-    os: [darwin]
-
   '@rollup/rollup-darwin-x64@4.50.1':
     resolution: {integrity: sha512-2ofU89lEpDYhdLAbRdeyz/kX3Y2lpYc6ShRnDjY35bZhd2ipuDMDi6ZTQ9NIag94K28nFMofdnKeHR7BT0CATw==}
     cpu: [x64]
@@ -608,41 +738,21 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.22.4':
-    resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==}
-    cpu: [arm]
-    os: [linux]
-
   '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
     resolution: {integrity: sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.22.4':
-    resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==}
-    cpu: [arm]
-    os: [linux]
-
   '@rollup/rollup-linux-arm-musleabihf@4.50.1':
     resolution: {integrity: sha512-p/LaFyajPN/0PUHjv8TNyxLiA7RwmDoVY3flXHPSzqrGcIp/c2FjwPPP5++u87DGHtw+5kSH5bCJz0mvXngYxw==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.22.4':
-    resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==}
-    cpu: [arm64]
-    os: [linux]
-
   '@rollup/rollup-linux-arm64-gnu@4.50.1':
     resolution: {integrity: sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.22.4':
-    resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==}
-    cpu: [arm64]
-    os: [linux]
-
   '@rollup/rollup-linux-arm64-musl@4.50.1':
     resolution: {integrity: sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w==}
     cpu: [arm64]
@@ -653,21 +763,11 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.22.4':
-    resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==}
-    cpu: [ppc64]
-    os: [linux]
-
   '@rollup/rollup-linux-ppc64-gnu@4.50.1':
     resolution: {integrity: sha512-eSGMVQw9iekut62O7eBdbiccRguuDgiPMsw++BVUg+1K7WjZXHOg/YOT9SWMzPZA+w98G+Fa1VqJgHZOHHnY0Q==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.22.4':
-    resolution: {integrity: sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==}
-    cpu: [riscv64]
-    os: [linux]
-
   '@rollup/rollup-linux-riscv64-gnu@4.50.1':
     resolution: {integrity: sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ==}
     cpu: [riscv64]
@@ -678,31 +778,16 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.22.4':
-    resolution: {integrity: sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==}
-    cpu: [s390x]
-    os: [linux]
-
   '@rollup/rollup-linux-s390x-gnu@4.50.1':
     resolution: {integrity: sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg==}
     cpu: [s390x]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-gnu@4.22.4':
-    resolution: {integrity: sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==}
-    cpu: [x64]
-    os: [linux]
-
   '@rollup/rollup-linux-x64-gnu@4.50.1':
     resolution: {integrity: sha512-MCgtFB2+SVNuQmmjHf+wfI4CMxy3Tk8XjA5Z//A0AKD7QXUYFMQcns91K6dEHBvZPCnhJSyDWLApk40Iq/H3tA==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.22.4':
-    resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==}
-    cpu: [x64]
-    os: [linux]
-
   '@rollup/rollup-linux-x64-musl@4.50.1':
     resolution: {integrity: sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg==}
     cpu: [x64]
@@ -713,31 +798,16 @@ packages:
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.22.4':
-    resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==}
-    cpu: [arm64]
-    os: [win32]
-
   '@rollup/rollup-win32-arm64-msvc@4.50.1':
     resolution: {integrity: sha512-hpZB/TImk2FlAFAIsoElM3tLzq57uxnGYwplg6WDyAxbYczSi8O2eQ+H2Lx74504rwKtZ3N2g4bCUkiamzS6TQ==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.22.4':
-    resolution: {integrity: sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==}
-    cpu: [ia32]
-    os: [win32]
-
   '@rollup/rollup-win32-ia32-msvc@4.50.1':
     resolution: {integrity: sha512-SXjv8JlbzKM0fTJidX4eVsH+Wmnp0/WcD8gJxIZyR6Gay5Qcsmdbi9zVtnbkGPG8v2vMR1AD06lGWy5FLMcG7A==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.22.4':
-    resolution: {integrity: sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==}
-    cpu: [x64]
-    os: [win32]
-
   '@rollup/rollup-win32-x64-msvc@4.50.1':
     resolution: {integrity: sha512-StxAO/8ts62KZVRAm4JZYq9+NqNsV7RvimNK+YM7ry//zebEH6meuugqW/P5OFUCjyQgui+9fUxT6d5NShvMvA==}
     cpu: [x64]
@@ -765,20 +835,20 @@ packages:
       typescript: '>= 5'
       typescript-eslint: '>= 8'
 
-  '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.2':
-    resolution: {integrity: sha512-Yl9BWvEj+1j+8mICIAA04/Sx0wEHNL0n9pSIZFM8n4NWgLFmR3v41qX2k54J/r4LWE2YHTeNNH2WJqEUb3geEA==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22}
+  '@sveltejs/vite-plugin-svelte-inspector@5.0.1':
+    resolution: {integrity: sha512-ubWshlMk4bc8mkwWbg6vNvCeT7lGQojE3ijDh3QTR6Zr/R+GXxsGbyH4PExEPpiFmqPhYiVSVmHBjUcVc1JIrA==}
+    engines: {node: ^20.19 || ^22.12 || >=24}
     peerDependencies:
-      '@sveltejs/vite-plugin-svelte': ^4.0.0-next.0||^4.0.0
-      svelte: ^5.0.0-next.96 || ^5.0.0
-      vite: ^5.0.0
+      '@sveltejs/vite-plugin-svelte': ^6.0.0-next.0
+      svelte: ^5.0.0
+      vite: ^6.3.0 || ^7.0.0
 
-  '@sveltejs/vite-plugin-svelte@4.0.0-next.6':
-    resolution: {integrity: sha512-7+bEFN5F9pthG6nOEHNz9yioHxNXK6yl+0GnTy9WOfxN/SvPykkH/Hs6MqTGjo47a9G2q3QXQnzuxG5WXNX4Tg==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22}
+  '@sveltejs/vite-plugin-svelte@6.2.0':
+    resolution: {integrity: sha512-nJsV36+o7rZUDlrnSduMNl11+RoDE1cKqOI0yUEBCcqFoAZOk47TwD3dPKS2WmRutke9StXnzsPBslY7prDM9w==}
+    engines: {node: ^20.19 || ^22.12 || >=24}
     peerDependencies:
-      svelte: ^5.0.0-next.96 || ^5.0.0
-      vite: ^5.0.0
+      svelte: ^5.0.0
+      vite: ^6.3.0 || ^7.0.0
 
   '@svitejs/changesets-changelog-github-compact@1.1.0':
     resolution: {integrity: sha512-qhUGGDHcpbY2zpjW3SwqchuW8J/5EzlPFud7xNntHKA7f3a/mx5+g+ruJKFHSAiVZYo30PALt+AyhmPUNKH/Og==}
@@ -790,12 +860,6 @@ packages:
   '@types/eslint@8.56.12':
     resolution: {integrity: sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==}
 
-  '@types/estree@1.0.5':
-    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
-
-  '@types/estree@1.0.6':
-    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
-
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
@@ -808,6 +872,12 @@ packages:
   '@types/node@20.12.7':
     resolution: {integrity: sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==}
 
+  '@types/node@24.5.2':
+    resolution: {integrity: sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==}
+
+  '@types/picomatch@4.0.2':
+    resolution: {integrity: sha512-qHHxQ+P9PysNEGbALT8f8YOSHW0KJu6l2xU8DYY0fu/EmGxXdVnuTLvFUvBgPJMSqXq29SYHveejeAha+4AYgA==}
+
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
@@ -941,11 +1011,6 @@ packages:
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  acorn@8.14.0:
-    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-
   acorn@8.15.0:
     resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
     engines: {node: '>=0.4.0'}
@@ -978,6 +1043,10 @@ packages:
     resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
     engines: {node: '>=12'}
 
+  ansis@4.1.0:
+    resolution: {integrity: sha512-BGcItUBWSMRgOCe+SVZJ+S7yTRG0eGt9cXAHev72yuGcY23hnLA7Bky5L/xLyPINoSN95geovfBkqoTlNZYa7w==}
+    engines: {node: '>=14'}
+
   anymatch@3.1.3:
     resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
     engines: {node: '>= 8'}
@@ -1018,6 +1087,9 @@ packages:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
+  birpc@2.5.0:
+    resolution: {integrity: sha512-VSWO/W6nNQdyP520F1mhf+Lc2f8pjGQOtoHHm7Ze8Go1kX7akpVIrtTa0fn+HB0QJEDVacl6aO08YE0PgXfdnQ==}
+
   brace-expansion@1.1.11:
     resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
 
@@ -1113,15 +1185,6 @@ packages:
   dataloader@1.4.0:
     resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==}
 
-  debug@4.4.0:
-    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
   debug@4.4.1:
     resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
     engines: {node: '>=6.0'}
@@ -1205,8 +1268,8 @@ packages:
     resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
     engines: {node: '>=0.12'}
 
-  error-stack-parser-es@0.1.1:
-    resolution: {integrity: sha512-g/9rfnvnagiNf+DRMHEVGuGuIBlCIMDFoTA616HaP2l9PlCjGjVhD98PNbVSJvmK4TttqT5mV5tInMhoFgi+aA==}
+  error-stack-parser-es@1.0.5:
+    resolution: {integrity: sha512-5qucVt2XcuGMcEGgWI7i+yZpmpByQ8J1lHhcL7PwqCwu9FPP3VUXzT4ltHe5i2z9dePwEHcDVOAfSnHsOlCXRA==}
 
   es-module-lexer@1.6.0:
     resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
@@ -1216,6 +1279,11 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
+  esbuild@0.25.10:
+    resolution: {integrity: sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
@@ -1257,10 +1325,6 @@ packages:
       svelte:
         optional: true
 
-  eslint-scope@8.0.2:
-    resolution: {integrity: sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   eslint-scope@8.4.0:
     resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1269,10 +1333,6 @@ packages:
     resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  eslint-visitor-keys@4.2.0:
-    resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   eslint-visitor-keys@4.2.1:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1342,10 +1402,6 @@ packages:
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
-  fast-glob@3.3.2:
-    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
-    engines: {node: '>=8.6.0'}
-
   fast-glob@3.3.3:
     resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
     engines: {node: '>=8.6.0'}
@@ -1359,8 +1415,9 @@ packages:
   fastq@1.16.0:
     resolution: {integrity: sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==}
 
-  fdir@6.4.3:
-    resolution: {integrity: sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==}
+  fdir@6.5.0:
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
     peerDependencies:
       picomatch: ^3 || ^4
     peerDependenciesMeta:
@@ -1398,10 +1455,6 @@ packages:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
     engines: {node: '>= 6'}
 
-  fs-extra@11.2.0:
-    resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==}
-    engines: {node: '>=14.14'}
-
   fs-extra@7.0.1:
     resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
     engines: {node: '>=6 <7 || >=8'}
@@ -1621,9 +1674,6 @@ packages:
   jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
 
-  jsonfile@6.1.0:
-    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
-
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
@@ -1740,10 +1790,6 @@ packages:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
 
-  micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
-    engines: {node: '>=8.6'}
-
   micromatch@4.0.8:
     resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
     engines: {node: '>=8.6'}
@@ -1802,8 +1848,11 @@ packages:
   nwsapi@2.2.12:
     resolution: {integrity: sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==}
 
-  open@10.1.0:
-    resolution: {integrity: sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==}
+  ohash@2.0.11:
+    resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==}
+
+  open@10.2.0:
+    resolution: {integrity: sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==}
     engines: {node: '>=18'}
 
   optionator@0.9.3:
@@ -1880,12 +1929,15 @@ packages:
   pathe@1.1.2:
     resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
 
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
+
   pathval@2.0.0:
     resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
     engines: {node: '>= 14.16'}
 
-  perfect-debounce@1.0.0:
-    resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
+  perfect-debounce@2.0.0:
+    resolution: {integrity: sha512-fkEH/OBiKrqqI/yIgjR92lMfs2K8105zt/VT6+7eTjNwisrsh47CeIED9z58zI7DfKdH3uHAn25ziRZn3kgAow==}
 
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
@@ -1894,10 +1946,6 @@ packages:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
-  picomatch@4.0.2:
-    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
-    engines: {node: '>=12'}
-
   picomatch@4.0.3:
     resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
     engines: {node: '>=12'}
@@ -1948,10 +1996,6 @@ packages:
     resolution: {integrity: sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==}
     engines: {node: '>=4'}
 
-  postcss@8.5.3:
-    resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
-    engines: {node: ^10 || ^12 || >=14}
-
   postcss@8.5.6:
     resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
     engines: {node: ^10 || ^12 || >=14}
@@ -2023,11 +2067,6 @@ packages:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rollup@4.22.4:
-    resolution: {integrity: sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==}
-    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
-    hasBin: true
-
   rollup@4.50.1:
     resolution: {integrity: sha512-78E9voJHwnXQMiQdiqswVLZwJIzdBKJ1GdI5Zx6XwoFKUIk09/sSrr+05QFzvYb8q6Y9pPV45zzDuYa3907TZA==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
@@ -2062,11 +2101,6 @@ packages:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
     engines: {node: '>=v12.22.7'}
 
-  semver@7.7.1:
-    resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   semver@7.7.2:
     resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
     engines: {node: '>=10'}
@@ -2101,9 +2135,9 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
-  sirv@2.0.4:
-    resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
-    engines: {node: '>= 10'}
+  sirv@3.0.2:
+    resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==}
+    engines: {node: '>=18'}
 
   slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
@@ -2209,8 +2243,8 @@ packages:
   tinyexec@0.3.2:
     resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
 
-  tinyglobby@0.2.12:
-    resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==}
+  tinyglobby@0.2.15:
+    resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
 
   tinypool@1.0.2:
@@ -2269,12 +2303,6 @@ packages:
     peerDependencies:
       typescript: '>=4.2.0'
 
-  ts-api-utils@2.0.1:
-    resolution: {integrity: sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==}
-    engines: {node: '>=18.12'}
-    peerDependencies:
-      typescript: '>=4.8.4'
-
   ts-api-utils@2.1.0:
     resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==}
     engines: {node: '>=18.12'}
@@ -2305,13 +2333,16 @@ packages:
   undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
+  undici-types@7.12.0:
+    resolution: {integrity: sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==}
+
   universalify@0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
 
-  universalify@2.0.1:
-    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
-    engines: {node: '>= 10.0.0'}
+  unplugin-utils@0.3.0:
+    resolution: {integrity: sha512-JLoggz+PvLVMJo+jZt97hdIIIZ2yTzGgft9e9q8iMrC4ewufl62ekeW7mixBghonn2gVb/ICjyvlmOCUBnJLQg==}
+    engines: {node: '>=20.19.0'}
 
   uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
@@ -2319,27 +2350,46 @@ packages:
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
+  uuid@11.1.0:
+    resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==}
+    hasBin: true
+
   v8-natives@1.2.5:
     resolution: {integrity: sha512-CVNliz6KF2yet3HBIkbFJKZmjlt95C8dsNZDnwoS6X98+QJRpsSz9uxo3TziBqdyJQkWwfD3VG9lRzsQNvF24Q==}
     engines: {node: '>= 0.6.0'}
 
+  vite-dev-rpc@1.1.0:
+    resolution: {integrity: sha512-pKXZlgoXGoE8sEKiKJSng4hI1sQ4wi5YT24FCrwrLt6opmkjlqPPVmiPWWJn8M8byMxRGzp1CrFuqQs4M/Z39A==}
+    peerDependencies:
+      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.1 || ^7.0.0-0
+
+  vite-hot-client@2.1.0:
+    resolution: {integrity: sha512-7SpgZmU7R+dDnSmvXE1mfDtnHLHQSisdySVR7lO8ceAXvM0otZeuQQ6C8LrS5d/aYyP/QZ0hI0L+dIPrm4YlFQ==}
+    peerDependencies:
+      vite: ^2.6.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0 || ^7.0.0-0
+
   vite-node@2.1.9:
     resolution: {integrity: sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
 
-  vite-plugin-inspect@0.8.4:
-    resolution: {integrity: sha512-G0N3rjfw+AiiwnGw50KlObIHYWfulVwaCBUBLh2xTW9G1eM9ocE5olXkEYUbwyTmX+azM8duubi+9w5awdCz+g==}
+  vite-plugin-devtools-json@1.0.0:
+    resolution: {integrity: sha512-MobvwqX76Vqt/O4AbnNMNWoXWGrKUqZbphCUle/J2KXH82yKQiunOeKnz/nqEPosPsoWWPP9FtNuPBSYpiiwkw==}
+    peerDependencies:
+      vite: ^5.0.0 || ^6.0.0 || ^7.0.0
+
+  vite-plugin-inspect@11.3.3:
+    resolution: {integrity: sha512-u2eV5La99oHoYPHE6UvbwgEqKKOQGz86wMg40CCosP6q8BkB6e5xPneZfYagK4ojPJSj5anHCrnvC20DpwVdRA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@nuxt/kit': '*'
-      vite: ^3.1.0 || ^4.0.0 || ^5.0.0-0
+      vite: ^6.0.0 || ^7.0.0-0
     peerDependenciesMeta:
       '@nuxt/kit':
         optional: true
 
-  vite@5.4.14:
-    resolution: {integrity: sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==}
+  vite@5.4.20:
+    resolution: {integrity: sha512-j3lYzGC3P+B5Yfy/pfKNgVEg4+UtcIJcVRt2cDjIOmhLourAqPqf8P7acgxeiSgUB7E3p2P8/3gNIgDLpwzs4g==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -2369,22 +2419,27 @@ packages:
       terser:
         optional: true
 
-  vite@5.4.20:
-    resolution: {integrity: sha512-j3lYzGC3P+B5Yfy/pfKNgVEg4+UtcIJcVRt2cDjIOmhLourAqPqf8P7acgxeiSgUB7E3p2P8/3gNIgDLpwzs4g==}
-    engines: {node: ^18.0.0 || >=20.0.0}
+  vite@7.1.5:
+    resolution: {integrity: sha512-4cKBO9wR75r0BeIWWWId9XK9Lj6La5X846Zw9dFfzMRw38IlTk2iCcUt6hsyiDRcPidc55ZParFYDXi0nXOeLQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
-      '@types/node': ^18.0.0 || >=20.0.0
-      less: '*'
+      '@types/node': ^20.19.0 || >=22.12.0
+      jiti: '>=1.21.0'
+      less: ^4.0.0
       lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
     peerDependenciesMeta:
       '@types/node':
         optional: true
+      jiti:
+        optional: true
       less:
         optional: true
       lightningcss:
@@ -2399,11 +2454,15 @@ packages:
         optional: true
       terser:
         optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
 
-  vitefu@0.2.5:
-    resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==}
+  vitefu@1.1.1:
+    resolution: {integrity: sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==}
     peerDependencies:
-      vite: ^3.0.0 || ^4.0.0 || ^5.0.0
+      vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0
     peerDependenciesMeta:
       vite:
         optional: true
@@ -2493,6 +2552,10 @@ packages:
       utf-8-validate:
         optional: true
 
+  wsl-utils@0.1.0:
+    resolution: {integrity: sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==}
+    engines: {node: '>=18'}
+
   xml-name-validator@5.0.0:
     resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
     engines: {node: '>=18'}
@@ -2523,8 +2586,6 @@ snapshots:
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
 
-  '@antfu/utils@0.7.8': {}
-
   '@babel/helper-string-parser@7.24.8': {}
 
   '@babel/helper-validator-identifier@7.24.7': {}
@@ -2559,7 +2620,7 @@ snapshots:
       outdent: 0.5.0
       prettier: 2.8.8
       resolve-from: 5.0.0
-      semver: 7.7.1
+      semver: 7.7.2
 
   '@changesets/assemble-release-plan@6.0.4':
     dependencies:
@@ -2568,7 +2629,7 @@ snapshots:
       '@changesets/should-skip-package': 0.1.1
       '@changesets/types': 6.0.0
       '@manypkg/get-packages': 1.1.3
-      semver: 7.7.1
+      semver: 7.7.2
 
   '@changesets/changelog-git@0.2.0':
     dependencies:
@@ -2603,7 +2664,7 @@ snapshots:
       package-manager-detector: 0.2.0
       picocolors: 1.1.1
       resolve-from: 5.0.0
-      semver: 7.7.1
+      semver: 7.7.2
       spawndamnit: 2.0.0
       term-size: 2.2.1
 
@@ -2615,7 +2676,7 @@ snapshots:
       '@changesets/types': 6.0.0
       '@manypkg/get-packages': 1.1.3
       fs-extra: 7.0.1
-      micromatch: 4.0.5
+      micromatch: 4.0.8
 
   '@changesets/errors@0.2.0':
     dependencies:
@@ -2626,7 +2687,7 @@ snapshots:
       '@changesets/types': 6.0.0
       '@manypkg/get-packages': 1.1.3
       picocolors: 1.1.1
-      semver: 7.7.1
+      semver: 7.7.2
 
   '@changesets/get-github-info@0.5.2':
     dependencies:
@@ -2651,7 +2712,7 @@ snapshots:
       '@changesets/errors': 0.2.0
       '@manypkg/get-packages': 1.1.3
       is-subdir: 1.2.0
-      micromatch: 4.0.5
+      micromatch: 4.0.8
       spawndamnit: 2.0.0
 
   '@changesets/logger@0.1.1':
@@ -2699,81 +2760,149 @@ snapshots:
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
+  '@esbuild/aix-ppc64@0.25.10':
+    optional: true
+
   '@esbuild/android-arm64@0.21.5':
     optional: true
 
+  '@esbuild/android-arm64@0.25.10':
+    optional: true
+
   '@esbuild/android-arm@0.21.5':
     optional: true
 
+  '@esbuild/android-arm@0.25.10':
+    optional: true
+
   '@esbuild/android-x64@0.21.5':
     optional: true
 
+  '@esbuild/android-x64@0.25.10':
+    optional: true
+
   '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
+  '@esbuild/darwin-arm64@0.25.10':
+    optional: true
+
   '@esbuild/darwin-x64@0.21.5':
     optional: true
 
+  '@esbuild/darwin-x64@0.25.10':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.25.10':
+    optional: true
+
   '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
+  '@esbuild/freebsd-x64@0.25.10':
+    optional: true
+
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
+  '@esbuild/linux-arm64@0.25.10':
+    optional: true
+
   '@esbuild/linux-arm@0.21.5':
     optional: true
 
+  '@esbuild/linux-arm@0.25.10':
+    optional: true
+
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
+  '@esbuild/linux-ia32@0.25.10':
+    optional: true
+
   '@esbuild/linux-loong64@0.21.5':
     optional: true
 
+  '@esbuild/linux-loong64@0.25.10':
+    optional: true
+
   '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
+  '@esbuild/linux-mips64el@0.25.10':
+    optional: true
+
   '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
+  '@esbuild/linux-ppc64@0.25.10':
+    optional: true
+
   '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
+  '@esbuild/linux-riscv64@0.25.10':
+    optional: true
+
   '@esbuild/linux-s390x@0.21.5':
     optional: true
 
+  '@esbuild/linux-s390x@0.25.10':
+    optional: true
+
   '@esbuild/linux-x64@0.21.5':
     optional: true
 
+  '@esbuild/linux-x64@0.25.10':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.25.10':
+    optional: true
+
   '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
+  '@esbuild/netbsd-x64@0.25.10':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.25.10':
+    optional: true
+
   '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
+  '@esbuild/openbsd-x64@0.25.10':
+    optional: true
+
+  '@esbuild/openharmony-arm64@0.25.10':
+    optional: true
+
   '@esbuild/sunos-x64@0.21.5':
     optional: true
 
+  '@esbuild/sunos-x64@0.25.10':
+    optional: true
+
   '@esbuild/win32-arm64@0.21.5':
     optional: true
 
+  '@esbuild/win32-arm64@0.25.10':
+    optional: true
+
   '@esbuild/win32-ia32@0.21.5':
     optional: true
 
-  '@esbuild/win32-x64@0.21.5':
+  '@esbuild/win32-ia32@0.25.10':
     optional: true
 
-  '@eslint-community/eslint-utils@4.4.1(eslint@9.9.1)':
-    dependencies:
-      eslint: 9.9.1
-      eslint-visitor-keys: 3.4.3
+  '@esbuild/win32-x64@0.21.5':
+    optional: true
 
-  '@eslint-community/eslint-utils@4.7.0(eslint@9.9.1)':
-    dependencies:
-      eslint: 9.9.1
-      eslint-visitor-keys: 3.4.3
+  '@esbuild/win32-x64@0.25.10':
+    optional: true
 
   '@eslint-community/eslint-utils@4.9.0(eslint@9.9.1)':
     dependencies:
@@ -2785,7 +2914,7 @@ snapshots:
   '@eslint/config-array@0.18.0':
     dependencies:
       '@eslint/object-schema': 2.1.4
-      debug: 4.4.0
+      debug: 4.4.1
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -2793,7 +2922,7 @@ snapshots:
   '@eslint/eslintrc@3.1.0':
     dependencies:
       ajv: 6.12.6
-      debug: 4.4.0
+      debug: 4.4.1
       espree: 10.1.0
       globals: 14.0.0
       ignore: 5.3.2
@@ -2887,77 +3016,57 @@ snapshots:
 
   '@polka/url@1.0.0-next.25': {}
 
-  '@rollup/plugin-commonjs@28.0.1(rollup@4.22.4)':
+  '@rollup/plugin-commonjs@28.0.1(rollup@4.50.1)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
+      '@rollup/pluginutils': 5.1.0(rollup@4.50.1)
       commondir: 1.0.1
       estree-walker: 2.0.2
-      fdir: 6.4.3(picomatch@4.0.2)
+      fdir: 6.5.0(picomatch@4.0.3)
       is-reference: 1.2.1
       magic-string: 0.30.17
-      picomatch: 4.0.2
+      picomatch: 4.0.3
     optionalDependencies:
-      rollup: 4.22.4
+      rollup: 4.50.1
 
-  '@rollup/plugin-node-resolve@15.3.0(rollup@4.22.4)':
+  '@rollup/plugin-node-resolve@15.3.0(rollup@4.50.1)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
+      '@rollup/pluginutils': 5.1.0(rollup@4.50.1)
       '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-module: 1.0.0
       resolve: 1.22.8
     optionalDependencies:
-      rollup: 4.22.4
+      rollup: 4.50.1
 
-  '@rollup/plugin-terser@0.4.4(rollup@4.22.4)':
+  '@rollup/plugin-terser@0.4.4(rollup@4.50.1)':
     dependencies:
       serialize-javascript: 6.0.2
       smob: 1.4.1
       terser: 5.27.0
     optionalDependencies:
-      rollup: 4.22.4
-
-  '@rollup/plugin-virtual@3.0.2(rollup@4.22.4)':
-    optionalDependencies:
-      rollup: 4.22.4
+      rollup: 4.50.1
 
-  '@rollup/pluginutils@5.1.0(rollup@4.22.4)':
-    dependencies:
-      '@types/estree': 1.0.6
-      estree-walker: 2.0.2
-      picomatch: 2.3.1
+  '@rollup/plugin-virtual@3.0.2(rollup@4.50.1)':
     optionalDependencies:
-      rollup: 4.22.4
+      rollup: 4.50.1
 
   '@rollup/pluginutils@5.1.0(rollup@4.50.1)':
     dependencies:
-      '@types/estree': 1.0.6
+      '@types/estree': 1.0.8
       estree-walker: 2.0.2
       picomatch: 2.3.1
     optionalDependencies:
       rollup: 4.50.1
 
-  '@rollup/rollup-android-arm-eabi@4.22.4':
-    optional: true
-
   '@rollup/rollup-android-arm-eabi@4.50.1':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.22.4':
-    optional: true
-
   '@rollup/rollup-android-arm64@4.50.1':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.22.4':
-    optional: true
-
   '@rollup/rollup-darwin-arm64@4.50.1':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.22.4':
-    optional: true
-
   '@rollup/rollup-darwin-x64@4.50.1':
     optional: true
 
@@ -2967,84 +3076,48 @@ snapshots:
   '@rollup/rollup-freebsd-x64@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.22.4':
-    optional: true
-
   '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.22.4':
-    optional: true
-
   '@rollup/rollup-linux-arm-musleabihf@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.22.4':
-    optional: true
-
   '@rollup/rollup-linux-arm64-gnu@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.22.4':
-    optional: true
-
   '@rollup/rollup-linux-arm64-musl@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.22.4':
-    optional: true
-
   '@rollup/rollup-linux-ppc64-gnu@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.22.4':
-    optional: true
-
   '@rollup/rollup-linux-riscv64-gnu@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-riscv64-musl@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.22.4':
-    optional: true
-
   '@rollup/rollup-linux-s390x-gnu@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.22.4':
-    optional: true
-
   '@rollup/rollup-linux-x64-gnu@4.50.1':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.22.4':
-    optional: true
-
   '@rollup/rollup-linux-x64-musl@4.50.1':
     optional: true
 
   '@rollup/rollup-openharmony-arm64@4.50.1':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.22.4':
-    optional: true
-
   '@rollup/rollup-win32-arm64-msvc@4.50.1':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.22.4':
-    optional: true
-
   '@rollup/rollup-win32-ia32-msvc@4.50.1':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.22.4':
-    optional: true
-
   '@rollup/rollup-win32-x64-msvc@4.50.1':
     optional: true
 
@@ -3057,9 +3130,9 @@ snapshots:
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
 
-  '@sveltejs/acorn-typescript@1.0.5(acorn@8.14.0)':
+  '@sveltejs/acorn-typescript@1.0.5(acorn@8.15.0)':
     dependencies:
-      acorn: 8.14.0
+      acorn: 8.15.0
 
   '@sveltejs/eslint-config@8.3.3(@stylistic/eslint-plugin-js@1.8.0(eslint@9.9.1))(eslint-config-prettier@9.1.0(eslint@9.9.1))(eslint-plugin-n@17.16.1(eslint@9.9.1)(typescript@5.5.4))(eslint-plugin-svelte@3.11.0(eslint@9.9.1)(svelte@packages+svelte))(eslint@9.9.1)(typescript-eslint@8.26.0(eslint@9.9.1)(typescript@5.5.4))(typescript@5.5.4)':
     dependencies:
@@ -3072,25 +3145,24 @@ snapshots:
       typescript: 5.5.4
       typescript-eslint: 8.26.0(eslint@9.9.1)(typescript@5.5.4)
 
-  '@sveltejs/vite-plugin-svelte-inspector@3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
+  '@sveltejs/vite-plugin-svelte-inspector@5.0.1(@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
-      debug: 4.4.0
+      '@sveltejs/vite-plugin-svelte': 6.2.0(svelte@packages+svelte)(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+      debug: 4.4.1
       svelte: link:packages/svelte
-      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
+  '@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 3.0.0-next.2(@sveltejs/vite-plugin-svelte@4.0.0-next.6(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
-      debug: 4.4.0
+      '@sveltejs/vite-plugin-svelte-inspector': 5.0.1(@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+      debug: 4.4.1
       deepmerge: 4.3.1
-      kleur: 4.1.5
       magic-string: 0.30.17
       svelte: link:packages/svelte
-      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
-      vitefu: 0.2.5(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+      vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vitefu: 1.1.1(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
     transitivePeerDependencies:
       - supports-color
 
@@ -3108,10 +3180,6 @@ snapshots:
       '@types/estree': 1.0.8
       '@types/json-schema': 7.0.15
 
-  '@types/estree@1.0.5': {}
-
-  '@types/estree@1.0.6': {}
-
   '@types/estree@1.0.8': {}
 
   '@types/json-schema@7.0.15': {}
@@ -3122,6 +3190,12 @@ snapshots:
     dependencies:
       undici-types: 5.26.5
 
+  '@types/node@24.5.2':
+    dependencies:
+      undici-types: 7.12.0
+
+  '@types/picomatch@4.0.2': {}
+
   '@types/resolve@1.20.2': {}
 
   '@types/semver@7.5.6': {}
@@ -3138,7 +3212,7 @@ snapshots:
       graphemer: 1.4.0
       ignore: 5.3.2
       natural-compare: 1.4.0
-      ts-api-utils: 2.0.1(typescript@5.5.4)
+      ts-api-utils: 2.1.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
@@ -3149,7 +3223,7 @@ snapshots:
       '@typescript-eslint/types': 8.26.0
       '@typescript-eslint/typescript-estree': 8.26.0(typescript@5.5.4)
       '@typescript-eslint/visitor-keys': 8.26.0
-      debug: 4.4.0
+      debug: 4.4.1
       eslint: 9.9.1
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -3182,9 +3256,9 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 8.26.0(typescript@5.5.4)
       '@typescript-eslint/utils': 8.26.0(eslint@9.9.1)(typescript@5.5.4)
-      debug: 4.4.0
+      debug: 4.4.1
       eslint: 9.9.1
-      ts-api-utils: 2.0.1(typescript@5.5.4)
+      ts-api-utils: 2.1.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
@@ -3197,12 +3271,12 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 8.26.0
       '@typescript-eslint/visitor-keys': 8.26.0
-      debug: 4.4.0
-      fast-glob: 3.3.2
+      debug: 4.4.1
+      fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
       semver: 7.7.2
-      ts-api-utils: 2.0.1(typescript@5.5.4)
+      ts-api-utils: 2.1.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
@@ -3225,7 +3299,7 @@ snapshots:
 
   '@typescript-eslint/utils@8.26.0(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.1(eslint@9.9.1)
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
       '@typescript-eslint/scope-manager': 8.26.0
       '@typescript-eslint/types': 8.26.0
       '@typescript-eslint/typescript-estree': 8.26.0(typescript@5.5.4)
@@ -3248,7 +3322,7 @@ snapshots:
   '@typescript-eslint/visitor-keys@8.26.0':
     dependencies:
       '@typescript-eslint/types': 8.26.0
-      eslint-visitor-keys: 4.2.0
+      eslint-visitor-keys: 4.2.1
 
   '@typescript-eslint/visitor-keys@8.43.0':
     dependencies:
@@ -3259,7 +3333,7 @@ snapshots:
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 0.2.3
-      debug: 4.4.0
+      debug: 4.4.1
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
@@ -3280,13 +3354,13 @@ snapshots:
       chai: 5.1.2
       tinyrainbow: 1.2.0
 
-  '@vitest/mocker@2.1.9(vite@5.4.14(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
+  '@vitest/mocker@2.1.9(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
       '@vitest/spy': 2.1.9
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 5.4.14(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
 
   '@vitest/pretty-format@2.1.9':
     dependencies:
@@ -3313,21 +3387,15 @@ snapshots:
       loupe: 3.1.3
       tinyrainbow: 1.2.0
 
-  acorn-jsx@5.3.2(acorn@8.14.0):
-    dependencies:
-      acorn: 8.14.0
-
   acorn-jsx@5.3.2(acorn@8.15.0):
     dependencies:
       acorn: 8.15.0
 
-  acorn@8.14.0: {}
-
   acorn@8.15.0: {}
 
   agent-base@7.1.1:
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -3350,6 +3418,8 @@ snapshots:
 
   ansi-styles@6.2.1: {}
 
+  ansis@4.1.0: {}
+
   anymatch@3.1.3:
     dependencies:
       normalize-path: 3.0.0
@@ -3381,6 +3451,8 @@ snapshots:
   binary-extensions@2.3.0:
     optional: true
 
+  birpc@2.5.0: {}
+
   brace-expansion@1.1.11:
     dependencies:
       balanced-match: 1.0.2
@@ -3479,10 +3551,6 @@ snapshots:
 
   dataloader@1.4.0: {}
 
-  debug@4.4.0:
-    dependencies:
-      ms: 2.1.3
-
   debug@4.4.1:
     dependencies:
       ms: 2.1.3
@@ -3525,7 +3593,7 @@ snapshots:
       locate-character: 3.0.0
       magic-string: 0.30.17
       sade: 1.8.1
-      tinyglobby: 0.2.12
+      tinyglobby: 0.2.15
       ts-api-utils: 1.3.0(typescript@5.5.4)
       typescript: 5.5.4
 
@@ -3547,7 +3615,7 @@ snapshots:
 
   entities@4.5.0: {}
 
-  error-stack-parser-es@0.1.1: {}
+  error-stack-parser-es@1.0.5: {}
 
   es-module-lexer@1.6.0: {}
 
@@ -3577,6 +3645,35 @@ snapshots:
       '@esbuild/win32-ia32': 0.21.5
       '@esbuild/win32-x64': 0.21.5
 
+  esbuild@0.25.10:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.25.10
+      '@esbuild/android-arm': 0.25.10
+      '@esbuild/android-arm64': 0.25.10
+      '@esbuild/android-x64': 0.25.10
+      '@esbuild/darwin-arm64': 0.25.10
+      '@esbuild/darwin-x64': 0.25.10
+      '@esbuild/freebsd-arm64': 0.25.10
+      '@esbuild/freebsd-x64': 0.25.10
+      '@esbuild/linux-arm': 0.25.10
+      '@esbuild/linux-arm64': 0.25.10
+      '@esbuild/linux-ia32': 0.25.10
+      '@esbuild/linux-loong64': 0.25.10
+      '@esbuild/linux-mips64el': 0.25.10
+      '@esbuild/linux-ppc64': 0.25.10
+      '@esbuild/linux-riscv64': 0.25.10
+      '@esbuild/linux-s390x': 0.25.10
+      '@esbuild/linux-x64': 0.25.10
+      '@esbuild/netbsd-arm64': 0.25.10
+      '@esbuild/netbsd-x64': 0.25.10
+      '@esbuild/openbsd-arm64': 0.25.10
+      '@esbuild/openbsd-x64': 0.25.10
+      '@esbuild/openharmony-arm64': 0.25.10
+      '@esbuild/sunos-x64': 0.25.10
+      '@esbuild/win32-arm64': 0.25.10
+      '@esbuild/win32-ia32': 0.25.10
+      '@esbuild/win32-x64': 0.25.10
+
   escape-string-regexp@4.0.0: {}
 
   eslint-compat-utils@0.5.1(eslint@9.9.1):
@@ -3616,15 +3713,15 @@ snapshots:
 
   eslint-plugin-svelte@3.11.0(eslint@9.9.1)(svelte@packages+svelte):
     dependencies:
-      '@eslint-community/eslint-utils': 4.7.0(eslint@9.9.1)
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
       '@jridgewell/sourcemap-codec': 1.5.0
       eslint: 9.9.1
       esutils: 2.0.3
       globals: 16.3.0
       known-css-properties: 0.37.0
-      postcss: 8.5.3
-      postcss-load-config: 3.1.4(postcss@8.5.3)
-      postcss-safe-parser: 7.0.1(postcss@8.5.3)
+      postcss: 8.5.6
+      postcss-load-config: 3.1.4(postcss@8.5.6)
+      postcss-safe-parser: 7.0.1(postcss@8.5.6)
       semver: 7.7.2
       svelte-eslint-parser: 1.3.0(svelte@packages+svelte)
     optionalDependencies:
@@ -3632,11 +3729,6 @@ snapshots:
     transitivePeerDependencies:
       - ts-node
 
-  eslint-scope@8.0.2:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-
   eslint-scope@8.4.0:
     dependencies:
       esrecurse: 4.3.0
@@ -3644,13 +3736,11 @@ snapshots:
 
   eslint-visitor-keys@3.4.3: {}
 
-  eslint-visitor-keys@4.2.0: {}
-
   eslint-visitor-keys@4.2.1: {}
 
   eslint@9.9.1:
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.1(eslint@9.9.1)
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
       '@eslint-community/regexpp': 4.12.1
       '@eslint/config-array': 0.18.0
       '@eslint/eslintrc': 3.1.0
@@ -3661,10 +3751,10 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.4.0
+      debug: 4.4.1
       escape-string-regexp: 4.0.0
-      eslint-scope: 8.0.2
-      eslint-visitor-keys: 4.2.0
+      eslint-scope: 8.4.0
+      eslint-visitor-keys: 4.2.1
       espree: 10.1.0
       esquery: 1.5.0
       esutils: 2.0.3
@@ -3691,9 +3781,9 @@ snapshots:
 
   espree@10.1.0:
     dependencies:
-      acorn: 8.14.0
-      acorn-jsx: 5.3.2(acorn@8.14.0)
-      eslint-visitor-keys: 4.2.0
+      acorn: 8.15.0
+      acorn-jsx: 5.3.2(acorn@8.15.0)
+      eslint-visitor-keys: 4.2.1
 
   espree@9.6.1:
     dependencies:
@@ -3721,7 +3811,7 @@ snapshots:
 
   estree-walker@3.0.3:
     dependencies:
-      '@types/estree': 1.0.6
+      '@types/estree': 1.0.8
 
   esutils@2.0.3: {}
 
@@ -3737,14 +3827,6 @@ snapshots:
 
   fast-deep-equal@3.1.3: {}
 
-  fast-glob@3.3.2:
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      '@nodelib/fs.walk': 1.2.8
-      glob-parent: 5.1.2
-      merge2: 1.4.1
-      micromatch: 4.0.5
-
   fast-glob@3.3.3:
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -3761,9 +3843,9 @@ snapshots:
     dependencies:
       reusify: 1.0.4
 
-  fdir@6.4.3(picomatch@4.0.2):
+  fdir@6.5.0(picomatch@4.0.3):
     optionalDependencies:
-      picomatch: 4.0.2
+      picomatch: 4.0.3
 
   file-entry-cache@8.0.0:
     dependencies:
@@ -3801,12 +3883,6 @@ snapshots:
       combined-stream: 1.0.8
       mime-types: 2.1.35
 
-  fs-extra@11.2.0:
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 6.1.0
-      universalify: 2.0.1
-
   fs-extra@7.0.1:
     dependencies:
       graceful-fs: 4.2.11
@@ -3858,7 +3934,7 @@ snapshots:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
-      fast-glob: 3.3.2
+      fast-glob: 3.3.3
       ignore: 5.3.2
       merge2: 1.4.1
       slash: 3.0.0
@@ -3882,14 +3958,14 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.4.0
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.5:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.4.0
+      debug: 4.4.1
     transitivePeerDependencies:
       - supports-color
 
@@ -3948,11 +4024,11 @@ snapshots:
 
   is-reference@1.2.1:
     dependencies:
-      '@types/estree': 1.0.6
+      '@types/estree': 1.0.8
 
   is-reference@3.0.3:
     dependencies:
-      '@types/estree': 1.0.6
+      '@types/estree': 1.0.8
 
   is-subdir@1.2.0:
     dependencies:
@@ -3977,7 +4053,7 @@ snapshots:
   istanbul-lib-source-maps@5.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.4.0
+      debug: 4.4.1
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
@@ -4040,12 +4116,6 @@ snapshots:
     optionalDependencies:
       graceful-fs: 4.2.11
 
-  jsonfile@6.1.0:
-    dependencies:
-      universalify: 2.0.1
-    optionalDependencies:
-      graceful-fs: 4.2.11
-
   keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
@@ -4142,11 +4212,6 @@ snapshots:
 
   merge2@1.4.1: {}
 
-  micromatch@4.0.5:
-    dependencies:
-      braces: 3.0.3
-      picomatch: 2.3.1
-
   micromatch@4.0.8:
     dependencies:
       braces: 3.0.3
@@ -4187,12 +4252,14 @@ snapshots:
 
   nwsapi@2.2.12: {}
 
-  open@10.1.0:
+  ohash@2.0.11: {}
+
+  open@10.2.0:
     dependencies:
       default-browser: 5.2.1
       define-lazy-prop: 3.0.0
       is-inside-container: 1.0.0
-      is-wsl: 3.1.0
+      wsl-utils: 0.1.0
 
   optionator@0.9.3:
     dependencies:
@@ -4258,16 +4325,16 @@ snapshots:
 
   pathe@1.1.2: {}
 
+  pathe@2.0.3: {}
+
   pathval@2.0.0: {}
 
-  perfect-debounce@1.0.0: {}
+  perfect-debounce@2.0.0: {}
 
   picocolors@1.1.1: {}
 
   picomatch@2.3.1: {}
 
-  picomatch@4.0.2: {}
-
   picomatch@4.0.3: {}
 
   pify@4.0.1: {}
@@ -4285,16 +4352,16 @@ snapshots:
       '@polka/url': 1.0.0-next.25
       trouter: 4.0.0
 
-  postcss-load-config@3.1.4(postcss@8.5.3):
+  postcss-load-config@3.1.4(postcss@8.5.6):
     dependencies:
       lilconfig: 2.1.0
       yaml: 1.10.2
     optionalDependencies:
-      postcss: 8.5.3
+      postcss: 8.5.6
 
-  postcss-safe-parser@7.0.1(postcss@8.5.3):
+  postcss-safe-parser@7.0.1(postcss@8.5.6):
     dependencies:
-      postcss: 8.5.3
+      postcss: 8.5.6
 
   postcss-scss@4.0.9(postcss@8.5.6):
     dependencies:
@@ -4305,12 +4372,6 @@ snapshots:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
 
-  postcss@8.5.3:
-    dependencies:
-      nanoid: 3.3.11
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
   postcss@8.5.6:
     dependencies:
       nanoid: 3.3.11
@@ -4368,28 +4429,6 @@ snapshots:
 
   reusify@1.0.4: {}
 
-  rollup@4.22.4:
-    dependencies:
-      '@types/estree': 1.0.5
-    optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.22.4
-      '@rollup/rollup-android-arm64': 4.22.4
-      '@rollup/rollup-darwin-arm64': 4.22.4
-      '@rollup/rollup-darwin-x64': 4.22.4
-      '@rollup/rollup-linux-arm-gnueabihf': 4.22.4
-      '@rollup/rollup-linux-arm-musleabihf': 4.22.4
-      '@rollup/rollup-linux-arm64-gnu': 4.22.4
-      '@rollup/rollup-linux-arm64-musl': 4.22.4
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.22.4
-      '@rollup/rollup-linux-riscv64-gnu': 4.22.4
-      '@rollup/rollup-linux-s390x-gnu': 4.22.4
-      '@rollup/rollup-linux-x64-gnu': 4.22.4
-      '@rollup/rollup-linux-x64-musl': 4.22.4
-      '@rollup/rollup-win32-arm64-msvc': 4.22.4
-      '@rollup/rollup-win32-ia32-msvc': 4.22.4
-      '@rollup/rollup-win32-x64-msvc': 4.22.4
-      fsevents: 2.3.3
-
   rollup@4.50.1:
     dependencies:
       '@types/estree': 1.0.8
@@ -4444,8 +4483,6 @@ snapshots:
     dependencies:
       xmlchars: 2.2.0
 
-  semver@7.7.1: {}
-
   semver@7.7.2: {}
 
   serialize-javascript@6.0.2:
@@ -4470,7 +4507,7 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
-  sirv@2.0.4:
+  sirv@3.0.2:
     dependencies:
       '@polka/url': 1.0.0-next.25
       mrmime: 2.0.0
@@ -4535,7 +4572,7 @@ snapshots:
   svelte-eslint-parser@1.3.0(svelte@packages+svelte):
     dependencies:
       eslint-scope: 8.4.0
-      eslint-visitor-keys: 4.2.0
+      eslint-visitor-keys: 4.2.1
       espree: 10.1.0
       postcss: 8.5.6
       postcss-scss: 4.0.9(postcss@8.5.6)
@@ -4552,7 +4589,7 @@ snapshots:
   terser@5.27.0:
     dependencies:
       '@jridgewell/source-map': 0.3.6
-      acorn: 8.14.0
+      acorn: 8.15.0
       commander: 2.20.3
       source-map-support: 0.5.21
 
@@ -4568,10 +4605,10 @@ snapshots:
 
   tinyexec@0.3.2: {}
 
-  tinyglobby@0.2.12:
+  tinyglobby@0.2.15:
     dependencies:
-      fdir: 6.4.3(picomatch@4.0.2)
-      picomatch: 4.0.2
+      fdir: 6.5.0(picomatch@4.0.3)
+      picomatch: 4.0.3
 
   tinypool@1.0.2: {}
 
@@ -4615,10 +4652,6 @@ snapshots:
     dependencies:
       typescript: 5.5.4
 
-  ts-api-utils@2.0.1(typescript@5.5.4):
-    dependencies:
-      typescript: 5.5.4
-
   ts-api-utils@2.1.0(typescript@5.5.4):
     dependencies:
       typescript: 5.5.4
@@ -4646,9 +4679,14 @@ snapshots:
 
   undici-types@5.26.5: {}
 
+  undici-types@7.12.0: {}
+
   universalify@0.1.2: {}
 
-  universalify@2.0.1: {}
+  unplugin-utils@0.3.0:
+    dependencies:
+      pathe: 2.0.3
+      picomatch: 4.0.3
 
   uri-js@4.4.1:
     dependencies:
@@ -4656,12 +4694,24 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
+  uuid@11.1.0: {}
+
   v8-natives@1.2.5: {}
 
+  vite-dev-rpc@1.1.0(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
+    dependencies:
+      birpc: 2.5.0
+      vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite-hot-client: 2.1.0(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+
+  vite-hot-client@2.1.0(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
+    dependencies:
+      vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+
   vite-node@2.1.9(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.0
+      debug: 4.4.1
       es-module-lexer: 1.6.0
       pathe: 1.1.2
       vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
@@ -4676,27 +4726,31 @@ snapshots:
       - supports-color
       - terser
 
-  vite-plugin-inspect@0.8.4(rollup@4.50.1)(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
+  vite-plugin-devtools-json@1.0.0(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
     dependencies:
-      '@antfu/utils': 0.7.8
-      '@rollup/pluginutils': 5.1.0(rollup@4.50.1)
-      debug: 4.4.0
-      error-stack-parser-es: 0.1.1
-      fs-extra: 11.2.0
-      open: 10.1.0
-      perfect-debounce: 1.0.0
-      picocolors: 1.1.1
-      sirv: 2.0.4
-      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      uuid: 11.1.0
+      vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+
+  vite-plugin-inspect@11.3.3(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
+    dependencies:
+      ansis: 4.1.0
+      debug: 4.4.1
+      error-stack-parser-es: 1.0.5
+      ohash: 2.0.11
+      open: 10.2.0
+      perfect-debounce: 2.0.0
+      sirv: 3.0.2
+      unplugin-utils: 0.3.0
+      vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite-dev-rpc: 1.1.0(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
     transitivePeerDependencies:
-      - rollup
       - supports-color
 
-  vite@5.4.14(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
+  vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.5.6
-      rollup: 4.22.4
+      rollup: 4.50.1
     optionalDependencies:
       '@types/node': 20.12.7
       fsevents: 2.3.3
@@ -4704,33 +4758,36 @@ snapshots:
       sass: 1.70.0
       terser: 5.27.0
 
-  vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
+  vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
-      esbuild: 0.21.5
+      esbuild: 0.25.10
+      fdir: 6.5.0(picomatch@4.0.3)
+      picomatch: 4.0.3
       postcss: 8.5.6
       rollup: 4.50.1
+      tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 20.12.7
+      '@types/node': 24.5.2
       fsevents: 2.3.3
       lightningcss: 1.23.0
       sass: 1.70.0
       terser: 5.27.0
 
-  vitefu@0.2.5(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
+  vitefu@1.1.1(vite@7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
     optionalDependencies:
-      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
 
   vitest@2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
       '@vitest/expect': 2.1.9
-      '@vitest/mocker': 2.1.9(vite@5.4.14(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+      '@vitest/mocker': 2.1.9(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
       '@vitest/pretty-format': 2.1.9
       '@vitest/runner': 2.1.9
       '@vitest/snapshot': 2.1.9
       '@vitest/spy': 2.1.9
       '@vitest/utils': 2.1.9
       chai: 5.1.2
-      debug: 4.4.0
+      debug: 4.4.1
       expect-type: 1.1.0
       magic-string: 0.30.17
       pathe: 1.1.2
@@ -4739,7 +4796,7 @@ snapshots:
       tinyexec: 0.3.2
       tinypool: 1.0.2
       tinyrainbow: 1.2.0
-      vite: 5.4.14(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
       vite-node: 2.1.9(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
@@ -4807,6 +4864,10 @@ snapshots:
 
   ws@8.18.0: {}
 
+  wsl-utils@0.1.0:
+    dependencies:
+      is-wsl: 3.1.0
+
   xml-name-validator@5.0.0: {}
 
   xmlchars@2.2.0: {}

From 39682e2435eb09e3f358450744f5cc247b8e81a6 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 17 Sep 2025 22:08:38 -0400
Subject: [PATCH 29/68] chore: fix SSR compiler output (#16790)

* chore: fix SSR compiler output

* update snapshots
---
 .../phases/3-transform/server/transform-server.js         | 6 +++---
 .../phases/3-transform/server/visitors/AwaitBlock.js      | 2 +-
 .../phases/3-transform/server/visitors/RegularElement.js  | 8 ++++----
 .../phases/3-transform/server/visitors/RenderTag.js       | 2 +-
 .../phases/3-transform/server/visitors/SlotElement.js     | 2 +-
 .../phases/3-transform/server/visitors/SnippetBlock.js    | 4 ++--
 .../phases/3-transform/server/visitors/SvelteBoundary.js  | 2 +-
 .../phases/3-transform/server/visitors/SvelteElement.js   | 4 ++--
 .../phases/3-transform/server/visitors/SvelteHead.js      | 2 +-
 .../phases/3-transform/server/visitors/TitleElement.js    | 2 +-
 .../3-transform/server/visitors/shared/component.js       | 6 +++---
 .../phases/3-transform/server/visitors/shared/element.js  | 6 +++---
 .../phases/3-transform/server/visitors/shared/utils.js    | 4 ++--
 .../_expected/server/index.svelte.js                      | 4 ++--
 .../async-each-hoisting/_expected/server/index.svelte.js  | 4 ++--
 .../_expected/server/index.svelte.js                      | 4 ++--
 .../async-if-hoisting/_expected/server/index.svelte.js    | 4 ++--
 .../await-block-scope/_expected/server/index.svelte.js    | 4 ++--
 .../_expected/server/index.svelte.js                      | 8 ++++----
 .../samples/bind-this/_expected/server/index.svelte.js    | 4 ++--
 .../_expected/server/index.svelte.js                      | 4 ++--
 .../_expected/server/index.svelte.js                      | 2 +-
 .../_expected/server/main.svelte.js                       | 2 +-
 .../each-index-non-null/_expected/server/index.svelte.js  | 2 +-
 .../each-string-template/_expected/server/index.svelte.js | 2 +-
 .../_expected/server/index.svelte.js                      | 6 +++---
 .../_expected/server/index.svelte.js                      | 2 +-
 .../samples/hello-world/_expected/server/index.svelte.js  | 2 +-
 .../snapshot/samples/hmr/_expected/server/index.svelte.js | 2 +-
 .../imports-in-modules/_expected/server/index.svelte.js   | 2 +-
 .../_expected/server/index.svelte.js                      | 2 +-
 .../props-identifier/_expected/server/index.svelte.js     | 4 ++--
 .../samples/purity/_expected/server/index.svelte.js       | 4 ++--
 .../skip-static-subtree/_expected/server/index.svelte.js  | 4 ++--
 .../state-proxy-literal/_expected/server/index.svelte.js  | 2 +-
 .../svelte-element/_expected/server/index.svelte.js       | 4 ++--
 .../text-nodes-deriveds/_expected/server/index.svelte.js  | 2 +-
 37 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index 4a1ba17238..91d8229e96 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -191,7 +191,7 @@ export function server_component(analysis, options) {
 			b.let('$$inner_renderer'),
 			b.function_declaration(
 				b.id('$$render_inner'),
-				[b.id(' $$renderer')],
+				[b.id('$$renderer')],
 				b.block(/** @type {Statement[]} */ (rest))
 			),
 			b.do_while(
@@ -253,7 +253,7 @@ export function server_component(analysis, options) {
 	if (analysis.props_id) {
 		// need to be placed on first line of the component for hydration
 		component_block.body.unshift(
-			b.const(analysis.props_id, b.call('$.props_id', b.id(' $$renderer')))
+			b.const(analysis.props_id, b.call('$.props_id', b.id('$$renderer')))
 		);
 	}
 
@@ -315,7 +315,7 @@ export function server_component(analysis, options) {
 
 	const component_function = b.function_declaration(
 		b.id(analysis.name),
-		should_inject_props ? [b.id(' $$renderer'), b.id('$$props')] : [b.id(' $$renderer')],
+		should_inject_props ? [b.id('$$renderer'), b.id('$$props')] : [b.id('$$renderer')],
 		component_block
 	);
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
index 1de64c62f5..e88f117c5c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
@@ -13,7 +13,7 @@ export function AwaitBlock(node, context) {
 	let statement = b.stmt(
 		b.call(
 			'$.await',
-			b.id(' $$renderer'),
+			b.id('$$renderer'),
 			/** @type {Expression} */ (context.visit(node.expression)),
 			b.thunk(
 				node.pending ? /** @type {BlockStatement} */ (context.visit(node.pending)) : b.block([])
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
index 52e06612c7..75b1bf4d4f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
@@ -68,7 +68,7 @@ export function RegularElement(node, context) {
 			b.stmt(
 				b.call(
 					'$.push_element',
-					b.id(' $$renderer'),
+					b.id('$$renderer'),
 					b.literal(node.name),
 					b.literal(location.line),
 					b.literal(location.column)
@@ -160,7 +160,7 @@ export function RegularElement(node, context) {
 				b.stmt(
 					b.call(
 						'$.simple_valueless_option',
-						b.id(' $$renderer'),
+						b.id('$$renderer'),
 						b.thunk(
 							node.metadata.synthetic_value_node.expression,
 							node.metadata.synthetic_value_node.metadata.expression.has_await
@@ -175,9 +175,9 @@ export function RegularElement(node, context) {
 				b.stmt(
 					b.call(
 						'$.valueless_option',
-						b.id(' $$renderer'),
+						b.id('$$renderer'),
 						b.arrow(
-							[b.id(' $$renderer')],
+							[b.id('$$renderer')],
 							b.block([...inner_state.init, ...build_template(inner_state.template)])
 						)
 					)
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RenderTag.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RenderTag.js
index 591f95cc6f..4ec686bb89 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RenderTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RenderTag.js
@@ -23,7 +23,7 @@ export function RenderTag(node, context) {
 		b.stmt(
 			(node.expression.type === 'CallExpression' ? b.call : b.maybe_call)(
 				snippet_function,
-				b.id(' $$renderer'),
+				b.id('$$renderer'),
 				...snippet_args
 			)
 		)
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
index 9865317daf..029a0f0a42 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
@@ -57,7 +57,7 @@ export function SlotElement(node, context) {
 
 	const slot = b.call(
 		'$.slot',
-		b.id(' $$renderer'),
+		b.id('$$renderer'),
 		b.id('$$props'),
 		name,
 		props_expression,
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js
index 38cf38deaf..7ae2a8e037 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js
@@ -11,7 +11,7 @@ import * as b from '#compiler/builders';
 export function SnippetBlock(node, context) {
 	let fn = b.function_declaration(
 		node.expression,
-		[b.id(' $$renderer'), ...node.parameters],
+		[b.id('$$renderer'), ...node.parameters],
 		/** @type {BlockStatement} */ (context.visit(node.body))
 	);
 
@@ -21,7 +21,7 @@ export function SnippetBlock(node, context) {
 	const statements = node.metadata.can_hoist ? context.state.hoisted : context.state.init;
 
 	if (dev) {
-		fn.body.body.unshift(b.stmt(b.call('$.validate_snippet_args', b.id(' $$renderer'))));
+		fn.body.body.unshift(b.stmt(b.call('$.validate_snippet_args', b.id('$$renderer'))));
 		statements.push(b.stmt(b.call('$.prevent_snippet_stringification', fn.id)));
 	}
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
index 44114a5b2c..2e116f57d8 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
@@ -24,7 +24,7 @@ export function SvelteBoundary(node, context) {
 		const pending = pending_attribute
 			? b.call(
 					build_attribute_value(pending_attribute.value, context, false, true),
-					b.id(' $$renderer')
+					b.id('$$renderer')
 				)
 			: /** @type {BlockStatement} */ (context.visit(pending_snippet.body));
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js
index 5fa842a9af..6ca0997bb6 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js
@@ -45,7 +45,7 @@ export function SvelteElement(node, context) {
 			b.stmt(
 				b.call(
 					'$.push_element',
-					b.id(' $$renderer'),
+					b.id('$$renderer'),
 					tag,
 					b.literal(location.line),
 					b.literal(location.column)
@@ -61,7 +61,7 @@ export function SvelteElement(node, context) {
 		b.stmt(
 			b.call(
 				'$.element',
-				b.id(' $$renderer'),
+				b.id('$$renderer'),
 				tag,
 				attributes.body.length > 0 && b.thunk(attributes),
 				children.body.length > 0 && b.thunk(children)
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteHead.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteHead.js
index 6ca797669c..a519057cb6 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteHead.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteHead.js
@@ -11,6 +11,6 @@ export function SvelteHead(node, context) {
 	const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
 
 	context.state.template.push(
-		b.stmt(b.call('$.head', b.id(' $$renderer'), b.arrow([b.id(' $$renderer')], block)))
+		b.stmt(b.call('$.head', b.id('$$renderer'), b.arrow([b.id('$$renderer')], block)))
 	);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
index 06e0a3b4c0..191205df28 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
@@ -14,6 +14,6 @@ export function TitleElement(node, context) {
 	template.push(b.literal('</title>'));
 
 	context.state.init.push(
-		b.stmt(b.call('$.build_title', b.id(' $$renderer'), b.thunk(b.block(build_template(template)))))
+		b.stmt(b.call('$.build_title', b.id('$$renderer'), b.thunk(b.block(build_template(template)))))
 	);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
index 5eeb5e3a0f..0e81ef5318 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
@@ -215,7 +215,7 @@ export function build_inline_component(node, expression, context) {
 		if (block.body.length === 0) continue;
 
 		/** @type {Pattern[]} */
-		const params = [b.id(' $$renderer')];
+		const params = [b.id('$$renderer')];
 
 		if (lets[slot_name].length > 0) {
 			const pattern = b.object_pattern(
@@ -292,7 +292,7 @@ export function build_inline_component(node, expression, context) {
 	let statement = b.stmt(
 		(node.type === 'SvelteComponent' ? b.maybe_call : b.call)(
 			expression,
-			b.id(' $$renderer'),
+			b.id('$$renderer'),
 			props_expression
 		)
 	);
@@ -308,7 +308,7 @@ export function build_inline_component(node, expression, context) {
 		statement = b.stmt(
 			b.call(
 				'$.css_props',
-				b.id(' $$renderer'),
+				b.id('$$renderer'),
 				b.literal(context.state.namespace === 'svg' ? false : true),
 				b.object(custom_css_props),
 				b.thunk(b.block([statement])),
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
index ddcc5f7901..fbd3a22b1c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
@@ -207,7 +207,7 @@ export function build_element_attributes(node, context) {
 			context.state.template.push(
 				b.call(
 					'$.maybe_selected',
-					b.id(' $$renderer'),
+					b.id('$$renderer'),
 					b.member(
 						build_spread_object(
 							node,
@@ -264,7 +264,7 @@ export function build_element_attributes(node, context) {
 					context.state.template.push(
 						b.call(
 							'$.maybe_selected',
-							b.id(' $$renderer'),
+							b.id('$$renderer'),
 							literal_value != null ? b.literal(/** @type {any} */ (literal_value)) : b.void0
 						)
 					);
@@ -296,7 +296,7 @@ export function build_element_attributes(node, context) {
 			}
 
 			if (name === 'value' && node.name === 'option') {
-				context.state.template.push(b.call('$.maybe_selected', b.id(' $$renderer'), value));
+				context.state.template.push(b.call('$.maybe_selected', b.id('$$renderer'), value));
 			}
 		}
 	}
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
index 971df1de93..4becb12169 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
@@ -267,7 +267,7 @@ export function build_getter(node, state) {
  * @returns {Statement}
  */
 export function call_child_renderer(body, async) {
-	return b.stmt(b.call(' $$renderer.child', b.arrow([b.id(' $$renderer')], body, async)));
+	return b.stmt(b.call(' $$renderer.child', b.arrow([b.id('$$renderer')], body, async)));
 }
 
 /**
@@ -277,7 +277,7 @@ export function call_child_renderer(body, async) {
  */
 export function call_component_renderer(body, component_fn_id) {
 	return b.stmt(
-		b.call(' $$renderer.component', b.arrow([b.id(' $$renderer')], body, false), component_fn_id)
+		b.call(' $$renderer.component', b.arrow([b.id('$$renderer')], body, false), component_fn_id)
 	);
 }
 
diff --git a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
index 599ef30233..304e7845b9 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
@@ -1,8 +1,8 @@
 import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
-export default function Async_each_fallback_hoisting( $$renderer) {
-	 $$renderer.child(async ( $$renderer) => {
+export default function Async_each_fallback_hoisting($$renderer) {
+	 $$renderer.child(async ($$renderer) => {
 		const each_array = $.ensure_array_like(await Promise.resolve([]));
 
 		if (each_array.length !== 0) {
diff --git a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
index e021115677..6965cb196a 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
@@ -1,14 +1,14 @@
 import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
-export default function Async_each_hoisting( $$renderer) {
+export default function Async_each_hoisting($$renderer) {
 	const first = Promise.resolve(1);
 	const second = Promise.resolve(2);
 	const third = Promise.resolve(3);
 
 	 $$renderer.push(`<!--[-->`);
 
-	 $$renderer.child(async ( $$renderer) => {
+	 $$renderer.child(async ($$renderer) => {
 		const each_array = $.ensure_array_like(await Promise.resolve([first, second, third]));
 
 		for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
diff --git a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
index 021f6b113e..70f529795c 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
@@ -1,8 +1,8 @@
 import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
-export default function Async_if_alternate_hoisting( $$renderer) {
-	 $$renderer.child(async ( $$renderer) => {
+export default function Async_if_alternate_hoisting($$renderer) {
+	 $$renderer.child(async ($$renderer) => {
 		if (await Promise.resolve(false)) {
 			 $$renderer.push('<!--[-->');
 			 $$renderer.push(async () => $.escape(await Promise.reject('no no no')));
diff --git a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
index 41c919d37f..d9f7529529 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
@@ -1,8 +1,8 @@
 import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
-export default function Async_if_hoisting( $$renderer) {
-	 $$renderer.child(async ( $$renderer) => {
+export default function Async_if_hoisting($$renderer) {
+	 $$renderer.child(async ($$renderer) => {
 		if (await Promise.resolve(true)) {
 			 $$renderer.push('<!--[-->');
 			 $$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
diff --git a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
index 5b9c864f08..533d7380c3 100644
--- a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Await_block_scope( $$renderer) {
+export default function Await_block_scope($$renderer) {
 	let counter = { count: 0 };
 	const promise = Promise.resolve(counter);
 
@@ -9,6 +9,6 @@ export default function Await_block_scope( $$renderer) {
 	}
 
 	 $$renderer.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
-	$.await( $$renderer, promise, () => {}, (counter) => {});
+	$.await($$renderer, promise, () => {}, (counter) => {});
 	 $$renderer.push(`<!--]--> ${$.escape(counter.count)}`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
index bc4544d854..ab80064d33 100644
--- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
@@ -1,18 +1,18 @@
 import * as $ from 'svelte/internal/server';
 import TextInput from './Child.svelte';
 
-function snippet( $$renderer) {
+function snippet($$renderer) {
 	 $$renderer.push(`<!---->Something`);
 }
 
-export default function Bind_component_snippet( $$renderer) {
+export default function Bind_component_snippet($$renderer) {
 	let value = '';
 	const _snippet = snippet;
 	let $$settled = true;
 	let $$inner_renderer;
 
-	function $$render_inner( $$renderer) {
-		TextInput( $$renderer, {
+	function $$render_inner($$renderer) {
+		TextInput($$renderer, {
 			get value() {
 				return value;
 			},
diff --git a/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js
index 0af5d879db..8697d71bfa 100644
--- a/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-this/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Bind_this( $$renderer) {
-	Foo( $$renderer, {});
+export default function Bind_this($$renderer) {
+	Foo($$renderer, {});
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
index 30976c1818..04d6faa25d 100644
--- a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Class_state_field_constructor_assignment( $$renderer, $$props) {
-	 $$renderer.component(( $$renderer) => {
+export default function Class_state_field_constructor_assignment($$renderer, $$props) {
+	 $$renderer.component(($$renderer) => {
 		class Foo {
 			a = 0;
 			#b;
diff --git a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
index 141721c0d8..5381aa6471 100644
--- a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Delegated_locally_declared_shadowed( $$renderer) {
+export default function Delegated_locally_declared_shadowed($$renderer) {
 	 $$renderer.push(`<!--[-->`);
 
 	const each_array = $.ensure_array_like({ length: 1 });
diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
index 764ebf28da..b4a63a9136 100644
--- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Main( $$renderer) {
+export default function Main($$renderer) {
 	// needs to be a snapshot test because jsdom does auto-correct the attribute casing
 	let x = 'test';
 
diff --git a/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
index e46b227b69..d65ed94ad0 100644
--- a/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Each_index_non_null( $$renderer) {
+export default function Each_index_non_null($$renderer) {
 	 $$renderer.push(`<!--[-->`);
 
 	const each_array = $.ensure_array_like(Array(10));
diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
index 42d262152c..44c4ae5fd1 100644
--- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Each_string_template( $$renderer) {
+export default function Each_string_template($$renderer) {
 	 $$renderer.push(`<!--[-->`);
 
 	const each_array = $.ensure_array_like(['foo', 'bar', 'baz']);
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
index af9746e60c..5ff9ce8796 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Function_prop_no_getter( $$renderer) {
+export default function Function_prop_no_getter($$renderer) {
 	let count = 0;
 
 	function onmouseup() {
@@ -9,12 +9,12 @@ export default function Function_prop_no_getter( $$renderer) {
 
 	const plusOne = (num) => num + 1;
 
-	Button( $$renderer, {
+	Button($$renderer, {
 		onmousedown: () => count += 1,
 		onmouseup,
 		onmouseenter: () => count = plusOne(count),
 
-		children: ( $$renderer) => {
+		children: ($$renderer) => {
 			 $$renderer.push(`<!---->clicks: ${$.escape(count)}`);
 		},
 
diff --git a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
index c2340dbd74..36913599b2 100644
--- a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Functional_templating( $$renderer) {
+export default function Functional_templating($$renderer) {
 	 $$renderer.push(`<h1>hello</h1> <div class="potato"><p>child element</p> <p>another child element</p></div>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
index 07ed88aae1..dd37baaaf0 100644
--- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Hello_world( $$renderer) {
+export default function Hello_world($$renderer) {
 	 $$renderer.push(`<h1>hello world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
index c7d6aea293..86b11c6ecd 100644
--- a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Hmr( $$renderer) {
+export default function Hmr($$renderer) {
 	 $$renderer.push(`<h1>hello world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js
index ae755b3702..2d7b9906ed 100644
--- a/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/imports-in-modules/_expected/server/index.svelte.js
@@ -1,4 +1,4 @@
 import * as $ from 'svelte/internal/server';
 import { random } from './module.svelte';
 
-export default function Imports_in_modules( $$renderer) {}
\ No newline at end of file
+export default function Imports_in_modules($$renderer) {}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
index 3e1d1ca47b..c801b85fc5 100644
--- a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Nullish_coallescence_omittance( $$renderer) {
+export default function Nullish_coallescence_omittance($$renderer) {
 	let name = 'world';
 	let count = 0;
 
diff --git a/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
index d9727d4623..ed5bfd3944 100644
--- a/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Props_identifier( $$renderer, $$props) {
-	 $$renderer.component(( $$renderer) => {
+export default function Props_identifier($$renderer, $$props) {
+	 $$renderer.component(($$renderer) => {
 		let { $$slots, $$events, ...props } = $$props;
 
 		props.a;
diff --git a/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
index 2c8f83cb26..39565ad4e8 100644
--- a/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Purity( $$renderer) {
+export default function Purity($$renderer) {
 	 $$renderer.push(`<p>0</p> <p>${$.escape(location.href)}</p> `);
-	Child( $$renderer, { prop: encodeURIComponent('hello') });
+	Child($$renderer, { prop: encodeURIComponent('hello') });
 	 $$renderer.push(`<!---->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
index 68bbf103ba..cddd248a6f 100644
--- a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Skip_static_subtree( $$renderer, $$props) {
+export default function Skip_static_subtree($$renderer, $$props) {
 	let { title, content } = $$props;
 
-	 $$renderer.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected( $$renderer, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
+	 $$renderer.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected($$renderer, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
index a6a53e6396..f266c7d2ca 100644
--- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function State_proxy_literal( $$renderer) {
+export default function State_proxy_literal($$renderer) {
 	let str = '';
 	let tpl = ``;
 
diff --git a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js
index dcfa3da129..fc97686bb1 100644
--- a/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/svelte-element/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Svelte_element( $$renderer, $$props) {
+export default function Svelte_element($$renderer, $$props) {
 	let { tag = 'hr' } = $$props;
 
-	$.element( $$renderer, tag);
+	$.element($$renderer, tag);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
index 5310bca90e..0b9b524445 100644
--- a/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
@@ -1,6 +1,6 @@
 import * as $ from 'svelte/internal/server';
 
-export default function Text_nodes_deriveds( $$renderer) {
+export default function Text_nodes_deriveds($$renderer) {
 	let count1 = 0;
 	let count2 = 0;
 

From e4ebca9289a28dc5e0d20c7fe7a06de132fec16e Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 17 Sep 2025 22:29:43 -0400
Subject: [PATCH 30/68] fix: preserve SSR context when block expressions
 contain `await` (#16791)

* DRY out

* fix: preserve SSR context when block expressions contain `await`
---
 .changeset/friendly-months-prove.md           |  5 ++++
 .../phases/3-transform/client/utils.js        |  4 +--
 .../client/visitors/AwaitExpression.js        |  3 ++-
 .../client/visitors/VariableDeclaration.js    |  6 ++---
 .../server/visitors/AwaitExpression.js        | 27 +++++++++++++++++--
 packages/svelte/src/compiler/utils/ast.js     |  8 ++++++
 .../samples/async-push-element-dev/_config.js | 15 +++++++++++
 .../async-push-element-dev/main.svelte        |  3 +++
 .../_expected/server/index.svelte.js          |  2 +-
 .../_expected/server/index.svelte.js          |  2 +-
 .../_expected/server/index.svelte.js          |  2 +-
 .../_expected/server/index.svelte.js          |  2 +-
 12 files changed, 67 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/friendly-months-prove.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-push-element-dev/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-push-element-dev/main.svelte

diff --git a/.changeset/friendly-months-prove.md b/.changeset/friendly-months-prove.md
new file mode 100644
index 0000000000..bdd061db89
--- /dev/null
+++ b/.changeset/friendly-months-prove.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: preserve SSR context when block expressions contain `await`
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/utils.js b/packages/svelte/src/compiler/phases/3-transform/client/utils.js
index 19a4342b5e..41ed277898 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/utils.js
@@ -4,7 +4,7 @@
 /** @import { Analysis } from '../../types.js' */
 /** @import { Scope } from '../../scope.js' */
 import * as b from '#compiler/builders';
-import { is_simple_expression } from '../../../utils/ast.js';
+import { is_simple_expression, save } from '../../../utils/ast.js';
 import {
 	PROPS_IS_LAZY_INITIAL,
 	PROPS_IS_IMMUTABLE,
@@ -296,7 +296,7 @@ export function create_derived(state, expression, async = false) {
 	const thunk = b.thunk(expression, async);
 
 	if (async) {
-		return b.call(b.await(b.call('$.save', b.call('$.async_derived', thunk))));
+		return save(b.call('$.async_derived', thunk));
 	} else {
 		return b.call(state.analysis.runes ? '$.derived' : '$.derived_safe_equal', thunk);
 	}
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
index 798d1bcdac..9fcc33287c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
@@ -1,6 +1,7 @@
 /** @import { AwaitExpression, Expression } from 'estree' */
 /** @import { Context } from '../types' */
 import { dev, is_ignored } from '../../../../state.js';
+import { save } from '../../../../utils/ast.js';
 import * as b from '../../../../utils/builders.js';
 
 /**
@@ -11,7 +12,7 @@ export function AwaitExpression(node, context) {
 	const argument = /** @type {Expression} */ (context.visit(node.argument));
 
 	if (context.state.analysis.pickled_awaits.has(node)) {
-		return b.call(b.await(b.call('$.save', argument)));
+		return save(argument);
 	}
 
 	// in dev, note which values are read inside a reactive expression,
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
index db5fe5252e..2fc3a8ed80 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js
@@ -2,7 +2,7 @@
 /** @import { Binding } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
 import { dev, is_ignored, locate_node } from '../../../../state.js';
-import { extract_paths } from '../../../../utils/ast.js';
+import { extract_paths, save } from '../../../../utils/ast.js';
 import * as b from '#compiler/builders';
 import * as assert from '../../../../utils/assert.js';
 import { get_rune } from '../../../scope.js';
@@ -212,7 +212,7 @@ export function VariableDeclaration(node, context) {
 							location ? b.literal(location) : undefined
 						);
 
-						call = b.call(b.await(b.call('$.save', call)));
+						call = save(call);
 						if (dev) call = b.call('$.tag', call, b.literal(declarator.id.name));
 
 						declarations.push(b.declarator(declarator.id, call));
@@ -243,7 +243,7 @@ export function VariableDeclaration(node, context) {
 								b.thunk(expression, true),
 								location ? b.literal(location) : undefined
 							);
-							call = b.call(b.await(b.call('$.save', call)));
+							call = save(call);
 						}
 
 						if (dev) {
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js
index 6384a6d4e7..820658d950 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitExpression.js
@@ -1,6 +1,6 @@
 /** @import { AwaitExpression, Expression } from 'estree' */
 /** @import { Context } from '../types' */
-import * as b from '../../../../utils/builders.js';
+import { save } from '../../../../utils/ast.js';
 
 /**
  * @param {AwaitExpression} node
@@ -10,7 +10,30 @@ export function AwaitExpression(node, context) {
 	const argument = /** @type {Expression} */ (context.visit(node.argument));
 
 	if (context.state.analysis.pickled_awaits.has(node)) {
-		return b.call(b.await(b.call('$.save', argument)));
+		return save(argument);
+	}
+
+	// we also need to restore context after block expressions
+	let i = context.path.length;
+	while (i--) {
+		const parent = context.path[i];
+
+		if (
+			parent.type === 'ArrowFunctionExpression' ||
+			parent.type === 'FunctionExpression' ||
+			parent.type === 'FunctionDeclaration'
+		) {
+			break;
+		}
+
+		// @ts-ignore
+		if (parent.metadata) {
+			if (parent.type !== 'ExpressionTag' && parent.type !== 'Fragment') {
+				return save(argument);
+			}
+
+			break;
+		}
 	}
 
 	return argument === node.argument ? node : { ...node, argument };
diff --git a/packages/svelte/src/compiler/utils/ast.js b/packages/svelte/src/compiler/utils/ast.js
index d988cd98fb..541921befb 100644
--- a/packages/svelte/src/compiler/utils/ast.js
+++ b/packages/svelte/src/compiler/utils/ast.js
@@ -625,3 +625,11 @@ export function has_await(expression) {
 
 	return has_await;
 }
+
+/**
+ * Turns `await ...` to `(await $.save(...))()`
+ * @param {ESTree.Expression} expression
+ */
+export function save(expression) {
+	return b.call(b.await(b.call('$.save', expression)));
+}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-push-element-dev/_config.js b/packages/svelte/tests/runtime-runes/samples/async-push-element-dev/_config.js
new file mode 100644
index 0000000000..044c6aeb9a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-push-element-dev/_config.js
@@ -0,0 +1,15 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['async-server'],
+
+	compileOptions: {
+		// include `push_element` calls, so that we can check they
+		// run with the correct ssr_context
+		dev: true
+	},
+
+	html: `
+		<h1>hello!</h1>
+	`
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-push-element-dev/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-push-element-dev/main.svelte
new file mode 100644
index 0000000000..99ce81e0c0
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-push-element-dev/main.svelte
@@ -0,0 +1,3 @@
+{#if await true}
+	<h1>hello!</h1>
+{/if}
diff --git a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
index 304e7845b9..2160d74c53 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
@@ -3,7 +3,7 @@ import * as $ from 'svelte/internal/server';
 
 export default function Async_each_fallback_hoisting($$renderer) {
 	 $$renderer.child(async ($$renderer) => {
-		const each_array = $.ensure_array_like(await Promise.resolve([]));
+		const each_array = $.ensure_array_like((await $.save(Promise.resolve([])))());
 
 		if (each_array.length !== 0) {
 			 $$renderer.push('<!--[-->');
diff --git a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
index 6965cb196a..636c6b4424 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
@@ -9,7 +9,7 @@ export default function Async_each_hoisting($$renderer) {
 	 $$renderer.push(`<!--[-->`);
 
 	 $$renderer.child(async ($$renderer) => {
-		const each_array = $.ensure_array_like(await Promise.resolve([first, second, third]));
+		const each_array = $.ensure_array_like((await $.save(Promise.resolve([first, second, third])))());
 
 		for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
 			let item = each_array[$$index];
diff --git a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
index 70f529795c..a64c527933 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
@@ -3,7 +3,7 @@ import * as $ from 'svelte/internal/server';
 
 export default function Async_if_alternate_hoisting($$renderer) {
 	 $$renderer.child(async ($$renderer) => {
-		if (await Promise.resolve(false)) {
+		if ((await $.save(Promise.resolve(false)))()) {
 			 $$renderer.push('<!--[-->');
 			 $$renderer.push(async () => $.escape(await Promise.reject('no no no')));
 		} else {
diff --git a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
index d9f7529529..2ad4b7d0f7 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
@@ -3,7 +3,7 @@ import * as $ from 'svelte/internal/server';
 
 export default function Async_if_hoisting($$renderer) {
 	 $$renderer.child(async ($$renderer) => {
-		if (await Promise.resolve(true)) {
+		if ((await $.save(Promise.resolve(true)))()) {
 			 $$renderer.push('<!--[-->');
 			 $$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
 		} else {

From 461642283285fdbe854a1dce5000cf4c882e566e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 22:31:40 -0400
Subject: [PATCH 31/68] Version Packages (#16789)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/friendly-months-prove.md | 5 -----
 .changeset/friendly-queens-melt.md  | 5 -----
 packages/svelte/CHANGELOG.md        | 8 ++++++++
 packages/svelte/package.json        | 2 +-
 packages/svelte/src/version.js      | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/friendly-months-prove.md
 delete mode 100644 .changeset/friendly-queens-melt.md

diff --git a/.changeset/friendly-months-prove.md b/.changeset/friendly-months-prove.md
deleted file mode 100644
index bdd061db89..0000000000
--- a/.changeset/friendly-months-prove.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: preserve SSR context when block expressions contain `await`
diff --git a/.changeset/friendly-queens-melt.md b/.changeset/friendly-queens-melt.md
deleted file mode 100644
index bbfce12bfb..0000000000
--- a/.changeset/friendly-queens-melt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"svelte": patch
----
-
-chore: bump some devDependencies
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 24b1e2f429..28724e123c 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.39.2
+
+### Patch Changes
+
+- fix: preserve SSR context when block expressions contain `await` ([#16791](https://github.com/sveltejs/svelte/pull/16791))
+
+- chore: bump some devDependencies ([#16787](https://github.com/sveltejs/svelte/pull/16787))
+
 ## 5.39.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 1563207957..30f22bba01 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.39.1",
+  "version": "5.39.2",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index d43938dca6..d24239a826 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.39.1';
+export const VERSION = '5.39.2';
 export const PUBLIC_VERSION = '5';

From dc7da40369152065f2297570aa42dd34b992775f Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 18 Sep 2025 11:13:50 -0400
Subject: [PATCH 32/68] chore: fix more wacky compiler output (#16794)

* chore: fix more wacky compiler output

* update tests
---
 .../3-transform/server/transform-server.js       |  6 +++---
 .../3-transform/server/visitors/EachBlock.js     |  4 ++--
 .../3-transform/server/visitors/IfBlock.js       |  4 ++--
 .../server/visitors/RegularElement.js            |  4 ++--
 .../3-transform/server/visitors/shared/utils.js  |  8 ++++----
 .../_expected/server/index.svelte.js             | 16 ++++++++--------
 .../_expected/server/index.svelte.js             | 10 +++++-----
 .../_expected/server/index.svelte.js             | 12 ++++++------
 .../_expected/server/index.svelte.js             | 12 ++++++------
 .../_expected/server/index.svelte.js             |  4 ++--
 .../_expected/server/index.svelte.js             |  8 ++++----
 .../_expected/server/index.svelte.js             |  2 +-
 .../_expected/server/index.svelte.js             |  6 +++---
 .../_expected/server/main.svelte.js              |  2 +-
 .../_expected/server/index.svelte.js             |  6 +++---
 .../_expected/server/index.svelte.js             |  6 +++---
 .../_expected/server/index.svelte.js             |  2 +-
 .../_expected/server/index.svelte.js             |  2 +-
 .../hello-world/_expected/server/index.svelte.js |  2 +-
 .../samples/hmr/_expected/server/index.svelte.js |  2 +-
 .../_expected/server/index.svelte.js             |  2 +-
 .../_expected/server/index.svelte.js             |  2 +-
 .../purity/_expected/server/index.svelte.js      |  4 ++--
 .../_expected/server/index.svelte.js             |  2 +-
 .../_expected/server/index.svelte.js             |  2 +-
 .../_expected/server/index.svelte.js             |  2 +-
 26 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index 91d8229e96..994db533c2 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -198,11 +198,11 @@ export function server_component(analysis, options) {
 				b.unary('!', b.id('$$settled')),
 				b.block([
 					b.stmt(b.assignment('=', b.id('$$settled'), b.true)),
-					b.stmt(b.assignment('=', b.id('$$inner_renderer'), b.call(' $$renderer.copy'))),
+					b.stmt(b.assignment('=', b.id('$$inner_renderer'), b.call('$$renderer.copy'))),
 					b.stmt(b.call('$$render_inner', b.id('$$inner_renderer')))
 				])
 			),
-			b.stmt(b.call(' $$renderer.subsume', b.id('$$inner_renderer')))
+			b.stmt(b.call('$$renderer.subsume', b.id('$$inner_renderer')))
 		];
 	}
 
@@ -301,7 +301,7 @@ export function server_component(analysis, options) {
 		const code = b.literal(render_stylesheet(analysis.source, analysis, options).code);
 
 		body.push(b.const('$$css', b.object([b.init('hash', hash), b.init('code', code)])));
-		component_block.body.unshift(b.stmt(b.call(' $$renderer.global.css.add', b.id('$$css'))));
+		component_block.body.unshift(b.stmt(b.call('$$renderer.global.css.add', b.id('$$css'))));
 	}
 
 	let should_inject_props =
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
index dc7cf3e73a..a8821c4ee7 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
@@ -45,11 +45,11 @@ export function EachBlock(node, context) {
 	);
 
 	if (node.fallback) {
-		const open = b.stmt(b.call(b.id(' $$renderer.push'), block_open));
+		const open = b.stmt(b.call(b.id('$$renderer.push'), block_open));
 
 		const fallback = /** @type {BlockStatement} */ (context.visit(node.fallback));
 
-		fallback.body.unshift(b.stmt(b.call(b.id(' $$renderer.push'), block_open_else)));
+		fallback.body.unshift(b.stmt(b.call(b.id('$$renderer.push'), block_open_else)));
 
 		block.body.push(
 			b.if(
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
index d16f13092b..426e468927 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
@@ -16,9 +16,9 @@ export function IfBlock(node, context) {
 		? /** @type {BlockStatement} */ (context.visit(node.alternate))
 		: b.block([]);
 
-	consequent.body.unshift(b.stmt(b.call(b.id(' $$renderer.push'), block_open)));
+	consequent.body.unshift(b.stmt(b.call(b.id('$$renderer.push'), block_open)));
 
-	alternate.body.unshift(b.stmt(b.call(b.id(' $$renderer.push'), block_open_else)));
+	alternate.body.unshift(b.stmt(b.call(b.id('$$renderer.push'), block_open_else)));
 
 	/** @type {Statement} */
 	let statement = b.if(test, consequent, alternate);
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
index 75b1bf4d4f..60ec158b53 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
@@ -97,7 +97,7 @@ export function RegularElement(node, context) {
 				b.stmt(
 					b.assignment(
 						'=',
-						b.id(' $$renderer.local.select_value'),
+						b.id('$$renderer.local.select_value'),
 						b.member(
 							build_spread_object(
 								node,
@@ -125,7 +125,7 @@ export function RegularElement(node, context) {
 				);
 			}
 
-			const left = b.id(' $$renderer.local.select_value');
+			const left = b.id('$$renderer.local.select_value');
 			if (value.type === 'Attribute') {
 				state.template.push(
 					b.stmt(b.assignment('=', left, build_attribute_value(value.value, context)))
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
index 4becb12169..5e2b34496f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
@@ -80,7 +80,7 @@ export function process_children(nodes, { visit, state }) {
 			flush();
 			const visited = /** @type {Expression} */ (visit(node.expression));
 			state.template.push(
-				b.stmt(b.call(' $$renderer.push', b.thunk(b.call('$.escape', visited), true)))
+				b.stmt(b.call('$$renderer.push', b.thunk(b.call('$.escape', visited), true)))
 			);
 		} else if (node.type === 'Text' || node.type === 'Comment' || node.type === 'ExpressionTag') {
 			sequence.push(node);
@@ -119,7 +119,7 @@ export function build_template(template) {
 		statements.push(
 			b.stmt(
 				b.call(
-					b.id(' $$renderer.push'),
+					b.id('$$renderer.push'),
 					b.template(
 						strings.map((cooked, i) => b.quasi(cooked, i === strings.length - 1)),
 						expressions
@@ -267,7 +267,7 @@ export function build_getter(node, state) {
  * @returns {Statement}
  */
 export function call_child_renderer(body, async) {
-	return b.stmt(b.call(' $$renderer.child', b.arrow([b.id('$$renderer')], body, async)));
+	return b.stmt(b.call('$$renderer.child', b.arrow([b.id('$$renderer')], body, async)));
 }
 
 /**
@@ -277,7 +277,7 @@ export function call_child_renderer(body, async) {
  */
 export function call_component_renderer(body, component_fn_id) {
 	return b.stmt(
-		b.call(' $$renderer.component', b.arrow([b.id('$$renderer')], body, false), component_fn_id)
+		b.call('$$renderer.component', b.arrow([b.id('$$renderer')], body, false), component_fn_id)
 	);
 }
 
diff --git a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
index 2160d74c53..d0c1e37209 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
@@ -2,24 +2,24 @@ import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
 export default function Async_each_fallback_hoisting($$renderer) {
-	 $$renderer.child(async ($$renderer) => {
+	$$renderer.child(async ($$renderer) => {
 		const each_array = $.ensure_array_like((await $.save(Promise.resolve([])))());
 
 		if (each_array.length !== 0) {
-			 $$renderer.push('<!--[-->');
+			$$renderer.push('<!--[-->');
 
 			for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
 				let item = each_array[$$index];
 
-				 $$renderer.push(`<!---->`);
-				 $$renderer.push(async () => $.escape(await Promise.reject('This should never be reached')));
+				$$renderer.push(`<!---->`);
+				$$renderer.push(async () => $.escape(await Promise.reject('This should never be reached')));
 			}
 		} else {
-			 $$renderer.push('<!--[!-->');
-			 $$renderer.push(`<!---->`);
-			 $$renderer.push(async () => $.escape(await Promise.resolve(4)));
+			$$renderer.push('<!--[!-->');
+			$$renderer.push(`<!---->`);
+			$$renderer.push(async () => $.escape(await Promise.resolve(4)));
 		}
 	});
 
-	 $$renderer.push(`<!--]-->`);
+	$$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
index 636c6b4424..4443880165 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
@@ -6,18 +6,18 @@ export default function Async_each_hoisting($$renderer) {
 	const second = Promise.resolve(2);
 	const third = Promise.resolve(3);
 
-	 $$renderer.push(`<!--[-->`);
+	$$renderer.push(`<!--[-->`);
 
-	 $$renderer.child(async ($$renderer) => {
+	$$renderer.child(async ($$renderer) => {
 		const each_array = $.ensure_array_like((await $.save(Promise.resolve([first, second, third])))());
 
 		for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
 			let item = each_array[$$index];
 
-			 $$renderer.push(`<!---->`);
-			 $$renderer.push(async () => $.escape(await item));
+			$$renderer.push(`<!---->`);
+			$$renderer.push(async () => $.escape(await item));
 		}
 	});
 
-	 $$renderer.push(`<!--]-->`);
+	$$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
index a64c527933..3dbd10204a 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
@@ -2,15 +2,15 @@ import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
 export default function Async_if_alternate_hoisting($$renderer) {
-	 $$renderer.child(async ($$renderer) => {
+	$$renderer.child(async ($$renderer) => {
 		if ((await $.save(Promise.resolve(false)))()) {
-			 $$renderer.push('<!--[-->');
-			 $$renderer.push(async () => $.escape(await Promise.reject('no no no')));
+			$$renderer.push('<!--[-->');
+			$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
 		} else {
-			 $$renderer.push('<!--[!-->');
-			 $$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
+			$$renderer.push('<!--[!-->');
+			$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
 		}
 	});
 
-	 $$renderer.push(`<!--]-->`);
+	$$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
index 2ad4b7d0f7..c0309748a1 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
@@ -2,15 +2,15 @@ import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
 export default function Async_if_hoisting($$renderer) {
-	 $$renderer.child(async ($$renderer) => {
+	$$renderer.child(async ($$renderer) => {
 		if ((await $.save(Promise.resolve(true)))()) {
-			 $$renderer.push('<!--[-->');
-			 $$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
+			$$renderer.push('<!--[-->');
+			$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
 		} else {
-			 $$renderer.push('<!--[!-->');
-			 $$renderer.push(async () => $.escape(await Promise.reject('no no no')));
+			$$renderer.push('<!--[!-->');
+			$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
 		}
 	});
 
-	 $$renderer.push(`<!--]-->`);
+	$$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
index 533d7380c3..e9bf215dcd 100644
--- a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/server/index.svelte.js
@@ -8,7 +8,7 @@ export default function Await_block_scope($$renderer) {
 		counter.count += 1;
 	}
 
-	 $$renderer.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
+	$$renderer.push(`<button>clicks: ${$.escape(counter.count)}</button> `);
 	$.await($$renderer, promise, () => {}, (counter) => {});
-	 $$renderer.push(`<!--]--> ${$.escape(counter.count)}`);
+	$$renderer.push(`<!--]--> ${$.escape(counter.count)}`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
index ab80064d33..2ef3a429ba 100644
--- a/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/bind-component-snippet/_expected/server/index.svelte.js
@@ -2,7 +2,7 @@ import * as $ from 'svelte/internal/server';
 import TextInput from './Child.svelte';
 
 function snippet($$renderer) {
-	 $$renderer.push(`<!---->Something`);
+	$$renderer.push(`<!---->Something`);
 }
 
 export default function Bind_component_snippet($$renderer) {
@@ -23,14 +23,14 @@ export default function Bind_component_snippet($$renderer) {
 			}
 		});
 
-		 $$renderer.push(`<!----> value: ${$.escape(value)}`);
+		$$renderer.push(`<!----> value: ${$.escape(value)}`);
 	}
 
 	do {
 		$$settled = true;
-		$$inner_renderer =  $$renderer.copy();
+		$$inner_renderer = $$renderer.copy();
 		$$render_inner($$inner_renderer);
 	} while (!$$settled);
 
-	 $$renderer.subsume($$inner_renderer);
+	$$renderer.subsume($$inner_renderer);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
index 04d6faa25d..57b81d86ba 100644
--- a/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/class-state-field-constructor-assignment/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Class_state_field_constructor_assignment($$renderer, $$props) {
-	 $$renderer.component(($$renderer) => {
+	$$renderer.component(($$renderer) => {
 		class Foo {
 			a = 0;
 			#b;
diff --git a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
index 5381aa6471..51241b92c0 100644
--- a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/server/index.svelte.js
@@ -1,13 +1,13 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Delegated_locally_declared_shadowed($$renderer) {
-	 $$renderer.push(`<!--[-->`);
+	$$renderer.push(`<!--[-->`);
 
 	const each_array = $.ensure_array_like({ length: 1 });
 
 	for (let index = 0, $$length = each_array.length; index < $$length; index++) {
-		 $$renderer.push(`<button type="button"${$.attr('data-index', index)}>B</button>`);
+		$$renderer.push(`<button type="button"${$.attr('data-index', index)}>B</button>`);
 	}
 
-	 $$renderer.push(`<!--]-->`);
+	$$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
index b4a63a9136..1ff8402974 100644
--- a/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/server/main.svelte.js
@@ -6,5 +6,5 @@ export default function Main($$renderer) {
 
 	let y = () => 'test';
 
-	 $$renderer.push(`<div${$.attr('foobar', x)}></div> <svg${$.attr('viewBox', x)}></svg> <custom-element${$.attr('foobar', x)}></custom-element> <div${$.attr('foobar', y())}></div> <svg${$.attr('viewBox', y())}></svg> <custom-element${$.attr('foobar', y())}></custom-element>`);
+	$$renderer.push(`<div${$.attr('foobar', x)}></div> <svg${$.attr('viewBox', x)}></svg> <custom-element${$.attr('foobar', x)}></custom-element> <div${$.attr('foobar', y())}></div> <svg${$.attr('viewBox', y())}></svg> <custom-element${$.attr('foobar', y())}></custom-element>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
index d65ed94ad0..e6de07a36e 100644
--- a/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-index-non-null/_expected/server/index.svelte.js
@@ -1,13 +1,13 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Each_index_non_null($$renderer) {
-	 $$renderer.push(`<!--[-->`);
+	$$renderer.push(`<!--[-->`);
 
 	const each_array = $.ensure_array_like(Array(10));
 
 	for (let i = 0, $$length = each_array.length; i < $$length; i++) {
-		 $$renderer.push(`<p>index: ${$.escape(i)}</p>`);
+		$$renderer.push(`<p>index: ${$.escape(i)}</p>`);
 	}
 
-	 $$renderer.push(`<!--]-->`);
+	$$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
index 44c4ae5fd1..e1c550e113 100644
--- a/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/each-string-template/_expected/server/index.svelte.js
@@ -1,15 +1,15 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Each_string_template($$renderer) {
-	 $$renderer.push(`<!--[-->`);
+	$$renderer.push(`<!--[-->`);
 
 	const each_array = $.ensure_array_like(['foo', 'bar', 'baz']);
 
 	for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
 		let thing = each_array[$$index];
 
-		 $$renderer.push(`<!---->${$.escape(thing)}, `);
+		$$renderer.push(`<!---->${$.escape(thing)}, `);
 	}
 
-	 $$renderer.push(`<!--]-->`);
+	$$renderer.push(`<!--]-->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
index 5ff9ce8796..855ae30d21 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/server/index.svelte.js
@@ -15,7 +15,7 @@ export default function Function_prop_no_getter($$renderer) {
 		onmouseenter: () => count = plusOne(count),
 
 		children: ($$renderer) => {
-			 $$renderer.push(`<!---->clicks: ${$.escape(count)}`);
+			$$renderer.push(`<!---->clicks: ${$.escape(count)}`);
 		},
 
 		$$slots: { default: true }
diff --git a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
index 36913599b2..a5eb404d9e 100644
--- a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Functional_templating($$renderer) {
-	 $$renderer.push(`<h1>hello</h1> <div class="potato"><p>child element</p> <p>another child element</p></div>`);
+	$$renderer.push(`<h1>hello</h1> <div class="potato"><p>child element</p> <p>another child element</p></div>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
index dd37baaaf0..5c1a710f2e 100644
--- a/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hello-world/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Hello_world($$renderer) {
-	 $$renderer.push(`<h1>hello world</h1>`);
+	$$renderer.push(`<h1>hello world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
index 86b11c6ecd..d8b9d98b03 100644
--- a/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hmr/_expected/server/index.svelte.js
@@ -1,5 +1,5 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Hmr($$renderer) {
-	 $$renderer.push(`<h1>hello world</h1>`);
+	$$renderer.push(`<h1>hello world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
index c801b85fc5..a7e580acb8 100644
--- a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/server/index.svelte.js
@@ -4,5 +4,5 @@ export default function Nullish_coallescence_omittance($$renderer) {
 	let name = 'world';
 	let count = 0;
 
-	 $$renderer.push(`<h1>Hello, world!</h1> <b>123</b> <button>Count is ${$.escape(count)}</button> <h1>Hello, world</h1>`);
+	$$renderer.push(`<h1>Hello, world!</h1> <b>123</b> <button>Count is ${$.escape(count)}</button> <h1>Hello, world</h1>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
index ed5bfd3944..6db24ac621 100644
--- a/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/props-identifier/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Props_identifier($$renderer, $$props) {
-	 $$renderer.component(($$renderer) => {
+	$$renderer.component(($$renderer) => {
 		let { $$slots, $$events, ...props } = $$props;
 
 		props.a;
diff --git a/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
index 39565ad4e8..9f76d8ffb8 100644
--- a/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/purity/_expected/server/index.svelte.js
@@ -1,7 +1,7 @@
 import * as $ from 'svelte/internal/server';
 
 export default function Purity($$renderer) {
-	 $$renderer.push(`<p>0</p> <p>${$.escape(location.href)}</p> `);
+	$$renderer.push(`<p>0</p> <p>${$.escape(location.href)}</p> `);
 	Child($$renderer, { prop: encodeURIComponent('hello') });
-	 $$renderer.push(`<!---->`);
+	$$renderer.push(`<!---->`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
index cddd248a6f..5bce27d1d8 100644
--- a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
@@ -3,5 +3,5 @@ import * as $ from 'svelte/internal/server';
 export default function Skip_static_subtree($$renderer, $$props) {
 	let { title, content } = $$props;
 
-	 $$renderer.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected($$renderer, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
+	$$renderer.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected($$renderer, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
index f266c7d2ca..4ab7f90c58 100644
--- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/server/index.svelte.js
@@ -11,5 +11,5 @@ export default function State_proxy_literal($$renderer) {
 		tpl = ``;
 	}
 
-	 $$renderer.push(`<input${$.attr('value', str)}/> <input${$.attr('value', tpl)}/> <button>reset</button>`);
+	$$renderer.push(`<input${$.attr('value', str)}/> <input${$.attr('value', tpl)}/> <button>reset</button>`);
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
index 0b9b524445..f886f9fbe3 100644
--- a/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/text-nodes-deriveds/_expected/server/index.svelte.js
@@ -12,5 +12,5 @@ export default function Text_nodes_deriveds($$renderer) {
 		return count2;
 	}
 
-	 $$renderer.push(`<p>${$.escape(text1())}${$.escape(text2())}</p>`);
+	$$renderer.push(`<p>${$.escape(text1())}${$.escape(text2())}</p>`);
 }
\ No newline at end of file

From e5a75aecf844052a95d1bc132d55cd1493f458cf Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 18 Sep 2025 13:35:19 -0400
Subject: [PATCH 33/68] chore: add explicit renderer.head method (#16796)

* chore: add explicit `renderer.head` method

* minor tweak
---
 packages/svelte/src/internal/server/dev.js    |  5 +---
 packages/svelte/src/internal/server/index.js  |  4 +--
 .../svelte/src/internal/server/renderer.js    | 29 +++++++++++++------
 .../src/internal/server/renderer.test.ts      | 20 ++++++++-----
 .../samples/head-multiple-title/_config.js    |  4 +--
 5 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/packages/svelte/src/internal/server/dev.js b/packages/svelte/src/internal/server/dev.js
index 66dff0fde2..1211670f94 100644
--- a/packages/svelte/src/internal/server/dev.js
+++ b/packages/svelte/src/internal/server/dev.js
@@ -39,10 +39,7 @@ function print_error(renderer, message) {
 
 	// eslint-disable-next-line no-console
 	console.error(message);
-	renderer.child(
-		(renderer) => renderer.push(`<script>console.error(${JSON.stringify(message)})</script>`),
-		'head'
-	);
+	renderer.head((r) => r.push(`<script>console.error(${JSON.stringify(message)})</script>`));
 }
 
 /**
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index 618e75f932..1e2d75d6dc 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -69,11 +69,11 @@ export function render(component, options = {}) {
  * @returns {void}
  */
 export function head(renderer, fn) {
-	renderer.child((renderer) => {
+	renderer.head((renderer) => {
 		renderer.push(BLOCK_OPEN);
 		renderer.child(fn);
 		renderer.push(BLOCK_CLOSE);
-	}, 'head');
+	});
 }
 
 /**
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 26f7ac2b3c..21ae91fbb7 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -81,23 +81,33 @@ export class Renderer {
 	/**
 	 * @param {SSRState} global
 	 * @param {Renderer | undefined} [parent]
-	 * @param {RendererType} [type]
 	 */
-	constructor(global, parent, type) {
+	constructor(global, parent) {
+		this.#parent = parent;
+
 		this.global = global;
 		this.local = parent ? { ...parent.local } : { select_value: undefined };
-		this.#parent = parent;
-		this.type = type ?? parent?.type ?? 'body';
+		this.type = parent ? parent.type : 'body';
+	}
+
+	/**
+	 * @param {(renderer: Renderer) => void} fn
+	 */
+	head(fn) {
+		const head = new Renderer(this.global, this);
+		head.type = 'head';
+
+		this.#out.push(head);
+		head.child(fn);
 	}
 
 	/**
 	 * Create a child renderer. The child renderer inherits the state from the parent,
 	 * but has its own content.
 	 * @param {(renderer: Renderer) => MaybePromise<void>} fn
-	 * @param {RendererType} [type]
 	 */
-	child(fn, type) {
-		const child = new Renderer(this.global, this, type);
+	child(fn) {
+		const child = new Renderer(this.global, this);
 		this.#out.push(child);
 
 		const parent = ssr_context;
@@ -184,7 +194,7 @@ export class Renderer {
 	 * @deprecated this is needed for legacy component bindings
 	 */
 	copy() {
-		const copy = new Renderer(this.global, this.#parent, this.type);
+		const copy = new Renderer(this.global, this.#parent);
 		copy.#out = this.#out.map((item) => (item instanceof Renderer ? item.copy() : item));
 		copy.promises = this.promises;
 		return copy;
@@ -457,7 +467,8 @@ export class Renderer {
 	static #push_accumulated_content(tree, accumulated_content) {
 		for (const [type, content] of Object.entries(accumulated_content)) {
 			if (!content) continue;
-			const child = new Renderer(tree.global, tree, /** @type {RendererType} */ (type));
+			const child = new Renderer(tree.global, tree);
+			child.type = /** @type {RendererType} */ (type);
 			child.push(content);
 			tree.#out.push(child);
 		}
diff --git a/packages/svelte/src/internal/server/renderer.test.ts b/packages/svelte/src/internal/server/renderer.test.ts
index fb14654d5d..2b2bf14cf7 100644
--- a/packages/svelte/src/internal/server/renderer.test.ts
+++ b/packages/svelte/src/internal/server/renderer.test.ts
@@ -20,9 +20,9 @@ test('collects synchronous body content by default', () => {
 test('child type switches content area (head vs body)', () => {
 	const component = (renderer: Renderer) => {
 		renderer.push('a');
-		renderer.child(($$renderer) => {
+		renderer.head(($$renderer) => {
 			$$renderer.push('<title>T</title>');
-		}, 'head');
+		});
 		renderer.push('b');
 	};
 
@@ -33,12 +33,12 @@ test('child type switches content area (head vs body)', () => {
 
 test('child inherits parent type when not specified', () => {
 	const component = (renderer: Renderer) => {
-		renderer.child((renderer) => {
+		renderer.head((renderer) => {
 			renderer.push('<meta name="x"/>');
 			renderer.child((renderer) => {
 				renderer.push('<style>/* css */</style>');
 			});
-		}, 'head');
+		});
 	};
 
 	const { head, body } = Renderer.render(component as unknown as Component);
@@ -118,7 +118,9 @@ test('local state is shallow-copied to children', () => {
 });
 
 test('subsume replaces tree content and state from other', () => {
-	const a = new Renderer(new SSRState('async'), undefined, 'head');
+	const a = new Renderer(new SSRState('async'));
+	a.type = 'head';
+
 	a.push('<meta />');
 	a.local.select_value = 'A';
 
@@ -140,7 +142,9 @@ test('subsume replaces tree content and state from other', () => {
 });
 
 test('subsume refuses to switch modes', () => {
-	const a = new Renderer(new SSRState('sync'), undefined, 'head');
+	const a = new Renderer(new SSRState('sync'));
+	a.type = 'head';
+
 	a.push('<meta />');
 	a.local.select_value = 'A';
 
@@ -273,12 +277,12 @@ describe('async', () => {
 
 	test('push async functions work with head content type', async () => {
 		const component = (renderer: Renderer) => {
-			renderer.child(($$renderer) => {
+			renderer.head(($$renderer) => {
 				$$renderer.push(async () => {
 					await Promise.resolve();
 					return '<title>Async Title</title>';
 				});
-			}, 'head');
+			});
 		};
 
 		const { head, body } = await Renderer.render(component as unknown as Component);
diff --git a/packages/svelte/tests/server-side-rendering/samples/head-multiple-title/_config.js b/packages/svelte/tests/server-side-rendering/samples/head-multiple-title/_config.js
index 45054bbada..f47bee71df 100644
--- a/packages/svelte/tests/server-side-rendering/samples/head-multiple-title/_config.js
+++ b/packages/svelte/tests/server-side-rendering/samples/head-multiple-title/_config.js
@@ -1,5 +1,3 @@
 import { test } from '../../test';
 
-export default test({
-	props: { adjective: 'custom' }
-});
+export default test({});

From 1c8456885c9ad4ec42252fa11ae2fdc7fb71d3bd Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 19 Sep 2025 14:03:34 -0400
Subject: [PATCH 34/68] fix: remove outer hydration markers (#16800)

---
 .changeset/six-files-speak.md                 |  5 +++++
 packages/svelte/src/internal/client/render.js | 19 ++++++++--------
 .../svelte/src/internal/server/renderer.js    |  3 +--
 .../src/internal/server/renderer.test.ts      | 22 +++++++++----------
 .../samples/binding-input/_expected.html      |  2 +-
 .../dynamic-text-changed/_expected.html       |  2 +-
 .../_expected.html                            |  2 +-
 .../_expected.html                            |  2 +-
 .../_expected.html                            |  2 +-
 .../_expected.html                            |  2 +-
 .../element-attribute-added/_expected.html    |  2 +-
 .../element-attribute-changed/_expected.html  |  2 +-
 .../element-attribute-removed/_expected.html  |  2 +-
 .../if-block-mismatch-2/_expected.html        |  2 +-
 .../samples/if-block-mismatch/_expected.html  |  2 +-
 .../_expected.html                            |  2 +-
 .../input-value-changed/_expected.html        |  2 +-
 .../hydration/samples/noscript/_expected.html |  2 +-
 .../pre-first-node-newline/_expected.html     |  4 ++--
 .../_expected.html                            |  2 +-
 .../repair-mismatched-a-href/_expected.html   |  2 +-
 .../samples/safari-borking/_override.html     |  2 +-
 .../hydration/samples/script/_expected.html   |  2 +-
 .../snippet-raw-hydrate/_expected.html        |  2 +-
 .../standalone-component/_expected.html       |  2 +-
 .../samples/standalone-snippet/_expected.html |  2 +-
 .../surrounding-whitespace/_expected.html     |  2 +-
 .../surrounding-whitespace/_override.html     |  2 +-
 .../samples/text-empty-2/_expected.html       |  2 +-
 .../samples/text-empty/_expected.html         |  2 +-
 .../whitespace-at-block-start/_override.html  |  4 ++--
 .../samples/textarea-content/_config.js       |  4 ++--
 .../samples/comment-preserve/_expected.html   |  2 +-
 .../_expected.html                            |  2 +-
 .../_expected.html                            |  2 --
 35 files changed, 59 insertions(+), 58 deletions(-)
 create mode 100644 .changeset/six-files-speak.md

diff --git a/.changeset/six-files-speak.md b/.changeset/six-files-speak.md
new file mode 100644
index 0000000000..1667b164c6
--- /dev/null
+++ b/.changeset/six-files-speak.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: remove outer hydration markers
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index ecd22a1db6..f5e32a2196 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -120,19 +120,9 @@ export function hydrate(component, options) {
 
 		set_hydrating(true);
 		set_hydrate_node(/** @type {Comment} */ (anchor));
-		hydrate_next();
 
 		const instance = _mount(component, { ...options, anchor });
 
-		if (
-			hydrate_node === null ||
-			hydrate_node.nodeType !== COMMENT_NODE ||
-			/** @type {Comment} */ (hydrate_node).data !== HYDRATION_END
-		) {
-			w.hydration_mismatch();
-			throw HYDRATION_ERROR;
-		}
-
 		set_hydrating(false);
 
 		return /**  @type {Exports} */ (instance);
@@ -247,6 +237,15 @@ function _mount(Component, { target, anchor, props = {}, events, context, intro
 
 				if (hydrating) {
 					/** @type {Effect} */ (active_effect).nodes_end = hydrate_node;
+
+					if (
+						hydrate_node === null ||
+						hydrate_node.nodeType !== COMMENT_NODE ||
+						/** @type {Comment} */ (hydrate_node).data !== HYDRATION_END
+					) {
+						w.hydration_mismatch();
+						throw HYDRATION_ERROR;
+					}
 				}
 
 				if (context) {
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 21ae91fbb7..a77afd68b3 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -516,8 +516,7 @@ export class Renderer {
 		}
 
 		let head = content.head + renderer.global.get_title();
-
-		const body = BLOCK_OPEN + content.body + BLOCK_CLOSE; // this inserts a fake boundary so hydration matches
+		let body = content.body;
 
 		for (const { hash, code } of renderer.global.css) {
 			head += `<style id="${hash}">${code}</style>`;
diff --git a/packages/svelte/src/internal/server/renderer.test.ts b/packages/svelte/src/internal/server/renderer.test.ts
index 2b2bf14cf7..7112bacd75 100644
--- a/packages/svelte/src/internal/server/renderer.test.ts
+++ b/packages/svelte/src/internal/server/renderer.test.ts
@@ -14,7 +14,7 @@ test('collects synchronous body content by default', () => {
 
 	const { head, body } = Renderer.render(component as unknown as Component);
 	expect(head).toBe('');
-	expect(body).toBe('<!--[--><!--[-->abc<!--]--><!--]-->');
+	expect(body).toBe('<!--[-->abc<!--]-->');
 });
 
 test('child type switches content area (head vs body)', () => {
@@ -28,7 +28,7 @@ test('child type switches content area (head vs body)', () => {
 
 	const { head, body } = Renderer.render(component as unknown as Component);
 	expect(head).toBe('<title>T</title>');
-	expect(body).toBe('<!--[--><!--[-->ab<!--]--><!--]-->');
+	expect(body).toBe('<!--[-->ab<!--]-->');
 });
 
 test('child inherits parent type when not specified', () => {
@@ -42,7 +42,7 @@ test('child inherits parent type when not specified', () => {
 	};
 
 	const { head, body } = Renderer.render(component as unknown as Component);
-	expect(body).toBe('<!--[--><!--[--><!--]--><!--]-->');
+	expect(body).toBe('<!--[--><!--]-->');
 	expect(head).toBe('<meta name="x"/><style>/* css */</style>');
 });
 
@@ -101,7 +101,7 @@ test('compact synchronously aggregates a range and can transform into head/body'
 
 	const { head, body } = Renderer.render(component as unknown as Component);
 	expect(head).toBe('<h>H</h>');
-	expect(body).toBe('<!--[--><!--[-->abdc<!--]--><!--]-->');
+	expect(body).toBe('<!--[-->abdc<!--]-->');
 });
 
 test('local state is shallow-copied to children', () => {
@@ -216,7 +216,7 @@ describe('async', () => {
 
 		const result = await Renderer.render(component as unknown as Component);
 		expect(result.head).toBe('');
-		expect(result.body).toBe('<!--[--><!--[-->123<!--]--><!--]-->');
+		expect(result.body).toBe('<!--[-->123<!--]-->');
 		expect(() => result.html).toThrow('html_deprecated');
 	});
 
@@ -239,7 +239,7 @@ describe('async', () => {
 
 		const { body, head } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
-		expect(body).toBe('<!--[--><!--[-->axb<!--]--><!--]-->');
+		expect(body).toBe('<!--[-->axb<!--]-->');
 	});
 
 	test('push accepts async functions in async context', async () => {
@@ -254,7 +254,7 @@ describe('async', () => {
 
 		const { head, body } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
-		expect(body).toBe('<!--[--><!--[-->abc<!--]--><!--]-->');
+		expect(body).toBe('<!--[-->abc<!--]-->');
 	});
 
 	test('push handles async functions with different timing', async () => {
@@ -272,7 +272,7 @@ describe('async', () => {
 
 		const { head, body } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
-		expect(body).toBe('<!--[--><!--[-->fastslowsync<!--]--><!--]-->');
+		expect(body).toBe('<!--[-->fastslowsync<!--]-->');
 	});
 
 	test('push async functions work with head content type', async () => {
@@ -286,7 +286,7 @@ describe('async', () => {
 		};
 
 		const { head, body } = await Renderer.render(component as unknown as Component);
-		expect(body).toBe('<!--[--><!--[--><!--]--><!--]-->');
+		expect(body).toBe('<!--[--><!--]-->');
 		expect(head).toBe('<title>Async Title</title>');
 	});
 
@@ -305,7 +305,7 @@ describe('async', () => {
 
 		const { head, body } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
-		expect(body).toBe('<!--[--><!--[-->start-async-child--end<!--]--><!--]-->');
+		expect(body).toBe('<!--[-->start-async-child--end<!--]-->');
 	});
 
 	test('push async functions work with compact operations', async () => {
@@ -324,7 +324,7 @@ describe('async', () => {
 
 		const { head, body } = await Renderer.render(component as unknown as Component);
 		expect(head).toBe('');
-		expect(body).toBe('<!--[--><!--[-->ABC<!--]--><!--]-->');
+		expect(body).toBe('<!--[-->ABC<!--]-->');
 	});
 
 	test('push async functions are not supported in sync context', () => {
diff --git a/packages/svelte/tests/hydration/samples/binding-input/_expected.html b/packages/svelte/tests/hydration/samples/binding-input/_expected.html
index 7a73053b82..e36735dc6b 100644
--- a/packages/svelte/tests/hydration/samples/binding-input/_expected.html
+++ b/packages/svelte/tests/hydration/samples/binding-input/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><input> <p>Hello world!</p><!--]--><!--]-->
+<!--[--><input> <p>Hello world!</p><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/dynamic-text-changed/_expected.html b/packages/svelte/tests/hydration/samples/dynamic-text-changed/_expected.html
index 04266bf7f3..11e3f55d6b 100644
--- a/packages/svelte/tests/hydration/samples/dynamic-text-changed/_expected.html
+++ b/packages/svelte/tests/hydration/samples/dynamic-text-changed/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><h1>Hello everybody!</h1><!--]--><!--]-->
+<!--[--><h1>Hello everybody!</h1><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/each-block-0-on-server-more-on-client/_expected.html b/packages/svelte/tests/hydration/samples/each-block-0-on-server-more-on-client/_expected.html
index 4b28b305d5..2b2a31b926 100644
--- a/packages/svelte/tests/hydration/samples/each-block-0-on-server-more-on-client/_expected.html
+++ b/packages/svelte/tests/hydration/samples/each-block-0-on-server-more-on-client/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--><!--]--><!--]-->
+<!--[--><ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/each-block-fallback-mismatch/_expected.html b/packages/svelte/tests/hydration/samples/each-block-fallback-mismatch/_expected.html
index 8ace6d0373..af66d98b25 100644
--- a/packages/svelte/tests/hydration/samples/each-block-fallback-mismatch/_expected.html
+++ b/packages/svelte/tests/hydration/samples/each-block-fallback-mismatch/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!--[!--><p>a</p><!--]--> <!--[--><p>empty</p><!--]--><!--]--><!--]-->
+<!--[--><!--[!--><p>a</p><!--]--> <!--[--><p>empty</p><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/each-block-less-nodes-on-client/_expected.html b/packages/svelte/tests/hydration/samples/each-block-less-nodes-on-client/_expected.html
index 4b28b305d5..2b2a31b926 100644
--- a/packages/svelte/tests/hydration/samples/each-block-less-nodes-on-client/_expected.html
+++ b/packages/svelte/tests/hydration/samples/each-block-less-nodes-on-client/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--><!--]--><!--]-->
+<!--[--><ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <ul><!--[--><li>a</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--> <!--[--><li>a</li> <li>a</li><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/each-block-more-nodes-on-client/_expected.html b/packages/svelte/tests/hydration/samples/each-block-more-nodes-on-client/_expected.html
index 89cbd0b466..fa72a80dcd 100644
--- a/packages/svelte/tests/hydration/samples/each-block-more-nodes-on-client/_expected.html
+++ b/packages/svelte/tests/hydration/samples/each-block-more-nodes-on-client/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><ul><!--[--><li>a</li><li>b</li><!--]--></ul> <ul><!--[--><li>a</li><li>b</li><!--]--></ul> <ul><!--[--><li>a</li><li>b</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--><!--]--><!--]-->
+<!--[--><ul><!--[--><li>a</li><li>b</li><!--]--></ul> <ul><!--[--><li>a</li><li>b</li><!--]--></ul> <ul><!--[--><li>a</li><li>b</li><!--]--></ul> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--> <!--[--><li>a</li> <li>a</li><li>b</li> <li>b</li><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/element-attribute-added/_expected.html b/packages/svelte/tests/hydration/samples/element-attribute-added/_expected.html
index 27f9299c54..7d8e91c757 100644
--- a/packages/svelte/tests/hydration/samples/element-attribute-added/_expected.html
+++ b/packages/svelte/tests/hydration/samples/element-attribute-added/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><div class="bar"></div><!--]--><!--]-->
+<!--[--><div class="bar"></div><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/element-attribute-changed/_expected.html b/packages/svelte/tests/hydration/samples/element-attribute-changed/_expected.html
index 27f9299c54..7d8e91c757 100644
--- a/packages/svelte/tests/hydration/samples/element-attribute-changed/_expected.html
+++ b/packages/svelte/tests/hydration/samples/element-attribute-changed/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><div class="bar"></div><!--]--><!--]-->
+<!--[--><div class="bar"></div><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/element-attribute-removed/_expected.html b/packages/svelte/tests/hydration/samples/element-attribute-removed/_expected.html
index 1a69c9fa30..a6c1be8b49 100644
--- a/packages/svelte/tests/hydration/samples/element-attribute-removed/_expected.html
+++ b/packages/svelte/tests/hydration/samples/element-attribute-removed/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><div></div> <!--[--><div></div> <div></div><!--]--><!--]--><!--]-->
+<!--[--><div></div> <!--[--><div></div> <div></div><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html b/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html
index 5620250623..08a3809de9 100644
--- a/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html
+++ b/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!--[--><!--]--> <div><!----><!----></div> hello<!--]--><!--]-->
+<!--[--><!--[--><!--]--> <div><!----><!----></div> hello<!--]-->
diff --git a/packages/svelte/tests/hydration/samples/if-block-mismatch/_expected.html b/packages/svelte/tests/hydration/samples/if-block-mismatch/_expected.html
index 5ace45d895..79cf2cf35f 100644
--- a/packages/svelte/tests/hydration/samples/if-block-mismatch/_expected.html
+++ b/packages/svelte/tests/hydration/samples/if-block-mismatch/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!--[!--><p>foo</p><!--]--><!--]--><!--]-->
+<!--[--><!--[!--><p>foo</p><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/input-checked-attribute-sibling/_expected.html b/packages/svelte/tests/hydration/samples/input-checked-attribute-sibling/_expected.html
index 521f9c52b8..bcd53f8783 100644
--- a/packages/svelte/tests/hydration/samples/input-checked-attribute-sibling/_expected.html
+++ b/packages/svelte/tests/hydration/samples/input-checked-attribute-sibling/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!---->.<input><!--]--><!--]-->
+<!--[--><!---->.<input><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/input-value-changed/_expected.html b/packages/svelte/tests/hydration/samples/input-value-changed/_expected.html
index c9bc1409d7..c5384e717e 100644
--- a/packages/svelte/tests/hydration/samples/input-value-changed/_expected.html
+++ b/packages/svelte/tests/hydration/samples/input-value-changed/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><input type="text"><!--]--><!--]-->
+<!--[--><input type="text"><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/noscript/_expected.html b/packages/svelte/tests/hydration/samples/noscript/_expected.html
index a587a13af1..990ce87303 100644
--- a/packages/svelte/tests/hydration/samples/noscript/_expected.html
+++ b/packages/svelte/tests/hydration/samples/noscript/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><noscript>JavaScript is required for this site.</noscript> <h1>Hello!</h1><p>Count: 1</p><!--]--><!--]-->
+<!--[--><noscript>JavaScript is required for this site.</noscript> <h1>Hello!</h1><p>Count: 1</p><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/pre-first-node-newline/_expected.html b/packages/svelte/tests/hydration/samples/pre-first-node-newline/_expected.html
index a4d2df2147..26de34d1ed 100644
--- a/packages/svelte/tests/hydration/samples/pre-first-node-newline/_expected.html
+++ b/packages/svelte/tests/hydration/samples/pre-first-node-newline/_expected.html
@@ -1,7 +1,7 @@
-<!--[--><!--[--><pre>static content no line</pre> <pre>	static content ignored line
+<!--[--><pre>static content no line</pre> <pre>	static content ignored line
 </pre> <pre>
 	static content relevant line
 </pre> <pre><div><span></span></div>
 </pre> <pre>
 <div><span></span></div>
-</pre><!--]--><!--]-->
+</pre><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/removes-undefined-attributes/_expected.html b/packages/svelte/tests/hydration/samples/removes-undefined-attributes/_expected.html
index 4af6885faf..cc789c8f51 100644
--- a/packages/svelte/tests/hydration/samples/removes-undefined-attributes/_expected.html
+++ b/packages/svelte/tests/hydration/samples/removes-undefined-attributes/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><div></div><!--]--><!--]-->
+<!--[--><div></div><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/repair-mismatched-a-href/_expected.html b/packages/svelte/tests/hydration/samples/repair-mismatched-a-href/_expected.html
index 1755e9bfe2..e1076af2ec 100644
--- a/packages/svelte/tests/hydration/samples/repair-mismatched-a-href/_expected.html
+++ b/packages/svelte/tests/hydration/samples/repair-mismatched-a-href/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><a href="/foo">foo</a> <a href="/foo">foo</a><!--]--><!--]-->
+<!--[--><a href="/foo">foo</a> <a href="/foo">foo</a><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/safari-borking/_override.html b/packages/svelte/tests/hydration/samples/safari-borking/_override.html
index b3665d1f80..876815e7a9 100644
--- a/packages/svelte/tests/hydration/samples/safari-borking/_override.html
+++ b/packages/svelte/tests/hydration/samples/safari-borking/_override.html
@@ -1 +1 @@
-<!--[--><!--[--><h1>call <a href="tel:+636-555-3226">+636-555-3226</a> now<span>!</span></h1><!--]--><!--]-->
+<!--[--><h1>call <a href="tel:+636-555-3226">+636-555-3226</a> now<span>!</span></h1><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/script/_expected.html b/packages/svelte/tests/hydration/samples/script/_expected.html
index ab881a6197..b3a4d92219 100644
--- a/packages/svelte/tests/hydration/samples/script/_expected.html
+++ b/packages/svelte/tests/hydration/samples/script/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!----><script>{}<!----></script><!----><!--]--><!--]-->
+<!--[--><!----><script>{}<!----></script><!----><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/snippet-raw-hydrate/_expected.html b/packages/svelte/tests/hydration/samples/snippet-raw-hydrate/_expected.html
index 0629ab64c2..8d9dde52c1 100644
--- a/packages/svelte/tests/hydration/samples/snippet-raw-hydrate/_expected.html
+++ b/packages/svelte/tests/hydration/samples/snippet-raw-hydrate/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><p>hydrated</p><!--]--><!--]-->
+<!--[--><p>hydrated</p><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/standalone-component/_expected.html b/packages/svelte/tests/hydration/samples/standalone-component/_expected.html
index 119576aa73..96850f7bdf 100644
--- a/packages/svelte/tests/hydration/samples/standalone-component/_expected.html
+++ b/packages/svelte/tests/hydration/samples/standalone-component/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!--[--><p>child</p><!--]--> <!--[--><p>child</p><p>child</p><p>child</p><!--]--><!--]--><!--]-->
+<!--[--><!--[--><p>child</p><!--]--> <!--[--><p>child</p><p>child</p><p>child</p><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/standalone-snippet/_expected.html b/packages/svelte/tests/hydration/samples/standalone-snippet/_expected.html
index 61fc31a95e..acb14818c2 100644
--- a/packages/svelte/tests/hydration/samples/standalone-snippet/_expected.html
+++ b/packages/svelte/tests/hydration/samples/standalone-snippet/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!--[--><p>thing</p><!--]--> <!--[--><p>thing</p><p>thing</p><p>thing</p><!--]--><!--]--><!--]-->
+<!--[--><!--[--><p>thing</p><!--]--> <!--[--><p>thing</p><p>thing</p><p>thing</p><!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/surrounding-whitespace/_expected.html b/packages/svelte/tests/hydration/samples/surrounding-whitespace/_expected.html
index 7b51bed662..e728b682d0 100644
--- a/packages/svelte/tests/hydration/samples/surrounding-whitespace/_expected.html
+++ b/packages/svelte/tests/hydration/samples/surrounding-whitespace/_expected.html
@@ -1,2 +1,2 @@
 		<!-- unrelated comment -->
-		<!--[--><!--[--><!--[-->hello<!--]--><!--]--><!--]-->
+		<!--[--><!--[-->hello<!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/surrounding-whitespace/_override.html b/packages/svelte/tests/hydration/samples/surrounding-whitespace/_override.html
index 7b51bed662..e728b682d0 100644
--- a/packages/svelte/tests/hydration/samples/surrounding-whitespace/_override.html
+++ b/packages/svelte/tests/hydration/samples/surrounding-whitespace/_override.html
@@ -1,2 +1,2 @@
 		<!-- unrelated comment -->
-		<!--[--><!--[--><!--[-->hello<!--]--><!--]--><!--]-->
+		<!--[--><!--[-->hello<!--]--><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/text-empty-2/_expected.html b/packages/svelte/tests/hydration/samples/text-empty-2/_expected.html
index e14014c2f0..ff12f10bfb 100644
--- a/packages/svelte/tests/hydration/samples/text-empty-2/_expected.html
+++ b/packages/svelte/tests/hydration/samples/text-empty-2/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><span><span></span></span><!--]--><!--]-->
+<!--[--><span><span></span></span><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/text-empty/_expected.html b/packages/svelte/tests/hydration/samples/text-empty/_expected.html
index c4d823410f..2e03580f42 100644
--- a/packages/svelte/tests/hydration/samples/text-empty/_expected.html
+++ b/packages/svelte/tests/hydration/samples/text-empty/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!---->x<!--]--><!--]-->
+<!--[--><!---->x<!--]-->
diff --git a/packages/svelte/tests/hydration/samples/whitespace-at-block-start/_override.html b/packages/svelte/tests/hydration/samples/whitespace-at-block-start/_override.html
index 7402247877..24b6bae7b8 100644
--- a/packages/svelte/tests/hydration/samples/whitespace-at-block-start/_override.html
+++ b/packages/svelte/tests/hydration/samples/whitespace-at-block-start/_override.html
@@ -1,2 +1,2 @@
-<!--[--><!--[-->
-<main><p>nested</p><!----></main><!--]--><!--]-->
\ No newline at end of file
+<!--[-->
+<main><p>nested</p><!----></main><!--]-->
diff --git a/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js b/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js
index dac6ee4fb8..7cd7c553e0 100644
--- a/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js
+++ b/packages/svelte/tests/runtime-legacy/samples/textarea-content/_config.js
@@ -4,7 +4,7 @@ export default test({
 	withoutNormalizeHtml: true,
 	// Unable to test `html` with `<textarea>` content
 	// as the textarea#value will not show within `innerHtml`
-	ssrHtml: `<!--[--><!--[--><textarea id="textarea">  A
+	ssrHtml: `<!--[--><textarea id="textarea">  A
   B
 </textarea> <div id="div-with-textarea"><textarea>    A
     B
@@ -14,7 +14,7 @@ newline after leading space</textarea></div> <textarea id="textarea-with-multipl
 
 multiple leading newlines</textarea> <div id="div-with-textarea-with-multiple-leading-newlines"><textarea>
 
-multiple leading newlines</textarea></div><!--]--><!--]-->`,
+multiple leading newlines</textarea></div><!--]-->`,
 	test({ assert, target }) {
 		// Test for <textarea> tag
 		const elementTextarea = /** @type {HTMLTextAreaElement} */ (target.querySelector('#textarea'));
diff --git a/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html b/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html
index df372583b1..3eb11afc34 100644
--- a/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/comment-preserve/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><p>before</p><!-- a comment --><p>after</p><!--]--><!--]-->
+<!--[--><p>before</p><!-- a comment --><p>after</p><!--]-->
diff --git a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
index 0919060246..8fb1be347c 100644
--- a/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/head-meta-hydrate-duplicate/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><div>Just a dummy page.</div><!--]--><!--]-->
+<!--[--><div>Just a dummy page.</div><!--]-->
diff --git a/packages/svelte/tests/server-side-rendering/samples/head-svelte-components-raw-content/_expected.html b/packages/svelte/tests/server-side-rendering/samples/head-svelte-components-raw-content/_expected.html
index 8c9e75c033..290179a702 100644
--- a/packages/svelte/tests/server-side-rendering/samples/head-svelte-components-raw-content/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/head-svelte-components-raw-content/_expected.html
@@ -1,5 +1,4 @@
 <!--[-->
-<!--[-->
 <!---->
 <title>lorem</title>
 <!---->
@@ -16,4 +15,3 @@
 </script>
 <!---->
 <!--]-->
-<!--]-->

From 5c09035685d0edd4c21453cd4b2f10fe984f913a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 19 Sep 2025 19:36:31 -0400
Subject: [PATCH 35/68] fix: async hydration (#16797)

* WIP fix async hydration

* add renderer.async method

* update tests

* changeset

* oops

* WIP fix async attributes

* fix

* fix

* all tests passing

* unused

* unused

* remove_nodes -> skip_nodes

* hydration boundaries around slots

* reorder arguments

* add select method

* WIP simplify selects

* WIP

* simplify

* renderer.title

* delete unused compact method

* simplify

* simplify

* simplify

* simplify

* fix TODO

* remove outdated TODO

* remove outdated TODO

* rename call_child_renderer -> create_child_block

* burrito

* add a couple of unit tests
---
 .changeset/six-rabbits-pull.md                |   5 +
 .../client/visitors/shared/component.js       |   2 +-
 .../3-transform/server/transform-server.js    |   8 +-
 .../3-transform/server/visitors/AwaitBlock.js |   4 +-
 .../3-transform/server/visitors/EachBlock.js  |   4 +-
 .../3-transform/server/visitors/IfBlock.js    |   4 +-
 .../server/visitors/RegularElement.js         | 221 +++++++++---------
 .../server/visitors/SlotElement.js            |  13 +-
 .../server/visitors/SvelteBoundary.js         |   8 +-
 .../server/visitors/SvelteElement.js          |  31 ++-
 .../server/visitors/TitleElement.js           |   4 +-
 .../server/visitors/shared/component.js       |  17 +-
 .../server/visitors/shared/element.js         | 136 +++++------
 .../server/visitors/shared/utils.js           |  17 +-
 .../src/internal/client/dom/blocks/async.js   |  27 +++
 .../src/internal/client/dom/blocks/await.js   |   4 +-
 .../internal/client/dom/blocks/boundary.js    |   4 +-
 .../src/internal/client/dom/blocks/each.js    |   6 +-
 .../src/internal/client/dom/blocks/if.js      |   4 +-
 .../src/internal/client/dom/hydration.js      |   7 +-
 packages/svelte/src/internal/server/index.js  | 122 +---------
 .../svelte/src/internal/server/renderer.js    | 206 +++++++++-------
 .../src/internal/server/renderer.test.ts      |  99 +++-----
 .../if-block-mismatch-2/_expected.html        |   2 +-
 .../async-no-pending-attributes/Child.svelte  |   5 +
 .../async-no-pending-attributes/_config.js    |  24 ++
 .../async-no-pending-attributes/main.svelte   |  12 +
 .../_config.js                                |  33 +++
 .../main.svelte                               |  10 +
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   8 +-
 34 files changed, 546 insertions(+), 509 deletions(-)
 create mode 100644 .changeset/six-rabbits-pull.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-block/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-block/main.svelte

diff --git a/.changeset/six-rabbits-pull.md b/.changeset/six-rabbits-pull.md
new file mode 100644
index 0000000000..55fc8c89b8
--- /dev/null
+++ b/.changeset/six-rabbits-pull.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: async hydration
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/component.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/component.js
index 7feeebdbbc..5c8ce897f4 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/component.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/component.js
@@ -130,7 +130,7 @@ export function build_component(node, component_name, context) {
 		} else if (attribute.type === 'SpreadAttribute') {
 			const expression = /** @type {Expression} */ (context.visit(attribute));
 
-			if (attribute.metadata.expression.has_state) {
+			if (attribute.metadata.expression.has_state || attribute.metadata.expression.has_await) {
 				props_and_spreads.push(
 					b.thunk(
 						attribute.metadata.expression.has_await || attribute.metadata.expression.has_call
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index 994db533c2..90845fb303 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -40,7 +40,11 @@ import { TitleElement } from './visitors/TitleElement.js';
 import { UpdateExpression } from './visitors/UpdateExpression.js';
 import { VariableDeclaration } from './visitors/VariableDeclaration.js';
 import { SvelteBoundary } from './visitors/SvelteBoundary.js';
-import { call_child_renderer, call_component_renderer } from './visitors/shared/utils.js';
+import {
+	create_child_block,
+	call_component_renderer,
+	create_async_block
+} from './visitors/shared/utils.js';
 
 /** @type {Visitors} */
 const global_visitors = {
@@ -244,7 +248,7 @@ export function server_component(analysis, options) {
 	]);
 
 	if (analysis.instance.has_await) {
-		component_block = b.block([call_child_renderer(component_block, true)]);
+		component_block = b.block([create_child_block(component_block, true)]);
 	}
 
 	// trick esrap into including comments
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
index e88f117c5c..132a83ec60 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/AwaitBlock.js
@@ -2,7 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
-import { block_close, call_child_renderer } from './shared/utils.js';
+import { block_close, create_async_block } from './shared/utils.js';
 
 /**
  * @param {AST.AwaitBlock} node
@@ -26,7 +26,7 @@ export function AwaitBlock(node, context) {
 	);
 
 	if (node.metadata.expression.has_await) {
-		statement = call_child_renderer(b.block([statement]), true);
+		statement = create_async_block(b.block([statement]));
 	}
 
 	context.state.template.push(statement, block_close);
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
index a8821c4ee7..5a7ca8b566 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/EachBlock.js
@@ -2,7 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
-import { block_close, block_open, block_open_else, call_child_renderer } from './shared/utils.js';
+import { block_close, block_open, block_open_else, create_async_block } from './shared/utils.js';
 
 /**
  * @param {AST.EachBlock} node
@@ -64,7 +64,7 @@ export function EachBlock(node, context) {
 	}
 
 	if (node.metadata.expression.has_await) {
-		state.template.push(call_child_renderer(block, true), block_close);
+		state.template.push(create_async_block(block), block_close);
 	} else {
 		state.template.push(...block.body, block_close);
 	}
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
index 426e468927..798cb02e49 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/IfBlock.js
@@ -2,7 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
-import { block_close, block_open, block_open_else, call_child_renderer } from './shared/utils.js';
+import { block_close, block_open, block_open_else, create_async_block } from './shared/utils.js';
 
 /**
  * @param {AST.IfBlock} node
@@ -24,7 +24,7 @@ export function IfBlock(node, context) {
 	let statement = b.if(test, consequent, alternate);
 
 	if (node.metadata.expression.has_await) {
-		statement = call_child_renderer(b.block([statement]), true);
+		statement = create_async_block(b.block([statement]));
 	}
 
 	context.state.template.push(statement, block_close);
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
index 60ec158b53..14f48d1ce7 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
@@ -1,4 +1,4 @@
-/** @import { Expression, Statement } from 'estree' */
+/** @import { Expression } from 'estree' */
 /** @import { Location } from 'locate-character' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext, ComponentServerTransformState } from '../types.js' */
@@ -12,7 +12,8 @@ import {
 	process_children,
 	build_template,
 	build_attribute_value,
-	call_child_renderer
+	create_child_block,
+	PromiseOptimiser
 } from './shared/utils.js';
 
 /**
@@ -27,21 +28,38 @@ export function RegularElement(node, context) {
 		...context.state,
 		namespace,
 		preserve_whitespace:
-			context.state.preserve_whitespace || node.name === 'pre' || node.name === 'textarea'
+			context.state.preserve_whitespace || node.name === 'pre' || node.name === 'textarea',
+		init: [],
+		template: []
 	};
 
 	const node_is_void = is_void(node.name);
 
-	context.state.template.push(b.literal(`<${node.name}`));
-	const body = build_element_attributes(node, { ...context, state });
-	context.state.template.push(b.literal(node_is_void ? '/>' : '>')); // add `/>` for XHTML compliance
+	const optimiser = new PromiseOptimiser();
+
+	state.template.push(b.literal(`<${node.name}`));
+	const body = build_element_attributes(node, { ...context, state }, optimiser.transform);
+	state.template.push(b.literal(node_is_void ? '/>' : '>')); // add `/>` for XHTML compliance
 
 	if ((node.name === 'script' || node.name === 'style') && node.fragment.nodes.length === 1) {
-		context.state.template.push(
+		state.template.push(
 			b.literal(/** @type {AST.Text} */ (node.fragment.nodes[0]).data),
 			b.literal(`</${node.name}>`)
 		);
 
+		// TODO this is a real edge case, would be good to DRY this out
+		if (optimiser.expressions.length > 0) {
+			context.state.template.push(
+				create_child_block(
+					b.block([optimiser.apply(), ...state.init, ...build_template(state.template)]),
+					true
+				)
+			);
+		} else {
+			context.state.init.push(...state.init);
+			context.state.template.push(...state.template);
+		}
+
 		return;
 	}
 
@@ -77,114 +95,92 @@ export function RegularElement(node, context) {
 		);
 	}
 
-	let select_with_value = false;
-	let select_with_value_async = false;
-	const template_start = state.template.length;
-
-	if (node.name === 'select') {
-		const value = node.attributes.find(
+	if (
+		node.name === 'select' &&
+		node.attributes.some(
 			(attribute) =>
-				(attribute.type === 'Attribute' || attribute.type === 'BindDirective') &&
-				attribute.name === 'value'
+				((attribute.type === 'Attribute' || attribute.type === 'BindDirective') &&
+					attribute.name === 'value') ||
+				attribute.type === 'SpreadAttribute'
+		)
+	) {
+		const attributes = build_spread_object(
+			node,
+			node.attributes.filter(
+				(attribute) =>
+					attribute.type === 'Attribute' ||
+					attribute.type === 'BindDirective' ||
+					attribute.type === 'SpreadAttribute'
+			),
+			context,
+			optimiser.transform
 		);
 
-		const spread = node.attributes.find((attribute) => attribute.type === 'SpreadAttribute');
-		if (spread) {
-			select_with_value = true;
-			select_with_value_async ||= spread.metadata.expression.has_await;
-
-			state.template.push(
-				b.stmt(
-					b.assignment(
-						'=',
-						b.id('$$renderer.local.select_value'),
-						b.member(
-							build_spread_object(
-								node,
-								node.attributes.filter(
-									(attribute) =>
-										attribute.type === 'Attribute' ||
-										attribute.type === 'BindDirective' ||
-										attribute.type === 'SpreadAttribute'
-								),
-								context
-							),
-							'value',
-							false,
-							true
-						)
-					)
-				)
+		const inner_state = { ...state, template: [], init: [] };
+		process_children(trimmed, { ...context, state: inner_state });
+
+		const fn = b.arrow(
+			[b.id('$$renderer')],
+			b.block([...state.init, ...build_template(inner_state.template)])
+		);
+
+		const statement = b.stmt(b.call('$$renderer.select', attributes, fn));
+
+		if (optimiser.expressions.length > 0) {
+			context.state.template.push(
+				create_child_block(b.block([optimiser.apply(), ...state.init, statement]), true)
 			);
-		} else if (value) {
-			select_with_value = true;
-
-			if (value.type === 'Attribute' && value.value !== true) {
-				select_with_value_async ||= (Array.isArray(value.value) ? value.value : [value.value]).some(
-					(tag) => tag.type === 'ExpressionTag' && tag.metadata.expression.has_await
-				);
-			}
-
-			const left = b.id('$$renderer.local.select_value');
-			if (value.type === 'Attribute') {
-				state.template.push(
-					b.stmt(b.assignment('=', left, build_attribute_value(value.value, context)))
-				);
-			} else if (value.type === 'BindDirective') {
-				state.template.push(
-					b.stmt(
-						b.assignment(
-							'=',
-							left,
-							value.expression.type === 'SequenceExpression'
-								? /** @type {Expression} */ (context.visit(b.call(value.expression.expressions[0])))
-								: /** @type {Expression} */ (context.visit(value.expression))
-						)
-					)
-				);
-			}
+		} else {
+			context.state.template.push(...state.init, statement);
 		}
+
+		return;
 	}
 
-	if (
-		node.name === 'option' &&
-		!node.attributes.some(
-			(attribute) =>
-				attribute.type === 'SpreadAttribute' ||
-				((attribute.type === 'Attribute' || attribute.type === 'BindDirective') &&
-					attribute.name === 'value')
-		)
-	) {
+	if (node.name === 'option') {
+		const attributes = build_spread_object(
+			node,
+			node.attributes.filter(
+				(attribute) =>
+					attribute.type === 'Attribute' ||
+					attribute.type === 'BindDirective' ||
+					attribute.type === 'SpreadAttribute'
+			),
+			context,
+			optimiser.transform
+		);
+
+		let body;
+
 		if (node.metadata.synthetic_value_node) {
-			state.template.push(
-				b.stmt(
-					b.call(
-						'$.simple_valueless_option',
-						b.id('$$renderer'),
-						b.thunk(
-							node.metadata.synthetic_value_node.expression,
-							node.metadata.synthetic_value_node.metadata.expression.has_await
-						)
-					)
-				)
+			body = optimiser.transform(
+				node.metadata.synthetic_value_node.expression,
+				node.metadata.synthetic_value_node.metadata.expression
 			);
 		} else {
 			const inner_state = { ...state, template: [], init: [] };
 			process_children(trimmed, { ...context, state: inner_state });
-			state.template.push(
-				b.stmt(
-					b.call(
-						'$.valueless_option',
-						b.id('$$renderer'),
-						b.arrow(
-							[b.id('$$renderer')],
-							b.block([...inner_state.init, ...build_template(inner_state.template)])
-						)
-					)
-				)
+
+			body = b.arrow(
+				[b.id('$$renderer')],
+				b.block([...state.init, ...build_template(inner_state.template)])
 			);
 		}
-	} else if (body !== null) {
+
+		const statement = b.stmt(b.call('$$renderer.option', attributes, body));
+
+		if (optimiser.expressions.length > 0) {
+			context.state.template.push(
+				create_child_block(b.block([optimiser.apply(), ...state.init, statement]), true)
+			);
+		} else {
+			context.state.template.push(...state.init, statement);
+		}
+
+		return;
+	}
+
+	if (body !== null) {
 		// if this is a `<textarea>` value or a contenteditable binding, we only add
 		// the body if the attribute/binding is falsy
 		const inner_state = { ...state, template: [], init: [] };
@@ -209,17 +205,6 @@ export function RegularElement(node, context) {
 		process_children(trimmed, { ...context, state });
 	}
 
-	if (select_with_value) {
-		// we need to create a child scope so that the `select_value` only applies children of this select element
-		// in an async world, we could technically have two adjacent select elements with async children, in which case
-		// the second element's select_value would override the first element's select_value if the children of the first
-		// element hadn't resolved prior to hitting the second element.
-		const elements = state.template.splice(template_start, Infinity);
-		state.template.push(
-			call_child_renderer(b.block(build_template(elements)), select_with_value_async)
-		);
-	}
-
 	if (!node_is_void) {
 		state.template.push(b.literal(`</${node.name}>`));
 	}
@@ -227,4 +212,16 @@ export function RegularElement(node, context) {
 	if (dev) {
 		state.template.push(b.stmt(b.call('$.pop_element')));
 	}
+
+	if (optimiser.expressions.length > 0) {
+		context.state.template.push(
+			create_child_block(
+				b.block([optimiser.apply(), ...state.init, ...build_template(state.template)]),
+				true
+			)
+		);
+	} else {
+		context.state.init.push(...state.init);
+		context.state.template.push(...state.template);
+	}
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
index 029a0f0a42..5841aa44d8 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SlotElement.js
@@ -3,10 +3,11 @@
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
 import {
-	empty_comment,
 	build_attribute_value,
 	PromiseOptimiser,
-	call_child_renderer
+	create_async_block,
+	block_open,
+	block_close
 } from './shared/utils.js';
 
 /**
@@ -32,9 +33,9 @@ export function SlotElement(node, context) {
 			const value = build_attribute_value(
 				attribute.value,
 				context,
+				optimiser.transform,
 				false,
-				true,
-				optimiser.transform
+				true
 			);
 
 			if (attribute.name === 'name') {
@@ -66,8 +67,8 @@ export function SlotElement(node, context) {
 
 	const statement =
 		optimiser.expressions.length > 0
-			? call_child_renderer(b.block([optimiser.apply(), b.stmt(slot)]), true)
+			? create_async_block(b.block([optimiser.apply(), b.stmt(slot)]))
 			: b.stmt(slot);
 
-	context.state.template.push(empty_comment, statement, empty_comment);
+	context.state.template.push(block_open, statement, block_close);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
index 2e116f57d8..b914c96f4e 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
@@ -23,7 +23,13 @@ export function SvelteBoundary(node, context) {
 	if (pending_attribute || pending_snippet) {
 		const pending = pending_attribute
 			? b.call(
-					build_attribute_value(pending_attribute.value, context, false, true),
+					build_attribute_value(
+						pending_attribute.value,
+						context,
+						(expression) => expression,
+						false,
+						true
+					),
 					b.id('$$renderer')
 				)
 			: /** @type {BlockStatement} */ (context.visit(pending_snippet.body));
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js
index 6ca0997bb6..2e61897924 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteElement.js
@@ -1,12 +1,12 @@
 /** @import { Location } from 'locate-character' */
-/** @import { BlockStatement, Expression } from 'estree' */
+/** @import { BlockStatement, Expression, Statement } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import { dev, locator } from '../../../../state.js';
 import * as b from '#compiler/builders';
 import { determine_namespace_for_children } from '../../utils.js';
 import { build_element_attributes } from './shared/element.js';
-import { build_template } from './shared/utils.js';
+import { build_template, create_child_block, PromiseOptimiser } from './shared/utils.js';
 
 /**
  * @param {AST.SvelteElement} node
@@ -37,7 +37,9 @@ export function SvelteElement(node, context) {
 		init: []
 	};
 
-	build_element_attributes(node, { ...context, state });
+	const optimiser = new PromiseOptimiser();
+
+	build_element_attributes(node, { ...context, state }, optimiser.transform);
 
 	if (dev) {
 		const location = /** @type {Location} */ (locator(node.start));
@@ -57,18 +59,23 @@ export function SvelteElement(node, context) {
 	const attributes = b.block([...state.init, ...build_template(state.template)]);
 	const children = /** @type {BlockStatement} */ (context.visit(node.fragment, state));
 
-	context.state.template.push(
-		b.stmt(
-			b.call(
-				'$.element',
-				b.id('$$renderer'),
-				tag,
-				attributes.body.length > 0 && b.thunk(attributes),
-				children.body.length > 0 && b.thunk(children)
-			)
+	/** @type {Statement} */
+	let statement = b.stmt(
+		b.call(
+			'$.element',
+			b.id('$$renderer'),
+			tag,
+			attributes.body.length > 0 && b.thunk(attributes),
+			children.body.length > 0 && b.thunk(children)
 		)
 	);
 
+	if (optimiser.expressions.length > 0) {
+		statement = create_child_block(b.block([optimiser.apply(), statement]), true);
+	}
+
+	context.state.template.push(statement);
+
 	if (dev) {
 		context.state.template.push(b.stmt(b.call('$.pop_element')));
 	}
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
index 191205df28..66f4afc94c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/TitleElement.js
@@ -14,6 +14,8 @@ export function TitleElement(node, context) {
 	template.push(b.literal('</title>'));
 
 	context.state.init.push(
-		b.stmt(b.call('$.build_title', b.id('$$renderer'), b.thunk(b.block(build_template(template)))))
+		b.stmt(
+			b.call('$$renderer.title', b.arrow([b.id('$$renderer')], b.block(build_template(template))))
+		)
 	);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
index 0e81ef5318..d0de750c0e 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
@@ -4,8 +4,9 @@
 import {
 	empty_comment,
 	build_attribute_value,
-	call_child_renderer,
-	PromiseOptimiser
+	create_async_block,
+	PromiseOptimiser,
+	build_template
 } from './utils.js';
 import * as b from '#compiler/builders';
 import { is_element_node } from '../../../../nodes.js';
@@ -91,9 +92,9 @@ export function build_inline_component(node, expression, context) {
 			const value = build_attribute_value(
 				attribute.value,
 				context,
+				optimiser.transform,
 				false,
-				true,
-				optimiser.transform
+				true
 			);
 
 			if (attribute.name.startsWith('--')) {
@@ -318,7 +319,7 @@ export function build_inline_component(node, expression, context) {
 	}
 
 	if (optimiser.expressions.length > 0) {
-		statement = call_child_renderer(b.block([optimiser.apply(), statement]), true);
+		statement = create_async_block(b.block([optimiser.apply(), statement]));
 	}
 
 	if (dynamic && custom_css_props.length === 0) {
@@ -327,7 +328,11 @@ export function build_inline_component(node, expression, context) {
 
 	context.state.template.push(statement);
 
-	if (!context.state.skip_hydration_boundaries && custom_css_props.length === 0) {
+	if (
+		!context.state.skip_hydration_boundaries &&
+		custom_css_props.length === 0 &&
+		optimiser.expressions.length === 0
+	) {
 		context.state.template.push(empty_comment);
 	}
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
index fbd3a22b1c..da90011259 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
@@ -1,5 +1,5 @@
 /** @import { ArrayExpression, Expression, Literal, ObjectExpression } from 'estree' */
-/** @import { AST } from '#compiler' */
+/** @import { AST, ExpressionMetadata } from '#compiler' */
 /** @import { ComponentContext, ComponentServerTransformState } from '../../types.js' */
 import { is_event_attribute, is_text_attribute } from '../../../../../utils/ast.js';
 import { binding_properties } from '../../../../bindings.js';
@@ -30,8 +30,9 @@ const WHITESPACE_INSENSITIVE_ATTRIBUTES = ['class', 'style'];
  * their output to be the child content instead. In this case, an object is returned.
  * @param {AST.RegularElement | AST.SvelteElement} node
  * @param {import('zimmerframe').Context<AST.SvelteNode, ComponentServerTransformState>} context
+ * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
  */
-export function build_element_attributes(node, context) {
+export function build_element_attributes(node, context, transform) {
 	/** @type {Array<AST.Attribute | AST.SpreadAttribute>} */
 	const attributes = [];
 
@@ -62,7 +63,8 @@ export function build_element_attributes(node, context) {
 						// also see related code in analysis phase
 						attribute.value[0].data = '\n' + attribute.value[0].data;
 					}
-					content = b.call('$.escape', build_attribute_value(attribute.value, context));
+
+					content = b.call('$.escape', build_attribute_value(attribute.value, context, transform));
 				} else if (node.name !== 'select') {
 					// omit value attribute for select elements, it's irrelevant for the initially selected value and has no
 					// effect on the selected value after the user interacts with the select element (the value _property_ does, but not the attribute)
@@ -150,12 +152,12 @@ export function build_element_attributes(node, context) {
 							expression: is_checkbox
 								? b.call(
 										b.member(attribute.expression, 'includes'),
-										build_attribute_value(value_attribute.value, context)
+										build_attribute_value(value_attribute.value, context, transform)
 									)
 								: b.binary(
 										'===',
 										attribute.expression,
-										build_attribute_value(value_attribute.value, context)
+										build_attribute_value(value_attribute.value, context, transform)
 									),
 							metadata: {
 								expression: create_expression_metadata()
@@ -202,30 +204,14 @@ export function build_element_attributes(node, context) {
 	}
 
 	if (has_spread) {
-		build_element_spread_attributes(node, attributes, style_directives, class_directives, context);
-		if (node.name === 'option') {
-			context.state.template.push(
-				b.call(
-					'$.maybe_selected',
-					b.id('$$renderer'),
-					b.member(
-						build_spread_object(
-							node,
-							node.attributes.filter(
-								(attribute) =>
-									attribute.type === 'Attribute' ||
-									attribute.type === 'BindDirective' ||
-									attribute.type === 'SpreadAttribute'
-							),
-							context
-						),
-						'value',
-						false,
-						true
-					)
-				)
-			);
-		}
+		build_element_spread_attributes(
+			node,
+			attributes,
+			style_directives,
+			class_directives,
+			context,
+			transform
+		);
 	} else {
 		const css_hash = node.metadata.scoped ? context.state.analysis.css.hash : null;
 
@@ -240,6 +226,7 @@ export function build_element_attributes(node, context) {
 					build_attribute_value(
 						attribute.value,
 						context,
+						transform,
 						WHITESPACE_INSENSITIVE_ATTRIBUTES.includes(name)
 					)
 				).value;
@@ -260,22 +247,13 @@ export function build_element_attributes(node, context) {
 					);
 				}
 
-				if (node.name === 'option' && name === 'value') {
-					context.state.template.push(
-						b.call(
-							'$.maybe_selected',
-							b.id('$$renderer'),
-							literal_value != null ? b.literal(/** @type {any} */ (literal_value)) : b.void0
-						)
-					);
-				}
-
 				continue;
 			}
 
 			const value = build_attribute_value(
 				attribute.value,
 				context,
+				transform,
 				WHITESPACE_INSENSITIVE_ATTRIBUTES.includes(name)
 			);
 
@@ -286,18 +264,16 @@ export function build_element_attributes(node, context) {
 				}
 				context.state.template.push(b.literal(` ${name}="${escape_html(value.value, true)}"`));
 			} else if (name === 'class') {
-				context.state.template.push(build_attr_class(class_directives, value, context, css_hash));
+				context.state.template.push(
+					build_attr_class(class_directives, value, context, css_hash, transform)
+				);
 			} else if (name === 'style') {
-				context.state.template.push(build_attr_style(style_directives, value, context));
+				context.state.template.push(build_attr_style(style_directives, value, context, transform));
 			} else {
 				context.state.template.push(
 					b.call('$.attr', b.literal(name), value, is_boolean_attribute(name) && b.true)
 				);
 			}
-
-			if (name === 'value' && node.name === 'option') {
-				context.state.template.push(b.call('$.maybe_selected', b.id('$$renderer'), value));
-			}
 		}
 	}
 
@@ -328,17 +304,20 @@ function get_attribute_name(element, attribute) {
  * @param {AST.RegularElement | AST.SvelteElement} element
  * @param {Array<AST.Attribute | AST.SpreadAttribute | AST.BindDirective>} attributes
  * @param {ComponentContext} context
+ * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
  */
-export function build_spread_object(element, attributes, context) {
-	return b.object(
+export function build_spread_object(element, attributes, context, transform) {
+	const object = b.object(
 		attributes.map((attribute) => {
 			if (attribute.type === 'Attribute') {
 				const name = get_attribute_name(element, attribute);
 				const value = build_attribute_value(
 					attribute.value,
 					context,
+					transform,
 					WHITESPACE_INSENSITIVE_ATTRIBUTES.includes(name)
 				);
+
 				return b.prop('init', b.key(name), value);
 			} else if (attribute.type === 'BindDirective') {
 				const name = get_attribute_name(element, attribute);
@@ -346,12 +325,20 @@ export function build_spread_object(element, attributes, context) {
 					attribute.expression.type === 'SequenceExpression'
 						? b.call(attribute.expression.expressions[0])
 						: /** @type {Expression} */ (context.visit(attribute.expression));
+
 				return b.prop('init', b.key(name), value);
 			}
 
-			return b.spread(/** @type {Expression} */ (context.visit(attribute)));
+			return b.spread(
+				transform(
+					/** @type {Expression} */ (context.visit(attribute)),
+					attribute.metadata.expression
+				)
+			);
 		})
 	);
+
+	return object;
 }
 
 /**
@@ -361,39 +348,48 @@ export function build_spread_object(element, attributes, context) {
  * @param {AST.StyleDirective[]} style_directives
  * @param {AST.ClassDirective[]} class_directives
  * @param {ComponentContext} context
+ * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
  */
 function build_element_spread_attributes(
 	element,
 	attributes,
 	style_directives,
 	class_directives,
-	context
+	context,
+	transform
 ) {
 	let classes;
 	let styles;
 	let flags = 0;
 
+	let has_await = false;
+
 	if (class_directives.length) {
-		const properties = class_directives.map((directive) =>
-			b.init(
+		const properties = class_directives.map((directive) => {
+			has_await ||= directive.metadata.expression.has_await;
+
+			return b.init(
 				directive.name,
 				directive.expression.type === 'Identifier' && directive.expression.name === directive.name
 					? b.id(directive.name)
 					: /** @type {Expression} */ (context.visit(directive.expression))
-			)
-		);
+			);
+		});
+
 		classes = b.object(properties);
 	}
 
 	if (style_directives.length > 0) {
-		const properties = style_directives.map((directive) =>
-			b.init(
+		const properties = style_directives.map((directive) => {
+			has_await ||= directive.metadata.expression.has_await;
+
+			return b.init(
 				directive.name,
 				directive.value === true
 					? b.id(directive.name)
-					: build_attribute_value(directive.value, context, true)
-			)
-		);
+					: build_attribute_value(directive.value, context, transform, true)
+			);
+		});
 
 		styles = b.object(properties);
 	}
@@ -406,15 +402,18 @@ function build_element_spread_attributes(
 		flags |= ELEMENT_IS_INPUT;
 	}
 
-	const object = build_spread_object(element, attributes, context);
+	const object = build_spread_object(element, attributes, context, transform);
 
 	const css_hash =
 		element.metadata.scoped && context.state.analysis.css.hash
 			? b.literal(context.state.analysis.css.hash)
-			: b.null;
+			: undefined;
 
 	const args = [object, css_hash, classes, styles, flags ? b.literal(flags) : undefined];
-	context.state.template.push(b.call('$.spread_attributes', ...args));
+
+	let call = b.call('$.attributes', ...args);
+
+	context.state.template.push(call);
 }
 
 /**
@@ -423,8 +422,9 @@ function build_element_spread_attributes(
  * @param {Expression} expression
  * @param {ComponentContext} context
  * @param {string | null} hash
+ * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
  */
-function build_attr_class(class_directives, expression, context, hash) {
+function build_attr_class(class_directives, expression, context, hash, transform) {
 	/** @type {ObjectExpression | undefined} */
 	let directives;
 
@@ -434,7 +434,10 @@ function build_attr_class(class_directives, expression, context, hash) {
 				b.prop(
 					'init',
 					b.literal(directive.name),
-					/** @type {Expression} */ (context.visit(directive.expression, context.state))
+					transform(
+						/** @type {Expression} */ (context.visit(directive.expression, context.state)),
+						directive.metadata.expression
+					)
 				)
 			)
 		);
@@ -457,9 +460,10 @@ function build_attr_class(class_directives, expression, context, hash) {
  *
  * @param {AST.StyleDirective[]} style_directives
  * @param {Expression} expression
- * @param {ComponentContext} context
+ * @param {ComponentContext} context,
+ * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
  */
-function build_attr_style(style_directives, expression, context) {
+function build_attr_style(style_directives, expression, context, transform) {
 	/** @type {ArrayExpression | ObjectExpression | undefined} */
 	let directives;
 
@@ -471,7 +475,7 @@ function build_attr_style(style_directives, expression, context) {
 			const expression =
 				directive.value === true
 					? b.id(directive.name)
-					: build_attribute_value(directive.value, context, true);
+					: build_attribute_value(directive.value, context, transform, true);
 
 			let name = directive.name;
 			if (name[0] !== '-' || name[1] !== '-') {
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
index 5e2b34496f..f5132c1cf8 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/utils.js
@@ -170,17 +170,17 @@ export function build_template(template) {
  *
  * @param {AST.Attribute['value']} value
  * @param {ComponentContext} context
+ * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
  * @param {boolean} trim_whitespace
  * @param {boolean} is_component
- * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
  * @returns {Expression}
  */
 export function build_attribute_value(
 	value,
 	context,
+	transform,
 	trim_whitespace = false,
-	is_component = false,
-	transform = (expression) => expression
+	is_component = false
 ) {
 	if (value === true) {
 		return b.true;
@@ -262,14 +262,23 @@ export function build_getter(node, state) {
 }
 
 /**
+ * Creates a `$$renderer.child(...)` expression statement
  * @param {BlockStatement | Expression} body
  * @param {boolean} async
  * @returns {Statement}
  */
-export function call_child_renderer(body, async) {
+export function create_child_block(body, async) {
 	return b.stmt(b.call('$$renderer.child', b.arrow([b.id('$$renderer')], body, async)));
 }
 
+/**
+ * Creates a `$$renderer.async(...)` expression statement
+ * @param {BlockStatement | Expression} body
+ */
+export function create_async_block(body) {
+	return b.stmt(b.call('$$renderer.async', b.arrow([b.id('$$renderer')], body, true)));
+}
+
 /**
  * @param {BlockStatement | Expression} body
  * @param {Identifier | false} component_fn_id
diff --git a/packages/svelte/src/internal/client/dom/blocks/async.js b/packages/svelte/src/internal/client/dom/blocks/async.js
index 5ec50a5988..6df0739918 100644
--- a/packages/svelte/src/internal/client/dom/blocks/async.js
+++ b/packages/svelte/src/internal/client/dom/blocks/async.js
@@ -1,6 +1,14 @@
 /** @import { TemplateNode, Value } from '#client' */
 import { flatten } from '../../reactivity/async.js';
 import { get } from '../../runtime.js';
+import {
+	hydrate_next,
+	hydrate_node,
+	hydrating,
+	set_hydrate_node,
+	set_hydrating,
+	skip_nodes
+} from '../hydration.js';
 import { get_boundary } from './boundary.js';
 
 /**
@@ -13,7 +21,22 @@ export function async(node, expressions, fn) {
 
 	boundary.update_pending_count(1);
 
+	var was_hydrating = hydrating;
+
+	if (was_hydrating) {
+		hydrate_next();
+
+		var previous_hydrate_node = hydrate_node;
+		var end = skip_nodes(false);
+		set_hydrate_node(end);
+	}
+
 	flatten([], expressions, (values) => {
+		if (was_hydrating) {
+			set_hydrating(true);
+			set_hydrate_node(previous_hydrate_node);
+		}
+
 		try {
 			// get values eagerly to avoid creating blocks if they reject
 			for (const d of values) get(d);
@@ -22,5 +45,9 @@ export function async(node, expressions, fn) {
 		} finally {
 			boundary.update_pending_count(-1);
 		}
+
+		if (was_hydrating) {
+			set_hydrating(false);
+		}
 	});
 }
diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js
index 42df41041e..8605812f1e 100644
--- a/packages/svelte/src/internal/client/dom/blocks/await.js
+++ b/packages/svelte/src/internal/client/dom/blocks/await.js
@@ -8,7 +8,7 @@ import {
 	hydrate_next,
 	hydrate_node,
 	hydrating,
-	remove_nodes,
+	skip_nodes,
 	set_hydrate_node,
 	set_hydrating
 } from '../hydration.js';
@@ -140,7 +140,7 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) {
 
 		if (mismatch) {
 			// Hydration mismatch: remove everything inside the anchor and start fresh
-			anchor = remove_nodes();
+			anchor = skip_nodes();
 
 			set_hydrate_node(anchor);
 			set_hydrating(false);
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 0532f2ca1b..6dde40d889 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -21,7 +21,7 @@ import {
 	hydrate_node,
 	hydrating,
 	next,
-	remove_nodes,
+	skip_nodes,
 	set_hydrate_node
 } from '../hydration.js';
 import { get_next_sibling } from '../operations.js';
@@ -335,7 +335,7 @@ export class Boundary {
 		if (hydrating) {
 			set_hydrate_node(/** @type {TemplateNode} */ (this.#hydrate_open));
 			next();
-			set_hydrate_node(remove_nodes());
+			set_hydrate_node(skip_nodes());
 		}
 
 		var did_reset = false;
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 006bf09257..a6369a7211 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -14,7 +14,7 @@ import {
 	hydrate_node,
 	hydrating,
 	read_hydration_instruction,
-	remove_nodes,
+	skip_nodes,
 	set_hydrate_node,
 	set_hydrating
 } from '../hydration.js';
@@ -209,7 +209,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 
 			if (is_else !== (length === 0)) {
 				// hydration mismatch — remove the server-rendered DOM and start over
-				anchor = remove_nodes();
+				anchor = skip_nodes();
 
 				set_hydrate_node(anchor);
 				set_hydrating(false);
@@ -259,7 +259,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 
 			// remove excess nodes
 			if (length > 0) {
-				set_hydrate_node(remove_nodes());
+				set_hydrate_node(skip_nodes());
 			}
 		}
 
diff --git a/packages/svelte/src/internal/client/dom/blocks/if.js b/packages/svelte/src/internal/client/dom/blocks/if.js
index f418d46538..6349ab8399 100644
--- a/packages/svelte/src/internal/client/dom/blocks/if.js
+++ b/packages/svelte/src/internal/client/dom/blocks/if.js
@@ -6,7 +6,7 @@ import {
 	hydrate_node,
 	hydrating,
 	read_hydration_instruction,
-	remove_nodes,
+	skip_nodes,
 	set_hydrate_node,
 	set_hydrating
 } from '../hydration.js';
@@ -93,7 +93,7 @@ export function if_block(node, fn, elseif = false) {
 			if (!!condition === is_else) {
 				// Hydration mismatch: remove everything inside the anchor and start fresh.
 				// This could happen with `{#if browser}...{/if}`, for example
-				anchor = remove_nodes();
+				anchor = skip_nodes();
 
 				set_hydrate_node(anchor);
 				set_hydrating(false);
diff --git a/packages/svelte/src/internal/client/dom/hydration.js b/packages/svelte/src/internal/client/dom/hydration.js
index 1f80b7922b..5df9536d4d 100644
--- a/packages/svelte/src/internal/client/dom/hydration.js
+++ b/packages/svelte/src/internal/client/dom/hydration.js
@@ -81,9 +81,10 @@ export function next(count = 1) {
 }
 
 /**
- * Removes all nodes starting at `hydrate_node` up until the next hydration end comment
+ * Skips or removes (depending on {@link remove}) all nodes starting at `hydrate_node` up until the next hydration end comment
+ * @param {boolean} remove
  */
-export function remove_nodes() {
+export function skip_nodes(remove = true) {
 	var depth = 0;
 	var node = hydrate_node;
 
@@ -100,7 +101,7 @@ export function remove_nodes() {
 		}
 
 		var next = /** @type {TemplateNode} */ (get_next_sibling(node));
-		node.remove();
+		if (remove) node.remove();
 		node = next;
 	}
 }
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index 1e2d75d6dc..3ff44f8030 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -108,13 +108,13 @@ export function css_props(renderer, is_html, props, component, dynamic = false)
 
 /**
  * @param {Record<string, unknown>} attrs
- * @param {string | null} css_hash
+ * @param {string} [css_hash]
  * @param {Record<string, boolean>} [classes]
  * @param {Record<string, string>} [styles]
  * @param {number} [flags]
  * @returns {string}
  */
-export function spread_attributes(attrs, css_hash, classes, styles, flags = 0) {
+export function attributes(attrs, css_hash, classes, styles, flags = 0) {
 	if (styles) {
 		attrs.style = to_style(attrs.style, styles);
 	}
@@ -493,121 +493,3 @@ export function derived(fn) {
 		return updated_value;
 	};
 }
-
-/**
- *
- * @param {Renderer} renderer
- * @param {unknown} value
- */
-export function maybe_selected(renderer, value) {
-	return value === renderer.local.select_value ? ' selected' : '';
-}
-
-/**
- * When an `option` element has no `value` attribute, we need to treat the child
- * content as its `value` to determine whether we should apply the `selected` attribute.
- * This has to be done at runtime, for hopefully obvious reasons. It is also complicated,
- * for sad reasons.
- * @param {Renderer} renderer
- * @param {((renderer: Renderer) => void | Promise<void>)} children
- * @returns {void}
- */
-export function valueless_option(renderer, children) {
-	const i = renderer.length;
-
-	// prior to children, `renderer` has some combination of string/unresolved renderer that ends in `<option ...>`
-	renderer.child(children);
-
-	// post-children, `renderer` has child content, possibly also with some number of hydration comments.
-	// we can compact this last chunk of content to see if it matches the select value...
-	renderer.compact({
-		start: i,
-		fn: (content) => {
-			if (content.body.replace(/<!---->/g, '') === renderer.local.select_value) {
-				// ...and if it does match the select value, we can compact the part of the renderer representing the `<option ...>`
-				// to add the `selected` attribute to the end.
-				renderer.compact({
-					start: i - 1,
-					end: i,
-					fn: (content) => {
-						return { body: content.body.slice(0, -1) + ' selected>', head: content.head };
-					}
-				});
-			}
-			return content;
-		}
-	});
-}
-
-/**
- * In the special case where an `option` element has no `value` attribute but
- * the children of the `option` element are a single expression, we can simplify
- * by running the children and passing the resulting value, which means
- * we don't have to do all of the same parsing nonsense. It also means we can avoid
- * coercing everything to a string.
- * @param {Renderer} renderer
- * @param {(() => unknown)} child
- */
-export function simple_valueless_option(renderer, child) {
-	const result = child();
-
-	/**
-	 * @param {AccumulatedContent} content
-	 * @param {unknown} child_value
-	 * @returns {AccumulatedContent}
-	 */
-	const mark_selected = (content, child_value) => {
-		if (child_value === renderer.local.select_value) {
-			return { body: content.body.slice(0, -1) + ' selected>', head: content.head };
-		}
-		return content;
-	};
-
-	renderer.compact({
-		start: renderer.length - 1,
-		fn: (content) => {
-			if (result instanceof Promise) {
-				return result.then((child_value) => mark_selected(content, child_value));
-			}
-			return mark_selected(content, result);
-		}
-	});
-
-	renderer.child((child_renderer) => {
-		if (result instanceof Promise) {
-			return result.then((child_value) => {
-				child_renderer.push(escape_html(child_value));
-			});
-		}
-		child_renderer.push(escape_html(result));
-	});
-}
-
-/**
- * Since your document can only have one `title`, we have to have some sort of algorithm for determining
- * which one "wins". To do this, we perform a depth-first comparison of where the title was encountered --
- * later ones "win" over earlier ones, regardless of what order the promises resolve in. To accomodate this, we:
- * - Figure out where we are in the content tree (`get_path`)
- * - Render the title in its own child so that it has a defined "slot" in the renderer
- * - Compact that spot so that we get the entire rendered contents of the title
- * - Attempt to set the global title (this is where the "wins" logic based on the path happens)
- *
- * TODO we could optimize this by not even rendering the title if the path wouldn't be accepted
- *
- * @param {Renderer} renderer
- * @param {((renderer: Renderer) => void | Promise<void>)} children
- */
-export function build_title(renderer, children) {
-	const path = renderer.get_path();
-	const i = renderer.length;
-	renderer.child(children);
-	renderer.compact({
-		start: i,
-		fn: ({ head }) => {
-			renderer.global.set_title(head, path);
-			// since we can only ever render the title in this chunk, and title rendering is handled specially,
-			// we can just ditch the results after we've saved them globally
-			return { head: '', body: '' };
-		}
-	});
-}
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index a77afd68b3..6971f200a0 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -6,6 +6,7 @@ import { pop, push, set_ssr_context, ssr_context } from './context.js';
 import * as e from './errors.js';
 import * as w from './warnings.js';
 import { BLOCK_CLOSE, BLOCK_OPEN } from './hydration.js';
+import { attributes } from './index.js';
 
 /** @typedef {'head' | 'body'} RendererType */
 /** @typedef {{ [key in RendererType]: string }} AccumulatedContent */
@@ -55,12 +56,10 @@ export class Renderer {
 	#parent;
 
 	/**
-	 * Asynchronous work associated with this renderer. `initial` is the promise from the function
-	 * this renderer was passed to (if that function was async), and `followup` is any any additional
-	 * work from `compact` calls that needs to complete prior to collecting this renderer's content.
-	 * @type {{ initial: Promise<void> | undefined, followup: Promise<void>[] }}
+	 * Asynchronous work associated with this renderer
+	 * @type {Promise<void> | undefined}
 	 */
-	promises = { initial: undefined, followup: [] };
+	promise = undefined;
 
 	/**
 	 * State which is associated with the content tree as a whole.
@@ -101,6 +100,15 @@ export class Renderer {
 		head.child(fn);
 	}
 
+	/**
+	 * @param {(renderer: Renderer) => void} fn
+	 */
+	async(fn) {
+		this.#out.push(BLOCK_OPEN);
+		this.child(fn);
+		this.#out.push(BLOCK_CLOSE);
+	}
+
 	/**
 	 * Create a child renderer. The child renderer inherits the state from the parent,
 	 * but has its own content.
@@ -129,7 +137,7 @@ export class Renderer {
 			}
 			// just to avoid unhandled promise rejections -- we'll end up throwing in `collect_async` if something fails
 			result.catch(() => {});
-			child.promises.initial = result;
+			child.promise = result;
 		}
 
 		return child;
@@ -150,29 +158,100 @@ export class Renderer {
 	}
 
 	/**
-	 * @param {string | (() => Promise<string>)} content
+	 * @param {Record<string, any>} attrs
+	 * @param {(renderer: Renderer) => void} fn
 	 */
-	push(content) {
-		if (typeof content === 'function') {
-			this.child(async (renderer) => renderer.push(await content()));
+	select({ value, ...attrs }, fn) {
+		this.push(`<select${attributes(attrs)}>`);
+		this.child((renderer) => {
+			renderer.local.select_value = value;
+			fn(renderer);
+		});
+		this.push('</select>');
+	}
+
+	/**
+	 * @param {Record<string, any>} attrs
+	 * @param {string | number | boolean | ((renderer: Renderer) => void)} body
+	 */
+	option(attrs, body) {
+		this.#out.push(`<option${attributes(attrs)}`);
+
+		/**
+		 * @param {Renderer} renderer
+		 * @param {any} value
+		 * @param {{ head?: string, body: any }} content
+		 */
+		const close = (renderer, value, { head, body }) => {
+			if ('value' in attrs) {
+				value = attrs.value;
+			}
+
+			if (value === this.local.select_value) {
+				renderer.#out.push(' selected');
+			}
+
+			renderer.#out.push(`>${body}</option>`);
+
+			// super edge case, but may as well handle it
+			if (head) {
+				renderer.head((child) => child.push(head));
+			}
+		};
+
+		if (typeof body === 'function') {
+			this.child((renderer) => {
+				const r = new Renderer(this.global, this);
+				body(r);
+
+				if (this.global.mode === 'async') {
+					return r.#collect_content_async().then((content) => {
+						close(renderer, content.body.replaceAll('<!---->', ''), content);
+					});
+				} else {
+					const content = r.#collect_content();
+					close(renderer, content.body.replaceAll('<!---->', ''), content);
+				}
+			});
 		} else {
-			this.#out.push(content);
+			close(this, body, { body });
 		}
 	}
 
 	/**
-	 * Compact everything between `start` and `end` into a single renderer, then call `fn` with the result of that renderer.
-	 * The compacted renderer will be sync if all of the children are sync and {@link fn} is sync, otherwise it will be async.
-	 * @param {{ start: number, end?: number, fn: (content: AccumulatedContent) => AccumulatedContent | Promise<AccumulatedContent> }} args
+	 * @param {(renderer: Renderer) => void} fn
 	 */
-	compact({ start, end = this.#out.length, fn }) {
-		const child = new Renderer(this.global, this);
-		const to_compact = this.#out.splice(start, end - start, child);
+	title(fn) {
+		const path = this.get_path();
+
+		/** @param {string} head */
+		const close = (head) => {
+			this.global.set_title(head, path);
+		};
 
-		if (this.global.mode === 'sync') {
-			Renderer.#compact(fn, child, to_compact, this.type);
+		this.child((renderer) => {
+			const r = new Renderer(renderer.global, renderer);
+			fn(r);
+
+			if (renderer.global.mode === 'async') {
+				return r.#collect_content_async().then((content) => {
+					close(content.head);
+				});
+			} else {
+				const content = r.#collect_content();
+				close(content.head);
+			}
+		});
+	}
+
+	/**
+	 * @param {string | (() => Promise<string>)} content
+	 */
+	push(content) {
+		if (typeof content === 'function') {
+			this.child(async (renderer) => renderer.push(await content()));
 		} else {
-			this.promises.followup.push(Renderer.#compact_async(fn, child, to_compact, this.type));
+			this.#out.push(content);
 		}
 	}
 
@@ -196,7 +275,7 @@ export class Renderer {
 	copy() {
 		const copy = new Renderer(this.global, this.#parent);
 		copy.#out = this.#out.map((item) => (item instanceof Renderer ? item.copy() : item));
-		copy.promises = this.promises;
+		copy.promise = this.promise;
 		return copy;
 	}
 
@@ -218,7 +297,7 @@ export class Renderer {
 			}
 			return item;
 		});
-		this.promises = other.promises;
+		this.promise = other.promise;
 		this.type = other.type;
 	}
 
@@ -355,7 +434,7 @@ export class Renderer {
 		try {
 			const renderer = Renderer.#open_render('sync', component, options);
 
-			const content = Renderer.#collect_content([renderer], renderer.type);
+			const content = renderer.#collect_content();
 			return Renderer.#close_render(content, renderer);
 		} finally {
 			abort();
@@ -376,7 +455,7 @@ export class Renderer {
 		try {
 			const renderer = Renderer.#open_render('async', component, options);
 
-			const content = await Renderer.#collect_content_async([renderer], renderer.type);
+			const content = await renderer.#collect_content_async();
 			return Renderer.#close_render(content, renderer);
 		} finally {
 			abort();
@@ -384,94 +463,41 @@ export class Renderer {
 		}
 	}
 
-	/**
-	 * @param {(content: AccumulatedContent) => AccumulatedContent | Promise<AccumulatedContent>} fn
-	 * @param {Renderer} child
-	 * @param {RendererItem[]} to_compact
-	 * @param {RendererType} type
-	 */
-	static #compact(fn, child, to_compact, type) {
-		const content = Renderer.#collect_content(to_compact, type);
-		const transformed_content = fn(content);
-		if (transformed_content instanceof Promise) {
-			throw new Error(
-				"invariant: Somehow you've encountered asynchronous work while rendering synchronously. If you're seeing this, there's a compiler bug. File an issue!"
-			);
-		} else {
-			Renderer.#push_accumulated_content(child, transformed_content);
-		}
-	}
-
-	/**
-	 * @param {(content: AccumulatedContent) => AccumulatedContent | Promise<AccumulatedContent>} fn
-	 * @param {Renderer} child
-	 * @param {RendererItem[]} to_compact
-	 * @param {RendererType} type
-	 */
-	static async #compact_async(fn, child, to_compact, type) {
-		const content = await Renderer.#collect_content_async(to_compact, type);
-		const transformed_content = await fn(content);
-		Renderer.#push_accumulated_content(child, transformed_content);
-	}
-
 	/**
 	 * Collect all of the code from the `out` array and return it as a string, or a promise resolving to a string.
-	 * @param {RendererItem[]} items
-	 * @param {RendererType} current_type
 	 * @param {AccumulatedContent} content
 	 * @returns {AccumulatedContent}
 	 */
-	static #collect_content(items, current_type, content = { head: '', body: '' }) {
-		for (const item of items) {
+	#collect_content(content = { head: '', body: '' }) {
+		for (const item of this.#out) {
 			if (typeof item === 'string') {
-				content[current_type] += item;
+				content[this.type] += item;
 			} else if (item instanceof Renderer) {
-				Renderer.#collect_content(item.#out, item.type, content);
+				item.#collect_content(content);
 			}
 		}
+
 		return content;
 	}
 
 	/**
 	 * Collect all of the code from the `out` array and return it as a string.
-	 * @param {RendererItem[]} items
-	 * @param {RendererType} current_type
 	 * @param {AccumulatedContent} content
 	 * @returns {Promise<AccumulatedContent>}
 	 */
-	static async #collect_content_async(items, current_type, content = { head: '', body: '' }) {
+	async #collect_content_async(content = { head: '', body: '' }) {
+		await this.promise;
+
 		// no danger to sequentially awaiting stuff in here; all of the work is already kicked off
-		for (const item of items) {
+		for (const item of this.#out) {
 			if (typeof item === 'string') {
-				content[current_type] += item;
-			} else {
-				if (item.promises.initial) {
-					// this represents the async function that's modifying this renderer.
-					// we can't do anything until it's done and we know our `out` array is complete.
-					await item.promises.initial;
-				}
-				for (const followup of item.promises.followup) {
-					// this is sequential because `compact` could synchronously queue up additional followup work
-					await followup;
-				}
-				await Renderer.#collect_content_async(item.#out, item.type, content);
+				content[this.type] += item;
+			} else if (item instanceof Renderer) {
+				await item.#collect_content_async(content);
 			}
 		}
-		return content;
-	}
 
-	/**
-	 * @param {Renderer} tree
-	 * @param {AccumulatedContent} accumulated_content
-	 */
-	static #push_accumulated_content(tree, accumulated_content) {
-		for (const [type, content] of Object.entries(accumulated_content)) {
-			if (!content) continue;
-			const child = new Renderer(tree.global, tree);
-			child.type = /** @type {RendererType} */ (type);
-			child.push(content);
-			tree.#out.push(child);
-		}
+		return content;
 	}
 
 	/**
diff --git a/packages/svelte/src/internal/server/renderer.test.ts b/packages/svelte/src/internal/server/renderer.test.ts
index 7112bacd75..88fbee855a 100644
--- a/packages/svelte/src/internal/server/renderer.test.ts
+++ b/packages/svelte/src/internal/server/renderer.test.ts
@@ -84,26 +84,6 @@ test('creating an async child in a sync context throws', () => {
 	expect(() => Renderer.render(component as unknown as Component).body).toThrow('await_invalid');
 });
 
-test('compact synchronously aggregates a range and can transform into head/body', () => {
-	const component = (renderer: Renderer) => {
-		const start = renderer.length;
-		renderer.push('a');
-		renderer.push('b');
-		renderer.push('c');
-		renderer.compact({
-			start,
-			end: start + 2,
-			fn: (content) => {
-				return { head: '<h>H</h>', body: content.body + 'd' };
-			}
-		});
-	};
-
-	const { head, body } = Renderer.render(component as unknown as Component);
-	expect(head).toBe('<h>H</h>');
-	expect(body).toBe('<!--[-->abdc<!--]-->');
-});
-
 test('local state is shallow-copied to children', () => {
 	const root = new Renderer(new SSRState('sync'));
 	root.local.select_value = 'A';
@@ -132,13 +112,13 @@ test('subsume replaces tree content and state from other', () => {
 	b.global.css.add({ hash: 'h', code: 'c' });
 	b.global.set_title('Title', [1]);
 	b.local.select_value = 'B';
-	b.promises.initial = Promise.resolve();
+	b.promise = Promise.resolve();
 
 	a.subsume(b);
 
 	expect(a.type).toBe('body');
 	expect(a.local.select_value).toBe('B');
-	expect(a.promises).toBe(b.promises);
+	expect(a.promise).toBe(b.promise);
 });
 
 test('subsume refuses to switch modes', () => {
@@ -156,7 +136,7 @@ test('subsume refuses to switch modes', () => {
 	b.global.css.add({ hash: 'h', code: 'c' });
 	b.global.set_title('Title', [1]);
 	b.local.select_value = 'B';
-	b.promises.initial = Promise.resolve();
+	b.promise = Promise.resolve();
 
 	expect(() => a.subsume(b)).toThrow(
 		"invariant: A renderer cannot switch modes. If you're seeing this, there's a compiler bug. File an issue!"
@@ -195,6 +175,38 @@ test('SSRState title ordering favors later lexicographic paths', () => {
 	expect(state.get_title()).toBe('E');
 });
 
+test('selects an option with an explicit value', () => {
+	const component = (renderer: Renderer) => {
+		renderer.select({ value: 2 }, (renderer) => {
+			renderer.option({ value: 1 }, (renderer) => renderer.push('one'));
+			renderer.option({ value: 2 }, (renderer) => renderer.push('two'));
+			renderer.option({ value: 3 }, (renderer) => renderer.push('three'));
+		});
+	};
+
+	const { head, body } = Renderer.render(component as unknown as Component);
+	expect(head).toBe('');
+	expect(body).toBe(
+		'<!--[--><select><option value="1">one</option><option value="2" selected>two</option><option value="3">three</option></select><!--]-->'
+	);
+});
+
+test('selects an option with an implicit value', () => {
+	const component = (renderer: Renderer) => {
+		renderer.select({ value: 'two' }, (renderer) => {
+			renderer.option({}, (renderer) => renderer.push('one'));
+			renderer.option({}, (renderer) => renderer.push('two'));
+			renderer.option({}, (renderer) => renderer.push('three'));
+		});
+	};
+
+	const { head, body } = Renderer.render(component as unknown as Component);
+	expect(head).toBe('');
+	expect(body).toBe(
+		'<!--[--><select><option>one</option><option selected>two</option><option>three</option></select><!--]-->'
+	);
+});
+
 describe('async', () => {
 	beforeAll(() => {
 		enable_async_mode_flag();
@@ -220,28 +232,6 @@ describe('async', () => {
 		expect(() => result.html).toThrow('html_deprecated');
 	});
 
-	test('compact schedules followup when compaction input is async', async () => {
-		const component = (renderer: Renderer) => {
-			renderer.push('a');
-			renderer.child(async ($$renderer) => {
-				await Promise.resolve();
-				$$renderer.push('X');
-			});
-			renderer.push('b');
-			renderer.compact({
-				start: 0,
-				fn: async (content) => ({
-					body: content.body.toLowerCase(),
-					head: await Promise.resolve('')
-				})
-			});
-		};
-
-		const { body, head } = await Renderer.render(component as unknown as Component);
-		expect(head).toBe('');
-		expect(body).toBe('<!--[-->axb<!--]-->');
-	});
-
 	test('push accepts async functions in async context', async () => {
 		const component = (renderer: Renderer) => {
 			renderer.push('a');
@@ -308,25 +298,6 @@ describe('async', () => {
 		expect(body).toBe('<!--[-->start-async-child--end<!--]-->');
 	});
 
-	test('push async functions work with compact operations', async () => {
-		const component = (renderer: Renderer) => {
-			renderer.push('a');
-			renderer.push(async () => {
-				await Promise.resolve();
-				return 'b';
-			});
-			renderer.push('c');
-			renderer.compact({
-				start: 0,
-				fn: (content) => ({ head: '', body: content.body.toUpperCase() })
-			});
-		};
-
-		const { head, body } = await Renderer.render(component as unknown as Component);
-		expect(head).toBe('');
-		expect(body).toBe('<!--[-->ABC<!--]-->');
-	});
-
 	test('push async functions are not supported in sync context', () => {
 		const component = (renderer: Renderer) => {
 			renderer.push('a');
diff --git a/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html b/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html
index 08a3809de9..72d1a4f024 100644
--- a/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html
+++ b/packages/svelte/tests/hydration/samples/if-block-mismatch-2/_expected.html
@@ -1 +1 @@
-<!--[--><!--[--><!--]--> <div><!----><!----></div> hello<!--]-->
+<!--[--><!--[--><!--]--> <div><!--[--><!--]--></div> hello<!--]-->
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/Child.svelte
new file mode 100644
index 0000000000..ab87364cb7
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/Child.svelte
@@ -0,0 +1,5 @@
+<script>
+	let { thing } = $props();
+</script>
+
+<p>{thing}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/_config.js b/packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/_config.js
new file mode 100644
index 0000000000..b8f8f61d96
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/_config.js
@@ -0,0 +1,24 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_mode: ['async-server'],
+
+	async test({ assert, target }) {
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p class="cool">cool</p>
+				<p>beans</p>
+
+				<p class="awesome">awesome</p>
+				<p>sauce</p>
+
+				<p class="neato">neato</p>
+				<p>burrito</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/main.svelte
new file mode 100644
index 0000000000..7a8280b314
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-attributes/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	import Child from './Child.svelte';
+</script>
+
+<p {...await { class: 'cool'}}>cool</p>
+<Child {...await { thing: 'beans' }} />
+
+<p class={await 'awesome'}>awesome</p>
+<Child thing={await 'sauce'} />
+
+<p {...{}} class={await 'neato'}>neato</p>
+<Child {...{}} thing={await 'burrito'} />
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-block/_config.js b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-block/_config.js
new file mode 100644
index 0000000000..35d88f6c8b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-block/_config.js
@@ -0,0 +1,33 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['hydrate'],
+
+	server_props: {
+		browser: false
+	},
+
+	ssrHtml: `
+		<h1>hello from the server</h1>
+		<h2>hello from the server</h2>
+		<h3>hello from the server</h3>
+	`,
+
+	props: {
+		browser: true
+	},
+
+	async test({ assert, target }) {
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<h1>hello from the browser</h1>
+				<h2>hello from the browser</h2>
+				<h3>hello from the browser</h3>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-block/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-block/main.svelte
new file mode 100644
index 0000000000..82e6a57a18
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-block/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	let { browser = typeof window !== 'undefined' } = $props();
+</script>
+
+{#if await true}
+	<h1>hello from the {browser ? 'browser' : 'server'}</h1>
+{/if}
+
+<h2>hello from the {browser ? 'browser' : 'server'}</h2>
+<h3>hello from the {browser ? 'browser' : 'server'}</h3>
diff --git a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
index d0c1e37209..c579fda929 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-fallback-hoisting/_expected/server/index.svelte.js
@@ -2,7 +2,7 @@ import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
 export default function Async_each_fallback_hoisting($$renderer) {
-	$$renderer.child(async ($$renderer) => {
+	$$renderer.async(async ($$renderer) => {
 		const each_array = $.ensure_array_like((await $.save(Promise.resolve([])))());
 
 		if (each_array.length !== 0) {
diff --git a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
index 4443880165..e87b50e2a4 100644
--- a/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/server/index.svelte.js
@@ -8,7 +8,7 @@ export default function Async_each_hoisting($$renderer) {
 
 	$$renderer.push(`<!--[-->`);
 
-	$$renderer.child(async ($$renderer) => {
+	$$renderer.async(async ($$renderer) => {
 		const each_array = $.ensure_array_like((await $.save(Promise.resolve([first, second, third])))());
 
 		for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
diff --git a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
index 3dbd10204a..df4ad80899 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/server/index.svelte.js
@@ -2,7 +2,7 @@ import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
 export default function Async_if_alternate_hoisting($$renderer) {
-	$$renderer.child(async ($$renderer) => {
+	$$renderer.async(async ($$renderer) => {
 		if ((await $.save(Promise.resolve(false)))()) {
 			$$renderer.push('<!--[-->');
 			$$renderer.push(async () => $.escape(await Promise.reject('no no no')));
diff --git a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
index c0309748a1..1d935f9be8 100644
--- a/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/server/index.svelte.js
@@ -2,7 +2,7 @@ import 'svelte/internal/flags/async';
 import * as $ from 'svelte/internal/server';
 
 export default function Async_if_hoisting($$renderer) {
-	$$renderer.child(async ($$renderer) => {
+	$$renderer.async(async ($$renderer) => {
 		if ((await $.save(Promise.resolve(true)))()) {
 			$$renderer.push('<!--[-->');
 			$$renderer.push(async () => $.escape(await Promise.resolve('yes yes yes')));
diff --git a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
index 5bce27d1d8..7a9f6193d7 100644
--- a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
@@ -3,5 +3,11 @@ import * as $ from 'svelte/internal/server';
 export default function Skip_static_subtree($$renderer, $$props) {
 	let { title, content } = $$props;
 
-	$$renderer.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected($$renderer, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
+	$$renderer.push(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select>`);
+
+	$$renderer.option({ value: 'a' }, ($$renderer) => {
+		$$renderer.push(`a`);
+	});
+
+	$$renderer.push(`</select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`);
 }
\ No newline at end of file

From ded13b825d7efcdf064fd65a5aa9e7e61293a48b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 19 Sep 2025 19:39:51 -0400
Subject: [PATCH 36/68] Version Packages (#16801)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/six-files-speak.md  | 5 -----
 .changeset/six-rabbits-pull.md | 5 -----
 packages/svelte/CHANGELOG.md   | 8 ++++++++
 packages/svelte/package.json   | 2 +-
 packages/svelte/src/version.js | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/six-files-speak.md
 delete mode 100644 .changeset/six-rabbits-pull.md

diff --git a/.changeset/six-files-speak.md b/.changeset/six-files-speak.md
deleted file mode 100644
index 1667b164c6..0000000000
--- a/.changeset/six-files-speak.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: remove outer hydration markers
diff --git a/.changeset/six-rabbits-pull.md b/.changeset/six-rabbits-pull.md
deleted file mode 100644
index 55fc8c89b8..0000000000
--- a/.changeset/six-rabbits-pull.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: async hydration
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 28724e123c..ef5cd32bd9 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.39.3
+
+### Patch Changes
+
+- fix: remove outer hydration markers ([#16800](https://github.com/sveltejs/svelte/pull/16800))
+
+- fix: async hydration ([#16797](https://github.com/sveltejs/svelte/pull/16797))
+
 ## 5.39.2
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 30f22bba01..b447f97c55 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.39.2",
+  "version": "5.39.3",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index d24239a826..0036617ac0 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.39.2';
+export const VERSION = '5.39.3';
 export const PUBLIC_VERSION = '5';

From 0e75498c21df33fb4bb49140b8807133fef19291 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sun, 21 Sep 2025 15:51:41 -0400
Subject: [PATCH 37/68] fix: restore hydration state after `await` in
 `<script>` (#16806)

* WIP fix more hydration stuff

* fix

* tidy up

* changeset

* fix

* fix
---
 .changeset/sweet-doors-brush.md               |  5 ++
 .../3-transform/server/transform-server.js    |  8 +---
 .../src/internal/client/reactivity/async.js   | 48 ++++++++++++++++++-
 .../Child.svelte                              |  3 ++
 .../_config.js                                | 13 +++++
 .../main.svelte                               |  9 ++++
 .../_config.js                                | 13 +++++
 .../main.svelte                               |  7 +++
 8 files changed, 99 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/sweet-doors-brush.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script/main.svelte

diff --git a/.changeset/sweet-doors-brush.md b/.changeset/sweet-doors-brush.md
new file mode 100644
index 0000000000..cc30343db9
--- /dev/null
+++ b/.changeset/sweet-doors-brush.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: restore hydration state after `await` in `<script>`
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
index 90845fb303..b22b95f5aa 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -40,11 +40,7 @@ import { TitleElement } from './visitors/TitleElement.js';
 import { UpdateExpression } from './visitors/UpdateExpression.js';
 import { VariableDeclaration } from './visitors/VariableDeclaration.js';
 import { SvelteBoundary } from './visitors/SvelteBoundary.js';
-import {
-	create_child_block,
-	call_component_renderer,
-	create_async_block
-} from './visitors/shared/utils.js';
+import { call_component_renderer, create_async_block } from './visitors/shared/utils.js';
 
 /** @type {Visitors} */
 const global_visitors = {
@@ -248,7 +244,7 @@ export function server_component(analysis, options) {
 	]);
 
 	if (analysis.instance.has_await) {
-		component_block = b.block([create_child_block(component_block, true)]);
+		component_block = b.block([create_async_block(component_block)]);
 	}
 
 	// trick esrap into including comments
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 018ab701f2..a9126f1a5c 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -20,6 +20,14 @@ import {
 	set_from_async_derived
 } from './deriveds.js';
 import { aborted } from './effects.js';
+import {
+	hydrate_next,
+	hydrate_node,
+	hydrating,
+	set_hydrate_node,
+	set_hydrating,
+	skip_nodes
+} from '../dom/hydration.js';
 
 /**
  *
@@ -40,6 +48,8 @@ export function flatten(sync, async, fn) {
 
 	var restore = capture();
 
+	var was_hydrating = hydrating;
+
 	Promise.all(async.map((expression) => async_derived(expression)))
 		.then((result) => {
 			batch?.activate();
@@ -55,6 +65,10 @@ export function flatten(sync, async, fn) {
 				}
 			}
 
+			if (was_hydrating) {
+				set_hydrating(false);
+			}
+
 			batch?.deactivate();
 			unset_context();
 		})
@@ -74,12 +88,23 @@ function capture() {
 	var previous_component_context = component_context;
 	var previous_batch = current_batch;
 
+	var was_hydrating = hydrating;
+
+	if (was_hydrating) {
+		var previous_hydrate_node = hydrate_node;
+	}
+
 	return function restore() {
 		set_active_effect(previous_effect);
 		set_active_reaction(previous_reaction);
 		set_component_context(previous_component_context);
 		previous_batch?.activate();
 
+		if (was_hydrating) {
+			set_hydrating(true);
+			set_hydrate_node(previous_hydrate_node);
+		}
+
 		if (DEV) {
 			set_from_async_derived(null);
 		}
@@ -186,13 +211,34 @@ export async function async_body(fn) {
 
 	var active = /** @type {Effect} */ (active_effect);
 
+	var was_hydrating = hydrating;
+	var next_hydrate_node = undefined;
+
+	if (was_hydrating) {
+		hydrate_next();
+		next_hydrate_node = skip_nodes(false);
+	}
+
 	try {
-		await fn();
+		var promise = fn();
+	} finally {
+		if (next_hydrate_node) {
+			set_hydrate_node(next_hydrate_node);
+			hydrate_next();
+		}
+	}
+
+	try {
+		await promise;
 	} catch (error) {
 		if (!aborted(active)) {
 			invoke_error_boundary(error, active);
 		}
 	} finally {
+		if (was_hydrating) {
+			set_hydrating(false);
+		}
+
 		boundary.update_pending_count(-1);
 
 		if (pending) {
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/Child.svelte
new file mode 100644
index 0000000000..6c2cb70b1a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/Child.svelte
@@ -0,0 +1,3 @@
+<script lang="ts">
+	await 1;
+</script>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/_config.js b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/_config.js
new file mode 100644
index 0000000000..0a92bf3bcb
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/_config.js
@@ -0,0 +1,13 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_mode: ['server'],
+
+	ssrHtml: '<p>hello</p>',
+
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<p>hello</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/main.svelte
new file mode 100644
index 0000000000..108655973d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script-2/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	import Child from './Child.svelte';
+</script>
+
+<Child />
+
+{#if true}
+	<p>hello</p>
+{/if}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script/_config.js b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script/_config.js
new file mode 100644
index 0000000000..0a92bf3bcb
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script/_config.js
@@ -0,0 +1,13 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_mode: ['server'],
+
+	ssrHtml: '<p>hello</p>',
+
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<p>hello</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script/main.svelte
new file mode 100644
index 0000000000..aa4c9dff2b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-no-pending-await-in-script/main.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+	await 1;
+</script>
+
+{#if true}
+	<p>hello</p>
+{/if}

From 3c694ce3a4806241405b7ffeff5de398c9e43241 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 21 Sep 2025 19:34:51 -0400
Subject: [PATCH 38/68] Version Packages (#16807)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/sweet-doors-brush.md | 5 -----
 packages/svelte/CHANGELOG.md    | 6 ++++++
 packages/svelte/package.json    | 2 +-
 packages/svelte/src/version.js  | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 .changeset/sweet-doors-brush.md

diff --git a/.changeset/sweet-doors-brush.md b/.changeset/sweet-doors-brush.md
deleted file mode 100644
index cc30343db9..0000000000
--- a/.changeset/sweet-doors-brush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: restore hydration state after `await` in `<script>`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index ef5cd32bd9..fe6e44ffbe 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.39.4
+
+### Patch Changes
+
+- fix: restore hydration state after `await` in `<script>` ([#16806](https://github.com/sveltejs/svelte/pull/16806))
+
 ## 5.39.3
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index b447f97c55..0be1242ffe 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.39.3",
+  "version": "5.39.4",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 0036617ac0..1ebbbb95dd 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.39.3';
+export const VERSION = '5.39.4';
 export const PUBLIC_VERSION = '5';

From cf35a22568be2e767c419a6b8ac36fe73c270eb3 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Tue, 23 Sep 2025 03:04:45 -0700
Subject: [PATCH 39/68] fix: allow `{@html await ...}` and async snippets on
 the server (#16817)

Fixes #16816
Fixes #16811

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .changeset/long-spies-hope.md                              | 5 +++++
 .../compiler/phases/3-transform/server/visitors/HtmlTag.js | 7 ++++++-
 .../phases/3-transform/server/visitors/SnippetBlock.js     | 5 +++++
 .../samples/async-html-tag/_expected.html                  | 1 +
 .../samples/async-html-tag/main.svelte                     | 1 +
 .../samples/async-snippet/_expected.html                   | 1 +
 .../samples/async-snippet/main.svelte                      | 6 ++++++
 7 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/long-spies-hope.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-html-tag/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-html-tag/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-snippet/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-snippet/main.svelte

diff --git a/.changeset/long-spies-hope.md b/.changeset/long-spies-hope.md
new file mode 100644
index 0000000000..6bb8184c64
--- /dev/null
+++ b/.changeset/long-spies-hope.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: allow `{@html await ...}` and snippets with async content on the server
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/HtmlTag.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/HtmlTag.js
index 9e857a9308..9a3d2830ac 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/HtmlTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/HtmlTag.js
@@ -9,5 +9,10 @@ import * as b from '#compiler/builders';
  */
 export function HtmlTag(node, context) {
 	const expression = /** @type {Expression} */ (context.visit(node.expression));
-	context.state.template.push(b.call('$.html', expression));
+	const call = b.call('$.html', expression);
+	context.state.template.push(
+		node.metadata.expression.has_await
+			? b.stmt(b.call('$$renderer.push', b.thunk(call, true)))
+			: call
+	);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js
index 7ae2a8e037..5fc865ec58 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SnippetBlock.js
@@ -3,6 +3,7 @@
 /** @import { ComponentContext } from '../types.js' */
 import { dev } from '../../../../state.js';
 import * as b from '#compiler/builders';
+import { create_async_block } from './shared/utils.js';
 
 /**
  * @param {AST.SnippetBlock} node
@@ -15,6 +16,10 @@ export function SnippetBlock(node, context) {
 		/** @type {BlockStatement} */ (context.visit(node.body))
 	);
 
+	if (node.body.metadata.has_await) {
+		fn.body = b.block([create_async_block(fn.body)]);
+	}
+
 	// @ts-expect-error - TODO remove this hack once $$render_inner for legacy bindings is gone
 	fn.___snippet = true;
 
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-html-tag/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-html-tag/_expected.html
new file mode 100644
index 0000000000..5be0be37f2
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-html-tag/_expected.html
@@ -0,0 +1 @@
+<div>this should work</div>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-html-tag/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-html-tag/main.svelte
new file mode 100644
index 0000000000..2d556e4d5b
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-html-tag/main.svelte
@@ -0,0 +1 @@
+<div>{@html await 'this should work'}</div>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-snippet/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-snippet/_expected.html
new file mode 100644
index 0000000000..5be0be37f2
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-snippet/_expected.html
@@ -0,0 +1 @@
+<div>this should work</div>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-snippet/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-snippet/main.svelte
new file mode 100644
index 0000000000..a6f2ac7b09
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-snippet/main.svelte
@@ -0,0 +1,6 @@
+{#snippet foo()}
+    {@const x = await 'this should work'}
+    <div>{x}</div>
+{/snippet}
+
+{@render foo()}

From 562623d536e9e2c3473d13a5cccce8d14ce98870 Mon Sep 17 00:00:00 2001
From: Brittany Harris <6003769+brittharr@users.noreply.github.com>
Date: Tue, 23 Sep 2025 13:55:46 +0100
Subject: [PATCH 40/68] fix: use SSR format compatible with nginx SSI for
 props.id (#16820)

* fix: use SSR format compatible with nginx SSI for props.id

* changeset

---------

Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 .changeset/silly-schools-divide.md                  | 5 +++++
 packages/svelte/src/internal/client/dom/template.js | 2 +-
 packages/svelte/src/internal/server/index.js        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/silly-schools-divide.md

diff --git a/.changeset/silly-schools-divide.md b/.changeset/silly-schools-divide.md
new file mode 100644
index 0000000000..ff36717063
--- /dev/null
+++ b/.changeset/silly-schools-divide.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: use nginx SSI-compatible comments for `$props.id()`
diff --git a/packages/svelte/src/internal/client/dom/template.js b/packages/svelte/src/internal/client/dom/template.js
index 135ca86610..c2443fda7a 100644
--- a/packages/svelte/src/internal/client/dom/template.js
+++ b/packages/svelte/src/internal/client/dom/template.js
@@ -365,7 +365,7 @@ export function props_id() {
 		hydrating &&
 		hydrate_node &&
 		hydrate_node.nodeType === COMMENT_NODE &&
-		hydrate_node.textContent?.startsWith(`#`)
+		hydrate_node.textContent?.startsWith(`$`)
 	) {
 		const id = hydrate_node.textContent.substring(1);
 		hydrate_next();
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index 3ff44f8030..50bb629c4d 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -448,7 +448,7 @@ export function once(get_value) {
  */
 export function props_id(renderer) {
 	const uid = renderer.global.uid();
-	renderer.push('<!--#' + uid + '-->');
+	renderer.push('<!--$' + uid + '-->');
 	return uid;
 }
 

From 8680c29a0a7bdb7993c40e8a34394d95c23d19c8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Sep 2025 08:57:46 -0400
Subject: [PATCH 41/68] Version Packages (#16818)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/long-spies-hope.md      | 5 -----
 .changeset/silly-schools-divide.md | 5 -----
 packages/svelte/CHANGELOG.md       | 8 ++++++++
 packages/svelte/package.json       | 2 +-
 packages/svelte/src/version.js     | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/long-spies-hope.md
 delete mode 100644 .changeset/silly-schools-divide.md

diff --git a/.changeset/long-spies-hope.md b/.changeset/long-spies-hope.md
deleted file mode 100644
index 6bb8184c64..0000000000
--- a/.changeset/long-spies-hope.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: allow `{@html await ...}` and snippets with async content on the server
diff --git a/.changeset/silly-schools-divide.md b/.changeset/silly-schools-divide.md
deleted file mode 100644
index ff36717063..0000000000
--- a/.changeset/silly-schools-divide.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"svelte": patch
----
-
-fix: use nginx SSI-compatible comments for `$props.id()`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index fe6e44ffbe..2cf08ae409 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.39.5
+
+### Patch Changes
+
+- fix: allow `{@html await ...}` and snippets with async content on the server ([#16817](https://github.com/sveltejs/svelte/pull/16817))
+
+- fix: use nginx SSI-compatible comments for `$props.id()` ([#16820](https://github.com/sveltejs/svelte/pull/16820))
+
 ## 5.39.4
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 0be1242ffe..a4865da75f 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.39.4",
+  "version": "5.39.5",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 1ebbbb95dd..55796a2083 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.39.4';
+export const VERSION = '5.39.5';
 export const PUBLIC_VERSION = '5';

From 7d9962a57268fbe02b6f5a6327e488e2b189f8ca Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 23 Sep 2025 14:56:08 -0400
Subject: [PATCH 42/68] docs: update await expressions documentation (#16822)

* docs: update await expressions documentation

* Update documentation/docs/03-template-syntax/19-await-expressions.md

Co-authored-by: Tee Ming <chewteeming01@gmail.com>

* Update documentation/docs/03-template-syntax/19-await-expressions.md

Co-authored-by: Elliott Johnson <sejohnson@torchcloudconsulting.com>

* Update documentation/docs/03-template-syntax/19-await-expressions.md

Co-authored-by: Tee Ming <chewteeming01@gmail.com>

* Update documentation/docs/03-template-syntax/19-await-expressions.md

---------

Co-authored-by: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Co-authored-by: Tee Ming <chewteeming01@gmail.com>
---
 .../19-await-expressions.md                   | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/documentation/docs/03-template-syntax/19-await-expressions.md b/documentation/docs/03-template-syntax/19-await-expressions.md
index 4e5ec28b26..e43d6c81d1 100644
--- a/documentation/docs/03-template-syntax/19-await-expressions.md
+++ b/documentation/docs/03-template-syntax/19-await-expressions.md
@@ -23,24 +23,6 @@ export default {
 
 The experimental flag will be removed in Svelte 6.
 
-## Boundaries
-
-Currently, you can only use `await` inside a [`<svelte:boundary>`](svelte-boundary) with a `pending` snippet:
-
-```svelte
-<svelte:boundary>
-	<MyApp />
-
-	{#snippet pending()}
-		<p>loading...</p>
-	{/snippet}
-</svelte:boundary>
-```
-
-This restriction will be lifted once Svelte supports asynchronous server-side rendering (see [caveats](#Caveats)).
-
-> [!NOTE] In the [playground](/playground), your app is rendered inside a boundary with an empty pending snippet, so that you can use `await` without having to create one.
-
 ## Synchronized updates
 
 When an `await` expression depends on a particular piece of state, changes to that state will not be reflected in the UI until the asynchronous work has completed, so that the UI is not left in an inconsistent state. In other words, in an example like [this](/playground/untitled#H4sIAAAAAAAAE42QsWrDQBBEf2VZUkhYRE4gjSwJ0qVMkS6XYk9awcFpJe5Wdoy4fw-ycdykSPt2dpiZFYVGxgrf2PsJTlPwPWTcO-U-xwIH5zli9bminudNtwEsbl-v8_wYj-x1Y5Yi_8W7SZRFI1ZYxy64WVsjRj0rEDTwEJWUs6f8cKP2Tp8vVIxSPEsHwyKdukmA-j6jAmwO63Y1SidyCsIneA_T6CJn2ZBD00Jk_XAjT4tmQwEv-32eH6AsgYK6wXWOPPTs6Xy1CaxLECDYgb3kSUbq8p5aaifzorCt0RiUZbQcDIJ10ldH8gs3K6X2Xzqbro5zu1KCHaw2QQPrtclvwVSXc2sEC1T-Vqw0LJy-ClRy_uSkx2ogHzn9ADZ1CubKAQAA)...
@@ -99,7 +81,9 @@ let b = $derived(await two());
 
 ## Indicating loading states
 
-In addition to the nearest boundary's [`pending`](svelte-boundary#Properties-pending) snippet, you can indicate that asynchronous work is ongoing with [`$effect.pending()`]($effect#$effect.pending).
+To render placeholder UI, you can wrap content in a `<svelte:boundary>` with a [`pending`](svelte-boundary#Properties-pending) snippet. This will be shown when the boundary is first created, but not for subsequent updates, which are globally coordinated.
+
+After the contents of a boundary have resolved for the first time and replaced the `pending` snippet, you can detect subsequent async work with [`$effect.pending()`]($effect#$effect.pending). This is what you would use display a "we're asynchronously validating your input" spinner next to a form field, for example.
 
 You can also use [`settled()`](svelte#settled) to get a promise that resolves when the current update is complete:
 
@@ -133,6 +117,24 @@ async function onclick() {
 
 Errors in `await` expressions will bubble to the nearest [error boundary](svelte-boundary).
 
+## Server-side rendering
+
+Svelte supports asynchronous server-side rendering (SSR) with the `render(...)` API. To use it, simply await the return value:
+
+```js
+/// file: server.js
+import { render } from 'svelte/server';
+import App from './App.svelte';
+
+const { head, body } = +++await+++ render(App);
+```
+
+> [!NOTE] If you're using a framework like SvelteKit, this is done on your behalf.
+
+If a `<svelte:boundary>` with a `pending` snippet is encountered during SSR, that snippet will be rendered while the rest of the content is ignored. All `await` expressions encountered outside boundaries with `pending` snippets will resolve and render their contents prior to `await render(...)` returning.
+
+> [!NOTE] In the future, we plan to add a streaming implementation that renders the content in the background.
+
 ## Caveats
 
 As an experimental feature, the details of how `await` is handled (and related APIs like `$effect.pending()`) are subject to breaking changes outside of a semver major release, though we intend to keep such changes to a bare minimum.

From 5e6fed6bab2423f7469f29ee9cd002dd698b91a2 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 23 Sep 2025 23:13:16 +0200
Subject: [PATCH 43/68] fix: depend on reads of deriveds created within
 reaction (async mode) (#16823)

* fix: depend on reads of deriveds created within reaction (async mode)

As part of https://github.com/sveltejs/kit/pull/14481 we discovered that deriveds created within reactions and reading from them in that same reaction is actually useful in some cases, as such a use case we couldn't imagine yet in #15564 has appeared.

We think it's ultimately better to rerun on those cases, so we're going to make this change in async mode (that way the behavior doesn't change unless you have enabled the experimental flag)

* fix tests
---
 .changeset/gold-eels-lay.md                   |  5 ++
 .../internal/client/reactivity/deriveds.js    |  4 +-
 .../samples/derived-in-expression/_config.js  | 74 +++++++++++++++++++
 .../samples/derived-in-expression/main.svelte | 30 ++++++++
 .../samples/untrack-own-deriveds/_config.js   |  5 +-
 .../samples/untrack-own-deriveds/main.svelte  |  6 +-
 6 files changed, 119 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/gold-eels-lay.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/derived-in-expression/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/derived-in-expression/main.svelte

diff --git a/.changeset/gold-eels-lay.md b/.changeset/gold-eels-lay.md
new file mode 100644
index 0000000000..ef6ceb4dab
--- /dev/null
+++ b/.changeset/gold-eels-lay.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: depend on reads of deriveds created within reaction (async mode)
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 299251a2dc..11405a8e66 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -29,7 +29,7 @@ import * as w from '../warnings.js';
 import { async_effect, destroy_effect } from './effects.js';
 import { inspect_effects, internal_set, set_inspect_effects, source } from './sources.js';
 import { get_stack } from '../dev/tracing.js';
-import { tracing_mode_flag } from '../../flags/index.js';
+import { async_mode_flag, tracing_mode_flag } from '../../flags/index.js';
 import { Boundary } from '../dom/blocks/boundary.js';
 import { component_context } from '../context.js';
 import { UNINITIALIZED } from '../../../constants.js';
@@ -231,7 +231,7 @@ export function async_derived(fn, location) {
 export function user_derived(fn) {
 	const d = derived(fn);
 
-	push_reaction_value(d);
+	if (!async_mode_flag) push_reaction_value(d);
 
 	return d;
 }
diff --git a/packages/svelte/tests/runtime-runes/samples/derived-in-expression/_config.js b/packages/svelte/tests/runtime-runes/samples/derived-in-expression/_config.js
new file mode 100644
index 0000000000..73428e0ff2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/derived-in-expression/_config.js
@@ -0,0 +1,74 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	// In non-async mode we're not reacting to deriveds read in the same context they're defined in
+	skip_no_async: true,
+	test({ assert, target, logs }) {
+		const [a, b] = target.querySelectorAll('button');
+
+		flushSync(() => a?.click());
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>a</button>
+				<button>b</button>
+				<p>1/0</p
+			`
+		);
+
+		flushSync(() => a?.click());
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>a</button>
+				<button>b</button>
+				<p>2/0</p
+			`
+		);
+
+		flushSync(() => b?.click());
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>a</button>
+				<button>b</button>
+				<p>2/1</p
+			`
+		);
+
+		flushSync(() => b?.click());
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>a</button>
+				<button>b</button>
+				<p>2/2</p
+			`
+		);
+
+		assert.deepEqual(logs, [
+			// init
+			'a',
+			'b',
+			'effect a',
+			'effect b',
+			// click a
+			'a',
+			'effect a',
+			// click a
+			'a',
+			'effect a',
+			// click b
+			'a',
+			'b',
+			'effect a',
+			'effect b',
+			// click b
+			'a',
+			'b',
+			'effect a',
+			'effect b'
+		]);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/derived-in-expression/main.svelte b/packages/svelte/tests/runtime-runes/samples/derived-in-expression/main.svelte
new file mode 100644
index 0000000000..f3a8bbe472
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/derived-in-expression/main.svelte
@@ -0,0 +1,30 @@
+<script>
+	let object = $state.raw({ a: 0, b: 0 });
+
+	function a() {
+		console.log('a');
+		return object.a;
+	}
+
+	function b() {
+		console.log('b');
+		let double = $derived(object.b)
+		return double;
+	}
+
+	$effect(() => {
+		object.a;
+		console.log('effect a');
+	})
+
+	$effect(() => {
+		const b = $derived(object.b);
+		b;
+		console.log('effect b');
+	})
+</script>
+
+<button onclick={() => object = { ...object, a: object.a + 1 }}>a</button>
+<button onclick={() => object = { ...object, b: object.b + 1 }}>b</button>
+
+<p>{a()}/{b()}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/untrack-own-deriveds/_config.js b/packages/svelte/tests/runtime-runes/samples/untrack-own-deriveds/_config.js
index b728c3c0be..b5233b01e8 100644
--- a/packages/svelte/tests/runtime-runes/samples/untrack-own-deriveds/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/untrack-own-deriveds/_config.js
@@ -13,10 +13,11 @@ export default test({
 			target.innerHTML,
 			`
 				<button>increment</button>
-				<p>1/2</p
+				<p>1/2</p>
+				<p>1/2</p>
 			`
 		);
 
-		assert.deepEqual(logs, [0, 0]);
+		assert.deepEqual(logs, [0, 0, 0, 0]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/untrack-own-deriveds/main.svelte b/packages/svelte/tests/runtime-runes/samples/untrack-own-deriveds/main.svelte
index bbad2cdf4a..c0dd86993a 100644
--- a/packages/svelte/tests/runtime-runes/samples/untrack-own-deriveds/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/untrack-own-deriveds/main.svelte
@@ -17,10 +17,14 @@
 	$effect(() => {
 		foo = new Foo();
 	});
+
+	let bar = $derived(new Foo());
 </script>
 
-<button onclick={() => foo.increment()}>increment</button>
+<button onclick={() => {foo.increment(); bar.increment()}}>increment</button>
 
 {#if foo}
 	<p>{foo.value}/{foo.double}</p>
 {/if}
+
+<p>{bar.value}/{bar.double}</p>

From 1ef297f25de64f220bce8ff020f38d399b69a647 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 23 Sep 2025 23:47:50 +0200
Subject: [PATCH 44/68] fix: ensure tick resolves within a macrotask (#16825)

Race them against each other - in almost all cases requestAnimationFrame will fire first, but e.g. in case the window is not focused or a view transition happens, requestAnimationFrame will be delayed and setTimeout helps us resolve fast enough in that case

Fixes #16429
Fixes https://github.com/sveltejs/kit/issues/14220
---
 .changeset/wise-bottles-explode.md             | 5 +++++
 packages/svelte/src/internal/client/runtime.js | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/wise-bottles-explode.md

diff --git a/.changeset/wise-bottles-explode.md b/.changeset/wise-bottles-explode.md
new file mode 100644
index 0000000000..d3b2931272
--- /dev/null
+++ b/.changeset/wise-bottles-explode.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure tick resolves within a macrotask
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 22a1890e0f..b8f5f5ffc9 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -500,7 +500,13 @@ export function update_effect(effect) {
  */
 export async function tick() {
 	if (async_mode_flag) {
-		return new Promise((f) => requestAnimationFrame(() => f()));
+		return new Promise((f) => {
+			// Race them against each other - in almost all cases requestAnimationFrame will fire first,
+			// but e.g. in case the window is not focused or a view transition happens, requestAnimationFrame
+			// will be delayed and setTimeout helps us resolve fast enough in that case
+			requestAnimationFrame(() => f());
+			setTimeout(() => f());
+		});
 	}
 
 	await Promise.resolve();

From 0ed0f1ef69a67324ef411b61c6cf088e4abcd57b Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 24 Sep 2025 11:08:06 -0400
Subject: [PATCH 45/68] chore: disable inspector in playground (#16836)

---
 playgrounds/sandbox/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playgrounds/sandbox/package.json b/playgrounds/sandbox/package.json
index 641f91ddfe..84aeab586b 100644
--- a/playgrounds/sandbox/package.json
+++ b/playgrounds/sandbox/package.json
@@ -5,8 +5,8 @@
   "type": "module",
   "scripts": {
     "prepare": "node scripts/create-app-svelte.js",
-    "dev": "vite --host",
-    "ssr": "node --conditions=development ./ssr-dev.js",
+    "dev": "SVELTE_INSPECTOR_OPTIONS=false vite --host",
+    "ssr": "SVELTE_INSPECTOR_OPTIONS=false node --conditions=development ./ssr-dev.js",
     "build": "vite build --outDir dist/client && vite build --outDir dist/server --ssr ssr-prod.js",
     "prod": "npm run build && node dist/server/ssr-prod",
     "preview": "vite preview",

From 7b2113e1bfb6da2078abe532b0530e25f8f85285 Mon Sep 17 00:00:00 2001
From: Aaron Ajose <aaronajoseajo@gmail.com>
Date: Wed, 24 Sep 2025 18:32:59 +0300
Subject: [PATCH 46/68] chore: fix typos (#16830)

* chore: fix typos

* revert bad change

---------

Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 packages/svelte/src/internal/client/render.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index f5e32a2196..b1165a6e7a 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -143,7 +143,7 @@ export function hydrate(component, options) {
 			e.hydration_failed();
 		}
 
-		// If an error occured above, the operations might not yet have been initialised.
+		// If an error occurred above, the operations might not yet have been initialised.
 		init_operations();
 		clear_text_content(target);
 

From c75e86267758a534c76c3d02eae6026171792704 Mon Sep 17 00:00:00 2001
From: Tee Ming <chewteeming01@gmail.com>
Date: Wed, 24 Sep 2025 23:34:05 +0800
Subject: [PATCH 47/68] Update 19-await-expressions.md (#16827)

---
 documentation/docs/03-template-syntax/19-await-expressions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/03-template-syntax/19-await-expressions.md b/documentation/docs/03-template-syntax/19-await-expressions.md
index e43d6c81d1..d3896a5c4e 100644
--- a/documentation/docs/03-template-syntax/19-await-expressions.md
+++ b/documentation/docs/03-template-syntax/19-await-expressions.md
@@ -83,7 +83,7 @@ let b = $derived(await two());
 
 To render placeholder UI, you can wrap content in a `<svelte:boundary>` with a [`pending`](svelte-boundary#Properties-pending) snippet. This will be shown when the boundary is first created, but not for subsequent updates, which are globally coordinated.
 
-After the contents of a boundary have resolved for the first time and replaced the `pending` snippet, you can detect subsequent async work with [`$effect.pending()`]($effect#$effect.pending). This is what you would use display a "we're asynchronously validating your input" spinner next to a form field, for example.
+After the contents of a boundary have resolved for the first time and have replaced the `pending` snippet, you can detect subsequent async work with [`$effect.pending()`]($effect#$effect.pending). This is what you would use to display a "we're asynchronously validating your input" spinner next to a form field, for example.
 
 You can also use [`settled()`](svelte#settled) to get a promise that resolves when the current update is complete:
 

From 24944e61f5ef5aebf00aa6f86f86edaf3ad70986 Mon Sep 17 00:00:00 2001
From: 7nik <kifiranet@gmail.com>
Date: Wed, 24 Sep 2025 18:35:24 +0300
Subject: [PATCH 48/68] fix: async `class:` + spread attributes were compiled
 into sync server-side code (#16834)

---
 .changeset/tasty-snails-dress.md                             | 5 +++++
 .../phases/3-transform/server/visitors/shared/element.js     | 5 ++++-
 .../samples/async-directive-with-spreading/_expected.html    | 1 +
 .../samples/async-directive-with-spreading/main.svelte       | 2 ++
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/tasty-snails-dress.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-directive-with-spreading/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-directive-with-spreading/main.svelte

diff --git a/.changeset/tasty-snails-dress.md b/.changeset/tasty-snails-dress.md
new file mode 100644
index 0000000000..0fb847c1ff
--- /dev/null
+++ b/.changeset/tasty-snails-dress.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: async `class:` + spread attributes were compiled into sync server-side code
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
index da90011259..3b5f2423a3 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
@@ -372,7 +372,10 @@ function build_element_spread_attributes(
 				directive.name,
 				directive.expression.type === 'Identifier' && directive.expression.name === directive.name
 					? b.id(directive.name)
-					: /** @type {Expression} */ (context.visit(directive.expression))
+					: transform(
+							/** @type {Expression} */ (context.visit(directive.expression)),
+							directive.metadata.expression
+						)
 			);
 		});
 
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-directive-with-spreading/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-directive-with-spreading/_expected.html
new file mode 100644
index 0000000000..d46a957bdf
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-directive-with-spreading/_expected.html
@@ -0,0 +1 @@
+<!--[--><div class="test"></div><div style="color: green;"></div><!--]-->
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-directive-with-spreading/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-directive-with-spreading/main.svelte
new file mode 100644
index 0000000000..ed4270b754
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-directive-with-spreading/main.svelte
@@ -0,0 +1,2 @@
+<div class:test={await true} {...{}}></div>
+<div style:color={await "green"} {...{}}></div>

From ac7e16002939f627bd961a9194e497f53ff466f9 Mon Sep 17 00:00:00 2001
From: LeeWxx <99359120+LeeWxx@users.noreply.github.com>
Date: Thu, 25 Sep 2025 01:35:51 +0900
Subject: [PATCH 49/68] fix: SSR scoped classes for <select value> elements
 (#16821)

* fix: preserve scoped classes on select during ssr

* test: cover select scoped class regression

* chore: changeset

* chore: format files after lint

* fix: unify <select> attribute handling and prevent double-await

* test: update renderer.select call order

* fix: restore scoped classes on <option>

* test: cover scoped class for <option>

* dry

* de-diff

* tweak changeset

---------

Co-authored-by: 7nik <kifiranet@gmail.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/nasty-comics-play.md               |   5 +
 .../server/visitors/RegularElement.js         |  71 +++++-------
 .../server/visitors/shared/element.js         | 103 ++++++++++++++----
 .../svelte/src/internal/server/renderer.js    |  19 +++-
 .../src/internal/server/renderer.test.ts      |  18 +++
 .../option-scoped-class/_expected.html        |   2 +
 .../samples/option-scoped-class/main.svelte   |  10 ++
 .../select-value-scoped-class/_expected.html  |   1 +
 .../select-value-scoped-class/main.svelte     |   9 ++
 9 files changed, 172 insertions(+), 66 deletions(-)
 create mode 100644 .changeset/nasty-comics-play.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/option-scoped-class/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/option-scoped-class/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/select-value-scoped-class/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/select-value-scoped-class/main.svelte

diff --git a/.changeset/nasty-comics-play.md b/.changeset/nasty-comics-play.md
new file mode 100644
index 0000000000..b75c82c493
--- /dev/null
+++ b/.changeset/nasty-comics-play.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: SSR regression of processing attributes of `<select>` and `<option>`
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
index 14f48d1ce7..df3e2fc37f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
@@ -7,11 +7,10 @@ import { is_void } from '../../../../../utils.js';
 import { dev, locator } from '../../../../state.js';
 import * as b from '#compiler/builders';
 import { clean_nodes, determine_namespace_for_children } from '../../utils.js';
-import { build_element_attributes, build_spread_object } from './shared/element.js';
+import { build_element_attributes, prepare_element_spread_object } from './shared/element.js';
 import {
 	process_children,
 	build_template,
-	build_attribute_value,
 	create_child_block,
 	PromiseOptimiser
 } from './shared/utils.js';
@@ -37,9 +36,27 @@ export function RegularElement(node, context) {
 
 	const optimiser = new PromiseOptimiser();
 
-	state.template.push(b.literal(`<${node.name}`));
-	const body = build_element_attributes(node, { ...context, state }, optimiser.transform);
-	state.template.push(b.literal(node_is_void ? '/>' : '>')); // add `/>` for XHTML compliance
+	// If this element needs special handling (like <select value> / <option>),
+	// avoid calling build_element_attributes here to prevent evaluating/awaiting
+	// attribute expressions twice. We'll handle attributes in the special branch.
+	const is_select_special =
+		node.name === 'select' &&
+		node.attributes.some(
+			(attribute) =>
+				((attribute.type === 'Attribute' || attribute.type === 'BindDirective') &&
+					attribute.name === 'value') ||
+				attribute.type === 'SpreadAttribute'
+		);
+	const is_option_special = node.name === 'option';
+	const is_special = is_select_special || is_option_special;
+
+	let body = /** @type {Expression | null} */ (null);
+	if (!is_special) {
+		// only open the tag in the non-special path
+		state.template.push(b.literal(`<${node.name}`));
+		body = build_element_attributes(node, { ...context, state }, optimiser.transform);
+		state.template.push(b.literal(node_is_void ? '/>' : '>')); // add `/>` for XHTML compliance
+	}
 
 	if ((node.name === 'script' || node.name === 'style') && node.fragment.nodes.length === 1) {
 		state.template.push(
@@ -95,27 +112,7 @@ export function RegularElement(node, context) {
 		);
 	}
 
-	if (
-		node.name === 'select' &&
-		node.attributes.some(
-			(attribute) =>
-				((attribute.type === 'Attribute' || attribute.type === 'BindDirective') &&
-					attribute.name === 'value') ||
-				attribute.type === 'SpreadAttribute'
-		)
-	) {
-		const attributes = build_spread_object(
-			node,
-			node.attributes.filter(
-				(attribute) =>
-					attribute.type === 'Attribute' ||
-					attribute.type === 'BindDirective' ||
-					attribute.type === 'SpreadAttribute'
-			),
-			context,
-			optimiser.transform
-		);
-
+	if (is_select_special) {
 		const inner_state = { ...state, template: [], init: [] };
 		process_children(trimmed, { ...context, state: inner_state });
 
@@ -124,7 +121,9 @@ export function RegularElement(node, context) {
 			b.block([...state.init, ...build_template(inner_state.template)])
 		);
 
-		const statement = b.stmt(b.call('$$renderer.select', attributes, fn));
+		const [attributes, ...rest] = prepare_element_spread_object(node, context, optimiser.transform);
+
+		const statement = b.stmt(b.call('$$renderer.select', attributes, fn, ...rest));
 
 		if (optimiser.expressions.length > 0) {
 			context.state.template.push(
@@ -137,19 +136,7 @@ export function RegularElement(node, context) {
 		return;
 	}
 
-	if (node.name === 'option') {
-		const attributes = build_spread_object(
-			node,
-			node.attributes.filter(
-				(attribute) =>
-					attribute.type === 'Attribute' ||
-					attribute.type === 'BindDirective' ||
-					attribute.type === 'SpreadAttribute'
-			),
-			context,
-			optimiser.transform
-		);
-
+	if (is_option_special) {
 		let body;
 
 		if (node.metadata.synthetic_value_node) {
@@ -167,7 +154,9 @@ export function RegularElement(node, context) {
 			);
 		}
 
-		const statement = b.stmt(b.call('$$renderer.option', attributes, body));
+		const [attributes, ...rest] = prepare_element_spread_object(node, context, optimiser.transform);
+
+		const statement = b.stmt(b.call('$$renderer.option', attributes, body, ...rest));
 
 		if (optimiser.expressions.length > 0) {
 			context.state.template.push(
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
index 3b5f2423a3..cfb87b0ce7 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
@@ -358,17 +358,86 @@ function build_element_spread_attributes(
 	context,
 	transform
 ) {
+	const args = prepare_element_spread(
+		element,
+		/** @type {Array<AST.Attribute | AST.SpreadAttribute | AST.BindDirective>} */ (attributes),
+		style_directives,
+		class_directives,
+		context,
+		transform
+	);
+
+	let call = b.call('$.attributes', ...args);
+
+	context.state.template.push(call);
+}
+
+/**
+ * Prepare args for $.attributes(...): compute object, css_hash, classes, styles and flags.
+ * @param {AST.RegularElement | AST.SvelteElement} element
+ * @param {ComponentContext} context
+ * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
+ * @returns {[ObjectExpression,Literal | undefined, ObjectExpression | undefined, ObjectExpression | undefined, Literal | undefined]}
+ */
+export function prepare_element_spread_object(element, context, transform) {
+	/** @type {Array<AST.Attribute | AST.SpreadAttribute | AST.BindDirective>} */
+	const select_attributes = [];
+	/** @type {AST.ClassDirective[]} */
+	const class_directives = [];
+	/** @type {AST.StyleDirective[]} */
+	const style_directives = [];
+
+	for (const attribute of element.attributes) {
+		if (
+			attribute.type === 'Attribute' ||
+			attribute.type === 'BindDirective' ||
+			attribute.type === 'SpreadAttribute'
+		) {
+			select_attributes.push(attribute);
+		} else if (attribute.type === 'ClassDirective') {
+			class_directives.push(attribute);
+		} else if (attribute.type === 'StyleDirective') {
+			style_directives.push(attribute);
+		}
+	}
+
+	return prepare_element_spread(
+		element,
+		select_attributes,
+		style_directives,
+		class_directives,
+		context,
+		transform
+	);
+}
+
+/**
+ * Prepare args for $.attributes(...): compute object, css_hash, classes, styles and flags.
+ * @param {AST.RegularElement | AST.SvelteElement} element
+ * @param {Array<AST.Attribute | AST.SpreadAttribute | AST.BindDirective>} attributes
+ * @param {AST.StyleDirective[]} style_directives
+ * @param {AST.ClassDirective[]} class_directives
+ * @param {ComponentContext} context
+ * @param {(expression: Expression, metadata: ExpressionMetadata) => Expression} transform
+ * @returns {[ObjectExpression,Literal | undefined, ObjectExpression | undefined, ObjectExpression | undefined, Literal | undefined]}
+ */
+export function prepare_element_spread(
+	element,
+	attributes,
+	style_directives,
+	class_directives,
+	context,
+	transform
+) {
+	/** @type {ObjectExpression | undefined} */
 	let classes;
+	/** @type {ObjectExpression | undefined} */
 	let styles;
 	let flags = 0;
 
-	let has_await = false;
-
 	if (class_directives.length) {
-		const properties = class_directives.map((directive) => {
-			has_await ||= directive.metadata.expression.has_await;
-
-			return b.init(
+		const properties = class_directives.map((directive) =>
+			b.init(
 				directive.name,
 				directive.expression.type === 'Identifier' && directive.expression.name === directive.name
 					? b.id(directive.name)
@@ -376,24 +445,21 @@ function build_element_spread_attributes(
 							/** @type {Expression} */ (context.visit(directive.expression)),
 							directive.metadata.expression
 						)
-			);
-		});
+			)
+		);
 
 		classes = b.object(properties);
 	}
 
 	if (style_directives.length > 0) {
-		const properties = style_directives.map((directive) => {
-			has_await ||= directive.metadata.expression.has_await;
-
-			return b.init(
+		const properties = style_directives.map((directive) =>
+			b.init(
 				directive.name,
 				directive.value === true
 					? b.id(directive.name)
 					: build_attribute_value(directive.value, context, transform, true)
-			);
-		});
-
+			)
+		);
 		styles = b.object(properties);
 	}
 
@@ -406,17 +472,12 @@ function build_element_spread_attributes(
 	}
 
 	const object = build_spread_object(element, attributes, context, transform);
-
 	const css_hash =
 		element.metadata.scoped && context.state.analysis.css.hash
 			? b.literal(context.state.analysis.css.hash)
 			: undefined;
 
-	const args = [object, css_hash, classes, styles, flags ? b.literal(flags) : undefined];
-
-	let call = b.call('$.attributes', ...args);
-
-	context.state.template.push(call);
+	return [object, css_hash, classes, styles, flags ? b.literal(flags) : undefined];
 }
 
 /**
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 6971f200a0..bbb43a6f3b 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -160,9 +160,16 @@ export class Renderer {
 	/**
 	 * @param {Record<string, any>} attrs
 	 * @param {(renderer: Renderer) => void} fn
+	 * @param {string | undefined} [css_hash]
+	 * @param {Record<string, boolean> | undefined} [classes]
+	 * @param {Record<string, string> | undefined} [styles]
+	 * @param {number | undefined} [flags]
+	 * @returns {void}
 	 */
-	select({ value, ...attrs }, fn) {
-		this.push(`<select${attributes(attrs)}>`);
+	select(attrs, fn, css_hash, classes, styles, flags) {
+		const { value, ...select_attrs } = attrs;
+
+		this.push(`<select${attributes(select_attrs, css_hash, classes, styles, flags)}>`);
 		this.child((renderer) => {
 			renderer.local.select_value = value;
 			fn(renderer);
@@ -173,9 +180,13 @@ export class Renderer {
 	/**
 	 * @param {Record<string, any>} attrs
 	 * @param {string | number | boolean | ((renderer: Renderer) => void)} body
+	 * @param {string | undefined} [css_hash]
+	 * @param {Record<string, boolean> | undefined} [classes]
+	 * @param {Record<string, string> | undefined} [styles]
+	 * @param {number | undefined} [flags]
 	 */
-	option(attrs, body) {
-		this.#out.push(`<option${attributes(attrs)}`);
+	option(attrs, body, css_hash, classes, styles, flags) {
+		this.#out.push(`<option${attributes(attrs, css_hash, classes, styles, flags)}`);
 
 		/**
 		 * @param {Renderer} renderer
diff --git a/packages/svelte/src/internal/server/renderer.test.ts b/packages/svelte/src/internal/server/renderer.test.ts
index 88fbee855a..8e9a377a5b 100644
--- a/packages/svelte/src/internal/server/renderer.test.ts
+++ b/packages/svelte/src/internal/server/renderer.test.ts
@@ -207,6 +207,24 @@ test('selects an option with an implicit value', () => {
 	);
 });
 
+test('select merges scoped css hash with static class', () => {
+	const component = (renderer: Renderer) => {
+		renderer.select(
+			{ class: 'foo', value: 'foo' },
+			(renderer) => {
+				renderer.option({ value: 'foo' }, (renderer) => renderer.push('foo'));
+			},
+			'svelte-hash'
+		);
+	};
+
+	const { head, body } = Renderer.render(component as unknown as Component);
+	expect(head).toBe('');
+	expect(body).toBe(
+		'<!--[--><select class="foo svelte-hash"><option value="foo" selected>foo</option></select><!--]-->'
+	);
+});
+
 describe('async', () => {
 	beforeAll(() => {
 		enable_async_mode_flag();
diff --git a/packages/svelte/tests/server-side-rendering/samples/option-scoped-class/_expected.html b/packages/svelte/tests/server-side-rendering/samples/option-scoped-class/_expected.html
new file mode 100644
index 0000000000..b30e5ff4a1
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/option-scoped-class/_expected.html
@@ -0,0 +1,2 @@
+<select><option class="opt svelte-1l69ci" value="foo" selected>foo</option></select>
+
diff --git a/packages/svelte/tests/server-side-rendering/samples/option-scoped-class/main.svelte b/packages/svelte/tests/server-side-rendering/samples/option-scoped-class/main.svelte
new file mode 100644
index 0000000000..657f1e949d
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/option-scoped-class/main.svelte
@@ -0,0 +1,10 @@
+<select value="foo">
+	<option class="opt" value="foo">foo</option>
+</select>
+
+<style>
+	option {
+		color: red;
+	}
+</style>
+
diff --git a/packages/svelte/tests/server-side-rendering/samples/select-value-scoped-class/_expected.html b/packages/svelte/tests/server-side-rendering/samples/select-value-scoped-class/_expected.html
new file mode 100644
index 0000000000..d74fc96d9c
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/select-value-scoped-class/_expected.html
@@ -0,0 +1 @@
+<select class="foo svelte-18avu97"><option value="foo" selected>foo</option></select>
diff --git a/packages/svelte/tests/server-side-rendering/samples/select-value-scoped-class/main.svelte b/packages/svelte/tests/server-side-rendering/samples/select-value-scoped-class/main.svelte
new file mode 100644
index 0000000000..9ad3a6b4d2
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/select-value-scoped-class/main.svelte
@@ -0,0 +1,9 @@
+<select class="foo" value="foo">
+	<option value="foo">foo</option>
+</select>
+
+<style>
+	select {
+		color: red;
+	}
+</style>

From b92a55994b7349e5c681df97a571481488020bc4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Sep 2025 13:00:20 -0400
Subject: [PATCH 50/68] Version Packages (#16824)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/gold-eels-lay.md        |  5 -----
 .changeset/nasty-comics-play.md    |  5 -----
 .changeset/tasty-snails-dress.md   |  5 -----
 .changeset/wise-bottles-explode.md |  5 -----
 packages/svelte/CHANGELOG.md       | 12 ++++++++++++
 packages/svelte/package.json       |  2 +-
 packages/svelte/src/version.js     |  2 +-
 7 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 .changeset/gold-eels-lay.md
 delete mode 100644 .changeset/nasty-comics-play.md
 delete mode 100644 .changeset/tasty-snails-dress.md
 delete mode 100644 .changeset/wise-bottles-explode.md

diff --git a/.changeset/gold-eels-lay.md b/.changeset/gold-eels-lay.md
deleted file mode 100644
index ef6ceb4dab..0000000000
--- a/.changeset/gold-eels-lay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: depend on reads of deriveds created within reaction (async mode)
diff --git a/.changeset/nasty-comics-play.md b/.changeset/nasty-comics-play.md
deleted file mode 100644
index b75c82c493..0000000000
--- a/.changeset/nasty-comics-play.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: SSR regression of processing attributes of `<select>` and `<option>`
diff --git a/.changeset/tasty-snails-dress.md b/.changeset/tasty-snails-dress.md
deleted file mode 100644
index 0fb847c1ff..0000000000
--- a/.changeset/tasty-snails-dress.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: async `class:` + spread attributes were compiled into sync server-side code
diff --git a/.changeset/wise-bottles-explode.md b/.changeset/wise-bottles-explode.md
deleted file mode 100644
index d3b2931272..0000000000
--- a/.changeset/wise-bottles-explode.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ensure tick resolves within a macrotask
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 2cf08ae409..83bd1d043f 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.39.6
+
+### Patch Changes
+
+- fix: depend on reads of deriveds created within reaction (async mode) ([#16823](https://github.com/sveltejs/svelte/pull/16823))
+
+- fix: SSR regression of processing attributes of `<select>` and `<option>` ([#16821](https://github.com/sveltejs/svelte/pull/16821))
+
+- fix: async `class:` + spread attributes were compiled into sync server-side code ([#16834](https://github.com/sveltejs/svelte/pull/16834))
+
+- fix: ensure tick resolves within a macrotask ([#16825](https://github.com/sveltejs/svelte/pull/16825))
+
 ## 5.39.5
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index a4865da75f..51c6a4f12e 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.39.5",
+  "version": "5.39.6",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 55796a2083..a0271de08b 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.39.5';
+export const VERSION = '5.39.6';
 export const PUBLIC_VERSION = '5';

From f0cede678200a3da2fbed6e84245dbef9ec0ecec Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 25 Sep 2025 13:45:31 -0400
Subject: [PATCH 51/68] chore: replace queue_idle_task with queue_micro_task
 (#16844)

---
 .../client/dom/elements/attributes.js         |  4 +--
 .../svelte/src/internal/client/dom/task.js    | 32 +------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/elements/attributes.js b/packages/svelte/src/internal/client/dom/elements/attributes.js
index fb6a92cc82..a5f63359c9 100644
--- a/packages/svelte/src/internal/client/dom/elements/attributes.js
+++ b/packages/svelte/src/internal/client/dom/elements/attributes.js
@@ -6,7 +6,7 @@ import { create_event, delegate } from './events.js';
 import { add_form_reset_listener, autofocus } from './misc.js';
 import * as w from '../../warnings.js';
 import { LOADING_ATTR_SYMBOL } from '#client/constants';
-import { queue_idle_task } from '../task.js';
+import { queue_micro_task } from '../task.js';
 import { is_capture_event, is_delegated, normalize_attribute } from '../../../../utils.js';
 import {
 	active_effect,
@@ -65,7 +65,7 @@ export function remove_input_defaults(input) {
 
 	// @ts-expect-error
 	input.__on_r = remove_defaults;
-	queue_idle_task(remove_defaults);
+	queue_micro_task(remove_defaults);
 	add_form_reset_listener();
 }
 
diff --git a/packages/svelte/src/internal/client/dom/task.js b/packages/svelte/src/internal/client/dom/task.js
index 938f3ccda2..1a47eee6cf 100644
--- a/packages/svelte/src/internal/client/dom/task.js
+++ b/packages/svelte/src/internal/client/dom/task.js
@@ -1,32 +1,17 @@
 import { run_all } from '../../shared/utils.js';
 import { is_flushing_sync } from '../reactivity/batch.js';
 
-// Fallback for when requestIdleCallback is not available
-const request_idle_callback =
-	typeof requestIdleCallback === 'undefined'
-		? (/** @type {() => void} */ cb) => setTimeout(cb, 1)
-		: requestIdleCallback;
-
 /** @type {Array<() => void>} */
 let micro_tasks = [];
 
-/** @type {Array<() => void>} */
-let idle_tasks = [];
-
 function run_micro_tasks() {
 	var tasks = micro_tasks;
 	micro_tasks = [];
 	run_all(tasks);
 }
 
-function run_idle_tasks() {
-	var tasks = idle_tasks;
-	idle_tasks = [];
-	run_all(tasks);
-}
-
 export function has_pending_tasks() {
-	return micro_tasks.length > 0 || idle_tasks.length > 0;
+	return micro_tasks.length > 0;
 }
 
 /**
@@ -51,17 +36,6 @@ export function queue_micro_task(fn) {
 	micro_tasks.push(fn);
 }
 
-/**
- * @param {() => void} fn
- */
-export function queue_idle_task(fn) {
-	if (idle_tasks.length === 0) {
-		request_idle_callback(run_idle_tasks);
-	}
-
-	idle_tasks.push(fn);
-}
-
 /**
  * Synchronously run any queued tasks.
  */
@@ -69,8 +43,4 @@ export function flush_tasks() {
 	if (micro_tasks.length > 0) {
 		run_micro_tasks();
 	}
-
-	if (idle_tasks.length > 0) {
-		run_idle_tasks();
-	}
 }

From ed0a39345b5e453abfdd5b4d921f3c5675dddea7 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 25 Sep 2025 14:36:47 -0400
Subject: [PATCH 52/68] chore: simplify batch logic (#16838)

* always delete a batch once committed

* activate inside flush

* centralise logic

* chore: simplify batch logic a bit more (#16845)

* more

* remove unnecessary flushSync

* simplify
---
 .../src/internal/client/dom/blocks/await.js   |  4 +-
 .../svelte/src/internal/client/dom/task.js    |  6 +--
 .../src/internal/client/reactivity/async.js   |  1 -
 .../src/internal/client/reactivity/batch.js   | 37 +++++++------------
 4 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js
index 8605812f1e..e7917fbd9e 100644
--- a/packages/svelte/src/internal/client/dom/blocks/await.js
+++ b/packages/svelte/src/internal/client/dom/blocks/await.js
@@ -22,7 +22,7 @@ import {
 	set_dev_current_component_function,
 	set_dev_stack
 } from '../../context.js';
-import { flushSync } from '../../reactivity/batch.js';
+import { flushSync, is_flushing_sync } from '../../reactivity/batch.js';
 
 const PENDING = 0;
 const THEN = 1;
@@ -126,7 +126,7 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) {
 
 				// without this, the DOM does not update until two ticks after the promise
 				// resolves, which is unexpected behaviour (and somewhat irksome to test)
-				flushSync();
+				if (!is_flushing_sync) flushSync();
 			}
 		}
 	}
diff --git a/packages/svelte/src/internal/client/dom/task.js b/packages/svelte/src/internal/client/dom/task.js
index 1a47eee6cf..8c51361467 100644
--- a/packages/svelte/src/internal/client/dom/task.js
+++ b/packages/svelte/src/internal/client/dom/task.js
@@ -10,10 +10,6 @@ function run_micro_tasks() {
 	run_all(tasks);
 }
 
-export function has_pending_tasks() {
-	return micro_tasks.length > 0;
-}
-
 /**
  * @param {() => void} fn
  */
@@ -40,7 +36,7 @@ export function queue_micro_task(fn) {
  * Synchronously run any queued tasks.
  */
 export function flush_tasks() {
-	if (micro_tasks.length > 0) {
+	while (micro_tasks.length > 0) {
 		run_micro_tasks();
 	}
 }
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index a9126f1a5c..4d572281b7 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -244,7 +244,6 @@ export async function async_body(fn) {
 		if (pending) {
 			batch.flush();
 		} else {
-			batch.activate();
 			batch.decrement();
 		}
 
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 35aff7d4c9..8cf0e4bd9d 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -23,7 +23,7 @@ import {
 	update_effect
 } from '../runtime.js';
 import * as e from '../errors.js';
-import { flush_tasks, has_pending_tasks, queue_micro_task } from '../dom/task.js';
+import { flush_tasks, queue_micro_task } from '../dom/task.js';
 import { DEV } from 'esm-env';
 import { invoke_error_boundary } from '../error-handling.js';
 import { old_values } from './sources.js';
@@ -216,15 +216,6 @@ export class Batch {
 			flush_queued_effects(render_effects);
 			flush_queued_effects(effects);
 
-			// Reinstate the current batch if there was no new one created, as `process()` runs in a loop in `flush_effects()`.
-			// That method expects `current_batch` to be set, and could run the loop again if effects result in new effects
-			// being scheduled but without writes happening in which case no new batch is created.
-			if (current_batch === null) {
-				current_batch = this;
-			} else {
-				batches.delete(this);
-			}
-
 			this.#deferred?.resolve();
 		} else {
 			this.#defer_effects(this.#render_effects);
@@ -365,19 +356,15 @@ export class Batch {
 
 	flush() {
 		if (queued_root_effects.length > 0) {
+			this.activate();
 			flush_effects();
-		} else {
-			this.#commit();
-		}
-
-		if (current_batch !== this) {
-			// this can happen if a `flushSync` occurred during `flush_effects()`,
-			// which is permitted in legacy mode despite being a terrible idea
-			return;
-		}
 
-		if (this.#pending === 0) {
-			batches.delete(this);
+			if (current_batch !== null && current_batch !== this) {
+				// this can happen if a new batch was created during `flush_effects()`
+				return;
+			}
+		} else if (this.#pending === 0) {
+			this.#commit();
 		}
 
 		this.deactivate();
@@ -394,6 +381,7 @@ export class Batch {
 		}
 
 		this.#callbacks.clear();
+		batches.delete(this);
 	}
 
 	increment() {
@@ -478,14 +466,17 @@ export function flushSync(fn) {
 		var result;
 
 		if (fn) {
-			flush_effects();
+			if (current_batch !== null) {
+				flush_effects();
+			}
+
 			result = fn();
 		}
 
 		while (true) {
 			flush_tasks();
 
-			if (queued_root_effects.length === 0 && !has_pending_tasks()) {
+			if (queued_root_effects.length === 0) {
 				current_batch?.flush();
 
 				// we need to check again, in case we just updated an `$effect.pending()`

From 12e1c81fe64c2754484e6ca2b89399258154e12c Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 25 Sep 2025 14:38:48 -0400
Subject: [PATCH 53/68] chore: add missing changeset for #16838 and #16845
 (#16847)

---
 .changeset/clever-turtles-wink.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/clever-turtles-wink.md

diff --git a/.changeset/clever-turtles-wink.md b/.changeset/clever-turtles-wink.md
new file mode 100644
index 0000000000..6ff21f4d91
--- /dev/null
+++ b/.changeset/clever-turtles-wink.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: simplify batch logic

From bb33c555b49b27ecd01afc742a7cf257b494b0b5 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Fri, 26 Sep 2025 20:46:26 +0200
Subject: [PATCH 54/68] chore: bump some dev deps, harden github actions
 (#16851)

---
 .github/workflows/ecosystem-ci-trigger.yml |   2 +
 .github/workflows/pkg.pr.new.yml           |   2 +
 package.json                               |   2 +-
 packages/svelte/package.json               |   2 +-
 pnpm-lock.yaml                             | 442 +++++++++------------
 5 files changed, 194 insertions(+), 256 deletions(-)

diff --git a/.github/workflows/ecosystem-ci-trigger.yml b/.github/workflows/ecosystem-ci-trigger.yml
index 7753b606e1..aa08df2f84 100644
--- a/.github/workflows/ecosystem-ci-trigger.yml
+++ b/.github/workflows/ecosystem-ci-trigger.yml
@@ -4,6 +4,8 @@ on:
   issue_comment:
     types: [created]
 
+permissions: {}
+
 jobs:
   trigger:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pkg.pr.new.yml b/.github/workflows/pkg.pr.new.yml
index b1ba217e5a..49303f1684 100644
--- a/.github/workflows/pkg.pr.new.yml
+++ b/.github/workflows/pkg.pr.new.yml
@@ -1,6 +1,8 @@
 name: Publish Any Commit
 on: [push, pull_request]
 
+permissions: {}
+
 jobs:
   build:
     permissions: {}
diff --git a/package.json b/package.json
index df882141ac..ad60494bf2 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "bench:debug": "node --allow-natives-syntax --inspect-brk ./benchmarking/run.js"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.27.8",
+    "@changesets/cli": "^2.29.7",
     "@sveltejs/eslint-config": "^8.3.3",
     "@svitejs/changesets-changelog-github-compact": "^1.1.0",
     "@types/node": "^20.11.5",
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 51c6a4f12e..41a32f4a79 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -158,7 +158,7 @@
     "@types/aria-query": "^5.0.4",
     "@types/node": "^20.11.5",
     "dts-buddy": "^0.5.5",
-    "esbuild": "^0.21.5",
+    "esbuild": "^0.25.10",
     "rollup": "^4.22.4",
     "source-map": "^0.7.4",
     "tinyglobby": "^0.2.12",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 39a504e504..f585619252 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     devDependencies:
       '@changesets/cli':
-        specifier: ^2.27.8
-        version: 2.27.8
+        specifier: ^2.29.7
+        version: 2.29.7(@types/node@20.19.17)
       '@sveltejs/eslint-config':
         specifier: ^8.3.3
         version: 8.3.3(@stylistic/eslint-plugin-js@1.8.0(eslint@9.9.1))(eslint-config-prettier@9.1.0(eslint@9.9.1))(eslint-plugin-n@17.16.1(eslint@9.9.1)(typescript@5.5.4))(eslint-plugin-svelte@3.11.0(eslint@9.9.1)(svelte@packages+svelte))(eslint@9.9.1)(typescript-eslint@8.26.0(eslint@9.9.1)(typescript@5.5.4))(typescript@5.5.4)
@@ -19,13 +19,13 @@ importers:
         version: 1.1.0
       '@types/node':
         specifier: ^20.11.5
-        version: 20.12.7
+        version: 20.19.17
       '@types/picomatch':
         specifier: ^4.0.2
         version: 4.0.2
       '@vitest/coverage-v8':
         specifier: ^2.1.9
-        version: 2.1.9(vitest@2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+        version: 2.1.9(vitest@2.1.9(@types/node@20.19.17)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
       eslint:
         specifier: ^9.9.1
         version: 9.9.1
@@ -61,7 +61,7 @@ importers:
         version: 1.2.5
       vitest:
         specifier: ^2.1.9
-        version: 2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+        version: 2.1.9(@types/node@20.19.17)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
 
   packages/svelte:
     dependencies:
@@ -110,7 +110,7 @@ importers:
     devDependencies:
       '@jridgewell/trace-mapping':
         specifier: ^0.3.25
-        version: 0.3.25
+        version: 0.3.31
       '@playwright/test':
         specifier: ^1.46.1
         version: 1.46.1
@@ -131,13 +131,13 @@ importers:
         version: 5.0.4
       '@types/node':
         specifier: ^20.11.5
-        version: 20.12.7
+        version: 20.19.17
       dts-buddy:
         specifier: ^0.5.5
         version: 0.5.5(typescript@5.5.4)
       esbuild:
-        specifier: ^0.21.5
-        version: 0.21.5
+        specifier: ^0.25.10
+        version: 0.25.10
       rollup:
         specifier: ^4.22.4
         version: 4.50.1
@@ -152,7 +152,7 @@ importers:
         version: 5.5.4
       vitest:
         specifier: ^2.1.9
-        version: 2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+        version: 2.1.9(@types/node@20.19.17)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
 
   playgrounds/sandbox:
     devDependencies:
@@ -215,63 +215,63 @@ packages:
   '@bcoe/v8-coverage@0.2.3':
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
-  '@changesets/apply-release-plan@7.0.5':
-    resolution: {integrity: sha512-1cWCk+ZshEkSVEZrm2fSj1Gz8sYvxgUL4Q78+1ZZqeqfuevPTPk033/yUZ3df8BKMohkqqHfzj0HOOrG0KtXTw==}
+  '@changesets/apply-release-plan@7.0.13':
+    resolution: {integrity: sha512-BIW7bofD2yAWoE8H4V40FikC+1nNFEKBisMECccS16W1rt6qqhNTBDmIw5HaqmMgtLNz9e7oiALiEUuKrQ4oHg==}
 
-  '@changesets/assemble-release-plan@6.0.4':
-    resolution: {integrity: sha512-nqICnvmrwWj4w2x0fOhVj2QEGdlUuwVAwESrUo5HLzWMI1rE5SWfsr9ln+rDqWB6RQ2ZyaMZHUcU7/IRaUJS+Q==}
+  '@changesets/assemble-release-plan@6.0.9':
+    resolution: {integrity: sha512-tPgeeqCHIwNo8sypKlS3gOPmsS3wP0zHt67JDuL20P4QcXiw/O4Hl7oXiuLnP9yg+rXLQ2sScdV1Kkzde61iSQ==}
 
-  '@changesets/changelog-git@0.2.0':
-    resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==}
+  '@changesets/changelog-git@0.2.1':
+    resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==}
 
-  '@changesets/cli@2.27.8':
-    resolution: {integrity: sha512-gZNyh+LdSsI82wBSHLQ3QN5J30P4uHKJ4fXgoGwQxfXwYFTJzDdvIJasZn8rYQtmKhyQuiBj4SSnLuKlxKWq4w==}
+  '@changesets/cli@2.29.7':
+    resolution: {integrity: sha512-R7RqWoaksyyKXbKXBTbT4REdy22yH81mcFK6sWtqSanxUCbUi9Uf+6aqxZtDQouIqPdem2W56CdxXgsxdq7FLQ==}
     hasBin: true
 
-  '@changesets/config@3.0.3':
-    resolution: {integrity: sha512-vqgQZMyIcuIpw9nqFIpTSNyc/wgm/Lu1zKN5vECy74u95Qx/Wa9g27HdgO4NkVAaq+BGA8wUc/qvbvVNs93n6A==}
+  '@changesets/config@3.1.1':
+    resolution: {integrity: sha512-bd+3Ap2TKXxljCggI0mKPfzCQKeV/TU4yO2h2C6vAihIo8tzseAn2e7klSuiyYYXvgu53zMN1OeYMIQkaQoWnA==}
 
   '@changesets/errors@0.2.0':
     resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==}
 
-  '@changesets/get-dependents-graph@2.1.2':
-    resolution: {integrity: sha512-sgcHRkiBY9i4zWYBwlVyAjEM9sAzs4wYVwJUdnbDLnVG3QwAaia1Mk5P8M7kraTOZN+vBET7n8KyB0YXCbFRLQ==}
+  '@changesets/get-dependents-graph@2.1.3':
+    resolution: {integrity: sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==}
 
   '@changesets/get-github-info@0.5.2':
     resolution: {integrity: sha512-JppheLu7S114aEs157fOZDjFqUDpm7eHdq5E8SSR0gUBTEK0cNSHsrSR5a66xs0z3RWuo46QvA3vawp8BxDHvg==}
 
-  '@changesets/get-release-plan@4.0.4':
-    resolution: {integrity: sha512-SicG/S67JmPTrdcc9Vpu0wSQt7IiuN0dc8iR5VScnnTVPfIaLvKmEGRvIaF0kcn8u5ZqLbormZNTO77bCEvyWw==}
+  '@changesets/get-release-plan@4.0.13':
+    resolution: {integrity: sha512-DWG1pus72FcNeXkM12tx+xtExyH/c9I1z+2aXlObH3i9YA7+WZEVaiHzHl03thpvAgWTRaH64MpfHxozfF7Dvg==}
 
   '@changesets/get-version-range-type@0.4.0':
     resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==}
 
-  '@changesets/git@3.0.1':
-    resolution: {integrity: sha512-pdgHcYBLCPcLd82aRcuO0kxCDbw/yISlOtkmwmE8Odo1L6hSiZrBOsRl84eYG7DRCab/iHnOkWqExqc4wxk2LQ==}
+  '@changesets/git@3.0.4':
+    resolution: {integrity: sha512-BXANzRFkX+XcC1q/d27NKvlJ1yf7PSAgi8JG6dt8EfbHFHi4neau7mufcSca5zRhwOL8j9s6EqsxmT+s+/E6Sw==}
 
   '@changesets/logger@0.1.1':
     resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==}
 
-  '@changesets/parse@0.4.0':
-    resolution: {integrity: sha512-TS/9KG2CdGXS27S+QxbZXgr8uPsP4yNJYb4BC2/NeFUj80Rni3TeD2qwWmabymxmrLo7JEsytXH1FbpKTbvivw==}
+  '@changesets/parse@0.4.1':
+    resolution: {integrity: sha512-iwksMs5Bf/wUItfcg+OXrEpravm5rEd9Bf4oyIPL4kVTmJQ7PNDSd6MDYkpSJR1pn7tz/k8Zf2DhTCqX08Ou+Q==}
 
-  '@changesets/pre@2.0.1':
-    resolution: {integrity: sha512-vvBJ/If4jKM4tPz9JdY2kGOgWmCowUYOi5Ycv8dyLnEE8FgpYYUo1mgJZxcdtGGP3aG8rAQulGLyyXGSLkIMTQ==}
+  '@changesets/pre@2.0.2':
+    resolution: {integrity: sha512-HaL/gEyFVvkf9KFg6484wR9s0qjAXlZ8qWPDkTyKF6+zqjBe/I2mygg3MbpZ++hdi0ToqNUF8cjj7fBy0dg8Ug==}
 
-  '@changesets/read@0.6.1':
-    resolution: {integrity: sha512-jYMbyXQk3nwP25nRzQQGa1nKLY0KfoOV7VLgwucI0bUO8t8ZLCr6LZmgjXsiKuRDc+5A6doKPr9w2d+FEJ55zQ==}
+  '@changesets/read@0.6.5':
+    resolution: {integrity: sha512-UPzNGhsSjHD3Veb0xO/MwvasGe8eMyNrR/sT9gR8Q3DhOQZirgKhhXv/8hVsI0QpPjR004Z9iFxoJU6in3uGMg==}
 
-  '@changesets/should-skip-package@0.1.1':
-    resolution: {integrity: sha512-H9LjLbF6mMHLtJIc/eHR9Na+MifJ3VxtgP/Y+XLn4BF7tDTEN1HNYtH6QMcjP1uxp9sjaFYmW8xqloaCi/ckTg==}
+  '@changesets/should-skip-package@0.1.2':
+    resolution: {integrity: sha512-qAK/WrqWLNCP22UDdBTMPH5f41elVDlsNyat180A33dWxuUDyNpg6fPi/FyTZwRriVjg0L8gnjJn2F9XAoF0qw==}
 
   '@changesets/types@4.1.0':
     resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==}
 
-  '@changesets/types@6.0.0':
-    resolution: {integrity: sha512-b1UkfNulgKoWfqyHtzKS5fOZYSJO+77adgL7DLRDr+/7jhChN+QcHnbjiQVOz/U+Ts3PGNySq7diAItzDgugfQ==}
+  '@changesets/types@6.1.0':
+    resolution: {integrity: sha512-rKQcJ+o1nKNgeoYRHKOS07tAMNd3YSN0uHaJOZYjBAgxfV7TUE7JE+z4BzZdQwb5hKaYbayKN5KrYV7ODb2rAA==}
 
-  '@changesets/write@0.3.2':
-    resolution: {integrity: sha512-kDxDrPNpUgsjDbWBvUo27PzKX4gqeKOlhibaOXDJA6kuBisGqNHv/HwGJrAu8U/dSf8ZEFIeHIPtvSlZI1kULw==}
+  '@changesets/write@0.4.0':
+    resolution: {integrity: sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==}
 
   '@esbuild/aix-ppc64@0.21.5':
     resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
@@ -601,6 +601,15 @@ packages:
     resolution: {integrity: sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==}
     engines: {node: '>=18.18'}
 
+  '@inquirer/external-editor@1.0.2':
+    resolution: {integrity: sha512-yy9cOoBnx58TlsPrIxauKIFQTiyH+0MK4e97y4sV9ERbI+zDxw7i2hxHLCIEGIE/8PPvDxGhgzIOTSOWcs6/MQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
   '@isaacs/cliui@8.0.2':
     resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
     engines: {node: '>=12'}
@@ -630,8 +639,8 @@ packages:
   '@jridgewell/sourcemap-codec@1.5.0':
     resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
 
-  '@jridgewell/trace-mapping@0.3.25':
-    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+  '@jridgewell/trace-mapping@0.3.31':
+    resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
   '@manypkg/find-root@1.1.0':
     resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==}
@@ -869,8 +878,8 @@ packages:
   '@types/node@12.20.55':
     resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==}
 
-  '@types/node@20.12.7':
-    resolution: {integrity: sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==}
+  '@types/node@20.19.17':
+    resolution: {integrity: sha512-gfehUI8N1z92kygssiuWvLiwcbOB3IRktR6hTDgJlXMYh5OvkPSRmgfoBUmfZt+vhwJtX7v1Yw4KvvAf7c5QKQ==}
 
   '@types/node@24.5.2':
     resolution: {integrity: sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==}
@@ -881,9 +890,6 @@ packages:
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
-  '@types/semver@7.5.6':
-    resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==}
-
   '@typescript-eslint/eslint-plugin@8.26.0':
     resolution: {integrity: sha512-cLr1J6pe56zjKYajK6SSSre6nl1Gj6xDp1TY0trpgPzjVbgDwd09v2Ws37LABxzkicmUjhEeg/fAUjPJJB1v5Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1115,16 +1121,16 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
-  chai@5.1.2:
-    resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==}
-    engines: {node: '>=12'}
+  chai@5.3.3:
+    resolution: {integrity: sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==}
+    engines: {node: '>=18'}
 
   chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
 
-  chardet@0.7.0:
-    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
+  chardet@2.1.0:
+    resolution: {integrity: sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==}
 
   check-error@2.1.1:
     resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==}
@@ -1162,11 +1168,8 @@ packages:
   concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  cross-spawn@5.1.0:
-    resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
-
-  cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
   cssesc@3.0.0:
@@ -1271,8 +1274,8 @@ packages:
   error-stack-parser-es@1.0.5:
     resolution: {integrity: sha512-5qucVt2XcuGMcEGgWI7i+yZpmpByQ8J1lHhcL7PwqCwu9FPP3VUXzT4ltHe5i2z9dePwEHcDVOAfSnHsOlCXRA==}
 
-  es-module-lexer@1.6.0:
-    resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
+  es-module-lexer@1.7.0:
+    resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}
 
   esbuild@0.21.5:
     resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
@@ -1388,17 +1391,13 @@ packages:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
 
-  expect-type@1.1.0:
-    resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==}
+  expect-type@1.2.2:
+    resolution: {integrity: sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==}
     engines: {node: '>=12.0.0'}
 
   extendable-error@0.1.7:
     resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==}
 
-  external-editor@3.1.0:
-    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
-    engines: {node: '>=4'}
-
   fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
@@ -1536,17 +1535,18 @@ packages:
     resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
     engines: {node: '>= 14'}
 
-  human-id@1.0.2:
-    resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==}
-
-  iconv-lite@0.4.24:
-    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
-    engines: {node: '>=0.10.0'}
+  human-id@4.1.1:
+    resolution: {integrity: sha512-3gKm/gCSUipeLsRYZbbdA1BD83lBoWUkZ7G9VFrhWPAU76KwYo5KR8V28bpoPm/ygy0x5/GCbpRQdY7VLYCoIg==}
+    hasBin: true
 
   iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
 
+  iconv-lite@0.7.0:
+    resolution: {integrity: sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==}
+    engines: {node: '>=0.10.0'}
+
   ignore@5.3.2:
     resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
     engines: {node: '>= 4'}
@@ -1767,15 +1767,12 @@ packages:
   lodash.startcase@4.4.0:
     resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==}
 
-  loupe@3.1.3:
-    resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
+  loupe@3.2.1:
+    resolution: {integrity: sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==}
 
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
-  lru-cache@4.1.5:
-    resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
-
   magic-string@0.30.17:
     resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
 
@@ -1859,10 +1856,6 @@ packages:
     resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
 
-  os-tmpdir@1.0.2:
-    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
-    engines: {node: '>=0.10.0'}
-
   outdent@0.5.0:
     resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==}
 
@@ -2020,9 +2013,6 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
-  pseudomap@1.0.2:
-    resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
-
   punycode@2.3.1:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
@@ -2109,18 +2099,10 @@ packages:
   serialize-javascript@6.0.2:
     resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==}
 
-  shebang-command@1.2.0:
-    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
-    engines: {node: '>=0.10.0'}
-
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
 
-  shebang-regex@1.0.0:
-    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
-    engines: {node: '>=0.10.0'}
-
   shebang-regex@3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
@@ -2128,9 +2110,6 @@ packages:
   siginfo@2.0.0:
     resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
 
-  signal-exit@3.0.7:
-    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
-
   signal-exit@4.1.0:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
@@ -2161,8 +2140,8 @@ packages:
     resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
     engines: {node: '>= 8'}
 
-  spawndamnit@2.0.0:
-    resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==}
+  spawndamnit@3.0.1:
+    resolution: {integrity: sha512-MmnduQUuHCoFckZoWnXsTg7JaiLBJrKFj9UI2MbRPGaJeVpsLcVBu6P/IGZovziM/YBsellCmsprgNA+w0CzVg==}
 
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
@@ -2170,8 +2149,8 @@ packages:
   stackback@0.0.2:
     resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
 
-  std-env@3.8.0:
-    resolution: {integrity: sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==}
+  std-env@3.9.0:
+    resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==}
 
   string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
@@ -2247,8 +2226,8 @@ packages:
     resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
     engines: {node: '>=12.0.0'}
 
-  tinypool@1.0.2:
-    resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==}
+  tinypool@1.1.1:
+    resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==}
     engines: {node: ^18.0.0 || >=20.0.0}
 
   tinyrainbow@1.2.0:
@@ -2266,10 +2245,6 @@ packages:
     resolution: {integrity: sha512-ph4AE5BXWIOsSy9stpoeo7bYe/Cy7VfpciIH4RhVZUPItCJmhqWCN0EVzxd8BOHiyNb42vuJc6NWTjJkg91Tuw==}
     hasBin: true
 
-  tmp@0.0.33:
-    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
-    engines: {node: '>=0.6.0'}
-
   to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
@@ -2330,8 +2305,8 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  undici-types@5.26.5:
-    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+  undici-types@6.21.0:
+    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
   undici-types@7.12.0:
     resolution: {integrity: sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==}
@@ -2518,10 +2493,6 @@ packages:
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
-  which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
-
   which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
@@ -2563,9 +2534,6 @@ packages:
   xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
 
-  yallist@2.1.2:
-    resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
-
   yaml@1.10.2:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
@@ -2584,7 +2552,7 @@ snapshots:
   '@ampproject/remapping@2.3.0':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.31
 
   '@babel/helper-string-parser@7.24.8': {}
 
@@ -2606,13 +2574,13 @@ snapshots:
 
   '@bcoe/v8-coverage@0.2.3': {}
 
-  '@changesets/apply-release-plan@7.0.5':
+  '@changesets/apply-release-plan@7.0.13':
     dependencies:
-      '@changesets/config': 3.0.3
+      '@changesets/config': 3.1.1
       '@changesets/get-version-range-type': 0.4.0
-      '@changesets/git': 3.0.1
-      '@changesets/should-skip-package': 0.1.1
-      '@changesets/types': 6.0.0
+      '@changesets/git': 3.0.4
+      '@changesets/should-skip-package': 0.1.2
+      '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
       detect-indent: 6.1.0
       fs-extra: 7.0.1
@@ -2622,58 +2590,58 @@ snapshots:
       resolve-from: 5.0.0
       semver: 7.7.2
 
-  '@changesets/assemble-release-plan@6.0.4':
+  '@changesets/assemble-release-plan@6.0.9':
     dependencies:
       '@changesets/errors': 0.2.0
-      '@changesets/get-dependents-graph': 2.1.2
-      '@changesets/should-skip-package': 0.1.1
-      '@changesets/types': 6.0.0
+      '@changesets/get-dependents-graph': 2.1.3
+      '@changesets/should-skip-package': 0.1.2
+      '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
       semver: 7.7.2
 
-  '@changesets/changelog-git@0.2.0':
+  '@changesets/changelog-git@0.2.1':
     dependencies:
-      '@changesets/types': 6.0.0
+      '@changesets/types': 6.1.0
 
-  '@changesets/cli@2.27.8':
+  '@changesets/cli@2.29.7(@types/node@20.19.17)':
     dependencies:
-      '@changesets/apply-release-plan': 7.0.5
-      '@changesets/assemble-release-plan': 6.0.4
-      '@changesets/changelog-git': 0.2.0
-      '@changesets/config': 3.0.3
+      '@changesets/apply-release-plan': 7.0.13
+      '@changesets/assemble-release-plan': 6.0.9
+      '@changesets/changelog-git': 0.2.1
+      '@changesets/config': 3.1.1
       '@changesets/errors': 0.2.0
-      '@changesets/get-dependents-graph': 2.1.2
-      '@changesets/get-release-plan': 4.0.4
-      '@changesets/git': 3.0.1
+      '@changesets/get-dependents-graph': 2.1.3
+      '@changesets/get-release-plan': 4.0.13
+      '@changesets/git': 3.0.4
       '@changesets/logger': 0.1.1
-      '@changesets/pre': 2.0.1
-      '@changesets/read': 0.6.1
-      '@changesets/should-skip-package': 0.1.1
-      '@changesets/types': 6.0.0
-      '@changesets/write': 0.3.2
+      '@changesets/pre': 2.0.2
+      '@changesets/read': 0.6.5
+      '@changesets/should-skip-package': 0.1.2
+      '@changesets/types': 6.1.0
+      '@changesets/write': 0.4.0
+      '@inquirer/external-editor': 1.0.2(@types/node@20.19.17)
       '@manypkg/get-packages': 1.1.3
-      '@types/semver': 7.5.6
       ansi-colors: 4.1.3
       ci-info: 3.9.0
       enquirer: 2.4.1
-      external-editor: 3.1.0
       fs-extra: 7.0.1
       mri: 1.2.0
-      outdent: 0.5.0
       p-limit: 2.3.0
       package-manager-detector: 0.2.0
       picocolors: 1.1.1
       resolve-from: 5.0.0
       semver: 7.7.2
-      spawndamnit: 2.0.0
+      spawndamnit: 3.0.1
       term-size: 2.2.1
+    transitivePeerDependencies:
+      - '@types/node'
 
-  '@changesets/config@3.0.3':
+  '@changesets/config@3.1.1':
     dependencies:
       '@changesets/errors': 0.2.0
-      '@changesets/get-dependents-graph': 2.1.2
+      '@changesets/get-dependents-graph': 2.1.3
       '@changesets/logger': 0.1.1
-      '@changesets/types': 6.0.0
+      '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
       fs-extra: 7.0.1
       micromatch: 4.0.8
@@ -2682,9 +2650,9 @@ snapshots:
     dependencies:
       extendable-error: 0.1.7
 
-  '@changesets/get-dependents-graph@2.1.2':
+  '@changesets/get-dependents-graph@2.1.3':
     dependencies:
-      '@changesets/types': 6.0.0
+      '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
       picocolors: 1.1.1
       semver: 7.7.2
@@ -2696,65 +2664,65 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@changesets/get-release-plan@4.0.4':
+  '@changesets/get-release-plan@4.0.13':
     dependencies:
-      '@changesets/assemble-release-plan': 6.0.4
-      '@changesets/config': 3.0.3
-      '@changesets/pre': 2.0.1
-      '@changesets/read': 0.6.1
-      '@changesets/types': 6.0.0
+      '@changesets/assemble-release-plan': 6.0.9
+      '@changesets/config': 3.1.1
+      '@changesets/pre': 2.0.2
+      '@changesets/read': 0.6.5
+      '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
 
   '@changesets/get-version-range-type@0.4.0': {}
 
-  '@changesets/git@3.0.1':
+  '@changesets/git@3.0.4':
     dependencies:
       '@changesets/errors': 0.2.0
       '@manypkg/get-packages': 1.1.3
       is-subdir: 1.2.0
       micromatch: 4.0.8
-      spawndamnit: 2.0.0
+      spawndamnit: 3.0.1
 
   '@changesets/logger@0.1.1':
     dependencies:
       picocolors: 1.1.1
 
-  '@changesets/parse@0.4.0':
+  '@changesets/parse@0.4.1':
     dependencies:
-      '@changesets/types': 6.0.0
+      '@changesets/types': 6.1.0
       js-yaml: 3.14.1
 
-  '@changesets/pre@2.0.1':
+  '@changesets/pre@2.0.2':
     dependencies:
       '@changesets/errors': 0.2.0
-      '@changesets/types': 6.0.0
+      '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
       fs-extra: 7.0.1
 
-  '@changesets/read@0.6.1':
+  '@changesets/read@0.6.5':
     dependencies:
-      '@changesets/git': 3.0.1
+      '@changesets/git': 3.0.4
       '@changesets/logger': 0.1.1
-      '@changesets/parse': 0.4.0
-      '@changesets/types': 6.0.0
+      '@changesets/parse': 0.4.1
+      '@changesets/types': 6.1.0
       fs-extra: 7.0.1
       p-filter: 2.1.0
       picocolors: 1.1.1
 
-  '@changesets/should-skip-package@0.1.1':
+  '@changesets/should-skip-package@0.1.2':
     dependencies:
-      '@changesets/types': 6.0.0
+      '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
 
   '@changesets/types@4.1.0': {}
 
-  '@changesets/types@6.0.0': {}
+  '@changesets/types@6.1.0': {}
 
-  '@changesets/write@0.3.2':
+  '@changesets/write@0.4.0':
     dependencies:
-      '@changesets/types': 6.0.0
+      '@changesets/types': 6.1.0
       fs-extra: 7.0.1
-      human-id: 1.0.2
+      human-id: 4.1.1
       prettier: 2.8.8
 
   '@esbuild/aix-ppc64@0.21.5':
@@ -2941,6 +2909,13 @@ snapshots:
 
   '@humanwhocodes/retry@0.3.0': {}
 
+  '@inquirer/external-editor@1.0.2(@types/node@20.19.17)':
+    dependencies:
+      chardet: 2.1.0
+      iconv-lite: 0.7.0
+    optionalDependencies:
+      '@types/node': 20.19.17
+
   '@isaacs/cliui@8.0.2':
     dependencies:
       string-width: 5.1.2
@@ -2956,12 +2931,12 @@ snapshots:
     dependencies:
       '@jridgewell/set-array': 1.2.1
       '@jridgewell/sourcemap-codec': 1.5.0
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.31
 
   '@jridgewell/remapping@2.3.4':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.31
 
   '@jridgewell/resolve-uri@3.1.1': {}
 
@@ -2970,11 +2945,11 @@ snapshots:
   '@jridgewell/source-map@0.3.6':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.31
 
   '@jridgewell/sourcemap-codec@1.5.0': {}
 
-  '@jridgewell/trace-mapping@0.3.25':
+  '@jridgewell/trace-mapping@0.3.31':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.1
       '@jridgewell/sourcemap-codec': 1.5.0
@@ -3186,9 +3161,9 @@ snapshots:
 
   '@types/node@12.20.55': {}
 
-  '@types/node@20.12.7':
+  '@types/node@20.19.17':
     dependencies:
-      undici-types: 5.26.5
+      undici-types: 6.21.0
 
   '@types/node@24.5.2':
     dependencies:
@@ -3198,8 +3173,6 @@ snapshots:
 
   '@types/resolve@1.20.2': {}
 
-  '@types/semver@7.5.6': {}
-
   '@typescript-eslint/eslint-plugin@8.26.0(@typescript-eslint/parser@8.26.0(eslint@9.9.1)(typescript@5.5.4))(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
       '@eslint-community/regexpp': 4.12.1
@@ -3329,7 +3302,7 @@ snapshots:
       '@typescript-eslint/types': 8.43.0
       eslint-visitor-keys: 4.2.1
 
-  '@vitest/coverage-v8@2.1.9(vitest@2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
+  '@vitest/coverage-v8@2.1.9(vitest@2.1.9(@types/node@20.19.17)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 0.2.3
@@ -3340,10 +3313,10 @@ snapshots:
       istanbul-reports: 3.1.7
       magic-string: 0.30.17
       magicast: 0.3.5
-      std-env: 3.8.0
+      std-env: 3.9.0
       test-exclude: 7.0.1
       tinyrainbow: 1.2.0
-      vitest: 2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vitest: 2.1.9(@types/node@20.19.17)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -3351,16 +3324,16 @@ snapshots:
     dependencies:
       '@vitest/spy': 2.1.9
       '@vitest/utils': 2.1.9
-      chai: 5.1.2
+      chai: 5.3.3
       tinyrainbow: 1.2.0
 
-  '@vitest/mocker@2.1.9(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
+  '@vitest/mocker@2.1.9(vite@5.4.20(@types/node@20.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
       '@vitest/spy': 2.1.9
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 5.4.20(@types/node@20.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
 
   '@vitest/pretty-format@2.1.9':
     dependencies:
@@ -3384,7 +3357,7 @@ snapshots:
   '@vitest/utils@2.1.9':
     dependencies:
       '@vitest/pretty-format': 2.1.9
-      loupe: 3.1.3
+      loupe: 3.2.1
       tinyrainbow: 1.2.0
 
   acorn-jsx@5.3.2(acorn@8.15.0):
@@ -3476,12 +3449,12 @@ snapshots:
 
   callsites@3.1.0: {}
 
-  chai@5.1.2:
+  chai@5.3.3:
     dependencies:
       assertion-error: 2.0.1
       check-error: 2.1.1
       deep-eql: 5.0.2
-      loupe: 3.1.3
+      loupe: 3.2.1
       pathval: 2.0.0
 
   chalk@4.1.2:
@@ -3489,7 +3462,7 @@ snapshots:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  chardet@0.7.0: {}
+  chardet@2.1.0: {}
 
   check-error@2.1.1: {}
 
@@ -3526,13 +3499,7 @@ snapshots:
 
   concat-map@0.0.1: {}
 
-  cross-spawn@5.1.0:
-    dependencies:
-      lru-cache: 4.1.5
-      shebang-command: 1.2.0
-      which: 1.3.1
-
-  cross-spawn@7.0.3:
+  cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
@@ -3617,7 +3584,7 @@ snapshots:
 
   error-stack-parser-es@1.0.5: {}
 
-  es-module-lexer@1.6.0: {}
+  es-module-lexer@1.7.0: {}
 
   esbuild@0.21.5:
     optionalDependencies:
@@ -3750,7 +3717,7 @@ snapshots:
       '@nodelib/fs.walk': 1.2.8
       ajv: 6.12.6
       chalk: 4.1.2
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       debug: 4.4.1
       escape-string-regexp: 4.0.0
       eslint-scope: 8.4.0
@@ -3815,16 +3782,10 @@ snapshots:
 
   esutils@2.0.3: {}
 
-  expect-type@1.1.0: {}
+  expect-type@1.2.2: {}
 
   extendable-error@0.1.7: {}
 
-  external-editor@3.1.0:
-    dependencies:
-      chardet: 0.7.0
-      iconv-lite: 0.4.24
-      tmp: 0.0.33
-
   fast-deep-equal@3.1.3: {}
 
   fast-glob@3.3.3:
@@ -3874,7 +3835,7 @@ snapshots:
 
   foreground-child@3.3.0:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
   form-data@4.0.0:
@@ -3969,13 +3930,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  human-id@1.0.2: {}
+  human-id@4.1.1: {}
 
-  iconv-lite@0.4.24:
+  iconv-lite@0.6.3:
     dependencies:
       safer-buffer: 2.1.2
 
-  iconv-lite@0.6.3:
+  iconv-lite@0.7.0:
     dependencies:
       safer-buffer: 2.1.2
 
@@ -4052,7 +4013,7 @@ snapshots:
 
   istanbul-lib-source-maps@5.0.6:
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.31
       debug: 4.4.1
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
@@ -4187,15 +4148,10 @@ snapshots:
 
   lodash.startcase@4.4.0: {}
 
-  loupe@3.1.3: {}
+  loupe@3.2.1: {}
 
   lru-cache@10.4.3: {}
 
-  lru-cache@4.1.5:
-    dependencies:
-      pseudomap: 1.0.2
-      yallist: 2.1.2
-
   magic-string@0.30.17:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
@@ -4270,8 +4226,6 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  os-tmpdir@1.0.2: {}
-
   outdent@0.5.0: {}
 
   p-filter@2.1.0:
@@ -4389,8 +4343,6 @@ snapshots:
 
   prettier@3.2.4: {}
 
-  pseudomap@1.0.2: {}
-
   punycode@2.3.1: {}
 
   queue-microtask@1.2.3: {}
@@ -4489,22 +4441,14 @@ snapshots:
     dependencies:
       randombytes: 2.1.0
 
-  shebang-command@1.2.0:
-    dependencies:
-      shebang-regex: 1.0.0
-
   shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
 
-  shebang-regex@1.0.0: {}
-
   shebang-regex@3.0.0: {}
 
   siginfo@2.0.0: {}
 
-  signal-exit@3.0.7: {}
-
   signal-exit@4.1.0: {}
 
   sirv@3.0.2:
@@ -4528,16 +4472,16 @@ snapshots:
 
   source-map@0.7.4: {}
 
-  spawndamnit@2.0.0:
+  spawndamnit@3.0.1:
     dependencies:
-      cross-spawn: 5.1.0
-      signal-exit: 3.0.7
+      cross-spawn: 7.0.6
+      signal-exit: 4.1.0
 
   sprintf-js@1.0.3: {}
 
   stackback@0.0.2: {}
 
-  std-env@3.8.0: {}
+  std-env@3.9.0: {}
 
   string-width@4.2.3:
     dependencies:
@@ -4610,7 +4554,7 @@ snapshots:
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
 
-  tinypool@1.0.2: {}
+  tinypool@1.1.1: {}
 
   tinyrainbow@1.2.0: {}
 
@@ -4622,10 +4566,6 @@ snapshots:
     dependencies:
       tldts-core: 6.1.64
 
-  tmp@0.0.33:
-    dependencies:
-      os-tmpdir: 1.0.2
-
   to-fast-properties@2.0.0: {}
 
   to-regex-range@5.0.1:
@@ -4677,7 +4617,7 @@ snapshots:
 
   typescript@5.5.4: {}
 
-  undici-types@5.26.5: {}
+  undici-types@6.21.0: {}
 
   undici-types@7.12.0: {}
 
@@ -4708,13 +4648,13 @@ snapshots:
     dependencies:
       vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
 
-  vite-node@2.1.9(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
+  vite-node@2.1.9(@types/node@20.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
       cac: 6.7.14
       debug: 4.4.1
-      es-module-lexer: 1.6.0
+      es-module-lexer: 1.7.0
       pathe: 1.1.2
-      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 5.4.20(@types/node@20.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -4746,13 +4686,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
+  vite@5.4.20(@types/node@20.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.5.6
       rollup: 4.50.1
     optionalDependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.19.17
       fsevents: 2.3.3
       lightningcss: 1.23.0
       sass: 1.70.0
@@ -4777,30 +4717,30 @@ snapshots:
     optionalDependencies:
       vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
 
-  vitest@2.1.9(@types/node@20.12.7)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
+  vitest@2.1.9(@types/node@20.19.17)(jsdom@25.0.1)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
       '@vitest/expect': 2.1.9
-      '@vitest/mocker': 2.1.9(vite@5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
+      '@vitest/mocker': 2.1.9(vite@5.4.20(@types/node@20.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
       '@vitest/pretty-format': 2.1.9
       '@vitest/runner': 2.1.9
       '@vitest/snapshot': 2.1.9
       '@vitest/spy': 2.1.9
       '@vitest/utils': 2.1.9
-      chai: 5.1.2
+      chai: 5.3.3
       debug: 4.4.1
-      expect-type: 1.1.0
+      expect-type: 1.2.2
       magic-string: 0.30.17
       pathe: 1.1.2
-      std-env: 3.8.0
+      std-env: 3.9.0
       tinybench: 2.9.0
       tinyexec: 0.3.2
-      tinypool: 1.0.2
+      tinypool: 1.1.1
       tinyrainbow: 1.2.0
-      vite: 5.4.20(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
-      vite-node: 2.1.9(@types/node@20.12.7)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 5.4.20(@types/node@20.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite-node: 2.1.9(@types/node@20.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 20.12.7
+      '@types/node': 20.19.17
       jsdom: 25.0.1
     transitivePeerDependencies:
       - less
@@ -4837,10 +4777,6 @@ snapshots:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
 
-  which@1.3.1:
-    dependencies:
-      isexe: 2.0.0
-
   which@2.0.2:
     dependencies:
       isexe: 2.0.0
@@ -4872,8 +4808,6 @@ snapshots:
 
   xmlchars@2.2.0: {}
 
-  yallist@2.1.2: {}
-
   yaml@1.10.2: {}
 
   yocto-queue@0.1.0: {}

From e0dba165b49d4489a1e622dd5bdededd32fa3d1a Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Sun, 28 Sep 2025 17:38:18 -0400
Subject: [PATCH 55/68] docs: remove reference to SSR being synchronous
 (#16861)

---
 documentation/docs/03-template-syntax/19-await-expressions.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/documentation/docs/03-template-syntax/19-await-expressions.md b/documentation/docs/03-template-syntax/19-await-expressions.md
index d3896a5c4e..1c613af870 100644
--- a/documentation/docs/03-template-syntax/19-await-expressions.md
+++ b/documentation/docs/03-template-syntax/19-await-expressions.md
@@ -139,8 +139,6 @@ If a `<svelte:boundary>` with a `pending` snippet is encountered during SSR, tha
 
 As an experimental feature, the details of how `await` is handled (and related APIs like `$effect.pending()`) are subject to breaking changes outside of a semver major release, though we intend to keep such changes to a bare minimum.
 
-Currently, server-side rendering is synchronous. If a `<svelte:boundary>` with a `pending` snippet is encountered during SSR, only the `pending` snippet will be rendered.
-
 ## Breaking changes
 
 Effects run in a slightly different order when the `experimental.async` option is `true`. Specifically, _block_ effects like `{#if ...}` and `{#each ...}` now run before an `$effect.pre` or `beforeUpdate` in the same component, which means that in [very rare situations](/playground/untitled?#H4sIAAAAAAAAE22R3VLDIBCFX2WLvUhnTHsf0zre-Q7WmfwtFV2BgU1rJ5N3F0jaOuoVcPbw7VkYhK4_URTiGYkMnIyjDjLsFGO3EvdCKkIvipdB8NlGXxSCPt96snbtj0gctab2-J_eGs2oOWBE6VunLO_2es-EDKZ5x5ZhC0vPNWM2gHXGouNzAex6hHH1cPHil_Lsb95YT9VQX6KUAbS2DrNsBdsdDFHe8_XSYjH1SrhELTe3MLpsemajweiWVPuxHSbKNd-8eQTdE0EBf4OOaSg2hwNhhE_ABB_ulJzjj9FULvIcqgm5vnAqUB7wWFMfhuugQWkcAr8hVD-mq8D12kOep24J_IszToOXdveGDsuNnZwbJUNlXsKnhJdhUcTo42s41YpOSneikDV5HL8BktM6yRcCAAA=) it is possible to update a block that should no longer exist, but only if you update state inside an effect, [which you should avoid]($effect#When-not-to-use-$effect).

From 8895bd44f5297c0c69b8bc081155fbf9bac9c00e Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Mon, 29 Sep 2025 08:04:57 -0700
Subject: [PATCH 56/68] fix: coerce nullish `<title>` to empty string (#16863)

---
 .changeset/silly-walls-fail.md                      |  5 +++++
 .../3-transform/client/visitors/TitleElement.js     | 13 ++++++++++++-
 .../runtime-runes/samples/title-nullish/_config.js  |  7 +++++++
 .../runtime-runes/samples/title-nullish/main.svelte |  6 ++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/silly-walls-fail.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/title-nullish/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/title-nullish/main.svelte

diff --git a/.changeset/silly-walls-fail.md b/.changeset/silly-walls-fail.md
new file mode 100644
index 0000000000..6f364e7f8a
--- /dev/null
+++ b/.changeset/silly-walls-fail.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: coerce nullish `<title>` to empty string
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/TitleElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/TitleElement.js
index e6f4202a01..98d7880b25 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/TitleElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/TitleElement.js
@@ -12,8 +12,19 @@ export function TitleElement(node, context) {
 		/** @type {any} */ (node.fragment.nodes),
 		context
 	);
+	const evaluated = context.state.scope.evaluate(value);
 
-	const statement = b.stmt(b.assignment('=', b.id('$.document.title'), value));
+	const statement = b.stmt(
+		b.assignment(
+			'=',
+			b.id('$.document.title'),
+			evaluated.is_known
+				? b.literal(evaluated.value)
+				: evaluated.is_defined
+					? value
+					: b.logical('??', value, b.literal(''))
+		)
+	);
 
 	if (has_state) {
 		context.state.update.push(statement);
diff --git a/packages/svelte/tests/runtime-runes/samples/title-nullish/_config.js b/packages/svelte/tests/runtime-runes/samples/title-nullish/_config.js
new file mode 100644
index 0000000000..819d6b620e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/title-nullish/_config.js
@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	test({ assert, target }) {
+		assert.equal(target.ownerDocument.title, '');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/title-nullish/main.svelte b/packages/svelte/tests/runtime-runes/samples/title-nullish/main.svelte
new file mode 100644
index 0000000000..f1fa7e7b84
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/title-nullish/main.svelte
@@ -0,0 +1,6 @@
+<script>
+    const thing = {};
+</script>
+<svelte:head>
+    <title>{thing.thing}</title>
+</svelte:head>
\ No newline at end of file

From 87f7e979635baa46acb594ecc7f2822920cb7aaf Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Mon, 29 Sep 2025 08:05:13 -0700
Subject: [PATCH 57/68] fix: wrap async `children` in `$$renderer.async`
 (#16862)

---
 .changeset/rude-terms-confess.md                           | 5 +++++
 .../phases/3-transform/server/visitors/shared/component.js | 7 ++++++-
 .../samples/async-children/_expected.html                  | 1 +
 .../samples/async-children/component.svelte                | 4 ++++
 .../samples/async-children/main.svelte                     | 7 +++++++
 5 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/rude-terms-confess.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-children/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-children/component.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-children/main.svelte

diff --git a/.changeset/rude-terms-confess.md b/.changeset/rude-terms-confess.md
new file mode 100644
index 0000000000..a24774952e
--- /dev/null
+++ b/.changeset/rude-terms-confess.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: wrap async `children` in `$$renderer.async`
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
index d0de750c0e..e463ea785a 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/component.js
@@ -242,7 +242,12 @@ export function build_inline_component(node, expression, context) {
 			params.push(pattern);
 		}
 
-		const slot_fn = b.arrow(params, b.block(block.body));
+		const slot_fn = b.arrow(
+			params,
+			node.fragment.metadata.has_await
+				? b.block([create_async_block(b.block(block.body))])
+				: b.block(block.body)
+		);
 
 		if (slot_name === 'default' && !has_children_prop) {
 			if (
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-children/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-children/_expected.html
new file mode 100644
index 0000000000..04d9709792
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-children/_expected.html
@@ -0,0 +1 @@
+<!--[--><!--[--><!---->1<!--]--><!----><!--]-->
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-children/component.svelte b/packages/svelte/tests/server-side-rendering/samples/async-children/component.svelte
new file mode 100644
index 0000000000..73b5a2f823
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-children/component.svelte
@@ -0,0 +1,4 @@
+<script>
+    const { children } = $props();
+</script>
+{@render children()}
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-children/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-children/main.svelte
new file mode 100644
index 0000000000..ae0fc571b3
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-children/main.svelte
@@ -0,0 +1,7 @@
+<script>
+    import Component from "./component.svelte";
+</script>
+<Component>
+    {@const one = await 1}
+    {one}
+</Component>
\ No newline at end of file

From 25cbdc8cb1c672cfa0ce506e9d432cf5d86863e6 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 30 Sep 2025 09:57:22 -0400
Subject: [PATCH 58/68] fix: merge batches (#16866)

whenever a batch is committed, we essentially 'rebase' other pending batches on top of the newly applied state
---
 .changeset/lemon-cars-count.md                |   5 +
 .../src/internal/client/reactivity/batch.js   | 206 +++++++++++-------
 .../internal/client/reactivity/deriveds.js    |  46 ++--
 .../samples/async-derived-module/_config.js   |  11 -
 .../runtime-runes/samples/async-if/_config.js |  30 ++-
 .../samples/async-if/main.svelte              |  21 +-
 .../_config.js                                |  12 +-
 .../main.svelte                               |  21 +-
 8 files changed, 208 insertions(+), 144 deletions(-)
 create mode 100644 .changeset/lemon-cars-count.md

diff --git a/.changeset/lemon-cars-count.md b/.changeset/lemon-cars-count.md
new file mode 100644
index 0000000000..5724e48460
--- /dev/null
+++ b/.changeset/lemon-cars-count.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: rebase pending batches when other batches are committed
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 8cf0e4bd9d..fb704edb13 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -1,4 +1,4 @@
-/** @import { Derived, Effect, Source } from '#client' */
+/** @import { Derived, Effect, Source, Value } from '#client' */
 import {
 	BLOCK_EFFECT,
 	BRANCH_EFFECT,
@@ -10,10 +10,11 @@ import {
 	INERT,
 	RENDER_EFFECT,
 	ROOT_EFFECT,
-	MAYBE_DIRTY
+	MAYBE_DIRTY,
+	DERIVED
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
-import { deferred, define_property } from '../../shared/utils.js';
+import { deferred, define_property, noop } from '../../shared/utils.js';
 import {
 	active_effect,
 	is_dirty,
@@ -97,22 +98,8 @@ export class Batch {
 	#deferred = null;
 
 	/**
-	 * True if an async effect inside this batch resolved and
-	 * its parent branch was already deleted
-	 */
-	#neutered = false;
-
-	/**
-	 * Async effects (created inside `async_derived`) encountered during processing.
-	 * These run after the rest of the batch has updated, since they should
-	 * always have the latest values
-	 * @type {Effect[]}
-	 */
-	#async_effects = [];
-
-	/**
-	 * The same as `#async_effects`, but for effects inside a newly-created
-	 * `<svelte:boundary>` — these do not prevent the batch from committing
+	 * Async effects inside a newly-created `<svelte:boundary>`
+	 * — these do not prevent the batch from committing
 	 * @type {Effect[]}
 	 */
 	#boundary_async_effects = [];
@@ -165,32 +152,7 @@ export class Batch {
 
 		previous_batch = null;
 
-		/** @type {Map<Source, { v: unknown, wv: number }> | null} */
-		var current_values = null;
-
-		// if there are multiple batches, we are 'time travelling' —
-		// we need to undo the changes belonging to any batch
-		// other than the current one
-		if (async_mode_flag && batches.size > 1) {
-			current_values = new Map();
-			batch_deriveds = new Map();
-
-			for (const [source, current] of this.current) {
-				current_values.set(source, { v: source.v, wv: source.wv });
-				source.v = current;
-			}
-
-			for (const batch of batches) {
-				if (batch === this) continue;
-
-				for (const [source, previous] of batch.#previous) {
-					if (!current_values.has(source)) {
-						current_values.set(source, { v: source.v, wv: source.wv });
-						source.v = previous;
-					}
-				}
-			}
-		}
+		var revert = Batch.apply(this);
 
 		for (const root of root_effects) {
 			this.#traverse_effect_tree(root);
@@ -198,7 +160,7 @@ export class Batch {
 
 		// if we didn't start any new async work, and no async work
 		// is outstanding from a previous flush, commit
-		if (this.#async_effects.length === 0 && this.#pending === 0) {
+		if (this.#pending === 0) {
 			this.#commit();
 
 			var render_effects = this.#render_effects;
@@ -210,7 +172,7 @@ export class Batch {
 
 			// If sources are written to, then work needs to happen in a separate batch, else prior sources would be mixed with
 			// newly updated sources, which could lead to infinite loops when effects run over and over again.
-			previous_batch = current_batch;
+			previous_batch = this;
 			current_batch = null;
 
 			flush_queued_effects(render_effects);
@@ -223,27 +185,12 @@ export class Batch {
 			this.#defer_effects(this.#block_effects);
 		}
 
-		if (current_values) {
-			for (const [source, { v, wv }] of current_values) {
-				// reset the source to the current value (unless
-				// it got a newer value as a result of effects running)
-				if (source.wv <= wv) {
-					source.v = v;
-				}
-			}
-
-			batch_deriveds = null;
-		}
-
-		for (const effect of this.#async_effects) {
-			update_effect(effect);
-		}
+		revert();
 
 		for (const effect of this.#boundary_async_effects) {
 			update_effect(effect);
 		}
 
-		this.#async_effects = [];
 		this.#boundary_async_effects = [];
 	}
 
@@ -272,12 +219,8 @@ export class Batch {
 				} else if (async_mode_flag && (flags & RENDER_EFFECT) !== 0) {
 					this.#render_effects.push(effect);
 				} else if ((flags & CLEAN) === 0) {
-					if ((flags & ASYNC) !== 0) {
-						var effects = effect.b?.is_pending()
-							? this.#boundary_async_effects
-							: this.#async_effects;
-
-						effects.push(effect);
+					if ((flags & ASYNC) !== 0 && effect.b?.is_pending()) {
+						this.#boundary_async_effects.push(effect);
 					} else if (is_dirty(effect)) {
 						if ((effect.f & BLOCK_EFFECT) !== 0) this.#block_effects.push(effect);
 						update_effect(effect);
@@ -350,10 +293,6 @@ export class Batch {
 		}
 	}
 
-	neuter() {
-		this.#neutered = true;
-	}
-
 	flush() {
 		if (queued_root_effects.length > 0) {
 			this.activate();
@@ -374,13 +313,58 @@ export class Batch {
 	 * Append and remove branches to/from the DOM
 	 */
 	#commit() {
-		if (!this.#neutered) {
-			for (const fn of this.#callbacks) {
-				fn();
-			}
+		for (const fn of this.#callbacks) {
+			fn();
 		}
 
 		this.#callbacks.clear();
+
+		// If there are other pending batches, they now need to be 'rebased' —
+		// in other words, we re-run block/async effects with the newly
+		// committed state, unless the batch in question has a more
+		// recent value for a given source
+		if (batches.size > 1) {
+			this.#previous.clear();
+
+			let is_earlier = true;
+
+			for (const batch of batches) {
+				if (batch === this) {
+					is_earlier = false;
+					continue;
+				}
+
+				for (const [source, value] of this.current) {
+					if (batch.current.has(source)) {
+						if (is_earlier) {
+							// bring the value up to date
+							batch.current.set(source, value);
+						} else {
+							// later batch has more recent value,
+							// no need to re-run these effects
+							continue;
+						}
+					}
+
+					mark_effects(source);
+				}
+
+				if (queued_root_effects.length > 0) {
+					current_batch = batch;
+					const revert = Batch.apply(batch);
+
+					for (const root of queued_root_effects) {
+						batch.#traverse_effect_tree(root);
+					}
+
+					queued_root_effects = [];
+					revert();
+				}
+			}
+
+			current_batch = null;
+		}
+
 		batches.delete(this);
 	}
 
@@ -402,9 +386,6 @@ export class Batch {
 				schedule_effect(e);
 			}
 
-			this.#render_effects = [];
-			this.#effects = [];
-
 			this.flush();
 		} else {
 			this.deactivate();
@@ -444,6 +425,51 @@ export class Batch {
 	static enqueue(task) {
 		queue_micro_task(task);
 	}
+
+	/**
+	 * @param {Batch} current_batch
+	 */
+	static apply(current_batch) {
+		if (!async_mode_flag || batches.size === 1) {
+			return noop;
+		}
+
+		// if there are multiple batches, we are 'time travelling' —
+		// we need to undo the changes belonging to any batch
+		// other than the current one
+
+		/** @type {Map<Source, { v: unknown, wv: number }>} */
+		var current_values = new Map();
+		batch_deriveds = new Map();
+
+		for (const [source, current] of current_batch.current) {
+			current_values.set(source, { v: source.v, wv: source.wv });
+			source.v = current;
+		}
+
+		for (const batch of batches) {
+			if (batch === current_batch) continue;
+
+			for (const [source, previous] of batch.#previous) {
+				if (!current_values.has(source)) {
+					current_values.set(source, { v: source.v, wv: source.wv });
+					source.v = previous;
+				}
+			}
+		}
+
+		return () => {
+			for (const [source, { v, wv }] of current_values) {
+				// reset the source to the current value (unless
+				// it got a newer value as a result of effects running)
+				if (source.wv <= wv) {
+					source.v = v;
+				}
+			}
+
+			batch_deriveds = null;
+		};
+	}
 }
 
 /**
@@ -615,6 +641,26 @@ function flush_queued_effects(effects) {
 	eager_block_effects = null;
 }
 
+/**
+ * This is similar to `mark_reactions`, but it only marks async/block effects
+ * so that these can re-run after another batch has been committed
+ * @param {Value} value
+ */
+function mark_effects(value) {
+	if (value.reactions !== null) {
+		for (const reaction of value.reactions) {
+			const flags = reaction.f;
+
+			if ((flags & DERIVED) !== 0) {
+				mark_effects(/** @type {Derived} */ (reaction));
+			} else if ((flags & (ASYNC | BLOCK_EFFECT)) !== 0) {
+				set_signal_status(reaction, DIRTY);
+				schedule_effect(/** @type {Effect} */ (reaction));
+			}
+		}
+	}
+}
+
 /**
  * @param {Effect} signal
  * @returns {void}
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 11405a8e66..5d5976a6c1 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -26,7 +26,7 @@ import {
 import { equals, safe_equals } from './equality.js';
 import * as e from '../errors.js';
 import * as w from '../warnings.js';
-import { async_effect, destroy_effect } from './effects.js';
+import { async_effect, destroy_effect, teardown } from './effects.js';
 import { inspect_effects, internal_set, set_inspect_effects, source } from './sources.js';
 import { get_stack } from '../dev/tracing.js';
 import { async_mode_flag, tracing_mode_flag } from '../../flags/index.js';
@@ -35,6 +35,7 @@ import { component_context } from '../context.js';
 import { UNINITIALIZED } from '../../../constants.js';
 import { batch_deriveds, current_batch } from './batch.js';
 import { unset_context } from './async.js';
+import { deferred } from '../../shared/utils.js';
 
 /** @type {Effect | null} */
 export let current_async_effect = null;
@@ -109,37 +110,40 @@ export function async_derived(fn, location) {
 	var promise = /** @type {Promise<V>} */ (/** @type {unknown} */ (undefined));
 	var signal = source(/** @type {V} */ (UNINITIALIZED));
 
-	/** @type {Promise<V> | null} */
-	var prev = null;
-
 	// only suspend in async deriveds created on initialisation
 	var should_suspend = !active_reaction;
 
+	/** @type {Map<Batch, ReturnType<typeof deferred<V>>>} */
+	var deferreds = new Map();
+
 	async_effect(() => {
 		if (DEV) current_async_effect = active_effect;
 
+		/** @type {ReturnType<typeof deferred<V>>} */
+		var d = deferred();
+		promise = d.promise;
+
 		try {
-			var p = fn();
-			// Make sure to always access the then property to read any signals
-			// it might access, so that we track them as dependencies.
-			if (prev) Promise.resolve(p).catch(() => {}); // avoid unhandled rejection
+			// If this code is changed at some point, make sure to still access the then property
+			// of fn() to read any signals it might access, so that we track them as dependencies.
+			Promise.resolve(fn()).then(d.resolve, d.reject);
 		} catch (error) {
-			p = Promise.reject(error);
+			d.reject(error);
 		}
 
 		if (DEV) current_async_effect = null;
 
-		var r = () => p;
-		promise = prev?.then(r, r) ?? Promise.resolve(p);
-
-		prev = promise;
-
 		var batch = /** @type {Batch} */ (current_batch);
 		var pending = boundary.is_pending();
 
 		if (should_suspend) {
 			boundary.update_pending_count(1);
-			if (!pending) batch.increment();
+			if (!pending) {
+				batch.increment();
+
+				deferreds.get(batch)?.reject(STALE_REACTION);
+				deferreds.set(batch, d);
+			}
 		}
 
 		/**
@@ -147,8 +151,6 @@ export function async_derived(fn, location) {
 		 * @param {unknown} error
 		 */
 		const handler = (value, error = undefined) => {
-			prev = null;
-
 			current_async_effect = null;
 
 			if (!pending) batch.activate();
@@ -187,12 +189,12 @@ export function async_derived(fn, location) {
 			unset_context();
 		};
 
-		promise.then(handler, (e) => handler(null, e || 'unknown'));
+		d.promise.then(handler, (e) => handler(null, e || 'unknown'));
+	});
 
-		if (batch) {
-			return () => {
-				queueMicrotask(() => batch.neuter());
-			};
+	teardown(() => {
+		for (const d of deferreds.values()) {
+			d.reject(STALE_REACTION);
 		}
 	});
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-module/_config.js b/packages/svelte/tests/runtime-runes/samples/async-derived-module/_config.js
index f7d1d28fde..318f88bcc9 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-derived-module/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-module/_config.js
@@ -14,17 +14,6 @@ export default test({
 		const [reset, a, b, increment] = target.querySelectorAll('button');
 
 		a.click();
-
-		// TODO why is this necessary? why isn't `await tick()` enough?
-		await Promise.resolve();
-		await Promise.resolve();
-		await Promise.resolve();
-		await Promise.resolve();
-		await Promise.resolve();
-		await Promise.resolve();
-		await Promise.resolve();
-		await Promise.resolve();
-		flushSync();
 		await tick();
 		assert.htmlEqual(
 			target.innerHTML,
diff --git a/packages/svelte/tests/runtime-runes/samples/async-if/_config.js b/packages/svelte/tests/runtime-runes/samples/async-if/_config.js
index 3cd67952c3..ef119d601d 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-if/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-if/_config.js
@@ -2,30 +2,46 @@ import { tick } from 'svelte';
 import { test } from '../../test';
 
 export default test({
-	html: `<button>reset</button><button>true</button><button>false</button><p>pending</p>`,
+	html: `<button>shift</button><button>true</button><button>false</button><p>pending</p>`,
 
 	async test({ assert, target }) {
-		const [reset, t, f] = target.querySelectorAll('button');
+		const [shift, t, f] = target.querySelectorAll('button');
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			'<button>shift</button><button>true</button><button>false</button><h1>yes</h1>'
+		);
+
+		f.click();
+		await tick();
 
 		t.click();
 		await tick();
+
+		f.click();
+		await tick();
+
+		shift.click();
+		await tick();
 		assert.htmlEqual(
 			target.innerHTML,
-			'<button>reset</button><button>true</button><button>false</button><h1>yes</h1>'
+			'<button>shift</button><button>true</button><button>false</button><h1>no</h1>'
 		);
 
-		reset.click();
+		shift.click();
 		await tick();
 		assert.htmlEqual(
 			target.innerHTML,
-			'<button>reset</button><button>true</button><button>false</button><h1>yes</h1>'
+			'<button>shift</button><button>true</button><button>false</button><h1>yes</h1>'
 		);
 
-		f.click();
+		shift.click();
 		await tick();
 		assert.htmlEqual(
 			target.innerHTML,
-			'<button>reset</button><button>true</button><button>false</button><h1>no</h1>'
+			'<button>shift</button><button>true</button><button>false</button><h1>no</h1>'
 		);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/async-if/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-if/main.svelte
index 21a4cbef97..ed708354a4 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-if/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-if/main.svelte
@@ -1,13 +1,24 @@
 <script>
-	let deferred = $state(Promise.withResolvers());
+	let condition = $state(true);
+
+	let deferreds = [];
+
+	function push(value) {
+		const deferred = Promise.withResolvers();
+		deferreds.push({ deferred, value });
+		return deferred.promise;
+	}
 </script>
 
-<button onclick={() => deferred = Promise.withResolvers()}>reset</button>
-<button onclick={() => deferred.resolve(true)}>true</button>
-<button onclick={() => deferred.resolve(false)}>false</button>
+<button onclick={() => {
+	const d = deferreds.shift();
+	d?.deferred.resolve(d.value);
+}}>shift</button>
+<button onclick={() => condition = true}>true</button>
+<button onclick={() => condition = false}>false</button>
 
 <svelte:boundary>
-	{#if await deferred.promise}
+	{#if await push(condition)}
 		<h1>yes</h1>
 	{:else}
 		<h1>no</h1>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/_config.js b/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/_config.js
index 5e522ebdb5..cc7b2756fa 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/_config.js
@@ -3,26 +3,24 @@ import { test } from '../../test';
 
 export default test({
 	async test({ assert, target }) {
-		const [a, b, reset1, reset2, resolve1, resolve2] = target.querySelectorAll('button');
+		const [a, b, shift, pop] = target.querySelectorAll('button');
 
-		resolve1.click();
+		shift.click();
 		await tick();
 
 		const p = /** @type {HTMLElement} */ (target.querySelector('#test'));
 
 		assert.htmlEqual(p.innerHTML, '1 + 2 = 3');
 
-		flushSync(() => reset1.click());
 		flushSync(() => a.click());
-		flushSync(() => reset2.click());
 		flushSync(() => b.click());
 
-		resolve2.click();
+		pop.click();
 		await tick();
 
-		assert.htmlEqual(p.innerHTML, '1 + 2 = 3');
+		assert.htmlEqual(p.innerHTML, '1 + 3 = 4');
 
-		resolve1.click();
+		pop.click();
 		await tick();
 
 		assert.htmlEqual(p.innerHTML, '2 + 3 = 5');
diff --git a/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/main.svelte
index cc82db0d75..48ff06fece 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-linear-order-same-derived/main.svelte
@@ -1,14 +1,14 @@
 <script>
-	let delay = 1000;
+	let deferreds = [];
+
 	let a = $state(1);
 	let b = $state(2);
 
-	let d1 = Promise.withResolvers();
-	let d2 = Promise.withResolvers();
-	let deferred = d1;
+	async function push(a, b) {
+		var d = Promise.withResolvers();
+		deferreds.push(d);
+		await d.promise;
 
-	async function add(a, b) {
-		await deferred.promise;
 		return a + b;
 	}
 </script>
@@ -16,14 +16,11 @@
 <button onclick={() => a++}>a++</button>
 <button onclick={() => b++}>b++</button>
 
-<button onclick={() => deferred = d1 = Promise.withResolvers()}>reset 1</button>
-<button onclick={() => deferred = d2 = Promise.withResolvers()}>reset 2</button>
-
-<button onclick={() => d1.resolve()}>resolve 1</button>
-<button onclick={() => d2.resolve()}>resolve 2</button>
+<button onclick={() => deferreds.shift()?.resolve()}>shift</button>
+<button onclick={() => deferreds.pop()?.resolve()}>pop</button>
 
 <svelte:boundary>
-	<p id="test">{a} + {b} = {await add(a, b)}</p>
+	<p id="test">{a} + {b} = {await push(a, b)}</p>
 
 	{#snippet pending()}
 		<p>loading...</p>

From 46c10d0476c38fae9dff28b812fa476d3202a21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Koles=C3=A1r?=
 <34346635+jakubkolesar@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:46:58 +0200
Subject: [PATCH 59/68] fix: missing title warning for buttons and anchor tags
 (#16872)

* fix(a11y): title warning for buttons and anchor tags

* chore(changeset): added changeset

* Update playgrounds/sandbox/index.html

* Update .changeset/shiny-chicken-occur.md

---------

Co-authored-by: 7nik <kfiiranet@gmail.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .changeset/shiny-chicken-occur.md                            | 5 +++++
 .../docs/98-reference/.generated/compile-warnings.md         | 2 +-
 packages/svelte/messages/compile-warnings/a11y.md            | 2 +-
 .../compiler/phases/2-analyze/visitors/shared/a11y/index.js  | 5 ++++-
 packages/svelte/src/compiler/warnings.js                     | 4 ++--
 .../validator/samples/a11y-anchor-has-content/warnings.json  | 2 +-
 .../samples/a11y-consider-explicit-label/input.svelte        | 3 +++
 .../samples/a11y-consider-explicit-label/warnings.json       | 4 ++--
 8 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/shiny-chicken-occur.md

diff --git a/.changeset/shiny-chicken-occur.md b/.changeset/shiny-chicken-occur.md
new file mode 100644
index 0000000000..45a560480b
--- /dev/null
+++ b/.changeset/shiny-chicken-occur.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: silence label warning for buttons and anchor tags with title attributes
diff --git a/documentation/docs/98-reference/.generated/compile-warnings.md b/documentation/docs/98-reference/.generated/compile-warnings.md
index 17841b863c..7dfbe75888 100644
--- a/documentation/docs/98-reference/.generated/compile-warnings.md
+++ b/documentation/docs/98-reference/.generated/compile-warnings.md
@@ -81,7 +81,7 @@ Coding for the keyboard is important for users with physical disabilities who ca
 ### a11y_consider_explicit_label
 
 ```
-Buttons and links should either contain text or have an `aria-label` or `aria-labelledby` attribute
+Buttons and links should either contain text or have an `aria-label`, `aria-labelledby` or `title` attribute
 ```
 
 ### a11y_distracting_elements
diff --git a/packages/svelte/messages/compile-warnings/a11y.md b/packages/svelte/messages/compile-warnings/a11y.md
index a299fa53bc..bc34829ce9 100644
--- a/packages/svelte/messages/compile-warnings/a11y.md
+++ b/packages/svelte/messages/compile-warnings/a11y.md
@@ -66,7 +66,7 @@ Coding for the keyboard is important for users with physical disabilities who ca
 
 ## a11y_consider_explicit_label
 
-> Buttons and links should either contain text or have an `aria-label` or `aria-labelledby` attribute
+> Buttons and links should either contain text or have an `aria-label`, `aria-labelledby` or `title` attribute
 
 ## a11y_distracting_elements
 
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/a11y/index.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/a11y/index.js
index e2f84290e5..8c5bf55e5f 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/a11y/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/a11y/index.js
@@ -382,7 +382,10 @@ export function check_element(node, context) {
 	}
 
 	// element-specific checks
-	const is_labelled = attribute_map.has('aria-label') || attribute_map.has('aria-labelledby');
+	const is_labelled =
+		attribute_map.has('aria-label') ||
+		attribute_map.has('aria-labelledby') ||
+		attribute_map.has('title');
 
 	switch (node.name) {
 		case 'a':
diff --git a/packages/svelte/src/compiler/warnings.js b/packages/svelte/src/compiler/warnings.js
index 8c03e12e71..089cb1e118 100644
--- a/packages/svelte/src/compiler/warnings.js
+++ b/packages/svelte/src/compiler/warnings.js
@@ -174,11 +174,11 @@ export function a11y_click_events_have_key_events(node) {
 }
 
 /**
- * Buttons and links should either contain text or have an `aria-label` or `aria-labelledby` attribute
+ * Buttons and links should either contain text or have an `aria-label`, `aria-labelledby` or `title` attribute
  * @param {null | NodeLike} node
  */
 export function a11y_consider_explicit_label(node) {
-	w(node, 'a11y_consider_explicit_label', `Buttons and links should either contain text or have an \`aria-label\` or \`aria-labelledby\` attribute\nhttps://svelte.dev/e/a11y_consider_explicit_label`);
+	w(node, 'a11y_consider_explicit_label', `Buttons and links should either contain text or have an \`aria-label\`, \`aria-labelledby\` or \`title\` attribute\nhttps://svelte.dev/e/a11y_consider_explicit_label`);
 }
 
 /**
diff --git a/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json b/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json
index cd3778a443..3d9adc1cde 100644
--- a/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-anchor-has-content/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_consider_explicit_label",
-		"message": "Buttons and links should either contain text or have an `aria-label` or `aria-labelledby` attribute",
+		"message": "Buttons and links should either contain text or have an `aria-label`, `aria-labelledby` or `title` attribute",
 		"start": {
 			"line": 1,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/a11y-consider-explicit-label/input.svelte b/packages/svelte/tests/validator/samples/a11y-consider-explicit-label/input.svelte
index e97951065d..463889dc4f 100644
--- a/packages/svelte/tests/validator/samples/a11y-consider-explicit-label/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-consider-explicit-label/input.svelte
@@ -4,6 +4,9 @@
 <button aria-label="Valid empty button"></button>
 <a href="/#" aria-label="Valid empty link"></a>
 
+<button title="Valid empty button"></button>
+<a href="/#" title="Valid empty link"></a>
+
 <button aria-hidden='true'></button>
 <button inert></button>
 <a href="/#" aria-hidden='true'><b></b></a>
diff --git a/packages/svelte/tests/validator/samples/a11y-consider-explicit-label/warnings.json b/packages/svelte/tests/validator/samples/a11y-consider-explicit-label/warnings.json
index 2dcecf08b3..bc29076184 100644
--- a/packages/svelte/tests/validator/samples/a11y-consider-explicit-label/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-consider-explicit-label/warnings.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "a11y_consider_explicit_label",
-		"message": "Buttons and links should either contain text or have an `aria-label` or `aria-labelledby` attribute",
+		"message": "Buttons and links should either contain text or have an `aria-label`, `aria-labelledby` or `title` attribute",
 		"start": {
 			"line": 1,
 			"column": 0
@@ -13,7 +13,7 @@
 	},
 	{
 		"code": "a11y_consider_explicit_label",
-		"message": "Buttons and links should either contain text or have an `aria-label` or `aria-labelledby` attribute",
+		"message": "Buttons and links should either contain text or have an `aria-label`, `aria-labelledby` or `title` attribute",
 		"start": {
 			"line": 2,
 			"column": 0

From e9cd45a2daf2de2a62077b1e68019e3cc6f658c8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 17:55:29 +0200
Subject: [PATCH 60/68] Version Packages (#16848)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/clever-turtles-wink.md |  5 -----
 .changeset/lemon-cars-count.md    |  5 -----
 .changeset/rude-terms-confess.md  |  5 -----
 .changeset/shiny-chicken-occur.md |  5 -----
 .changeset/silly-walls-fail.md    |  5 -----
 packages/svelte/CHANGELOG.md      | 14 ++++++++++++++
 packages/svelte/package.json      |  2 +-
 packages/svelte/src/version.js    |  2 +-
 8 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 .changeset/clever-turtles-wink.md
 delete mode 100644 .changeset/lemon-cars-count.md
 delete mode 100644 .changeset/rude-terms-confess.md
 delete mode 100644 .changeset/shiny-chicken-occur.md
 delete mode 100644 .changeset/silly-walls-fail.md

diff --git a/.changeset/clever-turtles-wink.md b/.changeset/clever-turtles-wink.md
deleted file mode 100644
index 6ff21f4d91..0000000000
--- a/.changeset/clever-turtles-wink.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: simplify batch logic
diff --git a/.changeset/lemon-cars-count.md b/.changeset/lemon-cars-count.md
deleted file mode 100644
index 5724e48460..0000000000
--- a/.changeset/lemon-cars-count.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: rebase pending batches when other batches are committed
diff --git a/.changeset/rude-terms-confess.md b/.changeset/rude-terms-confess.md
deleted file mode 100644
index a24774952e..0000000000
--- a/.changeset/rude-terms-confess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: wrap async `children` in `$$renderer.async`
diff --git a/.changeset/shiny-chicken-occur.md b/.changeset/shiny-chicken-occur.md
deleted file mode 100644
index 45a560480b..0000000000
--- a/.changeset/shiny-chicken-occur.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: silence label warning for buttons and anchor tags with title attributes
diff --git a/.changeset/silly-walls-fail.md b/.changeset/silly-walls-fail.md
deleted file mode 100644
index 6f364e7f8a..0000000000
--- a/.changeset/silly-walls-fail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: coerce nullish `<title>` to empty string
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 83bd1d043f..58cc215e9d 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,19 @@
 # svelte
 
+## 5.39.7
+
+### Patch Changes
+
+- chore: simplify batch logic ([#16847](https://github.com/sveltejs/svelte/pull/16847))
+
+- fix: rebase pending batches when other batches are committed ([#16866](https://github.com/sveltejs/svelte/pull/16866))
+
+- fix: wrap async `children` in `$$renderer.async` ([#16862](https://github.com/sveltejs/svelte/pull/16862))
+
+- fix: silence label warning for buttons and anchor tags with title attributes ([#16872](https://github.com/sveltejs/svelte/pull/16872))
+
+- fix: coerce nullish `<title>` to empty string ([#16863](https://github.com/sveltejs/svelte/pull/16863))
+
 ## 5.39.6
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 41a32f4a79..e5ed8c5aaf 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.39.6",
+  "version": "5.39.7",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index a0271de08b..aa515b600d 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.39.6';
+export const VERSION = '5.39.7';
 export const PUBLIC_VERSION = '5';

From 31541c88496d58850656005eb58570ff85b1d9ef Mon Sep 17 00:00:00 2001
From: Yuki Ishii <keryuuki0418@gmail.com>
Date: Wed, 1 Oct 2025 19:26:14 +0900
Subject: [PATCH 61/68] fix: allow await in svelte boundary without pending
 (#16857)

Fix: #16856
---
 .changeset/poor-flies-serve.md                      |  5 +++++
 .../3-transform/server/visitors/SvelteBoundary.js   | 13 +++++++++++--
 .../samples/async-svelte-boundary/_expected.html    |  1 +
 .../samples/async-svelte-boundary/main.svelte       |  4 ++++
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/poor-flies-serve.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-svelte-boundary/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-svelte-boundary/main.svelte

diff --git a/.changeset/poor-flies-serve.md b/.changeset/poor-flies-serve.md
new file mode 100644
index 0000000000..1ac13a88ab
--- /dev/null
+++ b/.changeset/poor-flies-serve.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: allow await in svelte:boundary without pending
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
index b914c96f4e..39e6912be0 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
@@ -2,7 +2,13 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
 import * as b from '#compiler/builders';
-import { block_close, block_open, block_open_else, build_attribute_value } from './shared/utils.js';
+import {
+	block_close,
+	block_open,
+	block_open_else,
+	build_attribute_value,
+	create_async_block
+} from './shared/utils.js';
 
 /**
  * @param {AST.SvelteBoundary} node
@@ -37,6 +43,9 @@ export function SvelteBoundary(node, context) {
 		context.state.template.push(block_open_else, pending, block_close);
 	} else {
 		const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
-		context.state.template.push(block_open, block, block_close);
+		const statement = node.fragment.metadata.has_await
+			? create_async_block(b.block([block]))
+			: block;
+		context.state.template.push(block_open, statement, block_close);
 	}
 }
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-svelte-boundary/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-svelte-boundary/_expected.html
new file mode 100644
index 0000000000..5be0be37f2
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-svelte-boundary/_expected.html
@@ -0,0 +1 @@
+<div>this should work</div>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-svelte-boundary/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-svelte-boundary/main.svelte
new file mode 100644
index 0000000000..c4cde60119
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-svelte-boundary/main.svelte
@@ -0,0 +1,4 @@
+<svelte:boundary>
+    {@const x = await 'this should work'}
+    <div>{x}</div>
+</svelte:boundary>
\ No newline at end of file

From 4f653ddceac466302b587830089c4cd5ffd7eff6 Mon Sep 17 00:00:00 2001
From: Yuki Ishii <keryuuki0418@gmail.com>
Date: Thu, 2 Oct 2025 00:56:32 +0900
Subject: [PATCH 62/68] fix: update  error message to clarify usage with radio
 inputs (#16874)

* fix: update  error message to clarify usage with radio inputs

* show an extra bind checked error when a radio type

* typo

* replace 'group' binding with , drive-by fix some other messages

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/slow-nails-push.md                      |  5 +++++
 documentation/docs/03-template-syntax/12-bind.md   |  4 +++-
 .../phases/2-analyze/visitors/BindDirective.js     | 12 ++++++++----
 .../dynamic-element-binding-invalid/_config.js     |  2 +-
 .../samples/binding-dimensions-svg/errors.json     |  2 +-
 .../samples/binding-input-checked/errors.json      |  2 +-
 .../binding-invalid-on-element-2/errors.json       |  2 +-
 .../samples/binding-invalid-on-element/errors.json |  2 +-
 .../binding-radio-input-checked/errors.json        | 14 ++++++++++++++
 .../binding-radio-input-checked/input.svelte       |  5 +++++
 10 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/slow-nails-push.md
 create mode 100644 packages/svelte/tests/validator/samples/binding-radio-input-checked/errors.json
 create mode 100644 packages/svelte/tests/validator/samples/binding-radio-input-checked/input.svelte

diff --git a/.changeset/slow-nails-push.md b/.changeset/slow-nails-push.md
new file mode 100644
index 0000000000..8dedf35593
--- /dev/null
+++ b/.changeset/slow-nails-push.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: update `bind:checked` error message to clarify usage with radio inputs
diff --git a/documentation/docs/03-template-syntax/12-bind.md b/documentation/docs/03-template-syntax/12-bind.md
index de57815687..c21ed35919 100644
--- a/documentation/docs/03-template-syntax/12-bind.md
+++ b/documentation/docs/03-template-syntax/12-bind.md
@@ -95,7 +95,7 @@ Since 5.6.0, if an `<input>` has a `defaultValue` and is part of a form, it will
 
 ## `<input bind:checked>`
 
-Checkbox and radio inputs can be bound with `bind:checked`:
+Checkbox inputs can be bound with `bind:checked`:
 
 ```svelte
 <label>
@@ -117,6 +117,8 @@ Since 5.6.0, if an `<input>` has a `defaultChecked` attribute and is part of a f
 </form>
 ```
 
+> [!NOTE] Use `bind:group` for radio inputs instead of `bind:checked`.
+
 ## `<input bind:indeterminate>`
 
 Checkboxes can be in an [indeterminate](https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement/indeterminate) state, independently of whether they are checked or unchecked:
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js
index 9f02e7fa5a..995d251a2e 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js
@@ -33,7 +33,7 @@ export function BindDirective(node, context) {
 				e.bind_invalid_target(
 					node,
 					node.name,
-					property.valid_elements.map((valid_element) => `<${valid_element}>`).join(', ')
+					property.valid_elements.map((valid_element) => `\`<${valid_element}>\``).join(', ')
 				);
 			}
 
@@ -67,11 +67,15 @@ export function BindDirective(node, context) {
 					}
 				} else {
 					if (node.name === 'checked' && type?.value[0].data !== 'checkbox') {
-						e.bind_invalid_target(node, node.name, '<input type="checkbox">');
+						e.bind_invalid_target(
+							node,
+							node.name,
+							`\`<input type="checkbox">\`${type?.value[0].data === 'radio' ? ` — for \`<input type="radio">\`, use \`bind:group\`` : ''}`
+						);
 					}
 
 					if (node.name === 'files' && type?.value[0].data !== 'file') {
-						e.bind_invalid_target(node, node.name, '<input type="file">');
+						e.bind_invalid_target(node, node.name, '`<input type="file">`');
 					}
 				}
 			}
@@ -94,7 +98,7 @@ export function BindDirective(node, context) {
 				e.bind_invalid_target(
 					node,
 					node.name,
-					`non-<svg> elements. Use 'clientWidth' for <svg> instead`
+					`non-\`<svg>\` elements. Use \`bind:clientWidth\` for \`<svg>\` instead`
 				);
 			}
 
diff --git a/packages/svelte/tests/compiler-errors/samples/dynamic-element-binding-invalid/_config.js b/packages/svelte/tests/compiler-errors/samples/dynamic-element-binding-invalid/_config.js
index 4bb3edc27b..25b0827765 100644
--- a/packages/svelte/tests/compiler-errors/samples/dynamic-element-binding-invalid/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/dynamic-element-binding-invalid/_config.js
@@ -3,6 +3,6 @@ import { test } from '../../test';
 export default test({
 	error: {
 		code: 'bind_invalid_target',
-		message: '`bind:value` can only be used with <input>, <textarea>, <select>'
+		message: '`bind:value` can only be used with `<input>`, `<textarea>`, `<select>`'
 	}
 });
diff --git a/packages/svelte/tests/validator/samples/binding-dimensions-svg/errors.json b/packages/svelte/tests/validator/samples/binding-dimensions-svg/errors.json
index 4d3819453c..61e6ca6355 100644
--- a/packages/svelte/tests/validator/samples/binding-dimensions-svg/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-dimensions-svg/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "bind_invalid_target",
-		"message": "`bind:offsetWidth` can only be used with non-<svg> elements. Use 'clientWidth' for <svg> instead",
+		"message": "`bind:offsetWidth` can only be used with non-`<svg>` elements. Use `bind:clientWidth` for `<svg>` instead",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/binding-input-checked/errors.json b/packages/svelte/tests/validator/samples/binding-input-checked/errors.json
index 574b25e06f..d7e8e48c95 100644
--- a/packages/svelte/tests/validator/samples/binding-input-checked/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-input-checked/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "bind_invalid_target",
-		"message": "`bind:checked` can only be used with <input type=\"checkbox\">",
+		"message": "`bind:checked` can only be used with `<input type=\"checkbox\">`",
 		"start": {
 			"line": 5,
 			"column": 7
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-on-element-2/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-on-element-2/errors.json
index 92111a4ec2..19d0cd0ce1 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-on-element-2/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-on-element-2/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "bind_invalid_target",
-		"message": "`bind:open` can only be used with <details>",
+		"message": "`bind:open` can only be used with `<details>`",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/binding-invalid-on-element/errors.json b/packages/svelte/tests/validator/samples/binding-invalid-on-element/errors.json
index 6626afc1d0..781a8301ea 100644
--- a/packages/svelte/tests/validator/samples/binding-invalid-on-element/errors.json
+++ b/packages/svelte/tests/validator/samples/binding-invalid-on-element/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "bind_invalid_target",
-		"message": "`bind:value` can only be used with <input>, <textarea>, <select>",
+		"message": "`bind:value` can only be used with `<input>`, `<textarea>`, `<select>`",
 		"start": {
 			"line": 5,
 			"column": 5
diff --git a/packages/svelte/tests/validator/samples/binding-radio-input-checked/errors.json b/packages/svelte/tests/validator/samples/binding-radio-input-checked/errors.json
new file mode 100644
index 0000000000..beb46affc5
--- /dev/null
+++ b/packages/svelte/tests/validator/samples/binding-radio-input-checked/errors.json
@@ -0,0 +1,14 @@
+[
+	{
+		"code": "bind_invalid_target",
+		"message": "`bind:checked` can only be used with `<input type=\"checkbox\">` — for `<input type=\"radio\">`, use `bind:group`",
+		"start": {
+			"line": 5,
+			"column": 20
+		},
+		"end": {
+			"line": 5,
+			"column": 38
+		}
+	}
+]
diff --git a/packages/svelte/tests/validator/samples/binding-radio-input-checked/input.svelte b/packages/svelte/tests/validator/samples/binding-radio-input-checked/input.svelte
new file mode 100644
index 0000000000..67e7b77a3a
--- /dev/null
+++ b/packages/svelte/tests/validator/samples/binding-radio-input-checked/input.svelte
@@ -0,0 +1,5 @@
+<script>
+	let foo;
+</script>
+
+<input type="radio" bind:checked={foo}>
\ No newline at end of file

From 499973454af1081e19d7eaae87658f3b76d3d091 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Wed, 1 Oct 2025 09:03:50 -0700
Subject: [PATCH 63/68] fix: check boundary `pending` attribute at runtime on
 server (#16855)

* fix: check boundary `pending` attribute at runtime on server

* fix

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/lazy-cooks-return.md               |  5 ++
 .../server/visitors/SvelteBoundary.js         | 50 ++++++++++++++-----
 packages/svelte/src/compiler/phases/scope.js  |  6 +++
 .../_expected.html                            |  1 +
 .../async-nullish-pending-snippet/main.svelte |  6 +++
 5 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/lazy-cooks-return.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-nullish-pending-snippet/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-nullish-pending-snippet/main.svelte

diff --git a/.changeset/lazy-cooks-return.md b/.changeset/lazy-cooks-return.md
new file mode 100644
index 0000000000..d2f346f76d
--- /dev/null
+++ b/.changeset/lazy-cooks-return.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: check boundary `pending` attribute at runtime on server
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
index 39e6912be0..b272870ac3 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
@@ -7,6 +7,7 @@ import {
 	block_open,
 	block_open_else,
 	build_attribute_value,
+	build_template,
 	create_async_block
 } from './shared/utils.js';
 
@@ -19,6 +20,11 @@ export function SvelteBoundary(node, context) {
 	const pending_attribute = /** @type {AST.Attribute} */ (
 		node.attributes.find((node) => node.type === 'Attribute' && node.name === 'pending')
 	);
+	const is_pending_attr_nullish =
+		pending_attribute &&
+		typeof pending_attribute.value === 'object' &&
+		!Array.isArray(pending_attribute.value) &&
+		!context.state.scope.evaluate(pending_attribute.value.expression).is_defined;
 
 	const pending_snippet = /** @type {AST.SnippetBlock} */ (
 		node.fragment.nodes.find(
@@ -27,20 +33,38 @@ export function SvelteBoundary(node, context) {
 	);
 
 	if (pending_attribute || pending_snippet) {
-		const pending = pending_attribute
-			? b.call(
-					build_attribute_value(
-						pending_attribute.value,
-						context,
-						(expression) => expression,
-						false,
-						true
-					),
-					b.id('$$renderer')
+		if (pending_attribute && is_pending_attr_nullish && !pending_snippet) {
+			const callee = build_attribute_value(
+				pending_attribute.value,
+				context,
+				(expression) => expression,
+				false,
+				true
+			);
+			const pending = b.call(callee, b.id('$$renderer'));
+			const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
+			context.state.template.push(
+				b.if(
+					callee,
+					b.block(build_template([block_open_else, pending, block_close])),
+					b.block(build_template([block_open, block, block_close]))
 				)
-			: /** @type {BlockStatement} */ (context.visit(pending_snippet.body));
-
-		context.state.template.push(block_open_else, pending, block_close);
+			);
+		} else {
+			const pending = pending_attribute
+				? b.call(
+						build_attribute_value(
+							pending_attribute.value,
+							context,
+							(expression) => expression,
+							false,
+							true
+						),
+						b.id('$$renderer')
+					)
+				: /** @type {BlockStatement} */ (context.visit(pending_snippet.body));
+			context.state.template.push(block_open_else, pending, block_close);
+		}
 	} else {
 		const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
 		const statement = node.fragment.metadata.has_await
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index 887bc47c56..0c6b64dd04 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -260,6 +260,12 @@ class Evaluation {
 						break;
 					}
 
+					if (binding.initial?.type === 'SnippetBlock') {
+						this.is_defined = true;
+						this.is_known = false;
+						break;
+					}
+
 					if (!binding.updated && binding.initial !== null && !is_prop) {
 						binding.scope.evaluate(/** @type {Expression} */ (binding.initial), this.values);
 						break;
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-nullish-pending-snippet/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-nullish-pending-snippet/_expected.html
new file mode 100644
index 0000000000..1cc0b4b00f
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-nullish-pending-snippet/_expected.html
@@ -0,0 +1 @@
+<!--[--><!--[--><!---->awaited<!--]--><!--]-->
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-nullish-pending-snippet/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-nullish-pending-snippet/main.svelte
new file mode 100644
index 0000000000..b4e8dbcb75
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-nullish-pending-snippet/main.svelte
@@ -0,0 +1,6 @@
+<script>
+    let pending = null;
+</script>
+<svelte:boundary {pending}>
+    {await 'awaited'}
+</svelte:boundary>
\ No newline at end of file

From 949c026259eb7d10cb50c92eec01f542b3916e05 Mon Sep 17 00:00:00 2001
From: Jungzl <13jungzl@gmail.com>
Date: Thu, 2 Oct 2025 00:04:03 +0800
Subject: [PATCH 64/68] fix: preserve tuple type in `$state.snapshot` (#16864)

* fix: preserve tuple type in `$state.snapshot`

* Update .changeset/lucky-moles-enjoy.md

---------

Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 .changeset/lucky-moles-enjoy.md  |  5 +++++
 packages/svelte/src/ambient.d.ts | 16 +++++++++-------
 packages/svelte/types/index.d.ts | 16 +++++++++-------
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/lucky-moles-enjoy.md

diff --git a/.changeset/lucky-moles-enjoy.md b/.changeset/lucky-moles-enjoy.md
new file mode 100644
index 0000000000..ef1dfe4bdd
--- /dev/null
+++ b/.changeset/lucky-moles-enjoy.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: preserve tuple type in `$state.snapshot`
diff --git a/packages/svelte/src/ambient.d.ts b/packages/svelte/src/ambient.d.ts
index 59128e45f0..d655fb648a 100644
--- a/packages/svelte/src/ambient.d.ts
+++ b/packages/svelte/src/ambient.d.ts
@@ -85,13 +85,15 @@ declare namespace $state {
 			? NonReactive<T>
 			: T extends { toJSON(): infer R }
 				? R
-				: T extends Array<infer U>
-					? Array<Snapshot<U>>
-					: T extends object
-						? T extends { [key: string]: any }
-							? { [K in keyof T]: Snapshot<T[K]> }
-							: never
-						: never;
+				: T extends readonly unknown[]
+					? { [K in keyof T]: Snapshot<T[K]> }
+					: T extends Array<infer U>
+						? Array<Snapshot<U>>
+						: T extends object
+							? T extends { [key: string]: any }
+								? { [K in keyof T]: Snapshot<T[K]> }
+								: never
+							: never;
 
 	/**
 	 * Declares state that is _not_ made deeply reactive — instead of mutating it,
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 2c015b5a10..6dc6629faa 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -3171,13 +3171,15 @@ declare namespace $state {
 			? NonReactive<T>
 			: T extends { toJSON(): infer R }
 				? R
-				: T extends Array<infer U>
-					? Array<Snapshot<U>>
-					: T extends object
-						? T extends { [key: string]: any }
-							? { [K in keyof T]: Snapshot<T[K]> }
-							: never
-						: never;
+				: T extends readonly unknown[]
+					? { [K in keyof T]: Snapshot<T[K]> }
+					: T extends Array<infer U>
+						? Array<Snapshot<U>>
+						: T extends object
+							? T extends { [key: string]: any }
+								? { [K in keyof T]: Snapshot<T[K]> }
+								: never
+							: never;
 
 	/**
 	 * Declares state that is _not_ made deeply reactive — instead of mutating it,

From fdb01fd9663937411f9d9a7a9306bf823d4acee4 Mon Sep 17 00:00:00 2001
From: Michael Shilman <shilman@users.noreply.github.com>
Date: Thu, 2 Oct 2025 00:05:53 +0800
Subject: [PATCH 65/68] docs: Promote Storybook testing to h2 (#16792)

* Promote Storybook testing

Storybook testing docs are currently buried in the page contents. This change makes it visible in the right-hand table of contents.

* Incorporate review feedback
---
 documentation/docs/07-misc/02-testing.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/docs/07-misc/02-testing.md b/documentation/docs/07-misc/02-testing.md
index 23e2e023d3..4807fc8f0c 100644
--- a/documentation/docs/07-misc/02-testing.md
+++ b/documentation/docs/07-misc/02-testing.md
@@ -4,7 +4,7 @@ title: Testing
 
 Testing helps you write and maintain your code and guard against regressions. Testing frameworks help you with that, allowing you to describe assertions or expectations about how your code should behave. Svelte is unopinionated about which testing framework you use — you can write unit tests, integration tests, and end-to-end tests using solutions like [Vitest](https://vitest.dev/), [Jasmine](https://jasmine.github.io/), [Cypress](https://www.cypress.io/) and [Playwright](https://playwright.dev/).
 
-## Unit and integration testing using Vitest
+## Unit and component tests with Vitest
 
 Unit tests allow you to test small isolated parts of your code. Integration tests allow you to test parts of your application to see if they work together. If you're using Vite (including via SvelteKit), we recommend using [Vitest](https://vitest.dev/). You can use the Svelte CLI to [setup Vitest](/docs/cli/vitest) either during project creation or later on.
 
@@ -246,7 +246,7 @@ test('Component', async () => {
 
 When writing component tests that involve two-way bindings, context or snippet props, it's best to create a wrapper component for your specific test and interact with that. `@testing-library/svelte` contains some [examples](https://testing-library.com/docs/svelte-testing-library/example).
 
-### Component testing with Storybook
+## Component tests with Storybook
 
 [Storybook](https://storybook.js.org) is a tool for developing and documenting UI components, and it can also be used to test your components. They're run with Vitest's browser mode, which renders your components in a real browser for the most realistic testing environment.
 
@@ -288,7 +288,7 @@ You can create stories for component variations and test interactions with the [
 />
 ```
 
-## E2E tests using Playwright
+## End-to-end tests with Playwright
 
 E2E (short for 'end to end') tests allow you to test your full application through the eyes of the user. This section uses [Playwright](https://playwright.dev/) as an example, but you can also use other solutions like [Cypress](https://www.cypress.io/) or [NightwatchJS](https://nightwatchjs.org/).
 

From 5c847ff79e13cf3a901794ba1fd053c12b2a744d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 12:07:12 -0400
Subject: [PATCH 66/68] Version Packages (#16877)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/lazy-cooks-return.md |  5 -----
 .changeset/lucky-moles-enjoy.md |  5 -----
 .changeset/poor-flies-serve.md  |  5 -----
 .changeset/slow-nails-push.md   |  5 -----
 packages/svelte/CHANGELOG.md    | 12 ++++++++++++
 packages/svelte/package.json    |  2 +-
 packages/svelte/src/version.js  |  2 +-
 7 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 .changeset/lazy-cooks-return.md
 delete mode 100644 .changeset/lucky-moles-enjoy.md
 delete mode 100644 .changeset/poor-flies-serve.md
 delete mode 100644 .changeset/slow-nails-push.md

diff --git a/.changeset/lazy-cooks-return.md b/.changeset/lazy-cooks-return.md
deleted file mode 100644
index d2f346f76d..0000000000
--- a/.changeset/lazy-cooks-return.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: check boundary `pending` attribute at runtime on server
diff --git a/.changeset/lucky-moles-enjoy.md b/.changeset/lucky-moles-enjoy.md
deleted file mode 100644
index ef1dfe4bdd..0000000000
--- a/.changeset/lucky-moles-enjoy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: preserve tuple type in `$state.snapshot`
diff --git a/.changeset/poor-flies-serve.md b/.changeset/poor-flies-serve.md
deleted file mode 100644
index 1ac13a88ab..0000000000
--- a/.changeset/poor-flies-serve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: allow await in svelte:boundary without pending
diff --git a/.changeset/slow-nails-push.md b/.changeset/slow-nails-push.md
deleted file mode 100644
index 8dedf35593..0000000000
--- a/.changeset/slow-nails-push.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: update `bind:checked` error message to clarify usage with radio inputs
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 58cc215e9d..18a726277f 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.39.8
+
+### Patch Changes
+
+- fix: check boundary `pending` attribute at runtime on server ([#16855](https://github.com/sveltejs/svelte/pull/16855))
+
+- fix: preserve tuple type in `$state.snapshot` ([#16864](https://github.com/sveltejs/svelte/pull/16864))
+
+- fix: allow await in svelte:boundary without pending ([#16857](https://github.com/sveltejs/svelte/pull/16857))
+
+- fix: update `bind:checked` error message to clarify usage with radio inputs ([#16874](https://github.com/sveltejs/svelte/pull/16874))
+
 ## 5.39.7
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index e5ed8c5aaf..21752e2d4b 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.39.7",
+  "version": "5.39.8",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index aa515b600d..6d69b57447 100644
--- a/packages/svelte/src/version.js
+++ b/packages/svelte/src/version.js
@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.39.7';
+export const VERSION = '5.39.8';
 export const PUBLIC_VERSION = '5';

From 01fc47d155ce7d4b94b32adf1db85179df6b9977 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 2 Oct 2025 10:48:15 -0700
Subject: [PATCH 67/68] docs: link to new packages page (#16882)

---
 .../docs/01-introduction/02-getting-started.md       |  4 ++--
 documentation/docs/07-misc/99-faq.md                 | 12 ++----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/documentation/docs/01-introduction/02-getting-started.md b/documentation/docs/01-introduction/02-getting-started.md
index e97a46ad34..2ad22c8469 100644
--- a/documentation/docs/01-introduction/02-getting-started.md
+++ b/documentation/docs/01-introduction/02-getting-started.md
@@ -15,11 +15,11 @@ Don't worry if you don't know Svelte yet! You can ignore all the nice features S
 
 ## Alternatives to SvelteKit
 
-You can also use Svelte directly with Vite by running `npm create vite@latest` and selecting the `svelte` option. With this, `npm run build` will generate HTML, JS, and CSS files inside the `dist` directory using [vite-plugin-svelte](https://github.com/sveltejs/vite-plugin-svelte). In most cases, you will probably need to [choose a routing library](faq#Is-there-a-router) as well.
+You can also use Svelte directly with Vite by running `npm create vite@latest` and selecting the `svelte` option. With this, `npm run build` will generate HTML, JS, and CSS files inside the `dist` directory using [vite-plugin-svelte](https://github.com/sveltejs/vite-plugin-svelte). In most cases, you will probably need to [choose a routing library](/packages#routing) as well.
 
 >[!NOTE] Vite is often used in standalone mode to build [single page apps (SPAs)](../kit/glossary#SPA), which you can also [build with SvelteKit](../kit/single-page-apps).
 
-There are also plugins for [Rollup](https://github.com/sveltejs/rollup-plugin-svelte), [Webpack](https://github.com/sveltejs/svelte-loader) [and a few others](https://sveltesociety.dev/packages?category=build-plugins), but we recommend Vite.
+There are also [plugins for other bundlers](/packages#bundler-plugins), but we recommend Vite.
 
 ## Editor tooling
 
diff --git a/documentation/docs/07-misc/99-faq.md b/documentation/docs/07-misc/99-faq.md
index cf98cdd3c3..cf84180dc2 100644
--- a/documentation/docs/07-misc/99-faq.md
+++ b/documentation/docs/07-misc/99-faq.md
@@ -91,17 +91,9 @@ Some resources for getting started with testing:
 
 ## Is there a router?
 
-The official routing library is [SvelteKit](/docs/kit). SvelteKit provides a filesystem router, server-side rendering (SSR), and hot module reloading (HMR) in one easy-to-use package. It shares similarities with Next.js for React.
+The official routing library is [SvelteKit](/docs/kit). SvelteKit provides a filesystem router, server-side rendering (SSR), and hot module reloading (HMR) in one easy-to-use package. It shares similarities with Next.js for React and Nuxt.js for Vue.
 
-However, you can use any router library. A lot of people use [page.js](https://github.com/visionmedia/page.js). There's also [navaid](https://github.com/lukeed/navaid), which is very similar. And [universal-router](https://github.com/kriasoft/universal-router), which is isomorphic with child routes, but without built-in history support.
-
-If you prefer a declarative HTML approach, there's the isomorphic [svelte-routing](https://github.com/EmilTholin/svelte-routing) library and a fork of it called [svelte-navigator](https://github.com/mefechoel/svelte-navigator) containing some additional functionality.
-
-If you need hash-based routing on the client side, check out the [hash option](https://svelte.dev/docs/kit/configuration#router) in SvelteKit, [svelte-spa-router](https://github.com/ItalyPaleAle/svelte-spa-router), or [abstract-state-router](https://github.com/TehShrike/abstract-state-router/).
-
-[Routify](https://routify.dev) is another filesystem-based router, similar to SvelteKit's router. Version 3 supports Svelte's native SSR.
-
-You can see a [community-maintained list of routers on sveltesociety.dev](https://sveltesociety.dev/packages?category=routers).
+However, you can use any router library. A sampling of available routers are highlighted [on the packages page](/packages#routing).
 
 ## How do I write a mobile app with Svelte?
 

From 30e2b23b591ec560a8972caffc37b2974fabbfb0 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 2 Oct 2025 20:29:55 -0700
Subject: [PATCH 68/68] docs: update one more link to the packages page
 (#16883)

---
 documentation/docs/07-misc/99-faq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/07-misc/99-faq.md b/documentation/docs/07-misc/99-faq.md
index cf84180dc2..1816998299 100644
--- a/documentation/docs/07-misc/99-faq.md
+++ b/documentation/docs/07-misc/99-faq.md
@@ -65,7 +65,7 @@ There will be a blog post about this eventually, but in the meantime, check out
 
 ## Is there a UI component library?
 
-There are several UI component libraries as well as standalone components. Find them under the [design systems section of the components page](https://sveltesociety.dev/packages?category=design-system) on the Svelte Society website.
+There are several [UI component libraries](/packages#component-libraries) as well as standalone components listed on [the packages page](/packages).
 
 ## How do I test Svelte apps?