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 001/347] 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 002/347] 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 003/347] 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 004/347] 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 005/347] 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 006/347] 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 007/347] 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 008/347] 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 009/347] 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 010/347] 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 011/347] 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 012/347] 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 013/347] 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 014/347] 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 015/347] 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 016/347] 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 017/347] 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 018/347] 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 019/347] 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 020/347] 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 021/347] 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 022/347] 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 023/347] 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 024/347] 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 025/347] 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 026/347] 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 027/347] 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 028/347] 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 029/347] 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 030/347] 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 031/347] 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 032/347] 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 033/347] 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 034/347] 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 035/347] 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 036/347] 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 037/347] 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 038/347] 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 039/347] 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 040/347] 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 041/347] 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 042/347] 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 043/347] 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 044/347] 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 045/347] 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 046/347] 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 047/347] 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 048/347] 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 049/347] 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 050/347] 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 051/347] 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 052/347] 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 053/347] 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 054/347] 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 055/347] 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 056/347] 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 057/347] 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 058/347] 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 059/347] 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 060/347] 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 061/347] 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 062/347] 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 063/347] 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 064/347] 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 065/347] 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?
 

From 2b49a5e3c0851ddba87d78b48551bd5f40e1ee13 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sun, 5 Oct 2025 17:59:58 -0400
Subject: [PATCH 066/347] fix: flush when pending boundaries resolve (#16897)

* fix: flush when pending boundaries resolve

* note to self

* Update packages/svelte/src/internal/client/dom/blocks/boundary.js
---
 .changeset/swift-starfishes-knock.md                  |  5 +++++
 .../svelte/src/internal/client/dom/blocks/boundary.js |  7 +++++++
 .../samples/async-attachment-in-block/_config.js      | 11 +++++++++++
 .../samples/async-attachment-in-block/main.svelte     |  9 +++++++++
 4 files changed, 32 insertions(+)
 create mode 100644 .changeset/swift-starfishes-knock.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-attachment-in-block/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-attachment-in-block/main.svelte

diff --git a/.changeset/swift-starfishes-knock.md b/.changeset/swift-starfishes-knock.md
new file mode 100644
index 0000000000..790b3fe697
--- /dev/null
+++ b/.changeset/swift-starfishes-knock.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: flush when pending boundaries resolve
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 6dde40d889..88f4a85e20 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -285,6 +285,13 @@ export class Boundary {
 				this.#anchor.before(this.#offscreen_fragment);
 				this.#offscreen_fragment = null;
 			}
+
+			// TODO this feels like a little bit of a kludge, but until we
+			// overhaul the boundary/batch relationship it's probably
+			// the most pragmatic solution available to us
+			queue_micro_task(() => {
+				Batch.ensure().flush();
+			});
 		}
 	}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-attachment-in-block/_config.js b/packages/svelte/tests/runtime-runes/samples/async-attachment-in-block/_config.js
new file mode 100644
index 0000000000..97da1bf835
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-attachment-in-block/_config.js
@@ -0,0 +1,11 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client', 'hydrate'],
+
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<div>attachment ran</div>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-attachment-in-block/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-attachment-in-block/main.svelte
new file mode 100644
index 0000000000..027b980bd1
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-attachment-in-block/main.svelte
@@ -0,0 +1,9 @@
+{#if await true}
+	<div
+		{@attach (node) => {
+			node.textContent = 'attachment ran';
+		}}
+	>
+		attachment did not run
+	</div>
+{/if}

From acdd93053da6a34aef104521ab87e85fe78081b6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 5 Oct 2025 19:11:05 -0400
Subject: [PATCH 067/347] Version Packages (#16899)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/swift-starfishes-knock.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/swift-starfishes-knock.md

diff --git a/.changeset/swift-starfishes-knock.md b/.changeset/swift-starfishes-knock.md
deleted file mode 100644
index 790b3fe697..0000000000
--- a/.changeset/swift-starfishes-knock.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: flush when pending boundaries resolve
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 18a726277f..13a2b4cc4d 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.39.9
+
+### Patch Changes
+
+- fix: flush when pending boundaries resolve ([#16897](https://github.com/sveltejs/svelte/pull/16897))
+
 ## 5.39.8
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 21752e2d4b..7a616abbe8 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.8",
+  "version": "5.39.9",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 6d69b57447..efc02968d7 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.8';
+export const VERSION = '5.39.9';
 export const PUBLIC_VERSION = '5';

From fc39f2ed0d2dd60bf1acd49fefb5c4e934d88b09 Mon Sep 17 00:00:00 2001
From: "Dominik G." <dominik.goepel@gmx.de>
Date: Mon, 6 Oct 2025 18:23:59 +0200
Subject: [PATCH 068/347] chore: port security improvements from
 vite-ecosystem-ci trigger workflow in vite repo (#16902)

---
 .github/workflows/ecosystem-ci-trigger.yml | 45 ++++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ecosystem-ci-trigger.yml b/.github/workflows/ecosystem-ci-trigger.yml
index aa08df2f84..8a6d1bf345 100644
--- a/.github/workflows/ecosystem-ci-trigger.yml
+++ b/.github/workflows/ecosystem-ci-trigger.yml
@@ -11,14 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'sveltejs/svelte' && github.event.issue.pull_request && startsWith(github.event.comment.body, '/ecosystem-ci run')
     permissions:
-      issues: write # to add / delete reactions
+      issues: write # to add / delete reactions, post comments
       pull-requests: write # to read PR data, and to add labels
       actions: read # to check workflow status
       contents: read # to clone the repo
     steps:
-      - name: monitor action permissions
-      - name: check user authorization # user needs triage permission
-        uses: actions/github-script@v7
+      - name: Check User Permissions
+        uses: actions/github-script@v8
         id: check-permissions
         with:
           script: |
@@ -57,7 +56,7 @@ jobs:
             }
 
       - name: Get PR Data
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         id: get-pr-data
         with:
           script: |
@@ -67,6 +66,37 @@ jobs:
               repo: context.repo.repo,
               pull_number: context.issue.number
             })
+
+            const commentCreatedAt = new Date(context.payload.comment.created_at)
+            const commitPushedAt = new Date(pr.head.repo.pushed_at)
+
+            console.log(`Comment created at: ${commentCreatedAt.toISOString()}`)
+            console.log(`PR last pushed at: ${commitPushedAt.toISOString()}`)
+
+            // Check if any commits were pushed after the comment was created
+            if (commitPushedAt > commentCreatedAt) {
+              const errorMsg = [
+                '⚠️ Security warning: PR was updated after the trigger command was posted.',
+                '',
+                `Comment posted at: ${commentCreatedAt.toISOString()}`,
+                `PR last pushed at: ${commitPushedAt.toISOString()}`,
+                '',
+                'This could indicate an attempt to inject code after approval.',
+                'Please review the latest changes and re-run /ecosystem-ci run if they are acceptable.'
+              ].join('\n')
+
+              core.setFailed(errorMsg)
+
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                body: errorMsg
+              })
+
+              throw new Error('PR was pushed to after comment was created')
+            }
+
             return {
               num: context.issue.number,
               branchName: pr.head.ref,
@@ -85,15 +115,16 @@ jobs:
             svelte-ecosystem-ci
 
       - name: Trigger Downstream Workflow
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         id: trigger
         env:
           COMMENT: ${{ github.event.comment.body }}
+          PR_DATA: ${{ steps.get-pr-data.outputs.result }}
         with:
           github-token: ${{ steps.generate-token.outputs.token }}
           script: |
             const comment = process.env.COMMENT.trim()
-            const prData = ${{ steps.get-pr-data.outputs.result }}
+            const prData = JSON.parse(process.env.PR_DATA)
 
             const suite = comment.split('\n')[0].replace(/^\/ecosystem-ci run/, '').trim()
 

From 303750a1241ac0ded3115ff879fa417e23fe7c89 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Tue, 7 Oct 2025 07:21:43 -0700
Subject: [PATCH 069/347] fix: don't replace rest props with `$$props` for
 excluded props (#16898)

Closes #16895
---
 .changeset/nervous-flies-laugh.md                 |  5 +++++
 .../2-analyze/visitors/VariableDeclarator.js      | 15 +++++++++++++++
 .../3-transform/client/visitors/Identifier.js     |  6 +++++-
 packages/svelte/src/compiler/phases/scope.js      |  2 +-
 .../rest-props-excludes-properties/_config.js     |  7 +++++++
 .../component.svelte                              |  4 ++++
 .../rest-props-excludes-properties/main.svelte    |  4 ++++
 7 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/nervous-flies-laugh.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/main.svelte

diff --git a/.changeset/nervous-flies-laugh.md b/.changeset/nervous-flies-laugh.md
new file mode 100644
index 0000000000..88c7694bcd
--- /dev/null
+++ b/.changeset/nervous-flies-laugh.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't replace rest props with `$$props` for excluded props
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 f56a665de8..7a85b4a93a 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js
@@ -46,6 +46,21 @@ export function VariableDeclarator(node, context) {
 								: path.is_rest
 									? 'rest_prop'
 									: 'prop';
+				if (rune === '$props' && binding.kind === 'rest_prop' && node.id.type === 'ObjectPattern') {
+					const { properties } = node.id;
+					/** @type {string[]} */
+					const exclude_props = [];
+					for (const property of properties) {
+						if (property.type === 'RestElement') {
+							continue;
+						}
+						const key = /** @type {Identifier | Literal & { value: string | number }} */ (
+							property.key
+						);
+						exclude_props.push(key.type === 'Identifier' ? key.name : key.value.toString());
+					}
+					(binding.metadata ??= {}).exclude_props = exclude_props;
+				}
 			}
 		}
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Identifier.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Identifier.js
index b01ed01bd7..b43ec7891e 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Identifier.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Identifier.js
@@ -32,7 +32,11 @@ export function Identifier(node, context) {
 				grand_parent?.type !== 'AssignmentExpression' &&
 				grand_parent?.type !== 'UpdateExpression'
 			) {
-				return b.id('$$props');
+				const key = /** @type {Identifier} */ (parent.property);
+
+				if (!binding.metadata?.exclude_props?.includes(key.name)) {
+					return b.id('$$props');
+				}
 			}
 		}
 
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index 0c6b64dd04..ffccaffba3 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -122,7 +122,7 @@ export class Binding {
 
 	/**
 	 * Additional metadata, varies per binding type
-	 * @type {null | { inside_rest?: boolean; is_template_declaration?: boolean }}
+	 * @type {null | { inside_rest?: boolean; is_template_declaration?: boolean; exclude_props?: string[] }}
 	 */
 	metadata = null;
 
diff --git a/packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/_config.js b/packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/_config.js
new file mode 100644
index 0000000000..66a42c08db
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/_config.js
@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		assert.equal(target.textContent, ' false');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/component.svelte b/packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/component.svelte
new file mode 100644
index 0000000000..40561218db
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/component.svelte
@@ -0,0 +1,4 @@
+<script>
+    const { name, ...rest } = $props();
+</script>
+{rest.name} {'name' in rest}
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/main.svelte b/packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/main.svelte
new file mode 100644
index 0000000000..d9f6d8a21c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/rest-props-excludes-properties/main.svelte
@@ -0,0 +1,4 @@
+<script>
+    import Component from './component.svelte';
+</script>
+<Component name='world' />
\ No newline at end of file

From 5d1ffcf413aa475dad2bdf975e907e2958615342 Mon Sep 17 00:00:00 2001
From: Yuki Ishii <keryuuki0418@gmail.com>
Date: Tue, 7 Oct 2025 23:27:30 +0900
Subject: [PATCH 070/347] fix: allow await in if block consequent and alternate
 (#16890)

Closes #16885
---
 .changeset/kind-tigers-retire.md                       |  5 +++++
 .../phases/3-transform/server/visitors/IfBlock.js      |  6 +++++-
 .../samples/async-if-const/_expected.html              |  1 +
 .../samples/async-if-const/main.svelte                 | 10 ++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/kind-tigers-retire.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-if-const/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/async-if-const/main.svelte

diff --git a/.changeset/kind-tigers-retire.md b/.changeset/kind-tigers-retire.md
new file mode 100644
index 0000000000..432ff1858b
--- /dev/null
+++ b/.changeset/kind-tigers-retire.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: allow await in if block consequent and alternate
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 798cb02e49..a869a8edf1 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
@@ -23,7 +23,11 @@ export function IfBlock(node, context) {
 	/** @type {Statement} */
 	let statement = b.if(test, consequent, alternate);
 
-	if (node.metadata.expression.has_await) {
+	if (
+		node.metadata.expression.has_await ||
+		node.consequent.metadata.has_await ||
+		node.alternate?.metadata.has_await
+	) {
 		statement = create_async_block(b.block([statement]));
 	}
 
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-if-const/_expected.html b/packages/svelte/tests/server-side-rendering/samples/async-if-const/_expected.html
new file mode 100644
index 0000000000..e440e5c842
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-if-const/_expected.html
@@ -0,0 +1 @@
+3
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/async-if-const/main.svelte b/packages/svelte/tests/server-side-rendering/samples/async-if-const/main.svelte
new file mode 100644
index 0000000000..1437ac8f14
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/async-if-const/main.svelte
@@ -0,0 +1,10 @@
+{#if false}
+  {@const one = await 1}
+  {one}
+{:else if false}
+  {@const two = await 2}
+  {two}
+{:else}
+  {@const three = await 3}
+  {three}
+{/if} 

From edcd4b59e3d06b14e8b5bc216b7e8ea874dd4995 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Tue, 7 Oct 2025 07:29:34 -0700
Subject: [PATCH 071/347] fix: correctly transform `$derived` private fields on
 server (#16894)

Closes #16889
---
 .changeset/seven-flies-drop.md                              | 5 +++++
 .../phases/3-transform/server/visitors/MemberExpression.js  | 6 +-----
 .../samples/class-state-derived-private/main.svelte         | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/seven-flies-drop.md

diff --git a/.changeset/seven-flies-drop.md b/.changeset/seven-flies-drop.md
new file mode 100644
index 0000000000..fed9c7dcac
--- /dev/null
+++ b/.changeset/seven-flies-drop.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly transform `$derived` private fields on server
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/MemberExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/MemberExpression.js
index 50b5ae793f..6326e9efe2 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/MemberExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/MemberExpression.js
@@ -7,11 +7,7 @@ import * as b from '#compiler/builders';
  * @param {Context} context
  */
 export function MemberExpression(node, context) {
-	if (
-		context.state.analysis.runes &&
-		node.object.type === 'ThisExpression' &&
-		node.property.type === 'PrivateIdentifier'
-	) {
+	if (context.state.analysis.runes && node.property.type === 'PrivateIdentifier') {
 		const field = context.state.state_fields?.get(`#${node.property.name}`);
 
 		if (field?.type === '$derived' || field?.type === '$derived.by') {
diff --git a/packages/svelte/tests/runtime-runes/samples/class-state-derived-private/main.svelte b/packages/svelte/tests/runtime-runes/samples/class-state-derived-private/main.svelte
index d971566396..92a1f5ab94 100644
--- a/packages/svelte/tests/runtime-runes/samples/class-state-derived-private/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/class-state-derived-private/main.svelte
@@ -9,7 +9,8 @@
 		}
 
 		get embiggened1() {
-			return this.#doubled;
+			const self = this;
+			return self.#doubled;
 		}
 
 		get embiggened2() {

From 1b1f14439660fed4df5074b9a648e9a1858e3b26 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Tue, 7 Oct 2025 17:11:39 +0200
Subject: [PATCH 072/347] fix: add `UNKNOWN` evaluation value before breaking
 for `binding.initial===SnippetBlock` (#16910)

---
 .changeset/tall-parents-go.md                     |  5 +++++
 packages/svelte/src/compiler/phases/scope.js      |  1 +
 .../const-snippet-reactive/Component.svelte       |  5 +++++
 .../samples/const-snippet-reactive/_config.js     | 10 ++++++++++
 .../samples/const-snippet-reactive/main.svelte    | 15 +++++++++++++++
 5 files changed, 36 insertions(+)
 create mode 100644 .changeset/tall-parents-go.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/main.svelte

diff --git a/.changeset/tall-parents-go.md b/.changeset/tall-parents-go.md
new file mode 100644
index 0000000000..6146a5c675
--- /dev/null
+++ b/.changeset/tall-parents-go.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: add `UNKNOWN` evaluation value before breaking for `binding.initial===SnippetBlock`
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index ffccaffba3..f7d3dac0f7 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -263,6 +263,7 @@ class Evaluation {
 					if (binding.initial?.type === 'SnippetBlock') {
 						this.is_defined = true;
 						this.is_known = false;
+						this.values.add(UNKNOWN);
 						break;
 					}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/Component.svelte b/packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/Component.svelte
new file mode 100644
index 0000000000..ba0e19e0a3
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/Component.svelte
@@ -0,0 +1,5 @@
+<script>
+	let { test } = $props();
+</script>
+
+{@render test?.()}
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/_config.js b/packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/_config.js
new file mode 100644
index 0000000000..5f6a0172ca
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/_config.js
@@ -0,0 +1,10 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const btn = target.querySelector('button');
+		flushSync(() => btn?.click());
+		assert.htmlEqual(target.innerHTML, `<button></button><p>snip</p>`);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/main.svelte b/packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/main.svelte
new file mode 100644
index 0000000000..c2b75c362f
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/const-snippet-reactive/main.svelte
@@ -0,0 +1,15 @@
+<script>
+	import Component from "./Component.svelte";
+	let count = $state(0);
+</script>
+
+{#snippet snip()}
+<p>snip</p>
+{/snippet}
+
+<button onclick={() => count++}></button>
+{#if true}
+	{@const test =  count % 2 === 0 ? undefined: snip}
+	<Component {test} />
+{/if}
+

From 78481862fb033bfaa1c31d84eba96460b0dfe19e Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 7 Oct 2025 18:00:05 +0200
Subject: [PATCH 073/347] fix: hydrate each blocks inside element correctly
 (#16908)

We have an each block optimization that omits the comment when the each block is the sole child of an element. This optimization clashes with async which wants to skip ahead to the sibling closing comment.

For now we therefore remove that optimization when the each block is async. In the long run we should instead optimize _all_ cases where _any_ block is the sole child of an element, in both async and sync mode, consistently.

fixes #16905
fixes #16907
---
 .changeset/chilly-bats-build.md                  |  5 +++++
 .../client/visitors/shared/fragment.js           |  9 ++++++++-
 .../samples/async-each-sibling/_config.js        | 16 ++++++++++++++++
 .../samples/async-each-sibling/main.svelte       | 11 +++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/chilly-bats-build.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-each-sibling/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-each-sibling/main.svelte

diff --git a/.changeset/chilly-bats-build.md b/.changeset/chilly-bats-build.md
new file mode 100644
index 0000000000..872e4c79c4
--- /dev/null
+++ b/.changeset/chilly-bats-build.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: hydrate each blocks inside element correctly
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
index 62d07014ee..3588f2843a 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
@@ -99,7 +99,14 @@ export function process_children(nodes, initial, is_element, context) {
 
 			if (is_static_element(node, context.state)) {
 				skipped += 1;
-			} else if (node.type === 'EachBlock' && nodes.length === 1 && is_element) {
+			} else if (
+				node.type === 'EachBlock' &&
+				nodes.length === 1 &&
+				is_element &&
+				// In case it's wrapped in async the async logic will want to skip sibling nodes up until the end, hence we cannot make this controlled
+				// TODO switch this around and instead optimize for elements with a single block child and not require extra comments (neither for async nor normally)
+				!(node.body.metadata.has_await || node.metadata.expression.has_await)
+			) {
 				node.metadata.is_controlled = true;
 			} else {
 				const id = flush_node(false, node.type === 'RegularElement' ? node.name : 'node');
diff --git a/packages/svelte/tests/runtime-runes/samples/async-each-sibling/_config.js b/packages/svelte/tests/runtime-runes/samples/async-each-sibling/_config.js
new file mode 100644
index 0000000000..ff10a48f11
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-each-sibling/_config.js
@@ -0,0 +1,16 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['async-server', 'hydrate', 'client'],
+	ssrHtml: `<ul><li>1</li></ul> <button>add</button>`,
+
+	async test({ assert, target }) {
+		await tick();
+		const [add] = target.querySelectorAll('button');
+
+		add.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<ul><li>1</li><li>2</li></ul> <button>add</button>`);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-each-sibling/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-each-sibling/main.svelte
new file mode 100644
index 0000000000..2c35440511
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-each-sibling/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	let array = $state(Promise.resolve([1]));
+</script>
+
+<ul>
+{#each await array as item}
+	<li>{item}</li>
+{/each}
+</ul>
+
+<button onclick={() => array = Promise.resolve([1, 2])}>add</button>

From 06bd6a8fbdd1aada619fe68114f3a6cc8ef37c4b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 09:03:07 -0700
Subject: [PATCH 074/347] Version Packages (#16909)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/chilly-bats-build.md   |  5 -----
 .changeset/kind-tigers-retire.md  |  5 -----
 .changeset/nervous-flies-laugh.md |  5 -----
 .changeset/seven-flies-drop.md    |  5 -----
 .changeset/tall-parents-go.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/chilly-bats-build.md
 delete mode 100644 .changeset/kind-tigers-retire.md
 delete mode 100644 .changeset/nervous-flies-laugh.md
 delete mode 100644 .changeset/seven-flies-drop.md
 delete mode 100644 .changeset/tall-parents-go.md

diff --git a/.changeset/chilly-bats-build.md b/.changeset/chilly-bats-build.md
deleted file mode 100644
index 872e4c79c4..0000000000
--- a/.changeset/chilly-bats-build.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: hydrate each blocks inside element correctly
diff --git a/.changeset/kind-tigers-retire.md b/.changeset/kind-tigers-retire.md
deleted file mode 100644
index 432ff1858b..0000000000
--- a/.changeset/kind-tigers-retire.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: allow await in if block consequent and alternate
diff --git a/.changeset/nervous-flies-laugh.md b/.changeset/nervous-flies-laugh.md
deleted file mode 100644
index 88c7694bcd..0000000000
--- a/.changeset/nervous-flies-laugh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't replace rest props with `$$props` for excluded props
diff --git a/.changeset/seven-flies-drop.md b/.changeset/seven-flies-drop.md
deleted file mode 100644
index fed9c7dcac..0000000000
--- a/.changeset/seven-flies-drop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: correctly transform `$derived` private fields on server
diff --git a/.changeset/tall-parents-go.md b/.changeset/tall-parents-go.md
deleted file mode 100644
index 6146a5c675..0000000000
--- a/.changeset/tall-parents-go.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: add `UNKNOWN` evaluation value before breaking for `binding.initial===SnippetBlock`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 13a2b4cc4d..84902a4718 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,19 @@
 # svelte
 
+## 5.39.10
+
+### Patch Changes
+
+- fix: hydrate each blocks inside element correctly ([#16908](https://github.com/sveltejs/svelte/pull/16908))
+
+- fix: allow await in if block consequent and alternate ([#16890](https://github.com/sveltejs/svelte/pull/16890))
+
+- fix: don't replace rest props with `$$props` for excluded props ([#16898](https://github.com/sveltejs/svelte/pull/16898))
+
+- fix: correctly transform `$derived` private fields on server ([#16894](https://github.com/sveltejs/svelte/pull/16894))
+
+- fix: add `UNKNOWN` evaluation value before breaking for `binding.initial===SnippetBlock` ([#16910](https://github.com/sveltejs/svelte/pull/16910))
+
 ## 5.39.9
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 7a616abbe8..41c43cdd25 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.9",
+  "version": "5.39.10",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index efc02968d7..cd2c8e9440 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.9';
+export const VERSION = '5.39.10';
 export const PUBLIC_VERSION = '5';

From b5c84371510d39770243a4431e271dd2ae5b2289 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 8 Oct 2025 06:58:21 -0400
Subject: [PATCH 075/347] fix: flush batches whenever an async value resolves
 (#16912)

* fix: flush batches whenever an async value resolves

* move some code around

* unnecessary
---
 .changeset/metal-parents-train.md             |  5 +++
 .../src/internal/client/reactivity/async.js   |  2 -
 .../src/internal/client/reactivity/batch.js   | 45 +++++++++----------
 3 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/metal-parents-train.md

diff --git a/.changeset/metal-parents-train.md b/.changeset/metal-parents-train.md
new file mode 100644
index 0000000000..57c99453c3
--- /dev/null
+++ b/.changeset/metal-parents-train.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: flush batches whenever an async value resolves
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 4d572281b7..45c78ff926 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -52,8 +52,6 @@ export function flatten(sync, async, fn) {
 
 	Promise.all(async.map((expression) => async_derived(expression)))
 		.then((result) => {
-			batch?.activate();
-
 			restore();
 
 			try {
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index fb704edb13..102d0670b6 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -178,6 +178,8 @@ export class Batch {
 			flush_queued_effects(render_effects);
 			flush_queued_effects(effects);
 
+			previous_batch = null;
+
 			this.#deferred?.resolve();
 		} else {
 			this.#defer_effects(this.#render_effects);
@@ -280,17 +282,6 @@ export class Batch {
 
 	deactivate() {
 		current_batch = null;
-		previous_batch = null;
-
-		for (const update of effect_pending_updates) {
-			effect_pending_updates.delete(update);
-			update();
-
-			if (current_batch !== null) {
-				// only do one at a time
-				break;
-			}
-		}
 	}
 
 	flush() {
@@ -307,6 +298,16 @@ export class Batch {
 		}
 
 		this.deactivate();
+
+		for (const update of effect_pending_updates) {
+			effect_pending_updates.delete(update);
+			update();
+
+			if (current_batch !== null) {
+				// only do one at a time
+				break;
+			}
+		}
 	}
 
 	/**
@@ -375,21 +376,17 @@ export class Batch {
 	decrement() {
 		this.#pending -= 1;
 
-		if (this.#pending === 0) {
-			for (const e of this.#dirty_effects) {
-				set_signal_status(e, DIRTY);
-				schedule_effect(e);
-			}
-
-			for (const e of this.#maybe_dirty_effects) {
-				set_signal_status(e, MAYBE_DIRTY);
-				schedule_effect(e);
-			}
+		for (const e of this.#dirty_effects) {
+			set_signal_status(e, DIRTY);
+			schedule_effect(e);
+		}
 
-			this.flush();
-		} else {
-			this.deactivate();
+		for (const e of this.#maybe_dirty_effects) {
+			set_signal_status(e, MAYBE_DIRTY);
+			schedule_effect(e);
 		}
+
+		this.flush();
 	}
 
 	/** @param {() => void} fn */

From 844fab7798dd242bed0460ceeebd18c50674f83b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 8 Oct 2025 13:01:06 +0200
Subject: [PATCH 076/347] Version Packages (#16913)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/metal-parents-train.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/metal-parents-train.md

diff --git a/.changeset/metal-parents-train.md b/.changeset/metal-parents-train.md
deleted file mode 100644
index 57c99453c3..0000000000
--- a/.changeset/metal-parents-train.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: flush batches whenever an async value resolves
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 84902a4718..2302acd033 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.39.11
+
+### Patch Changes
+
+- fix: flush batches whenever an async value resolves ([#16912](https://github.com/sveltejs/svelte/pull/16912))
+
 ## 5.39.10
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 41c43cdd25..822f19f001 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.10",
+  "version": "5.39.11",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index cd2c8e9440..0f723c4eb0 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.10';
+export const VERSION = '5.39.11';
 export const PUBLIC_VERSION = '5';

From 9c350cfdab1a55e7d7960e434e2a3349e9da0946 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 8 Oct 2025 14:59:40 +0200
Subject: [PATCH 077/347] chore: test for batches flush fix (#16915)

Test for #16912

Also some explanation what the bug was:
1. async batch kicks off
2. outer async work succeeds, still something pending, so doesn't do anything for now
3. something unrelated writes to a signal (in the remote functions case it's the query writing to loading, raw etc), which creates a new batch
4. new batch executes. since there are multiple batches it takes the previous value which means if block is still alive. commits that, since no async work from the perspective of this branch
5. inner async work succeeds. now the batch has zero pending async work so it can flush. But the if block is no longer dirty since it was done by the other batch already -> never undos the other work

#16912 fixes it by still traversing the tree which means the if block deletion is scheduled to commit later, which it then does
---
 .../async-inner-after-outer/_config.js        | 57 +++++++++++++++++++
 .../async-inner-after-outer/main.svelte       | 41 +++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-inner-after-outer/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-inner-after-outer/main.svelte

diff --git a/packages/svelte/tests/runtime-runes/samples/async-inner-after-outer/_config.js b/packages/svelte/tests/runtime-runes/samples/async-inner-after-outer/_config.js
new file mode 100644
index 0000000000..8905ee4bf5
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-inner-after-outer/_config.js
@@ -0,0 +1,57 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const shift = document.querySelector('button');
+		shift?.click();
+		await tick();
+		shift?.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<p>true</p>
+			<button>toggle</button>
+			<button>shift</button>
+		`
+		);
+
+		const toggle = target.querySelector('button');
+		toggle?.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<p>true</p>
+			<button>toggle</button>
+			<button>shift</button>
+		`
+		);
+
+		shift?.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<p>true</p>
+			<button>toggle</button>
+			<button>shift</button>
+		`
+		);
+
+		shift?.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>toggle</button>
+			<button>shift</button>
+		`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-inner-after-outer/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-inner-after-outer/main.svelte
new file mode 100644
index 0000000000..0b3b21f28c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-inner-after-outer/main.svelte
@@ -0,0 +1,41 @@
+<script>
+	let show = $state(true);
+	let count = $state(0);
+	let queue = [];
+
+	function foo() {
+		const {promise, resolve} = Promise.withResolvers();
+		const s = show;
+		queue.push(() => resolve(s));
+		return promise;
+	}
+
+	function bar() {
+		const {promise, resolve} = Promise.withResolvers();
+		const s = show;
+		queue.push(() => {
+			// This will create a new batch while the other batch is still in flight
+			count++
+			resolve(s);
+		});
+		return promise;
+	}
+
+	$effect(() => { count; });
+</script>
+
+<svelte:boundary>
+	{#if await foo()}
+		<p>{await bar()}</p>
+	{/if}
+
+	<button onclick={() => {
+		show = !show
+	}}>toggle</button>
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>
+
+<button onclick={() => queue.shift()()}>shift</button>
\ No newline at end of file

From 7f8e60fd8a53e1eed28a60b5514bd07b49e97423 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Thu, 9 Oct 2025 13:32:45 +0200
Subject: [PATCH 078/347] fix: generate correct  SSR code for the case where
 `pending` is an attribute (#16919)

Closes #16886
---
 .changeset/spicy-rabbits-drive.md                         | 5 +++++
 .../phases/3-transform/server/visitors/SvelteBoundary.js  | 7 +++++--
 .../samples/boundary-pending-prop-async/_config.js        | 3 +++
 .../samples/boundary-pending-prop-async/_expected.html    | 1 +
 .../samples/boundary-pending-prop-async/main.svelte       | 8 ++++++++
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/spicy-rabbits-drive.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/main.svelte

diff --git a/.changeset/spicy-rabbits-drive.md b/.changeset/spicy-rabbits-drive.md
new file mode 100644
index 0000000000..01834294e1
--- /dev/null
+++ b/.changeset/spicy-rabbits-drive.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: generate correct  SSR code for the case where `pending` is an attribute
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 b272870ac3..41a18cf52d 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
@@ -43,11 +43,14 @@ export function SvelteBoundary(node, context) {
 			);
 			const pending = b.call(callee, b.id('$$renderer'));
 			const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
+			const statement = node.fragment.metadata.has_await
+				? create_async_block(b.block([block]))
+				: block;
 			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]))
+					b.block([b.stmt(pending)]),
+					b.block(build_template([block_open, statement, block_close]))
 				)
 			);
 		} else {
diff --git a/packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/_config.js b/packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/_config.js
new file mode 100644
index 0000000000..f47bee71df
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/_config.js
@@ -0,0 +1,3 @@
+import { test } from '../../test';
+
+export default test({});
diff --git a/packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/_expected.html b/packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/_expected.html
new file mode 100644
index 0000000000..ac7cd985f1
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/_expected.html
@@ -0,0 +1 @@
+<!--[--><!---->Loading...<!--]-->
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/main.svelte b/packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/main.svelte
new file mode 100644
index 0000000000..7e0d4c62ea
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/boundary-pending-prop-async/main.svelte
@@ -0,0 +1,8 @@
+{#snippet pending()}
+	Loading...
+{/snippet}
+
+<svelte:boundary pending={pending}>
+	{@const data = await Promise.resolve('hello')}
+	<p>{data}</p>
+</svelte:boundary>
\ No newline at end of file

From 297afd057828a1bf04f15d5b22b4123fd3e522d8 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Thu, 9 Oct 2025 18:43:41 +0200
Subject: [PATCH 079/347] fix: generate correct code for `each` blocks with
 async body (#16923)

* fix: generate correct code for `each` blocks with async body

* fix: else branch of `each` block

* chore: add expected html
---
 .changeset/wicked-goats-begin.md                      |  5 +++++
 .../phases/3-transform/server/visitors/EachBlock.js   |  6 ++++--
 .../samples/each-body-async/_config.js                |  5 +++++
 .../samples/each-body-async/_expected.html            |  1 +
 .../samples/each-body-async/main.svelte               | 11 +++++++++++
 5 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/wicked-goats-begin.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/each-body-async/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/each-body-async/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/each-body-async/main.svelte

diff --git a/.changeset/wicked-goats-begin.md b/.changeset/wicked-goats-begin.md
new file mode 100644
index 0000000000..04a22aa310
--- /dev/null
+++ b/.changeset/wicked-goats-begin.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: generate correct code for `each` blocks with async body
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 5a7ca8b566..2d5b0c8931 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
@@ -32,7 +32,9 @@ export function EachBlock(node, context) {
 		each.push(b.let(node.index, index));
 	}
 
-	each.push(.../** @type {BlockStatement} */ (context.visit(node.body)).body);
+	const new_body = /** @type {BlockStatement} */ (context.visit(node.body)).body;
+
+	each.push(...(node.body.metadata.has_await ? [create_async_block(b.block(new_body))] : new_body));
 
 	const for_loop = b.for(
 		b.declaration('let', [
@@ -55,7 +57,7 @@ export function EachBlock(node, context) {
 			b.if(
 				b.binary('!==', b.member(array_id, 'length'), b.literal(0)),
 				b.block([open, for_loop]),
-				fallback
+				node.fallback.metadata.has_await ? create_async_block(fallback) : fallback
 			)
 		);
 	} else {
diff --git a/packages/svelte/tests/server-side-rendering/samples/each-body-async/_config.js b/packages/svelte/tests/server-side-rendering/samples/each-body-async/_config.js
new file mode 100644
index 0000000000..05de37a8bd
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/each-body-async/_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/each-body-async/_expected.html b/packages/svelte/tests/server-side-rendering/samples/each-body-async/_expected.html
new file mode 100644
index 0000000000..605299c2ae
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/each-body-async/_expected.html
@@ -0,0 +1 @@
+<!--[--><!--[--><!--[--><!---->each<!--]--><!--]--> <!--[--><!--[!--><!---->else<!--]--><!--]--><!--]-->
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/each-body-async/main.svelte b/packages/svelte/tests/server-side-rendering/samples/each-body-async/main.svelte
new file mode 100644
index 0000000000..86e15c4e7e
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/each-body-async/main.svelte
@@ -0,0 +1,11 @@
+{#each { length: 1 }}
+	{@const data = await Promise.resolve("each")}
+	{data}
+{/each}
+
+{#each { length: 0 }}
+	should not see this
+{:else}
+	{@const data = await Promise.resolve("else")}
+	{data}
+{/each}
\ No newline at end of file

From 93012e1e6fce4d26b75d065301330cbe8a9e489a Mon Sep 17 00:00:00 2001
From: 7nik <kifiranet@gmail.com>
Date: Thu, 9 Oct 2025 23:26:52 +0300
Subject: [PATCH 080/347] fix: track the user's getter of `bind:this` (#16916)

---
 .changeset/rude-frogs-train.md                |  5 ++
 .../docs/03-template-syntax/12-bind.md        |  2 +
 .../client/visitors/AssignmentExpression.js   | 11 +++--
 .../client/visitors/shared/utils.js           | 48 +++++++++++++------
 .../bind-getter-setter-loop/_config.js        | 16 +++++++
 .../bind-getter-setter-loop/main.svelte       | 13 +++++
 6 files changed, 75 insertions(+), 20 deletions(-)
 create mode 100644 .changeset/rude-frogs-train.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/bind-getter-setter-loop/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/bind-getter-setter-loop/main.svelte

diff --git a/.changeset/rude-frogs-train.md b/.changeset/rude-frogs-train.md
new file mode 100644
index 0000000000..06da5dcc1e
--- /dev/null
+++ b/.changeset/rude-frogs-train.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: track the user's getter of `bind:this`
diff --git a/documentation/docs/03-template-syntax/12-bind.md b/documentation/docs/03-template-syntax/12-bind.md
index c21ed35919..be84969b87 100644
--- a/documentation/docs/03-template-syntax/12-bind.md
+++ b/documentation/docs/03-template-syntax/12-bind.md
@@ -364,6 +364,8 @@ Components also support `bind:this`, allowing you to interact with component ins
 </script>
 ```
 
+> [!NOTE] In case of using [the function bindings](#Function-bindings), the getter is required to ensure that the correct value is nullified on component or element destruction.
+
 ## bind:_property_ for components
 
 ```svelte
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js
index 7d64d60bca..731569aaae 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js
@@ -192,17 +192,18 @@ function build_assignment(operator, left, right, context) {
 		path.at(-1) === 'Component' ||
 		path.at(-1) === 'SvelteComponent' ||
 		(path.at(-1) === 'ArrowFunctionExpression' &&
-			path.at(-2) === 'SequenceExpression' &&
-			(path.at(-3) === 'Component' ||
-				path.at(-3) === 'SvelteComponent' ||
-				path.at(-3) === 'BindDirective'))
+			(path.at(-2) === 'BindDirective' ||
+				(path.at(-2) === 'Component' && path.at(-3) === 'Fragment') ||
+				(path.at(-2) === 'SequenceExpression' &&
+					(path.at(-3) === 'Component' ||
+						path.at(-3) === 'SvelteComponent' ||
+						path.at(-3) === 'BindDirective'))))
 	) {
 		should_transform = false;
 	}
 
 	if (left.type === 'MemberExpression' && should_transform) {
 		const callee = callees[operator];
-
 		return /** @type {Expression} */ (
 			context.visit(
 				b.call(
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
index ba140a153e..a42063b2e2 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
@@ -209,10 +209,8 @@ export function parse_directive_name(name) {
  * @param {import('zimmerframe').Context<AST.SvelteNode, ComponentClientTransformState>} context
  */
 export function build_bind_this(expression, value, { state, visit }) {
-	if (expression.type === 'SequenceExpression') {
-		const [get, set] = /** @type {SequenceExpression} */ (visit(expression)).expressions;
-		return b.call('$.bind_this', value, set, get);
-	}
+	const [getter, setter] =
+		expression.type === 'SequenceExpression' ? expression.expressions : [null, null];
 
 	/** @type {Identifier[]} */
 	const ids = [];
@@ -229,7 +227,7 @@ export function build_bind_this(expression, value, { state, visit }) {
 	// Note that we only do this for each context variables, the consequence is that the value might be stale in
 	// some scenarios where the value is a member expression with changing computed parts or using a combination of multiple
 	// variables, but that was the same case in Svelte 4, too. Once legacy mode is gone completely, we can revisit this.
-	walk(expression, null, {
+	walk(getter ?? expression, null, {
 		Identifier(node, { path }) {
 			if (seen.includes(node.name)) return;
 			seen.push(node.name);
@@ -260,9 +258,17 @@ export function build_bind_this(expression, value, { state, visit }) {
 
 	const child_state = { ...state, transform };
 
-	const get = /** @type {Expression} */ (visit(expression, child_state));
-	const set = /** @type {Expression} */ (
-		visit(b.assignment('=', expression, b.id('$$value')), child_state)
+	let get = /** @type {Expression} */ (visit(getter ?? expression, child_state));
+	let set = /** @type {Expression} */ (
+		visit(
+			setter ??
+				b.assignment(
+					'=',
+					/** @type {Identifier | MemberExpression} */ (expression),
+					b.id('$$value')
+				),
+			child_state
+		)
 	);
 
 	// If we're mutating a property, then it might already be non-existent.
@@ -275,13 +281,25 @@ export function build_bind_this(expression, value, { state, visit }) {
 		node = node.object;
 	}
 
-	return b.call(
-		'$.bind_this',
-		value,
-		b.arrow([b.id('$$value'), ...ids], set),
-		b.arrow([...ids], get),
-		values.length > 0 && b.thunk(b.array(values))
-	);
+	get =
+		get.type === 'ArrowFunctionExpression'
+			? b.arrow([...ids], get.body)
+			: get.type === 'FunctionExpression'
+				? b.function(null, [...ids], get.body)
+				: getter
+					? get
+					: b.arrow([...ids], get);
+
+	set =
+		set.type === 'ArrowFunctionExpression'
+			? b.arrow([set.params[0] ?? b.id('_'), ...ids], set.body)
+			: set.type === 'FunctionExpression'
+				? b.function(null, [set.params[0] ?? b.id('_'), ...ids], set.body)
+				: setter
+					? set
+					: b.arrow([b.id('$$value'), ...ids], set);
+
+	return b.call('$.bind_this', value, set, get, values.length > 0 && b.thunk(b.array(values)));
 }
 
 /**
diff --git a/packages/svelte/tests/runtime-runes/samples/bind-getter-setter-loop/_config.js b/packages/svelte/tests/runtime-runes/samples/bind-getter-setter-loop/_config.js
new file mode 100644
index 0000000000..9c8b4fc6c0
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/bind-getter-setter-loop/_config.js
@@ -0,0 +1,16 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [btn] = target.querySelectorAll('button');
+
+		flushSync(() => {
+			btn.click();
+		});
+		assert.htmlEqual(
+			target.innerHTML,
+			'<button>Shuffle</button> <br> <b>5</b><b>1</b><b>4</b><b>2</b><b>3</b> <br> 51423'
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/bind-getter-setter-loop/main.svelte b/packages/svelte/tests/runtime-runes/samples/bind-getter-setter-loop/main.svelte
new file mode 100644
index 0000000000..60444e8978
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/bind-getter-setter-loop/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	let arr = $state([1, 2, 3, 4, 5]);
+	let elements = $state([]);
+</script>
+
+<button onclick={() => arr = [5, 1, 4, 2, 3]}>Shuffle</button><br>
+{#each arr as item, i (item)}
+	<b bind:this={() => elements[i], (v) => elements[i] = v }>{item}</b>
+{/each}
+<br>
+{#each elements as elem}
+	{elem.textContent}
+{/each}
\ No newline at end of file

From 5d9b4c66ca4df817c0c8146b71d30fbbdb958872 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 13 Oct 2025 20:25:35 +0200
Subject: [PATCH 081/347] fix: better input cursor restoration for `bind:value`
 (#16925)

If cursor was at end and new input is longer, move cursor to new end

No test because not possible to reproduce using our test setup.

Follow-up to #14649, helps with #16577
---
 .changeset/fair-aliens-wait.md                       |  5 +++++
 .../internal/client/dom/elements/bindings/input.js   | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/fair-aliens-wait.md

diff --git a/.changeset/fair-aliens-wait.md b/.changeset/fair-aliens-wait.md
new file mode 100644
index 0000000000..66e4cf2bd1
--- /dev/null
+++ b/.changeset/fair-aliens-wait.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: better input cursor restoration for `bind:value`
diff --git a/packages/svelte/src/internal/client/dom/elements/bindings/input.js b/packages/svelte/src/internal/client/dom/elements/bindings/input.js
index 815acde7c5..23ad6f5cdc 100644
--- a/packages/svelte/src/internal/client/dom/elements/bindings/input.js
+++ b/packages/svelte/src/internal/client/dom/elements/bindings/input.js
@@ -43,14 +43,22 @@ export function bind_value(input, get, set = get) {
 		if (value !== (value = get())) {
 			var start = input.selectionStart;
 			var end = input.selectionEnd;
+			var length = input.value.length;
 
 			// the value is coerced on assignment
 			input.value = value ?? '';
 
 			// Restore selection
 			if (end !== null) {
-				input.selectionStart = start;
-				input.selectionEnd = Math.min(end, input.value.length);
+				var new_length = input.value.length;
+				// If cursor was at end and new input is longer, move cursor to new end
+				if (start === end && end === length && new_length > length) {
+					input.selectionStart = new_length;
+					input.selectionEnd = new_length;
+				} else {
+					input.selectionStart = start;
+					input.selectionEnd = Math.min(end, new_length);
+				}
 			}
 		}
 	});

From 420468a04167bf30c745476a96942ca7bf7d1850 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:52:11 -0400
Subject: [PATCH 082/347] Version Packages (#16920)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/fair-aliens-wait.md    |  5 -----
 .changeset/rude-frogs-train.md    |  5 -----
 .changeset/spicy-rabbits-drive.md |  5 -----
 .changeset/wicked-goats-begin.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/fair-aliens-wait.md
 delete mode 100644 .changeset/rude-frogs-train.md
 delete mode 100644 .changeset/spicy-rabbits-drive.md
 delete mode 100644 .changeset/wicked-goats-begin.md

diff --git a/.changeset/fair-aliens-wait.md b/.changeset/fair-aliens-wait.md
deleted file mode 100644
index 66e4cf2bd1..0000000000
--- a/.changeset/fair-aliens-wait.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: better input cursor restoration for `bind:value`
diff --git a/.changeset/rude-frogs-train.md b/.changeset/rude-frogs-train.md
deleted file mode 100644
index 06da5dcc1e..0000000000
--- a/.changeset/rude-frogs-train.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: track the user's getter of `bind:this`
diff --git a/.changeset/spicy-rabbits-drive.md b/.changeset/spicy-rabbits-drive.md
deleted file mode 100644
index 01834294e1..0000000000
--- a/.changeset/spicy-rabbits-drive.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: generate correct  SSR code for the case where `pending` is an attribute
diff --git a/.changeset/wicked-goats-begin.md b/.changeset/wicked-goats-begin.md
deleted file mode 100644
index 04a22aa310..0000000000
--- a/.changeset/wicked-goats-begin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: generate correct code for `each` blocks with async body
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 2302acd033..70f549ce29 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.39.12
+
+### Patch Changes
+
+- fix: better input cursor restoration for `bind:value` ([#16925](https://github.com/sveltejs/svelte/pull/16925))
+
+- fix: track the user's getter of `bind:this` ([#16916](https://github.com/sveltejs/svelte/pull/16916))
+
+- fix: generate correct SSR code for the case where `pending` is an attribute ([#16919](https://github.com/sveltejs/svelte/pull/16919))
+
+- fix: generate correct code for `each` blocks with async body ([#16923](https://github.com/sveltejs/svelte/pull/16923))
+
 ## 5.39.11
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 822f19f001..a2d5a6e401 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.11",
+  "version": "5.39.12",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 0f723c4eb0..e520d1248a 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.11';
+export const VERSION = '5.39.12';
 export const PUBLIC_VERSION = '5';

From b91f9de129d41c2674ff8bd818eb8bbcc984683e Mon Sep 17 00:00:00 2001
From: Hyunbin Seo <47051820+hyunbinseo@users.noreply.github.com>
Date: Tue, 14 Oct 2025 04:19:55 +0900
Subject: [PATCH 083/347] docs: await no longer need pending (#16900)

---
 documentation/docs/05-special-elements/01-svelte-boundary.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/05-special-elements/01-svelte-boundary.md b/documentation/docs/05-special-elements/01-svelte-boundary.md
index 3e91af5d83..40e8d144e1 100644
--- a/documentation/docs/05-special-elements/01-svelte-boundary.md
+++ b/documentation/docs/05-special-elements/01-svelte-boundary.md
@@ -24,7 +24,7 @@ For the boundary to do anything, one or more of the following must be provided.
 
 ### `pending`
 
-As of Svelte 5.36, boundaries with a `pending` snippet can contain [`await`](await-expressions) expressions. This snippet will be shown when the boundary is first created, and will remain visible until all the `await` expressions inside the boundary have resolved ([demo](/playground/untitled#H4sIAAAAAAAAE21QQW6DQAz8ytY9BKQVpFdKkPqDHnorPWzAaSwt3tWugUaIv1eE0KpKD5as8YxnNBOw6RAKKOOAVrA4up5bEy6VGknOyiO3xJ8qMnmPAhpOZDFC8T6BXPyiXADQ258X77P1FWg4moj_4Y1jQZZ49W0CealqruXUcyPkWLVozQXbZDC2R606spYiNo7bqA7qab_fp2paFLUElD6wYhzVa3AdRUySgNHZAVN1qDZaLRHljTp0vSTJ9XJjrSbpX5f0eZXN6zLXXOa_QfmurIVU-moyoyH5ib87o7XuYZfOZe6vnGWmx1uZW7lJOq9upa-sMwuUZdkmmfIbfQ1xZwwaBL8ECgk9zh8axJAdiVsoTsZGnL8Bg4tX_OMBAAA=)):
+This snippet will be shown when the boundary is first created, and will remain visible until all the [`await`](await-expressions) expressions inside the boundary have resolved ([demo](/playground/untitled#H4sIAAAAAAAAE21QQW6DQAz8ytY9BKQVpFdKkPqDHnorPWzAaSwt3tWugUaIv1eE0KpKD5as8YxnNBOw6RAKKOOAVrA4up5bEy6VGknOyiO3xJ8qMnmPAhpOZDFC8T6BXPyiXADQ258X77P1FWg4moj_4Y1jQZZ49W0CealqruXUcyPkWLVozQXbZDC2R606spYiNo7bqA7qab_fp2paFLUElD6wYhzVa3AdRUySgNHZAVN1qDZaLRHljTp0vSTJ9XJjrSbpX5f0eZXN6zLXXOa_QfmurIVU-moyoyH5ib87o7XuYZfOZe6vnGWmx1uZW7lJOq9upa-sMwuUZdkmmfIbfQ1xZwwaBL8ECgk9zh8axJAdiVsoTsZGnL8Bg4tX_OMBAAA=)):
 
 ```svelte
 <svelte:boundary>

From ba782f9fdea1fd028a5e54abcb2c2ab05a67dcc7 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 13 Oct 2025 12:20:22 -0700
Subject: [PATCH 084/347] docs: link to custom renderer issue in Svelte Native
 discussion (#16896)

---
 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 1816998299..86489e87e4 100644
--- a/documentation/docs/07-misc/99-faq.md
+++ b/documentation/docs/07-misc/99-faq.md
@@ -99,7 +99,7 @@ However, you can use any router library. A sampling of available routers are hig
 
 While most mobile apps are written without using JavaScript, if you'd like to leverage your existing Svelte components and knowledge of Svelte when building mobile apps, you can turn a [SvelteKit SPA](https://kit.svelte.dev/docs/single-page-apps) into a mobile app with [Tauri](https://v2.tauri.app/start/frontend/sveltekit/) or [Capacitor](https://capacitorjs.com/solution/svelte). Mobile features like the camera, geolocation, and push notifications are available via plugins for both platforms.
 
-Svelte Native was an option available for Svelte 4, but note that Svelte 5 does not currently support it. Svelte Native lets you write NativeScript apps using Svelte components that contain [NativeScript UI components](https://docs.nativescript.org/ui/) rather than DOM elements, which may be familiar for users coming from React Native.
+Some work has been completed towards [custom renderer support in Svelte 5](https://github.com/sveltejs/svelte/issues/15470), but this feature is not yet available. The custom rendering API would support additional mobile frameworks like Lynx JS and Svelte Native. Svelte Native was an option available for Svelte 4, but Svelte 5 does not currently support it. Svelte Native lets you write NativeScript apps using Svelte components that contain [NativeScript UI components](https://docs.nativescript.org/ui/) rather than DOM elements, which may be familiar for users coming from React Native.
 
 ## Can I tell Svelte not to remove my unused styles?
 

From b05e12fd63a9cf1957ac2ecd27440fc6248ac298 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 13 Oct 2025 15:30:58 -0400
Subject: [PATCH 085/347] fix code block (#16937)

Updated code block syntax from Svelte to JavaScript for clarity.
---
 documentation/docs/02-runes/03-$derived.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/02-runes/03-$derived.md b/documentation/docs/02-runes/03-$derived.md
index 0123868c4e..308693d19c 100644
--- a/documentation/docs/02-runes/03-$derived.md
+++ b/documentation/docs/02-runes/03-$derived.md
@@ -85,7 +85,7 @@ Derived expressions are recalculated when their dependencies change, but you can
 
 Unlike `$state`, which converts objects and arrays to [deeply reactive proxies]($state#Deep-state), `$derived` values are left as-is. For example, [in a case like this](/playground/untitled#H4sIAAAAAAAAE4VU22rjMBD9lUHd3aaQi9PdstS1A3t5XvpQ2Ic4D7I1iUUV2UjjNMX431eS7TRdSosxgjMzZ45mjt0yzffIYibvy0ojFJWqDKCQVBk2ZVup0LJ43TJ6rn2aBxw-FP2o67k9oCKP5dziW3hRaUJNjoYltjCyplWmM1JIIAn3FlL4ZIkTTtYez6jtj4w8WwyXv9GiIXiQxLVs9pfTMR7EuoSLIuLFbX7Z4930bZo_nBrD1bs834tlfvsBz9_SyX6PZXu9XaL4gOWn4sXjeyzftv4ZWfyxubpzxzg6LfD4MrooxELEosKCUPigQCMPKCZh0OtQE1iSxcsmdHuBvCiHZXALLXiN08EL3RRkaJ_kDVGle0HcSD5TPEeVtj67O4Nrg9aiSNtBY5oODJkrL5QsHtN2cgXp6nSJMWzpWWGasdlsGEMbzi5jPr5KFr0Ep7pdeM2-TCelCddIhDxAobi1jqF3cMaC1RKp64bAW9iFAmXGIHfd4wNXDabtOLN53w8W53VvJoZLh7xk4Rr3CoL-UNoLhWHrT1JQGcM17u96oES5K-kc2XOzkzqGCKL5De79OUTyyrg1zgwXsrEx3ESfx4Bz0M5UjVMHB24mw9SuXtXFoN13fYKOM1tyUT3FbvbWmSWCZX2Er-41u5xPoml45svRahl9Wb9aasbINJixDZwcPTbyTLZSUsAvrg_cPuCR7s782_WU8343Y72Qtlb8OYatwuOQvuN13M_hJKNfxann1v1U_B1KZ_D_mzhzhz24fw85CSz2irtN9w9HshBK7AQAAA==)...
 
-```svelte
+```js
 let items = $state([...]);
 
 let index = $state(0);

From 23e2bb3b89cf27bd4526c59a03cee86df1bd3eb2 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 13 Oct 2025 23:22:44 +0200
Subject: [PATCH 086/347] fix: unset context on stale promises (#16935)

* fix: unset context on stale promises

When a stale promise is rejected in `async_derived`, and the promise eventually resolves, `d.resolve` will be noop and `d.promise.then(handler, ...)` will never run. That in turns means any restored context (via `(await save(..))()`) will never be unset. We have to handle this case and unset the context to prevent errors such as false-positive state mutation errors

* fix: unset context on stale promises (slightly different approach) (#16936)

* slightly different approach to #16935

* move unset_context call

* get rid of logs

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/major-beans-fry.md                 |  5 +++
 .../internal/client/reactivity/deriveds.js    |  6 ++--
 .../samples/async-resolve-stale/_config.js    | 26 ++++++++++++++
 .../samples/async-resolve-stale/main.svelte   | 34 +++++++++++++++++++
 4 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/major-beans-fry.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-resolve-stale/main.svelte

diff --git a/.changeset/major-beans-fry.md b/.changeset/major-beans-fry.md
new file mode 100644
index 0000000000..8f35683cd6
--- /dev/null
+++ b/.changeset/major-beans-fry.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: unset context on stale promises
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 5d5976a6c1..076a919236 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -126,9 +126,11 @@ export function async_derived(fn, location) {
 		try {
 			// 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);
+			// We call `unset_context` to undo any `save` calls that happen inside `fn()`
+			Promise.resolve(fn()).then(d.resolve, d.reject).then(unset_context);
 		} catch (error) {
 			d.reject(error);
+			unset_context();
 		}
 
 		if (DEV) current_async_effect = null;
@@ -185,8 +187,6 @@ export function async_derived(fn, location) {
 				boundary.update_pending_count(-1);
 				if (!pending) batch.decrement();
 			}
-
-			unset_context();
 		};
 
 		d.promise.then(handler, (e) => handler(null, e || 'unknown'));
diff --git a/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js
new file mode 100644
index 0000000000..bccf12562a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js
@@ -0,0 +1,26 @@
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		// We gotta wait a bit more in this test because of the macrotasks in App.svelte
+		function macrotask(t = 3) {
+			return new Promise((r) => setTimeout(r, t));
+		}
+
+		await macrotask();
+		assert.htmlEqual(target.innerHTML, '<input> 1 | ');
+
+		const [input] = target.querySelectorAll('input');
+
+		input.value = '1';
+		input.dispatchEvent(new Event('input', { bubbles: true }));
+		await macrotask();
+		assert.htmlEqual(target.innerHTML, '<input> 1 | ');
+
+		input.value = '12';
+		input.dispatchEvent(new Event('input', { bubbles: true }));
+		await macrotask(6);
+		// TODO this is wrong (separate bug), this should be 3 | 12
+		assert.htmlEqual(target.innerHTML, '<input> 5 | 12');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/main.svelte
new file mode 100644
index 0000000000..dc4a157928
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/main.svelte
@@ -0,0 +1,34 @@
+<script>
+	let count = $state(0);
+	let value = $state('');
+	let prev;
+
+	function asd(v) {
+		const r = Promise.withResolvers();
+
+		if (prev || v === '') {
+			Promise.resolve().then(async () => {
+				count++;
+				r.resolve(v);
+				await new Promise(r => setTimeout(r, 0));
+				// TODO with a microtask like below it still throws a mutation error
+				// await Promise.resolve();
+				prev?.resolve();
+			});
+		} else {
+			prev = Promise.withResolvers();
+			prev.promise.then(() => {
+				count++;
+				r.resolve(v)
+			});
+		}
+
+		return r.promise;
+	}
+
+	const x = $derived(await asd(value))
+</script>
+
+<input bind:value />
+
+{count} | {x}

From e8330ee7bfff1eef61d5990e99c75dc6e225b5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20R=C3=BCger?= <hannes@hannesrueger.de>
Date: Tue, 14 Oct 2025 15:56:41 +0200
Subject: [PATCH 087/347] fix: svg `radialGradient` `fr` attribute missing in
 types (#16943)

* fix(svg radialGradient): fr attribute missing in types

* chore: add changeset
---
 .changeset/grumpy-towns-stop.md | 5 +++++
 packages/svelte/elements.d.ts   | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .changeset/grumpy-towns-stop.md

diff --git a/.changeset/grumpy-towns-stop.md b/.changeset/grumpy-towns-stop.md
new file mode 100644
index 0000000000..2b146818f5
--- /dev/null
+++ b/.changeset/grumpy-towns-stop.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+add missing type for `fr` attribute for `radialGradient` tags in svg
diff --git a/packages/svelte/elements.d.ts b/packages/svelte/elements.d.ts
index b0c2fae2de..17ff100729 100644
--- a/packages/svelte/elements.d.ts
+++ b/packages/svelte/elements.d.ts
@@ -1658,6 +1658,7 @@ export interface SVGAttributes<T extends EventTarget> extends AriaAttributes, DO
 	'font-variant'?: number | string | undefined | null;
 	'font-weight'?: number | string | undefined | null;
 	format?: number | string | undefined | null;
+	fr?: number | string | undefined | null;
 	from?: number | string | undefined | null;
 	fx?: number | string | undefined | null;
 	fy?: number | string | undefined | null;

From 2a951391dc31326fd5df14bf1bfcf425bd13d5ad Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 09:59:09 -0400
Subject: [PATCH 088/347] Version Packages (#16940)

* Version Packages

* Update packages/svelte/CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/grumpy-towns-stop.md | 5 -----
 .changeset/major-beans-fry.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/grumpy-towns-stop.md
 delete mode 100644 .changeset/major-beans-fry.md

diff --git a/.changeset/grumpy-towns-stop.md b/.changeset/grumpy-towns-stop.md
deleted file mode 100644
index 2b146818f5..0000000000
--- a/.changeset/grumpy-towns-stop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-add missing type for `fr` attribute for `radialGradient` tags in svg
diff --git a/.changeset/major-beans-fry.md b/.changeset/major-beans-fry.md
deleted file mode 100644
index 8f35683cd6..0000000000
--- a/.changeset/major-beans-fry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: unset context on stale promises
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 70f549ce29..b3af39eb4c 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.39.13
+
+### Patch Changes
+
+- fix: add missing type for `fr` attribute for `radialGradient` tags in svg ([#16943](https://github.com/sveltejs/svelte/pull/16943))
+
+- fix: unset context on stale promises ([#16935](https://github.com/sveltejs/svelte/pull/16935))
+
 ## 5.39.12
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index a2d5a6e401..55b44fb2b6 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.12",
+  "version": "5.39.13",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index e520d1248a..536a2260c9 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.12';
+export const VERSION = '5.39.13';
 export const PUBLIC_VERSION = '5';

From a7c958a2a5a89e1d22fa530e2bacd2b0e3ba7ba6 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 14 Oct 2025 11:12:07 -0400
Subject: [PATCH 089/347] chore: simplify `batch.apply()` (#16945)

* chore: simplify `batch.apply()`

* belt and braces

* note to self
---
 .changeset/pretty-llamas-explode.md           |  5 ++
 .../src/internal/client/reactivity/batch.js   | 67 +++++++------------
 .../internal/client/reactivity/deriveds.js    |  8 ++-
 .../svelte/src/internal/client/runtime.js     | 10 ++-
 4 files changed, 41 insertions(+), 49 deletions(-)
 create mode 100644 .changeset/pretty-llamas-explode.md

diff --git a/.changeset/pretty-llamas-explode.md b/.changeset/pretty-llamas-explode.md
new file mode 100644
index 0000000000..00109112de
--- /dev/null
+++ b/.changeset/pretty-llamas-explode.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: simplify `batch.apply()`
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 102d0670b6..0dc149260a 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -44,12 +44,12 @@ export let current_batch = null;
 export let previous_batch = null;
 
 /**
- * When time travelling, we re-evaluate deriveds based on the temporary
- * values of their dependencies rather than their actual values, and cache
- * the results in this map rather than on the deriveds themselves
- * @type {Map<Derived, any> | null}
+ * When time travelling (i.e. working in one batch, while other batches
+ * still have ongoing work), we ignore the real values of affected
+ * signals in favour of their values within the batch
+ * @type {Map<Value, any> | null}
  */
-export let batch_deriveds = null;
+export let batch_values = null;
 
 /** @type {Set<() => void>} */
 export let effect_pending_updates = new Set();
@@ -152,7 +152,7 @@ export class Batch {
 
 		previous_batch = null;
 
-		var revert = Batch.apply(this);
+		this.apply();
 
 		for (const root of root_effects) {
 			this.#traverse_effect_tree(root);
@@ -161,6 +161,10 @@ 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.#pending === 0) {
+			// TODO we need this because we commit _then_ flush effects...
+			// maybe there's a way we can reverse the order?
+			var previous_batch_sources = batch_values;
+
 			this.#commit();
 
 			var render_effects = this.#render_effects;
@@ -175,6 +179,7 @@ export class Batch {
 			previous_batch = this;
 			current_batch = null;
 
+			batch_values = previous_batch_sources;
 			flush_queued_effects(render_effects);
 			flush_queued_effects(effects);
 
@@ -187,7 +192,7 @@ export class Batch {
 			this.#defer_effects(this.#block_effects);
 		}
 
-		revert();
+		batch_values = null;
 
 		for (const effect of this.#boundary_async_effects) {
 			update_effect(effect);
@@ -274,6 +279,7 @@ export class Batch {
 		}
 
 		this.current.set(source, source.v);
+		batch_values?.set(source, source.v);
 	}
 
 	activate() {
@@ -282,6 +288,7 @@ export class Batch {
 
 	deactivate() {
 		current_batch = null;
+		batch_values = null;
 	}
 
 	flush() {
@@ -352,14 +359,14 @@ export class Batch {
 
 				if (queued_root_effects.length > 0) {
 					current_batch = batch;
-					const revert = Batch.apply(batch);
+					batch.apply();
 
 					for (const root of queued_root_effects) {
 						batch.#traverse_effect_tree(root);
 					}
 
 					queued_root_effects = [];
-					revert();
+					batch.deactivate();
 				}
 			}
 
@@ -423,49 +430,23 @@ export class Batch {
 		queue_micro_task(task);
 	}
 
-	/**
-	 * @param {Batch} current_batch
-	 */
-	static apply(current_batch) {
-		if (!async_mode_flag || batches.size === 1) {
-			return noop;
-		}
+	apply() {
+		if (!async_mode_flag || batches.size === 1) return;
 
 		// 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;
-		}
+		// we need to override values with the ones in this batch...
+		batch_values = new Map(this.current);
 
+		// ...and undo changes belonging to other batches
 		for (const batch of batches) {
-			if (batch === current_batch) continue;
+			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;
+				if (!batch_values.has(source)) {
+					batch_values.set(source, 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;
-		};
 	}
 }
 
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 076a919236..bf8733cfe5 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -33,7 +33,7 @@ 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';
-import { batch_deriveds, current_batch } from './batch.js';
+import { batch_values, current_batch } from './batch.js';
 import { unset_context } from './async.js';
 import { deferred } from '../../shared/utils.js';
 
@@ -336,6 +336,8 @@ export function update_derived(derived) {
 	var value = execute_derived(derived);
 
 	if (!derived.equals(value)) {
+		// TODO can we avoid setting `derived.v` when `batch_values !== null`,
+		// without causing the value to be stale later?
 		derived.v = value;
 		derived.wv = increment_write_version();
 	}
@@ -346,8 +348,8 @@ export function update_derived(derived) {
 		return;
 	}
 
-	if (batch_deriveds !== null) {
-		batch_deriveds.set(derived, derived.v);
+	if (batch_values !== null) {
+		batch_values.set(derived, derived.v);
 	} else {
 		var status =
 			(skip_reaction || (derived.f & UNOWNED) !== 0) && derived.deps !== null ? MAYBE_DIRTY : CLEAN;
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index b8f5f5ffc9..a146659bf6 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -42,7 +42,7 @@ import {
 	set_dev_stack
 } from './context.js';
 import * as w from './warnings.js';
-import { Batch, batch_deriveds, flushSync, schedule_effect } from './reactivity/batch.js';
+import { Batch, batch_values, flushSync, schedule_effect } from './reactivity/batch.js';
 import { handle_error } from './error-handling.js';
 import { UNINITIALIZED } from '../../constants.js';
 import { captured_signals } from './legacy.js';
@@ -671,8 +671,8 @@ export function get(signal) {
 	} else if (is_derived) {
 		derived = /** @type {Derived} */ (signal);
 
-		if (batch_deriveds?.has(derived)) {
-			return batch_deriveds.get(derived);
+		if (batch_values?.has(derived)) {
+			return batch_values.get(derived);
 		}
 
 		if (is_dirty(derived)) {
@@ -680,6 +680,10 @@ export function get(signal) {
 		}
 	}
 
+	if (batch_values?.has(signal)) {
+		return batch_values.get(signal);
+	}
+
 	if ((signal.f & ERROR_VALUE) !== 0) {
 		throw signal.v;
 	}

From d50701d277e5c57204f1e51314926b0d73b0cbf9 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 14 Oct 2025 11:36:55 -0400
Subject: [PATCH 090/347] unused

---
 packages/svelte/src/internal/client/reactivity/batch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 0dc149260a..2edfc1343a 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -14,7 +14,7 @@ import {
 	DERIVED
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
-import { deferred, define_property, noop } from '../../shared/utils.js';
+import { deferred, define_property } from '../../shared/utils.js';
 import {
 	active_effect,
 	is_dirty,

From 28765f846e956c0da0e41e634de8c1066da9e6d5 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 14 Oct 2025 17:59:02 +0200
Subject: [PATCH 091/347] fix: don't rerun async effects unnecessarily (#16944)

Since #16866, when an async effect runs multiple times, we rebase older batches and rerun those effects. This can have unintended consequences: In a case where an async effect only depends on a single source, and that single source was updated in a later batch, we know that we don't need to / should not rerun the older batch.

This PR makes it so: We collect all the sources of older batches that are not part of the current batch that just committed, and then only mark those async effects as dirty which depend on one of those other sources. Fixes the bug I noticed while working on #16935
---
 .changeset/wild-mirrors-take.md               |  5 ++
 .../src/internal/client/reactivity/batch.js   | 67 ++++++++++++++-----
 .../internal/client/reactivity/deriveds.js    |  7 ++
 .../samples/async-resolve-stale/_config.js    |  3 +-
 4 files changed, 65 insertions(+), 17 deletions(-)
 create mode 100644 .changeset/wild-mirrors-take.md

diff --git a/.changeset/wild-mirrors-take.md b/.changeset/wild-mirrors-take.md
new file mode 100644
index 0000000000..faf28e7695
--- /dev/null
+++ b/.changeset/wild-mirrors-take.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't rerun async effects unnecessarily
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 2edfc1343a..2956e7ed6a 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, Value } from '#client' */
+/** @import { Derived, Effect, Reaction, Source, Value } from '#client' */
 import {
 	BLOCK_EFFECT,
 	BRANCH_EFFECT,
@@ -342,31 +342,46 @@ export class Batch {
 					continue;
 				}
 
+				/** @type {Source[]} */
+				const sources = [];
+
 				for (const [source, value] of this.current) {
 					if (batch.current.has(source)) {
-						if (is_earlier) {
+						if (is_earlier && value !== batch.current.get(source)) {
 							// bring the value up to date
 							batch.current.set(source, value);
 						} else {
-							// later batch has more recent value,
+							// same value or later batch has more recent value,
 							// no need to re-run these effects
 							continue;
 						}
 					}
 
-					mark_effects(source);
+					sources.push(source);
 				}
 
-				if (queued_root_effects.length > 0) {
-					current_batch = batch;
-					batch.apply();
+				if (sources.length === 0) {
+					continue;
+				}
 
-					for (const root of queued_root_effects) {
-						batch.#traverse_effect_tree(root);
+				// Re-run async/block effects that depend on distinct values changed in both batches
+				const others = [...batch.current.keys()].filter((s) => !this.current.has(s));
+				if (others.length > 0) {
+					for (const source of sources) {
+						mark_effects(source, others);
 					}
 
-					queued_root_effects = [];
-					batch.deactivate();
+					if (queued_root_effects.length > 0) {
+						current_batch = batch;
+						batch.apply();
+
+						for (const root of queued_root_effects) {
+							batch.#traverse_effect_tree(root);
+						}
+
+						queued_root_effects = [];
+						batch.deactivate();
+					}
 				}
 			}
 
@@ -621,17 +636,19 @@ function flush_queued_effects(effects) {
 
 /**
  * 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
+ * depending on `value` and at least one of the other `sources`, so that
+ * these effects can re-run after another batch has been committed
  * @param {Value} value
+ * @param {Source[]} sources
  */
-function mark_effects(value) {
+function mark_effects(value, sources) {
 	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) {
+				mark_effects(/** @type {Derived} */ (reaction), sources);
+			} else if ((flags & (ASYNC | BLOCK_EFFECT)) !== 0 && depends_on(reaction, sources)) {
 				set_signal_status(reaction, DIRTY);
 				schedule_effect(/** @type {Effect} */ (reaction));
 			}
@@ -639,6 +656,26 @@ function mark_effects(value) {
 	}
 }
 
+/**
+ * @param {Reaction} reaction
+ * @param {Source[]} sources
+ */
+function depends_on(reaction, sources) {
+	if (reaction.deps !== null) {
+		for (const dep of reaction.deps) {
+			if (sources.includes(dep)) {
+				return true;
+			}
+
+			if ((dep.f & DERIVED) !== 0 && depends_on(/** @type {Derived} */ (dep), sources)) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
 /**
  * @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 bf8733cfe5..fa780013e1 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -171,6 +171,13 @@ export function async_derived(fn, location) {
 
 				internal_set(signal, value);
 
+				// All prior async derived runs are now stale
+				for (const [b, d] of deferreds) {
+					deferreds.delete(b);
+					if (b === batch) break;
+					d.reject(STALE_REACTION);
+				}
+
 				if (DEV && location !== undefined) {
 					recent_async_deriveds.add(signal);
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js
index bccf12562a..50bb414afc 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js
@@ -20,7 +20,6 @@ export default test({
 		input.value = '12';
 		input.dispatchEvent(new Event('input', { bubbles: true }));
 		await macrotask(6);
-		// TODO this is wrong (separate bug), this should be 3 | 12
-		assert.htmlEqual(target.innerHTML, '<input> 5 | 12');
+		assert.htmlEqual(target.innerHTML, '<input> 3 | 12');
 	}
 });

From 99711d582263ce3dc0103baecf579e995363db86 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 14 Oct 2025 18:25:52 +0200
Subject: [PATCH 092/347] fix: ensure map iteration order is correct (#16947)

quick follow-up to #16944
Resetting a map entry does not change its position in the map when iterating. We need to make sure that reset makes that batch jump "to the front" for the "reject all stale batches" logic below. Edge case for which I can't come up with a test case but it _is_ a possibility.
---
 packages/svelte/src/internal/client/reactivity/deriveds.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index fa780013e1..6aa9a1d9d9 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -144,6 +144,7 @@ export function async_derived(fn, location) {
 				batch.increment();
 
 				deferreds.get(batch)?.reject(STALE_REACTION);
+				deferreds.delete(batch); // delete to ensure correct order in Map iteration below
 				deferreds.set(batch, d);
 			}
 		}

From f3c55e8e6c26bc8c006c84a656c845584abf3eb4 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 14 Oct 2025 15:48:29 -0400
Subject: [PATCH 093/347] feat: add `createContext` utility for type-safe
 context (#16948)

* feat: add `createContext` utility for type-safe context

* regenerate
---
 .changeset/neat-melons-cheer.md               |  5 +++++
 .../98-reference/.generated/shared-errors.md  |  8 ++++++++
 .../svelte/messages/shared-errors/errors.md   |  6 ++++++
 packages/svelte/src/index-client.js           |  8 +++++++-
 packages/svelte/src/index-server.js           |  8 +++++++-
 .../svelte/src/internal/client/context.js     | 20 +++++++++++++++++++
 .../svelte/src/internal/server/context.js     |  9 +++++++++
 packages/svelte/src/internal/shared/errors.js | 16 +++++++++++++++
 .../samples/create-context/Child.svelte       |  7 +++++++
 .../samples/create-context/_config.js         |  5 +++++
 .../samples/create-context/main.svelte        | 16 +++++++++++++++
 packages/svelte/types/index.d.ts              |  4 ++++
 12 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/neat-melons-cheer.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/create-context/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/create-context/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/create-context/main.svelte

diff --git a/.changeset/neat-melons-cheer.md b/.changeset/neat-melons-cheer.md
new file mode 100644
index 0000000000..1107d7ef20
--- /dev/null
+++ b/.changeset/neat-melons-cheer.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: add `createContext` utility for type-safe context
diff --git a/documentation/docs/98-reference/.generated/shared-errors.md b/documentation/docs/98-reference/.generated/shared-errors.md
index 6c31aaafd0..07e13dea45 100644
--- a/documentation/docs/98-reference/.generated/shared-errors.md
+++ b/documentation/docs/98-reference/.generated/shared-errors.md
@@ -60,6 +60,14 @@ Certain lifecycle methods can only be used during component initialisation. To f
 <button onclick={handleClick}>click me</button>
 ```
 
+### missing_context
+
+```
+Context was not set in a parent component
+```
+
+The [`createContext()`](svelte#createContext) utility returns a `[get, set]` pair of functions. `get` will throw an error if `set` was not used to set the context in a parent component.
+
 ### snippet_without_render_tag
 
 ```
diff --git a/packages/svelte/messages/shared-errors/errors.md b/packages/svelte/messages/shared-errors/errors.md
index 4b4d332202..e3959034a3 100644
--- a/packages/svelte/messages/shared-errors/errors.md
+++ b/packages/svelte/messages/shared-errors/errors.md
@@ -52,6 +52,12 @@ Certain lifecycle methods can only be used during component initialisation. To f
 <button onclick={handleClick}>click me</button>
 ```
 
+## missing_context
+
+> Context was not set in a parent component
+
+The [`createContext()`](svelte#createContext) utility returns a `[get, set]` pair of functions. `get` will throw an error if `set` was not used to set the context in a parent component.
+
 ## snippet_without_render_tag
 
 > Attempted to render a snippet without a `{@render}` block. This would cause the snippet code to be stringified instead of its content being rendered to the DOM. To fix this, change `{snippet}` to `{@render snippet()}`.
diff --git a/packages/svelte/src/index-client.js b/packages/svelte/src/index-client.js
index 85eeab7de9..337cbb500b 100644
--- a/packages/svelte/src/index-client.js
+++ b/packages/svelte/src/index-client.js
@@ -242,7 +242,13 @@ function init_update_callbacks(context) {
 }
 
 export { flushSync } from './internal/client/reactivity/batch.js';
-export { getContext, getAllContexts, hasContext, setContext } from './internal/client/context.js';
+export {
+	createContext,
+	getContext,
+	getAllContexts,
+	hasContext,
+	setContext
+} from './internal/client/context.js';
 export { hydrate, mount, unmount } from './internal/client/render.js';
 export { tick, untrack, settled } from './internal/client/runtime.js';
 export { createRawSnippet } from './internal/client/dom/blocks/snippet.js';
diff --git a/packages/svelte/src/index-server.js b/packages/svelte/src/index-server.js
index f193c46894..223ce6a4cd 100644
--- a/packages/svelte/src/index-server.js
+++ b/packages/svelte/src/index-server.js
@@ -39,6 +39,12 @@ export async function settled() {}
 
 export { getAbortSignal } from './internal/server/abort-signal.js';
 
-export { getAllContexts, getContext, hasContext, setContext } from './internal/server/context.js';
+export {
+	createContext,
+	getAllContexts,
+	getContext,
+	hasContext,
+	setContext
+} from './internal/server/context.js';
 
 export { createRawSnippet } from './internal/server/blocks/snippet.js';
diff --git a/packages/svelte/src/internal/client/context.js b/packages/svelte/src/internal/client/context.js
index cad75546d4..ea63072a37 100644
--- a/packages/svelte/src/internal/client/context.js
+++ b/packages/svelte/src/internal/client/context.js
@@ -69,6 +69,26 @@ export function set_dev_current_component_function(fn) {
 	dev_current_component_function = fn;
 }
 
+/**
+ * Returns a `[get, set]` pair of functions for working with context in a type-safe way.
+ * @template T
+ * @returns {[() => T, (context: T) => T]}
+ */
+export function createContext() {
+	const key = {};
+
+	return [
+		() => {
+			if (!hasContext(key)) {
+				e.missing_context();
+			}
+
+			return getContext(key);
+		},
+		(context) => setContext(key, context)
+	];
+}
+
 /**
  * Retrieves the context that belongs to the closest parent component with the specified `key`.
  * Must be called during component initialisation.
diff --git a/packages/svelte/src/internal/server/context.js b/packages/svelte/src/internal/server/context.js
index c59b2d260a..1813bfbf78 100644
--- a/packages/svelte/src/internal/server/context.js
+++ b/packages/svelte/src/internal/server/context.js
@@ -10,6 +10,15 @@ export function set_ssr_context(v) {
 	ssr_context = v;
 }
 
+/**
+ * @template T
+ * @returns {[() => T, (context: T) => T]}
+ */
+export function createContext() {
+	const key = {};
+	return [() => getContext(key), (context) => setContext(key, context)];
+}
+
 /**
  * @template T
  * @param {any} key
diff --git a/packages/svelte/src/internal/shared/errors.js b/packages/svelte/src/internal/shared/errors.js
index 6bcc35016a..669cdd96a7 100644
--- a/packages/svelte/src/internal/shared/errors.js
+++ b/packages/svelte/src/internal/shared/errors.js
@@ -51,6 +51,22 @@ export function lifecycle_outside_component(name) {
 	}
 }
 
+/**
+ * Context was not set in a parent component
+ * @returns {never}
+ */
+export function missing_context() {
+	if (DEV) {
+		const error = new Error(`missing_context\nContext was not set in a parent component\nhttps://svelte.dev/e/missing_context`);
+
+		error.name = 'Svelte error';
+
+		throw error;
+	} else {
+		throw new Error(`https://svelte.dev/e/missing_context`);
+	}
+}
+
 /**
  * Attempted to render a snippet without a `{@render}` block. This would cause the snippet code to be stringified instead of its content being rendered to the DOM. To fix this, change `{snippet}` to `{@render snippet()}`.
  * @returns {never}
diff --git a/packages/svelte/tests/runtime-runes/samples/create-context/Child.svelte b/packages/svelte/tests/runtime-runes/samples/create-context/Child.svelte
new file mode 100644
index 0000000000..3e39d5043e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/create-context/Child.svelte
@@ -0,0 +1,7 @@
+<script>
+	import { get } from './main.svelte';
+
+	const message = get();
+</script>
+
+<h1>{message}</h1>
diff --git a/packages/svelte/tests/runtime-runes/samples/create-context/_config.js b/packages/svelte/tests/runtime-runes/samples/create-context/_config.js
new file mode 100644
index 0000000000..4ae28e68bd
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/create-context/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	html: `<h1>hello</h1>`
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/create-context/main.svelte b/packages/svelte/tests/runtime-runes/samples/create-context/main.svelte
new file mode 100644
index 0000000000..8d3c50ba55
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/create-context/main.svelte
@@ -0,0 +1,16 @@
+<script module>
+	import { createContext } from 'svelte';
+
+	/** @type {ReturnType<typeof createContext<string>>} */
+	const [get, set] = createContext();
+
+	export { get };
+</script>
+
+<script>
+	import Child from './Child.svelte';
+
+	set('hello');
+</script>
+
+<Child />
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 6dc6629faa..58e3285e4a 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -448,6 +448,10 @@ declare module 'svelte' {
 	}): Snippet<Params>;
 	/** Anything except a function */
 	type NotFunction<T> = T extends Function ? never : T;
+	/**
+	 * Returns a `[get, set]` pair of functions for working with context in a type-safe way.
+	 * */
+	export function createContext<T>(): [() => T, (context: T) => T];
 	/**
 	 * Retrieves the context that belongs to the closest parent component with the specified `key`.
 	 * Must be called during component initialisation.

From 005895d9940eea9006b1d36f2b0d7260a15a91a9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 15:58:42 -0400
Subject: [PATCH 094/347] Version Packages (#16946)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/neat-melons-cheer.md     |  5 -----
 .changeset/pretty-llamas-explode.md |  5 -----
 .changeset/wild-mirrors-take.md     |  5 -----
 packages/svelte/CHANGELOG.md        | 12 ++++++++++++
 packages/svelte/package.json        |  2 +-
 packages/svelte/src/version.js      |  2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 .changeset/neat-melons-cheer.md
 delete mode 100644 .changeset/pretty-llamas-explode.md
 delete mode 100644 .changeset/wild-mirrors-take.md

diff --git a/.changeset/neat-melons-cheer.md b/.changeset/neat-melons-cheer.md
deleted file mode 100644
index 1107d7ef20..0000000000
--- a/.changeset/neat-melons-cheer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': minor
----
-
-feat: add `createContext` utility for type-safe context
diff --git a/.changeset/pretty-llamas-explode.md b/.changeset/pretty-llamas-explode.md
deleted file mode 100644
index 00109112de..0000000000
--- a/.changeset/pretty-llamas-explode.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: simplify `batch.apply()`
diff --git a/.changeset/wild-mirrors-take.md b/.changeset/wild-mirrors-take.md
deleted file mode 100644
index faf28e7695..0000000000
--- a/.changeset/wild-mirrors-take.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't rerun async effects unnecessarily
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index b3af39eb4c..5d23dddd15 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.40.0
+
+### Minor Changes
+
+- feat: add `createContext` utility for type-safe context ([#16948](https://github.com/sveltejs/svelte/pull/16948))
+
+### Patch Changes
+
+- chore: simplify `batch.apply()` ([#16945](https://github.com/sveltejs/svelte/pull/16945))
+
+- fix: don't rerun async effects unnecessarily ([#16944](https://github.com/sveltejs/svelte/pull/16944))
+
 ## 5.39.13
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 55b44fb2b6..8c049e0f85 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.13",
+  "version": "5.40.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 536a2260c9..2fcca0bd8d 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.13';
+export const VERSION = '5.40.0';
 export const PUBLIC_VERSION = '5';

From 9cdd76e3a3666b6c041fc2eb2c4498db31c795e5 Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Tue, 14 Oct 2025 14:56:49 -0600
Subject: [PATCH 095/347] chore: Remove annoying sync-async warning (#16949)

---
 .changeset/eager-cups-argue.md                      |  5 +++++
 .../docs/98-reference/.generated/server-warnings.md |  9 ---------
 .../svelte/messages/server-warnings/warnings.md     |  5 -----
 packages/svelte/src/internal/server/renderer.js     |  2 --
 packages/svelte/src/internal/server/warnings.js     | 13 +------------
 packages/svelte/src/legacy/legacy-server.js         |  1 -
 6 files changed, 6 insertions(+), 29 deletions(-)
 create mode 100644 .changeset/eager-cups-argue.md
 delete mode 100644 documentation/docs/98-reference/.generated/server-warnings.md
 delete mode 100644 packages/svelte/messages/server-warnings/warnings.md

diff --git a/.changeset/eager-cups-argue.md b/.changeset/eager-cups-argue.md
new file mode 100644
index 0000000000..74f03bc1da
--- /dev/null
+++ b/.changeset/eager-cups-argue.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: Remove sync-in-async warning for server rendering
diff --git a/documentation/docs/98-reference/.generated/server-warnings.md b/documentation/docs/98-reference/.generated/server-warnings.md
deleted file mode 100644
index 26b3628be9..0000000000
--- a/documentation/docs/98-reference/.generated/server-warnings.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- 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/packages/svelte/messages/server-warnings/warnings.md b/packages/svelte/messages/server-warnings/warnings.md
deleted file mode 100644
index 4df89d0176..0000000000
--- a/packages/svelte/messages/server-warnings/warnings.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## 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/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index bbb43a6f3b..602c680c08 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -4,7 +4,6 @@ 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';
 import { attributes } from './index.js';
 
@@ -361,7 +360,6 @@ export class Renderer {
 					 */
 					(onfulfilled, onrejected) => {
 						if (!async_mode_flag) {
-							w.experimental_async_ssr();
 							const result = (sync ??= Renderer.#render(component, options));
 							const user_result = onfulfilled({
 								head: result.head,
diff --git a/packages/svelte/src/internal/server/warnings.js b/packages/svelte/src/internal/server/warnings.js
index d8d9cd6d43..d4ee7a86c2 100644
--- a/packages/svelte/src/internal/server/warnings.js
+++ b/packages/svelte/src/internal/server/warnings.js
@@ -3,15 +3,4 @@
 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
+var normal = 'font-weight: normal';
\ No newline at end of file
diff --git a/packages/svelte/src/legacy/legacy-server.js b/packages/svelte/src/legacy/legacy-server.js
index b7d3e673bc..a50d961751 100644
--- a/packages/svelte/src/legacy/legacy-server.js
+++ b/packages/svelte/src/legacy/legacy-server.js
@@ -53,7 +53,6 @@ export function asClassComponent(component) {
 					 */
 					value: (onfulfilled, onrejected) => {
 						if (!async_mode_flag) {
-							w.experimental_async_ssr();
 							const user_result = onfulfilled({
 								css: munged.css,
 								head: munged.head,

From ec99d7bc4c57e130183f48e10e5b2f37fb173c97 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 14 Oct 2025 19:02:16 -0400
Subject: [PATCH 096/347] fix docs (#16953)

---
 documentation/docs/02-runes/03-$derived.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/documentation/docs/02-runes/03-$derived.md b/documentation/docs/02-runes/03-$derived.md
index 308693d19c..d3e46eb22d 100644
--- a/documentation/docs/02-runes/03-$derived.md
+++ b/documentation/docs/02-runes/03-$derived.md
@@ -86,7 +86,8 @@ Derived expressions are recalculated when their dependencies change, but you can
 Unlike `$state`, which converts objects and arrays to [deeply reactive proxies]($state#Deep-state), `$derived` values are left as-is. For example, [in a case like this](/playground/untitled#H4sIAAAAAAAAE4VU22rjMBD9lUHd3aaQi9PdstS1A3t5XvpQ2Ic4D7I1iUUV2UjjNMX431eS7TRdSosxgjMzZ45mjt0yzffIYibvy0ojFJWqDKCQVBk2ZVup0LJ43TJ6rn2aBxw-FP2o67k9oCKP5dziW3hRaUJNjoYltjCyplWmM1JIIAn3FlL4ZIkTTtYez6jtj4w8WwyXv9GiIXiQxLVs9pfTMR7EuoSLIuLFbX7Z4930bZo_nBrD1bs834tlfvsBz9_SyX6PZXu9XaL4gOWn4sXjeyzftv4ZWfyxubpzxzg6LfD4MrooxELEosKCUPigQCMPKCZh0OtQE1iSxcsmdHuBvCiHZXALLXiN08EL3RRkaJ_kDVGle0HcSD5TPEeVtj67O4Nrg9aiSNtBY5oODJkrL5QsHtN2cgXp6nSJMWzpWWGasdlsGEMbzi5jPr5KFr0Ep7pdeM2-TCelCddIhDxAobi1jqF3cMaC1RKp64bAW9iFAmXGIHfd4wNXDabtOLN53w8W53VvJoZLh7xk4Rr3CoL-UNoLhWHrT1JQGcM17u96oES5K-kc2XOzkzqGCKL5De79OUTyyrg1zgwXsrEx3ESfx4Bz0M5UjVMHB24mw9SuXtXFoN13fYKOM1tyUT3FbvbWmSWCZX2Er-41u5xPoml45svRahl9Wb9aasbINJixDZwcPTbyTLZSUsAvrg_cPuCR7s782_WU8343Y72Qtlb8OYatwuOQvuN13M_hJKNfxann1v1U_B1KZ_D_mzhzhz24fw85CSz2irtN9w9HshBK7AQAAA==)...
 
 ```js
-let items = $state([...]);
+// @errors: 7005
+let items = $state([ /*...*/ ]);
 
 let index = $state(0);
 let selected = $derived(items[index]);

From d6d13ced086f5ddb617db2bcd524b2417dd5eb14 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 14 Oct 2025 20:45:29 -0400
Subject: [PATCH 097/347] docs: improve createContext documentation (#16952)

* docs: improve createContext documentation

* update context page

* bump
---
 documentation/docs/06-runtime/02-context.md   | 21 ++++++-------------
 .../svelte/src/internal/client/context.js     |  8 +++++++
 .../svelte/src/internal/server/context.js     |  1 +
 packages/svelte/types/index.d.ts              | 10 ++++++++-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/documentation/docs/06-runtime/02-context.md b/documentation/docs/06-runtime/02-context.md
index f395de421c..0dfb996164 100644
--- a/documentation/docs/06-runtime/02-context.md
+++ b/documentation/docs/06-runtime/02-context.md
@@ -83,27 +83,18 @@ Svelte will warn you if you get it wrong.
 
 ## Type-safe context
 
-A useful pattern is to wrap the calls to `setContext` and `getContext` inside helper functions that let you preserve type safety:
+As an alternative to using `setContext` and `getContext` directly, you can use them via `createContext`. This gives you type safety and makes it unnecessary to use a key:
 
-```js
-/// file: context.js
+```ts
+/// file: context.ts
 // @filename: ambient.d.ts
 interface User {}
 
-// @filename: index.js
+// @filename: index.ts
 // ---cut---
-import { getContext, setContext } from 'svelte';
-
-const key = {};
-
-/** @param {User} user */
-export function setUserContext(user) {
-	setContext(key, user);
-}
+import { createContext } from 'svelte';
 
-export function getUserContext() {
-	return /** @type {User} */ (getContext(key));
-}
+export const [getUserContext, setUserContext] = createContext<User>();
 ```
 
 ## Replacing global state
diff --git a/packages/svelte/src/internal/client/context.js b/packages/svelte/src/internal/client/context.js
index ea63072a37..751a35321a 100644
--- a/packages/svelte/src/internal/client/context.js
+++ b/packages/svelte/src/internal/client/context.js
@@ -71,8 +71,12 @@ export function set_dev_current_component_function(fn) {
 
 /**
  * Returns a `[get, set]` pair of functions for working with context in a type-safe way.
+ *
+ * `get` will throw an error if no parent component called `set`.
+ *
  * @template T
  * @returns {[() => T, (context: T) => T]}
+ * @since 5.40.0
  */
 export function createContext() {
 	const key = {};
@@ -93,6 +97,8 @@ export function createContext() {
  * Retrieves the context that belongs to the closest parent component with the specified `key`.
  * Must be called during component initialisation.
  *
+ * [`createContext`](https://svelte.dev/docs/svelte/svelte#createContext) is a type-safe alternative.
+ *
  * @template T
  * @param {any} key
  * @returns {T}
@@ -110,6 +116,8 @@ export function getContext(key) {
  *
  * Like lifecycle functions, this must be called during component initialisation.
  *
+ * [`createContext`](https://svelte.dev/docs/svelte/svelte#createContext) is a type-safe alternative.
+ *
  * @template T
  * @param {any} key
  * @param {T} context
diff --git a/packages/svelte/src/internal/server/context.js b/packages/svelte/src/internal/server/context.js
index 1813bfbf78..7779da4c1d 100644
--- a/packages/svelte/src/internal/server/context.js
+++ b/packages/svelte/src/internal/server/context.js
@@ -13,6 +13,7 @@ export function set_ssr_context(v) {
 /**
  * @template T
  * @returns {[() => T, (context: T) => T]}
+ * @since 5.40.0
  */
 export function createContext() {
 	const key = {};
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 58e3285e4a..a9938fe924 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -450,12 +450,18 @@ declare module 'svelte' {
 	type NotFunction<T> = T extends Function ? never : T;
 	/**
 	 * Returns a `[get, set]` pair of functions for working with context in a type-safe way.
-	 * */
+	 *
+	 * `get` will throw an error if no parent component called `set`.
+	 *
+	 * @since 5.40.0
+	 */
 	export function createContext<T>(): [() => T, (context: T) => T];
 	/**
 	 * Retrieves the context that belongs to the closest parent component with the specified `key`.
 	 * Must be called during component initialisation.
 	 *
+	 * [`createContext`](https://svelte.dev/docs/svelte/svelte#createContext) is a type-safe alternative.
+	 *
 	 * */
 	export function getContext<T>(key: any): T;
 	/**
@@ -465,6 +471,8 @@ declare module 'svelte' {
 	 *
 	 * Like lifecycle functions, this must be called during component initialisation.
 	 *
+	 * [`createContext`](https://svelte.dev/docs/svelte/svelte#createContext) is a type-safe alternative.
+	 *
 	 * */
 	export function setContext<T>(key: any, context: T): T;
 	/**

From 470d61221ec3fc2b80ec889853c5d2c9adcf4c50 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 15 Oct 2025 09:50:56 -0400
Subject: [PATCH 098/347] chore: tidy up (#16957)

---
 packages/svelte/src/ambient.d.ts                           | 6 +++---
 packages/svelte/src/internal/client/dom/blocks/boundary.js | 2 +-
 packages/svelte/types/index.d.ts                           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/svelte/src/ambient.d.ts b/packages/svelte/src/ambient.d.ts
index d655fb648a..1f1b0e7b5e 100644
--- a/packages/svelte/src/ambient.d.ts
+++ b/packages/svelte/src/ambient.d.ts
@@ -100,7 +100,7 @@ declare namespace $state {
 	 * you must reassign it.
 	 *
 	 * Example:
-	 * ```ts
+	 * ```svelte
 	 * <script>
 	 *   let items = $state.raw([0]);
 	 *
@@ -109,7 +109,7 @@ declare namespace $state {
 	 *   };
 	 * </script>
 	 *
-	 * <button on:click={addItem}>
+	 * <button onclick={addItem}>
 	 *   {items.join(', ')}
 	 * </button>
 	 * ```
@@ -124,7 +124,7 @@ declare namespace $state {
 	 * To take a static snapshot of a deeply reactive `$state` proxy, use `$state.snapshot`:
 	 *
 	 * Example:
-	 * ```ts
+	 * ```svelte
 	 * <script>
 	 *   let counter = $state({ count: 0 });
 	 *
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 88f4a85e20..ca6437e384 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -29,7 +29,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, current_batch, effect_pending_updates } from '../../reactivity/batch.js';
+import { 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/types/index.d.ts b/packages/svelte/types/index.d.ts
index a9938fe924..f01edd947f 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -3198,7 +3198,7 @@ declare namespace $state {
 	 * you must reassign it.
 	 *
 	 * Example:
-	 * ```ts
+	 * ```svelte
 	 * <script>
 	 *   let items = $state.raw([0]);
 	 *
@@ -3207,7 +3207,7 @@ declare namespace $state {
 	 *   };
 	 * </script>
 	 *
-	 * <button on:click={addItem}>
+	 * <button onclick={addItem}>
 	 *   {items.join(', ')}
 	 * </button>
 	 * ```
@@ -3222,7 +3222,7 @@ declare namespace $state {
 	 * To take a static snapshot of a deeply reactive `$state` proxy, use `$state.snapshot`:
 	 *
 	 * Example:
-	 * ```ts
+	 * ```svelte
 	 * <script>
 	 *   let counter = $state({ count: 0 });
 	 *

From 94fc836e3a11f089ffc2cff002810e839f81215c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 15 Oct 2025 12:59:55 -0400
Subject: [PATCH 099/347] Version Packages (#16950)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/eager-cups-argue.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/eager-cups-argue.md

diff --git a/.changeset/eager-cups-argue.md b/.changeset/eager-cups-argue.md
deleted file mode 100644
index 74f03bc1da..0000000000
--- a/.changeset/eager-cups-argue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: Remove sync-in-async warning for server rendering
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 5d23dddd15..a779431a29 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.40.1
+
+### Patch Changes
+
+- chore: Remove sync-in-async warning for server rendering ([#16949](https://github.com/sveltejs/svelte/pull/16949))
+
 ## 5.40.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 8c049e0f85..0868714f6f 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.40.0",
+  "version": "5.40.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 2fcca0bd8d..565f08a9d0 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.40.0';
+export const VERSION = '5.40.1';
 export const PUBLIC_VERSION = '5';

From 8691391c0892f03731bc55e84a6d78ad56065871 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Thu, 16 Oct 2025 17:02:55 +0200
Subject: [PATCH 100/347] fix: add hydration markers in `pending` branch of SSR
 boundary (#16965)

---
 .changeset/happy-numbers-stick.md                      |  5 +++++
 .../3-transform/server/visitors/SvelteBoundary.js      |  2 +-
 .../samples/boundary-pending-attribute/_config.js      | 10 ++++++++++
 .../samples/boundary-pending-attribute/_expected.html  |  1 +
 .../samples/boundary-pending-attribute/main.svelte     |  8 ++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/happy-numbers-stick.md
 create mode 100644 packages/svelte/tests/hydration/samples/boundary-pending-attribute/_config.js
 create mode 100644 packages/svelte/tests/hydration/samples/boundary-pending-attribute/_expected.html
 create mode 100644 packages/svelte/tests/hydration/samples/boundary-pending-attribute/main.svelte

diff --git a/.changeset/happy-numbers-stick.md b/.changeset/happy-numbers-stick.md
new file mode 100644
index 0000000000..12fbd68ad8
--- /dev/null
+++ b/.changeset/happy-numbers-stick.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: add hydration markers in `pending` branch of SSR boundary
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 41a18cf52d..45f1b5aad2 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
@@ -49,7 +49,7 @@ export function SvelteBoundary(node, context) {
 			context.state.template.push(
 				b.if(
 					callee,
-					b.block([b.stmt(pending)]),
+					b.block(build_template([block_open_else, b.stmt(pending), block_close])),
 					b.block(build_template([block_open, statement, block_close]))
 				)
 			);
diff --git a/packages/svelte/tests/hydration/samples/boundary-pending-attribute/_config.js b/packages/svelte/tests/hydration/samples/boundary-pending-attribute/_config.js
new file mode 100644
index 0000000000..eec39eb84c
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/boundary-pending-attribute/_config.js
@@ -0,0 +1,10 @@
+import { flushSync } from 'svelte';
+import { assert_ok, test } from '../../test';
+
+export default test({
+	compileOptions: {
+		experimental: {
+			async: true
+		}
+	}
+});
diff --git a/packages/svelte/tests/hydration/samples/boundary-pending-attribute/_expected.html b/packages/svelte/tests/hydration/samples/boundary-pending-attribute/_expected.html
new file mode 100644
index 0000000000..8b44c4cc91
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/boundary-pending-attribute/_expected.html
@@ -0,0 +1 @@
+<!--[--><!--[!--><!---->loading...<!--]--><!--]-->
\ No newline at end of file
diff --git a/packages/svelte/tests/hydration/samples/boundary-pending-attribute/main.svelte b/packages/svelte/tests/hydration/samples/boundary-pending-attribute/main.svelte
new file mode 100644
index 0000000000..15612dd27e
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/boundary-pending-attribute/main.svelte
@@ -0,0 +1,8 @@
+{#snippet pending()}
+	loading...
+{/snippet}
+
+<svelte:boundary {pending}>
+	{@const data = await Promise.resolve("data")}
+	{data}
+</svelte:boundary>
\ No newline at end of file

From a54186242a584fd43ee9b58a91c5d9fef9da6837 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Oct 2025 21:28:31 -0400
Subject: [PATCH 101/347] Version Packages (#16967)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/happy-numbers-stick.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/happy-numbers-stick.md

diff --git a/.changeset/happy-numbers-stick.md b/.changeset/happy-numbers-stick.md
deleted file mode 100644
index 12fbd68ad8..0000000000
--- a/.changeset/happy-numbers-stick.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: add hydration markers in `pending` branch of SSR boundary
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index a779431a29..5c8a5e5b58 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.40.2
+
+### Patch Changes
+
+- fix: add hydration markers in `pending` branch of SSR boundary ([#16965](https://github.com/sveltejs/svelte/pull/16965))
+
 ## 5.40.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 0868714f6f..d99ddb502d 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.40.1",
+  "version": "5.40.2",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 565f08a9d0..021668f1e6 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.40.1';
+export const VERSION = '5.40.2';
 export const PUBLIC_VERSION = '5';

From 7d977fad88c5199773fa0dc234c61440922575c3 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 16 Oct 2025 21:29:06 -0400
Subject: [PATCH 102/347] chore: run boundary async effects in the context of
 the current batch (#16968)

---
 .changeset/selfish-pets-teach.md              |  5 ++++
 .../src/internal/client/reactivity/batch.js   | 26 +++----------------
 2 files changed, 9 insertions(+), 22 deletions(-)
 create mode 100644 .changeset/selfish-pets-teach.md

diff --git a/.changeset/selfish-pets-teach.md b/.changeset/selfish-pets-teach.md
new file mode 100644
index 0000000000..d78fea8f9f
--- /dev/null
+++ b/.changeset/selfish-pets-teach.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: run boundary async effects in the context of the current batch
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 2956e7ed6a..fd2a6d9f5d 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -97,13 +97,6 @@ export class Batch {
 	 */
 	#deferred = null;
 
-	/**
-	 * Async effects inside a newly-created `<svelte:boundary>`
-	 * — these do not prevent the batch from committing
-	 * @type {Effect[]}
-	 */
-	#boundary_async_effects = [];
-
 	/**
 	 * Template effects and `$effect.pre` effects, which run when
 	 * a batch is committed
@@ -158,8 +151,7 @@ export class Batch {
 			this.#traverse_effect_tree(root);
 		}
 
-		// if we didn't start any new async work, and no async work
-		// is outstanding from a previous flush, commit
+		// if there is no outstanding async work, commit
 		if (this.#pending === 0) {
 			// TODO we need this because we commit _then_ flush effects...
 			// maybe there's a way we can reverse the order?
@@ -193,12 +185,6 @@ export class Batch {
 		}
 
 		batch_values = null;
-
-		for (const effect of this.#boundary_async_effects) {
-			update_effect(effect);
-		}
-
-		this.#boundary_async_effects = [];
 	}
 
 	/**
@@ -225,13 +211,9 @@ export class Batch {
 					this.#effects.push(effect);
 				} else if (async_mode_flag && (flags & RENDER_EFFECT) !== 0) {
 					this.#render_effects.push(effect);
-				} else if ((flags & CLEAN) === 0) {
-					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);
-					}
+				} else if (is_dirty(effect)) {
+					if ((effect.f & BLOCK_EFFECT) !== 0) this.#block_effects.push(effect);
+					update_effect(effect);
 				}
 
 				var child = effect.first;

From 9b5fb3f430d437ac94f752da87cff6d35dc9555c Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 17 Oct 2025 06:56:04 -0400
Subject: [PATCH 103/347] fix: error if `each` block has `key` but no `as`
 clause (#16966)

---
 .changeset/thirty-rules-dance.md                    |  5 +++++
 .../docs/98-reference/.generated/compile-errors.md  |  8 +++++++-
 packages/svelte/messages/compile-errors/template.md |  6 +++++-
 packages/svelte/src/compiler/errors.js              | 13 +++++++++++--
 .../compiler/phases/2-analyze/visitors/EachBlock.js |  4 ++++
 .../_config.js                                      |  2 +-
 .../_config.js                                      |  2 +-
 .../samples/each-key-without-as/_config.js          |  8 ++++++++
 .../samples/each-key-without-as/main.svelte         |  7 +++++++
 9 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/thirty-rules-dance.md
 create mode 100644 packages/svelte/tests/compiler-errors/samples/each-key-without-as/_config.js
 create mode 100644 packages/svelte/tests/compiler-errors/samples/each-key-without-as/main.svelte

diff --git a/.changeset/thirty-rules-dance.md b/.changeset/thirty-rules-dance.md
new file mode 100644
index 0000000000..7fcf8d63d0
--- /dev/null
+++ b/.changeset/thirty-rules-dance.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: error if `each` block has `key` but no `as` clause
diff --git a/documentation/docs/98-reference/.generated/compile-errors.md b/documentation/docs/98-reference/.generated/compile-errors.md
index b9c44163c9..c5703c636b 100644
--- a/documentation/docs/98-reference/.generated/compile-errors.md
+++ b/documentation/docs/98-reference/.generated/compile-errors.md
@@ -199,7 +199,7 @@ Cyclical dependency detected: %cycle%
 ### const_tag_invalid_reference
 
 ```
-The `{@const %name% = ...}` declaration is not available in this snippet 
+The `{@const %name% = ...}` declaration is not available in this snippet
 ```
 
 The following is an error:
@@ -453,6 +453,12 @@ This turned out to be buggy and unpredictable, particularly when working with de
 {/each}
 ```
 
+### each_key_without_as
+
+```
+An `{#each ...}` block without an `as` clause cannot have a key
+```
+
 ### effect_invalid_placement
 
 ```
diff --git a/packages/svelte/messages/compile-errors/template.md b/packages/svelte/messages/compile-errors/template.md
index dc26a02767..ac95bfe4a7 100644
--- a/packages/svelte/messages/compile-errors/template.md
+++ b/packages/svelte/messages/compile-errors/template.md
@@ -126,7 +126,7 @@
 
 ## const_tag_invalid_reference
 
-> The `{@const %name% = ...}` declaration is not available in this snippet 
+> The `{@const %name% = ...}` declaration is not available in this snippet
 
 The following is an error:
 
@@ -179,6 +179,10 @@ The same applies to components:
 
 > `%type%` name cannot be empty
 
+## each_key_without_as
+
+> An `{#each ...}` block without an `as` clause cannot have a key
+
 ## element_invalid_closing_tag
 
 > `</%name%>` attempted to close an element that was not open
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index 44fc641ee5..5e3968215f 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -986,13 +986,13 @@ export function const_tag_invalid_placement(node) {
 }
 
 /**
- * The `{@const %name% = ...}` declaration is not available in this snippet 
+ * The `{@const %name% = ...}` declaration is not available in this snippet
  * @param {null | number | NodeLike} node
  * @param {string} name
  * @returns {never}
  */
 export function const_tag_invalid_reference(node, name) {
-	e(node, 'const_tag_invalid_reference', `The \`{@const ${name} = ...}\` declaration is not available in this snippet \nhttps://svelte.dev/e/const_tag_invalid_reference`);
+	e(node, 'const_tag_invalid_reference', `The \`{@const ${name} = ...}\` declaration is not available in this snippet\nhttps://svelte.dev/e/const_tag_invalid_reference`);
 }
 
 /**
@@ -1023,6 +1023,15 @@ export function directive_missing_name(node, type) {
 	e(node, 'directive_missing_name', `\`${type}\` name cannot be empty\nhttps://svelte.dev/e/directive_missing_name`);
 }
 
+/**
+ * An `{#each ...}` block without an `as` clause cannot have a key
+ * @param {null | number | NodeLike} node
+ * @returns {never}
+ */
+export function each_key_without_as(node) {
+	e(node, 'each_key_without_as', `An \`{#each ...}\` block without an \`as\` clause cannot have a key\nhttps://svelte.dev/e/each_key_without_as`);
+}
+
 /**
  * `</%name%>` attempted to close an element that was not open
  * @param {null | number | NodeLike} node
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js
index e6a83921b1..d3eb58053e 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js
@@ -28,6 +28,10 @@ export function EachBlock(node, context) {
 			node.key.type !== 'Identifier' || !node.index || node.key.name !== node.index;
 	}
 
+	if (node.metadata.keyed && !node.context) {
+		e.each_key_without_as(node);
+	}
+
 	// evaluate expression in parent scope
 	context.visit(node.expression, {
 		...context.state,
diff --git a/packages/svelte/tests/compiler-errors/samples/const-tag-snippet-invalid-reference-1/_config.js b/packages/svelte/tests/compiler-errors/samples/const-tag-snippet-invalid-reference-1/_config.js
index 7424278180..be9d5a483f 100644
--- a/packages/svelte/tests/compiler-errors/samples/const-tag-snippet-invalid-reference-1/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/const-tag-snippet-invalid-reference-1/_config.js
@@ -4,7 +4,7 @@ export default test({
 	async: true,
 	error: {
 		code: 'const_tag_invalid_reference',
-		message: 'The `{@const foo = ...}` declaration is not available in this snippet ',
+		message: 'The `{@const foo = ...}` declaration is not available in this snippet',
 		position: [376, 379]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/const-tag-snippet-invalid-reference-2/_config.js b/packages/svelte/tests/compiler-errors/samples/const-tag-snippet-invalid-reference-2/_config.js
index 7ff71a61f9..5132bd93b7 100644
--- a/packages/svelte/tests/compiler-errors/samples/const-tag-snippet-invalid-reference-2/_config.js
+++ b/packages/svelte/tests/compiler-errors/samples/const-tag-snippet-invalid-reference-2/_config.js
@@ -4,7 +4,7 @@ export default test({
 	async: true,
 	error: {
 		code: 'const_tag_invalid_reference',
-		message: 'The `{@const foo = ...}` declaration is not available in this snippet ',
+		message: 'The `{@const foo = ...}` declaration is not available in this snippet',
 		position: [298, 301]
 	}
 });
diff --git a/packages/svelte/tests/compiler-errors/samples/each-key-without-as/_config.js b/packages/svelte/tests/compiler-errors/samples/each-key-without-as/_config.js
new file mode 100644
index 0000000000..923fe0c0ac
--- /dev/null
+++ b/packages/svelte/tests/compiler-errors/samples/each-key-without-as/_config.js
@@ -0,0 +1,8 @@
+import { test } from '../../test';
+
+export default test({
+	error: {
+		code: 'each_key_without_as',
+		message: 'An `{#each ...}` block without an `as` clause cannot have a key'
+	}
+});
diff --git a/packages/svelte/tests/compiler-errors/samples/each-key-without-as/main.svelte b/packages/svelte/tests/compiler-errors/samples/each-key-without-as/main.svelte
new file mode 100644
index 0000000000..794740de8f
--- /dev/null
+++ b/packages/svelte/tests/compiler-errors/samples/each-key-without-as/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	let items = [{ id: 3 }, { id: 2 }, { id: 1 }];
+</script>
+
+{#each items, i (items[i].id)}
+	<p>{items[i].id}</p>
+{/each}

From ee093e4c86a2db0f2ce636d86856fbe0e5540070 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 17 Oct 2025 13:12:31 -0400
Subject: [PATCH 104/347] fix: preserve `<select>` state while focused (#16958)

---
 .changeset/quiet-weeks-camp.md                |  5 ++
 .../client/dom/elements/bindings/select.js    | 21 +++++
 .../_config.js                                | 17 ++--
 .../main.svelte                               | 23 +++---
 .../_config.js                                | 82 +++++++++++++++++++
 .../main.svelte                               | 31 +++++++
 6 files changed, 160 insertions(+), 19 deletions(-)
 create mode 100644 .changeset/quiet-weeks-camp.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/main.svelte

diff --git a/.changeset/quiet-weeks-camp.md b/.changeset/quiet-weeks-camp.md
new file mode 100644
index 0000000000..9e04031535
--- /dev/null
+++ b/.changeset/quiet-weeks-camp.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: preserve `<select>` state while focused
diff --git a/packages/svelte/src/internal/client/dom/elements/bindings/select.js b/packages/svelte/src/internal/client/dom/elements/bindings/select.js
index e39fb865cd..46e8f524f8 100644
--- a/packages/svelte/src/internal/client/dom/elements/bindings/select.js
+++ b/packages/svelte/src/internal/client/dom/elements/bindings/select.js
@@ -3,6 +3,7 @@ import { listen_to_event_and_reset_event } from './shared.js';
 import { is } from '../../../proxy.js';
 import { is_array } from '../../../../shared/utils.js';
 import * as w from '../../../warnings.js';
+import { Batch, current_batch, previous_batch } from '../../../reactivity/batch.js';
 
 /**
  * Selects the correct option(s) (depending on whether this is a multiple select)
@@ -83,6 +84,7 @@ export function init_select(select) {
  * @returns {void}
  */
 export function bind_select_value(select, get, set = get) {
+	var batches = new WeakSet();
 	var mounting = true;
 
 	listen_to_event_and_reset_event(select, 'change', (is_reset) => {
@@ -102,11 +104,30 @@ export function bind_select_value(select, get, set = get) {
 		}
 
 		set(value);
+
+		if (current_batch !== null) {
+			batches.add(current_batch);
+		}
 	});
 
 	// Needs to be an effect, not a render_effect, so that in case of each loops the logic runs after the each block has updated
 	effect(() => {
 		var value = get();
+
+		if (select === document.activeElement) {
+			// we need both, because in non-async mode, render effects run before previous_batch is set
+			var batch = /** @type {Batch} */ (previous_batch ?? current_batch);
+
+			// Don't update the <select> if it is focused. We can get here if, for example,
+			// an update is deferred because of async work depending on the select:
+			//
+			// <select bind:value={selected}>...</select>
+			// <p>{await find(selected)}</p>
+			if (batches.has(batch)) {
+				return;
+			}
+		}
+
 		select_option(select, value, mounting);
 
 		// Mounting and value undefined -> take selection from dom
diff --git a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/_config.js b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/_config.js
index b0772ad3c0..76a2032c7a 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/_config.js
@@ -2,8 +2,9 @@ import { tick } from 'svelte';
 import { test } from '../../test';
 
 export default test({
-	async test({ assert, target, instance }) {
-		instance.shift();
+	async test({ assert, target }) {
+		const [shift] = target.querySelectorAll('button');
+		shift.click();
 		await tick();
 
 		const [input] = target.querySelectorAll('input');
@@ -13,7 +14,7 @@ export default test({
 		input.dispatchEvent(new InputEvent('input', { bubbles: true }));
 		await tick();
 
-		assert.htmlEqual(target.innerHTML, `<input type="number" /> <p>0</p>`);
+		assert.htmlEqual(target.innerHTML, `<button>shift</button><input type="number" /> <p>0</p>`);
 		assert.equal(input.value, '1');
 
 		input.focus();
@@ -21,17 +22,17 @@ export default test({
 		input.dispatchEvent(new InputEvent('input', { bubbles: true }));
 		await tick();
 
-		assert.htmlEqual(target.innerHTML, `<input type="number" /> <p>0</p>`);
+		assert.htmlEqual(target.innerHTML, `<button>shift</button><input type="number" /> <p>0</p>`);
 		assert.equal(input.value, '2');
 
-		instance.shift();
+		shift.click();
 		await tick();
-		assert.htmlEqual(target.innerHTML, `<input type="number" /> <p>1</p>`);
+		assert.htmlEqual(target.innerHTML, `<button>shift</button><input type="number" /> <p>1</p>`);
 		assert.equal(input.value, '2');
 
-		instance.shift();
+		shift.click();
 		await tick();
-		assert.htmlEqual(target.innerHTML, `<input type="number" /> <p>2</p>`);
+		assert.htmlEqual(target.innerHTML, `<button>shift</button><input type="number" /> <p>2</p>`);
 		assert.equal(input.value, '2');
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/main.svelte
index 2fc898e654..e2f01a66c8 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/main.svelte
@@ -1,22 +1,23 @@
 <script lang="ts">
 	let count = $state(0);
 
-	let deferreds = [];
+	let resolvers = [];
+	let input;
 
-	export function shift() {
-		const d = deferreds.shift();
-		d.d.resolve(d.v);
-	}
-
-	function push(v) {
-		const d = Promise.withResolvers();
-		deferreds.push({ d, v });
-		return d.promise;
+	function push(value) {
+		const { promise, resolve } = Promise.withResolvers();
+		resolvers.push(() => resolve(value));
+		return promise;
 	}
 </script>
 
+<button onclick={() => {
+	input.focus();
+	resolvers.shift()?.();
+}}>shift</button>
+
 <svelte:boundary>
-	<input type="number" bind:value={count} />
+	<input bind:this={input} type="number" bind:value={count} />
 	<p>{await push(count)}</p>
 
 	{#snippet pending()}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/_config.js b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/_config.js
new file mode 100644
index 0000000000..7fddca0d58
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/_config.js
@@ -0,0 +1,82 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [shift] = target.querySelectorAll('button');
+		shift.click();
+		await tick();
+
+		const [select] = target.querySelectorAll('select');
+
+		select.focus();
+		select.value = 'three';
+		select.dispatchEvent(new InputEvent('change', { bubbles: true }));
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<select>
+					<option>one</option>
+					<option>two</option>
+					<option>three</option>
+				</select>
+				<p>two</p>
+			`
+		);
+		assert.equal(select.value, 'three');
+
+		select.focus();
+		select.value = 'one';
+		select.dispatchEvent(new InputEvent('change', { bubbles: true }));
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<select>
+					<option>one</option>
+					<option>two</option>
+					<option>three</option>
+				</select>
+				<p>two</p>
+			`
+		);
+		assert.equal(select.value, 'one');
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<select>
+					<option>one</option>
+					<option>two</option>
+					<option>three</option>
+				</select>
+				<p>three</p>
+			`
+		);
+		assert.equal(select.value, 'one');
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<select>
+					<option>one</option>
+					<option>two</option>
+					<option>three</option>
+				</select>
+				<p>one</p>
+			`
+		);
+		assert.equal(select.value, 'one');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/main.svelte
new file mode 100644
index 0000000000..566ea60ec5
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/main.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+	let selected = $state('two');
+
+	let resolvers = [];
+	let select;
+
+	function push(value) {
+		const { promise, resolve } = Promise.withResolvers();
+		resolvers.push(() => resolve(value));
+		return promise;
+	}
+</script>
+
+<button onclick={() => {
+	select.focus();
+	resolvers.shift()?.();
+}}>shift</button>
+
+<svelte:boundary>
+	<select bind:this={select} bind:value={selected}>
+		<option>one</option>
+		<option>two</option>
+		<option>three</option>
+	</select>
+
+	<p>{await push(selected)}</p>
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>

From 53f2693b3b501c0bc0b8c129fa3e6a5d70903050 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 17 Oct 2025 22:59:50 -0400
Subject: [PATCH 105/347] feat: `$state.eager(value)` (#16849)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* WIP implement `$effect.pending(...)`

* feat: `$state.eager(value)` (#16926)

* runtime-first approach

* revert these

* type safety, lint

* fix: better input cursor restoration for `bind:value` (#16925)

If cursor was at end and new input is longer, move cursor to new end

No test because not possible to reproduce using our test setup.

Follow-up to #14649, helps with #16577

* Version Packages (#16920)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* docs: await no longer need pending (#16900)

* docs: link to custom renderer issue in Svelte Native discussion (#16896)

* fix code block (#16937)

Updated code block syntax from Svelte to JavaScript for clarity.

* fix: unset context on stale promises (#16935)

* fix: unset context on stale promises

When a stale promise is rejected in `async_derived`, and the promise eventually resolves, `d.resolve` will be noop and `d.promise.then(handler, ...)` will never run. That in turns means any restored context (via `(await save(..))()`) will never be unset. We have to handle this case and unset the context to prevent errors such as false-positive state mutation errors

* fix: unset context on stale promises (slightly different approach) (#16936)

* slightly different approach to #16935

* move unset_context call

* get rid of logs

---------

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

* fix: svg `radialGradient` `fr` attribute missing in types (#16943)

* fix(svg radialGradient): fr attribute missing in types

* chore: add changeset

* Version Packages (#16940)

* Version Packages

* Update packages/svelte/CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>

* chore: simplify `batch.apply()` (#16945)

* chore: simplify `batch.apply()`

* belt and braces

* note to self

* unused

* fix: don't rerun async effects unnecessarily (#16944)

Since #16866, when an async effect runs multiple times, we rebase older batches and rerun those effects. This can have unintended consequences: In a case where an async effect only depends on a single source, and that single source was updated in a later batch, we know that we don't need to / should not rerun the older batch.

This PR makes it so: We collect all the sources of older batches that are not part of the current batch that just committed, and then only mark those async effects as dirty which depend on one of those other sources. Fixes the bug I noticed while working on #16935

* fix: ensure map iteration order is correct (#16947)

quick follow-up to #16944
Resetting a map entry does not change its position in the map when iterating. We need to make sure that reset makes that batch jump "to the front" for the "reject all stale batches" logic below. Edge case for which I can't come up with a test case but it _is_ a possibility.

* feat: add `createContext` utility for type-safe context (#16948)

* feat: add `createContext` utility for type-safe context

* regenerate

* Version Packages (#16946)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore: Remove annoying sync-async warning (#16949)

* fix

* use `$state.eager(value)` instead of `$effect.pending(value)`

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hyunbin Seo <47051820+hyunbinseo@users.noreply.github.com>
Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
Co-authored-by: Hannes Rüger <hannes@hannesrueger.de>
Co-authored-by: Elliott Johnson <sejohnson@torchcloudconsulting.com>

* decouple from boundaries

* use queue_micro_task

* add test

* fix

* changeset

* revert

* tidy up

* update docs

* Update packages/svelte/src/internal/client/reactivity/batch.js

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

* minor tweak

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hyunbin Seo <47051820+hyunbinseo@users.noreply.github.com>
Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
Co-authored-by: Hannes Rüger <hannes@hannesrueger.de>
Co-authored-by: Elliott Johnson <sejohnson@torchcloudconsulting.com>
---
 .changeset/shy-boats-protect.md               |  5 ++
 documentation/docs/02-runes/02-$state.md      | 15 +++++
 packages/svelte/src/ambient.d.ts              | 12 ++++
 .../2-analyze/visitors/CallExpression.js      |  7 ++
 .../client/visitors/CallExpression.js         |  6 ++
 .../server/visitors/CallExpression.js         |  4 ++
 packages/svelte/src/internal/client/index.js  |  2 +-
 .../src/internal/client/reactivity/batch.js   | 64 ++++++++++++++++++-
 packages/svelte/src/utils.js                  |  1 +
 .../samples/async-state-eager/_config.js      | 36 +++++++++++
 .../samples/async-state-eager/main.svelte     | 20 ++++++
 packages/svelte/types/index.d.ts              | 12 ++++
 12 files changed, 181 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/shy-boats-protect.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-state-eager/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-state-eager/main.svelte

diff --git a/.changeset/shy-boats-protect.md b/.changeset/shy-boats-protect.md
new file mode 100644
index 0000000000..7efa8ebb31
--- /dev/null
+++ b/.changeset/shy-boats-protect.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: add `$state.eager(value)` rune
diff --git a/documentation/docs/02-runes/02-$state.md b/documentation/docs/02-runes/02-$state.md
index 741e24fde0..6fbf3b8895 100644
--- a/documentation/docs/02-runes/02-$state.md
+++ b/documentation/docs/02-runes/02-$state.md
@@ -166,6 +166,21 @@ To take a static snapshot of a deeply reactive `$state` proxy, use `$state.snaps
 
 This is handy when you want to pass some state to an external library or API that doesn't expect a proxy, such as `structuredClone`.
 
+## `$state.eager`
+
+When state changes, it may not be reflected in the UI immediately if it is used by an `await` expression, because [updates are synchronized](await-expressions#Synchronized-updates).
+
+In some cases, you may want to update the UI as soon as the state changes. For example, you might want to update a navigation bar when the user clicks on a link, so that they get visual feedback while waiting for the new page to load. To do this, use `$state.eager(value)`:
+
+```svelte
+<nav>
+	<a href="/" aria-current={$state.eager(pathname) === '/' ? 'page' : null}>home</a>
+	<a href="/about" aria-current={$state.eager(pathname) === '/about' ? 'page' : null}>about</a>
+</nav>
+```
+
+Use this feature sparingly, and only to provide feedback in response to user action — in general, allowing Svelte to coordinate updates will provide a better user experience.
+
 ## Passing state into functions
 
 JavaScript is a _pass-by-value_ language — when you call a function, the arguments are the _values_ rather than the _variables_. In other words:
diff --git a/packages/svelte/src/ambient.d.ts b/packages/svelte/src/ambient.d.ts
index 1f1b0e7b5e..823dbde9a4 100644
--- a/packages/svelte/src/ambient.d.ts
+++ b/packages/svelte/src/ambient.d.ts
@@ -95,6 +95,18 @@ declare namespace $state {
 								: never
 							: never;
 
+	/**
+	 * Returns the latest `value`, even if the rest of the UI is suspending
+	 * while async work (such as data loading) completes.
+	 *
+	 * ```svelte
+	 * <nav>
+	 *   <a href="/" aria-current={$state.eager(pathname) === '/' ? 'page' : null}>home</a>
+	 *   <a href="/about" aria-current={$state.eager(pathname) === '/about' ? 'page' : null}>about</a>
+	 * </nav>
+	 * ```
+	 */
+	export function eager<T>(value: T): T;
 	/**
 	 * Declares state that is _not_ made deeply reactive — instead of mutating it,
 	 * you must reassign it.
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 53a89125a2..76d9cecd9a 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
@@ -226,6 +226,13 @@ export function CallExpression(node, context) {
 			break;
 		}
 
+		case '$state.eager':
+			if (node.arguments.length !== 1) {
+				e.rune_invalid_arguments_length(node, rune, 'exactly one argument');
+			}
+
+			break;
+
 		case '$state.snapshot':
 			if (node.arguments.length !== 1) {
 				e.rune_invalid_arguments_length(node, rune, 'exactly one argument');
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 fcc385c2ba..bf9a09bb74 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
@@ -49,6 +49,12 @@ export function CallExpression(node, context) {
 			return b.call('$.derived', rune === '$derived' ? b.thunk(fn) : fn);
 		}
 
+		case '$state.eager':
+			return b.call(
+				'$.eager',
+				b.thunk(/** @type {Expression} */ (context.visit(node.arguments[0])))
+			);
+
 		case '$state.snapshot':
 			return b.call(
 				'$.snapshot',
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
index 41d3202ce9..d53b631aa5 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
@@ -38,6 +38,10 @@ export function CallExpression(node, context) {
 		return b.call('$.derived', rune === '$derived' ? b.thunk(fn) : fn);
 	}
 
+	if (rune === '$state.eager') {
+		return node.arguments[0];
+	}
+
 	if (rune === '$state.snapshot') {
 		return b.call(
 			'$.snapshot',
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index 3c5409bcfe..471eed299d 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 } from './reactivity/batch.js';
+export { eager, flushSync as flush } from './reactivity/batch.js';
 export {
 	async_derived,
 	user_derived as derived,
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index fd2a6d9f5d..b35e16a409 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -17,6 +17,7 @@ import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
 import {
 	active_effect,
+	get,
 	is_dirty,
 	is_updating_effect,
 	set_is_updating_effect,
@@ -27,8 +28,8 @@ import * as e from '../errors.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';
-import { unlink_effect } from './effects.js';
+import { old_values, source, update } from './sources.js';
+import { inspect_effect, unlink_effect } from './effects.js';
 
 /** @type {Set<Batch>} */
 const batches = new Set();
@@ -684,6 +685,65 @@ export function schedule_effect(signal) {
 	queued_root_effects.push(effect);
 }
 
+/** @type {Source<number>[]} */
+let eager_versions = [];
+
+function eager_flush() {
+	try {
+		flushSync(() => {
+			for (const version of eager_versions) {
+				update(version);
+			}
+		});
+	} finally {
+		eager_versions = [];
+	}
+}
+
+/**
+ * Implementation of `$state.eager(fn())`
+ * @template T
+ * @param {() => T} fn
+ * @returns {T}
+ */
+export function eager(fn) {
+	var version = source(0);
+	var initial = true;
+	var value = /** @type {T} */ (undefined);
+
+	get(version);
+
+	inspect_effect(() => {
+		if (initial) {
+			// the first time this runs, we create an inspect effect
+			// that will run eagerly whenever the expression changes
+			var previous_batch_values = batch_values;
+
+			try {
+				batch_values = null;
+				value = fn();
+			} finally {
+				batch_values = previous_batch_values;
+			}
+
+			return;
+		}
+
+		// the second time this effect runs, it's to schedule a
+		// `version` update. since this will recreate the effect,
+		// we don't need to evaluate the expression here
+		if (eager_versions.length === 0) {
+			queue_micro_task(eager_flush);
+		}
+
+		eager_versions.push(version);
+	});
+
+	initial = false;
+
+	return value;
+}
+
 /**
  * Forcibly remove all current batches, to prevent cross-talk between tests
  */
diff --git a/packages/svelte/src/utils.js b/packages/svelte/src/utils.js
index f8a7e8d46d..a54a421418 100644
--- a/packages/svelte/src/utils.js
+++ b/packages/svelte/src/utils.js
@@ -436,6 +436,7 @@ const STATE_CREATION_RUNES = /** @type {const} */ ([
 
 const RUNES = /** @type {const} */ ([
 	...STATE_CREATION_RUNES,
+	'$state.eager',
 	'$state.snapshot',
 	'$props',
 	'$props.id',
diff --git a/packages/svelte/tests/runtime-runes/samples/async-state-eager/_config.js b/packages/svelte/tests/runtime-runes/samples/async-state-eager/_config.js
new file mode 100644
index 0000000000..f84228ec14
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-state-eager/_config.js
@@ -0,0 +1,36 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [count, shift] = target.querySelectorAll('button');
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>0</button><button>shift</button><p>0</p>`);
+
+		count.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>1</button><button>shift</button><p>0</p>`);
+
+		count.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>2</button><button>shift</button><p>0</p>`);
+
+		count.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>3</button><button>shift</button><p>0</p>`);
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>3</button><button>shift</button><p>1</p>`);
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>3</button><button>shift</button><p>2</p>`);
+
+		shift.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>3</button><button>shift</button><p>3</p>`);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-state-eager/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-state-eager/main.svelte
new file mode 100644
index 0000000000..c9168b3984
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-state-eager/main.svelte
@@ -0,0 +1,20 @@
+<script>
+	let count = $state(0);
+
+	let resolvers = [];
+
+	function push(value) {
+		const { promise, resolve } = Promise.withResolvers();
+		resolvers.push(() => resolve(value));
+		return promise;
+	}
+</script>
+
+<button onclick={() => count += 1}>{$state.eager(count)}</button>
+<button onclick={() => resolvers.shift()?.()}>shift</button>
+
+<svelte:boundary>
+	<p>{await push(count)}</p>
+
+	{#snippet pending()}{/snippet}
+</svelte:boundary>
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index f01edd947f..d260b738c3 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -3193,6 +3193,18 @@ declare namespace $state {
 								: never
 							: never;
 
+	/**
+	 * Returns the latest `value`, even if the rest of the UI is suspending
+	 * while async work (such as data loading) completes.
+	 *
+	 * ```svelte
+	 * <nav>
+	 *   <a href="/" aria-current={$state.eager(pathname) === '/' ? 'page' : null}>home</a>
+	 *   <a href="/about" aria-current={$state.eager(pathname) === '/about' ? 'page' : null}>about</a>
+	 * </nav>
+	 * ```
+	 */
+	export function eager<T>(value: T): T;
 	/**
 	 * Declares state that is _not_ made deeply reactive — instead of mutating it,
 	 * you must reassign it.

From bd2d3db6d0d7a931c2e84c38a5c537e30dda1dbe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 Oct 2025 23:02:55 -0400
Subject: [PATCH 106/347] Version Packages (#16970)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/quiet-weeks-camp.md   |  5 -----
 .changeset/selfish-pets-teach.md |  5 -----
 .changeset/shy-boats-protect.md  |  5 -----
 .changeset/thirty-rules-dance.md |  5 -----
 packages/svelte/CHANGELOG.md     | 14 ++++++++++++++
 packages/svelte/package.json     |  2 +-
 packages/svelte/src/version.js   |  2 +-
 7 files changed, 16 insertions(+), 22 deletions(-)
 delete mode 100644 .changeset/quiet-weeks-camp.md
 delete mode 100644 .changeset/selfish-pets-teach.md
 delete mode 100644 .changeset/shy-boats-protect.md
 delete mode 100644 .changeset/thirty-rules-dance.md

diff --git a/.changeset/quiet-weeks-camp.md b/.changeset/quiet-weeks-camp.md
deleted file mode 100644
index 9e04031535..0000000000
--- a/.changeset/quiet-weeks-camp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: preserve `<select>` state while focused
diff --git a/.changeset/selfish-pets-teach.md b/.changeset/selfish-pets-teach.md
deleted file mode 100644
index d78fea8f9f..0000000000
--- a/.changeset/selfish-pets-teach.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: run boundary async effects in the context of the current batch
diff --git a/.changeset/shy-boats-protect.md b/.changeset/shy-boats-protect.md
deleted file mode 100644
index 7efa8ebb31..0000000000
--- a/.changeset/shy-boats-protect.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': minor
----
-
-feat: add `$state.eager(value)` rune
diff --git a/.changeset/thirty-rules-dance.md b/.changeset/thirty-rules-dance.md
deleted file mode 100644
index 7fcf8d63d0..0000000000
--- a/.changeset/thirty-rules-dance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: error if `each` block has `key` but no `as` clause
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 5c8a5e5b58..81529104d9 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,19 @@
 # svelte
 
+## 5.41.0
+
+### Minor Changes
+
+- feat: add `$state.eager(value)` rune ([#16849](https://github.com/sveltejs/svelte/pull/16849))
+
+### Patch Changes
+
+- fix: preserve `<select>` state while focused ([#16958](https://github.com/sveltejs/svelte/pull/16958))
+
+- chore: run boundary async effects in the context of the current batch ([#16968](https://github.com/sveltejs/svelte/pull/16968))
+
+- fix: error if `each` block has `key` but no `as` clause ([#16966](https://github.com/sveltejs/svelte/pull/16966))
+
 ## 5.40.2
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index d99ddb502d..6d8463a52a 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.40.2",
+  "version": "5.41.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 021668f1e6..e88bf0d0ea 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.40.2';
+export const VERSION = '5.41.0';
 export const PUBLIC_VERSION = '5';

From c8ef54098584587777993a361cdb68f086433ca9 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sun, 19 Oct 2025 14:53:49 -0400
Subject: [PATCH 107/347] fix: improve `each_key_without_as` error (#16983)

---
 .changeset/three-wasps-work.md                               | 5 +++++
 .../src/compiler/phases/2-analyze/visitors/EachBlock.js      | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/three-wasps-work.md

diff --git a/.changeset/three-wasps-work.md b/.changeset/three-wasps-work.md
new file mode 100644
index 0000000000..318d8668a4
--- /dev/null
+++ b/.changeset/three-wasps-work.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: improve `each_key_without_as` error
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js
index d3eb58053e..81a9c1e2d1 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js
@@ -1,3 +1,4 @@
+/** @import { Expression } from 'estree' */
 /** @import { AST, Binding } from '#compiler' */
 /** @import { Context } from '../types' */
 /** @import { Scope } from '../../scope' */
@@ -29,7 +30,7 @@ export function EachBlock(node, context) {
 	}
 
 	if (node.metadata.keyed && !node.context) {
-		e.each_key_without_as(node);
+		e.each_key_without_as(/** @type {Expression} */ (node.key));
 	}
 
 	// evaluate expression in parent scope

From 9a488d6b25d41d594ee73582e56aff123eec49e9 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Sun, 19 Oct 2025 18:35:38 -0700
Subject: [PATCH 108/347] fix: place `let:` declarations before `{@const}`
 declarations (#16985)

* fix: place `let:` declarations before `{@const}` declarations

* lint

* fix
---
 .changeset/brown-insects-burn.md              |  5 +++
 .../3-transform/client/transform-client.js    |  1 +
 .../phases/3-transform/client/types.d.ts      |  2 +
 .../3-transform/client/visitors/Fragment.js   |  3 +-
 .../client/visitors/LetDirective.js           | 38 ++++++++++---------
 .../client/visitors/RegularElement.js         |  2 +-
 .../client/visitors/SlotElement.js            |  2 +-
 .../client/visitors/SvelteFragment.js         |  2 +-
 .../client/visitors/shared/component.js       |  4 +-
 .../let-directive-and-const-tag/_config.js    |  5 +++
 .../component.svelte                          |  1 +
 .../let-directive-and-const-tag/main.svelte   |  7 ++++
 12 files changed, 49 insertions(+), 23 deletions(-)
 create mode 100644 .changeset/brown-insects-burn.md
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/_config.js
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/component.svelte
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/main.svelte

diff --git a/.changeset/brown-insects-burn.md b/.changeset/brown-insects-burn.md
new file mode 100644
index 0000000000..ceccc3fd9b
--- /dev/null
+++ b/.changeset/brown-insects-burn.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: place `let:` declarations before `{@const}` declarations
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 2629379f63..cd3fb7a64d 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
@@ -172,6 +172,7 @@ export function client_component(analysis, options) {
 		// these are set inside the `Fragment` visitor, and cannot be used until then
 		init: /** @type {any} */ (null),
 		consts: /** @type {any} */ (null),
+		let_directives: /** @type {any} */ (null),
 		update: /** @type {any} */ (null),
 		after_update: /** @type {any} */ (null),
 		template: /** @type {any} */ (null),
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 932d353671..b9a8691a6b 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
@@ -54,6 +54,8 @@ export interface ComponentClientTransformState extends ClientTransformState {
 	readonly after_update: Statement[];
 	/** Transformed `{@const }` declarations */
 	readonly consts: Statement[];
+	/** Transformed `let:` directives */
+	readonly let_directives: Statement[];
 	/** Memoized expressions */
 	readonly memoizer: Memoizer;
 	/** The HTML template string */
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
index 85d8e3caff..bee4fcaab4 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
@@ -63,6 +63,7 @@ export function Fragment(node, context) {
 		...context.state,
 		init: [],
 		consts: [],
+		let_directives: [],
 		update: [],
 		after_update: [],
 		memoizer: new Memoizer(),
@@ -150,7 +151,7 @@ export function Fragment(node, context) {
 		}
 	}
 
-	body.push(...state.consts);
+	body.push(...state.let_directives, ...state.consts);
 
 	if (has_await) {
 		body.push(b.if(b.call('$.aborted'), b.return()));
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/LetDirective.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/LetDirective.js
index f33febeeb2..c134b4e1e7 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/LetDirective.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/LetDirective.js
@@ -21,22 +21,24 @@ export function LetDirective(node, context) {
 			};
 		}
 
-		return b.const(
-			name,
-			b.call(
-				'$.derived',
-				b.thunk(
-					b.block([
-						b.let(
-							/** @type {Expression} */ (node.expression).type === 'ObjectExpression'
-								? // @ts-expect-error types don't match, but it can't contain spread elements and the structure is otherwise fine
-									b.object_pattern(node.expression.properties)
-								: // @ts-expect-error types don't match, but it can't contain spread elements and the structure is otherwise fine
-									b.array_pattern(node.expression.elements),
-							b.member(b.id('$$slotProps'), node.name)
-						),
-						b.return(b.object(bindings.map((binding) => b.init(binding.node.name, binding.node))))
-					])
+		context.state.let_directives.push(
+			b.const(
+				name,
+				b.call(
+					'$.derived',
+					b.thunk(
+						b.block([
+							b.let(
+								/** @type {Expression} */ (node.expression).type === 'ObjectExpression'
+									? // @ts-expect-error types don't match, but it can't contain spread elements and the structure is otherwise fine
+										b.object_pattern(node.expression.properties)
+									: // @ts-expect-error types don't match, but it can't contain spread elements and the structure is otherwise fine
+										b.array_pattern(node.expression.elements),
+								b.member(b.id('$$slotProps'), node.name)
+							),
+							b.return(b.object(bindings.map((binding) => b.init(binding.node.name, binding.node))))
+						])
+					)
 				)
 			)
 		);
@@ -46,6 +48,8 @@ export function LetDirective(node, context) {
 			read: (node) => b.call('$.get', node)
 		};
 
-		return b.const(name, create_derived(context.state, b.member(b.id('$$slotProps'), node.name)));
+		context.state.let_directives.push(
+			b.const(name, create_derived(context.state, b.member(b.id('$$slotProps'), node.name)))
+		);
 	}
 }
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 e35b7cbe5a..ab119e8f80 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
@@ -106,7 +106,7 @@ export function RegularElement(node, context) {
 
 			case 'LetDirective':
 				// visit let directives before everything else, to set state
-				lets.push(/** @type {ExpressionStatement} */ (context.visit(attribute)));
+				context.visit(attribute, { ...context.state, let_directives: lets });
 				break;
 
 			case 'OnDirective':
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js
index a5c0974738..b87a13253b 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js
@@ -49,7 +49,7 @@ export function SlotElement(node, context) {
 				}
 			}
 		} else if (attribute.type === 'LetDirective') {
-			lets.push(/** @type {ExpressionStatement} */ (context.visit(attribute)));
+			context.visit(attribute, { ...context.state, let_directives: lets });
 		}
 	}
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteFragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteFragment.js
index 65cc170ce5..e3b46a4eef 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteFragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteFragment.js
@@ -9,7 +9,7 @@
 export function SvelteFragment(node, context) {
 	for (const attribute of node.attributes) {
 		if (attribute.type === 'LetDirective') {
-			context.state.init.push(/** @type {ExpressionStatement} */ (context.visit(attribute)));
+			context.visit(attribute);
 		}
 	}
 
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 5c8ce897f4..5ca941fd70 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
@@ -101,7 +101,7 @@ export function build_component(node, component_name, context) {
 	if (slot_scope_applies_to_itself) {
 		for (const attribute of node.attributes) {
 			if (attribute.type === 'LetDirective') {
-				lets.push(/** @type {ExpressionStatement} */ (context.visit(attribute)));
+				context.visit(attribute, { ...context.state, let_directives: lets });
 			}
 		}
 	}
@@ -109,7 +109,7 @@ export function build_component(node, component_name, context) {
 	for (const attribute of node.attributes) {
 		if (attribute.type === 'LetDirective') {
 			if (!slot_scope_applies_to_itself) {
-				lets.push(/** @type {ExpressionStatement} */ (context.visit(attribute, states.default)));
+				context.visit(attribute, { ...states.default, let_directives: lets });
 			}
 		} else if (attribute.type === 'OnDirective') {
 			if (!attribute.expression) {
diff --git a/packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/_config.js b/packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/_config.js
new file mode 100644
index 0000000000..2f7a7863a7
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	html: 'foo'
+});
diff --git a/packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/component.svelte b/packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/component.svelte
new file mode 100644
index 0000000000..44e700bdd4
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/component.svelte
@@ -0,0 +1 @@
+<slot data='foo'></slot>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/main.svelte b/packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/main.svelte
new file mode 100644
index 0000000000..abca25bab2
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/let-directive-and-const-tag/main.svelte
@@ -0,0 +1,7 @@
+<script>
+    import Component from './component.svelte';
+</script>
+<Component let:data>
+    {@const thing = data}
+    {thing}
+</Component>
\ No newline at end of file

From b8627e511ddfa9310e6952989c7f7de8ef035b0e Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 20 Oct 2025 09:27:28 -0400
Subject: [PATCH 109/347] chore: centralise branch management (#16977)

* WIP

* WIP

* WIP

* WIP

* WIP

* fix hydration

* simplify

* all tests passing

* key blocks

* snippets

* fix

* tidy up

* WIP await

* tidy up

* fix

* neaten up

* unused

* tweak

* elements

* changeset

* fix

* preserve newer batches

* add comment

* add comment

* no longer necessary apparently?

* move legacy logic to key block
---
 .changeset/yellow-shrimps-provide.md          |   5 +
 .../3-transform/client/transform-client.js    |   4 +-
 .../3-transform/client/visitors/Fragment.js   |   6 +-
 .../src/internal/client/dom/blocks/await.js   | 208 ++++++------------
 .../internal/client/dom/blocks/boundary.js    |  26 +--
 .../internal/client/dom/blocks/branches.js    | 185 ++++++++++++++++
 .../src/internal/client/dom/blocks/if.js      | 135 +++---------
 .../src/internal/client/dom/blocks/key.js     |  70 +-----
 .../src/internal/client/dom/blocks/snippet.js |  28 +--
 .../client/dom/blocks/svelte-component.js     |  70 +-----
 .../client/dom/blocks/svelte-element.js       |  79 +++----
 .../src/internal/client/reactivity/async.js   |  32 ++-
 .../src/internal/client/reactivity/effects.js |  22 +-
 .../samples/await-pending-destroy/_config.js  |   3 +-
 14 files changed, 409 insertions(+), 464 deletions(-)
 create mode 100644 .changeset/yellow-shrimps-provide.md
 create mode 100644 packages/svelte/src/internal/client/dom/blocks/branches.js

diff --git a/.changeset/yellow-shrimps-provide.md b/.changeset/yellow-shrimps-provide.md
new file mode 100644
index 0000000000..a29385660a
--- /dev/null
+++ b/.changeset/yellow-shrimps-provide.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: centralise branch management
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 cd3fb7a64d..0dd4ae03b9 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
@@ -385,7 +385,9 @@ export function client_component(analysis, options) {
 			.../** @type {ESTree.Statement[]} */ (template.body)
 		]);
 
-		component_block.body.push(b.stmt(b.call(`$.async_body`, b.arrow([], body, true))));
+		component_block.body.push(
+			b.stmt(b.call(`$.async_body`, b.id('$$anchor'), b.arrow([b.id('$$anchor')], body, true)))
+		);
 	} else {
 		component_block.body.push(
 			...state.instance_level_snippets,
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
index bee4fcaab4..8d6a2fac88 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
@@ -178,7 +178,11 @@ export function Fragment(node, context) {
 	}
 
 	if (has_await) {
-		return b.block([b.stmt(b.call('$.async_body', b.arrow([], b.block(body), true)))]);
+		return b.block([
+			b.stmt(
+				b.call('$.async_body', b.id('$$anchor'), b.arrow([b.id('$$anchor')], b.block(body), true))
+			)
+		]);
 	} else {
 		return b.block(body);
 	}
diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js
index e7917fbd9e..bac01e4c33 100644
--- a/packages/svelte/src/internal/client/dom/blocks/await.js
+++ b/packages/svelte/src/internal/client/dom/blocks/await.js
@@ -1,12 +1,9 @@
-/** @import { Effect, Source, TemplateNode } from '#client' */
-import { DEV } from 'esm-env';
+/** @import { Source, TemplateNode } from '#client' */
 import { is_promise } from '../../../shared/utils.js';
-import { block, branch, pause_effect, resume_effect } from '../../reactivity/effects.js';
+import { block } from '../../reactivity/effects.js';
 import { internal_set, mutable_source, source } from '../../reactivity/sources.js';
-import { set_active_effect, set_active_reaction } from '../../runtime.js';
 import {
 	hydrate_next,
-	hydrate_node,
 	hydrating,
 	skip_nodes,
 	set_hydrate_node,
@@ -14,15 +11,10 @@ import {
 } from '../hydration.js';
 import { queue_micro_task } from '../task.js';
 import { HYDRATION_START_ELSE, UNINITIALIZED } from '../../../../constants.js';
-import {
-	component_context,
-	dev_stack,
-	is_runes,
-	set_component_context,
-	set_dev_current_component_function,
-	set_dev_stack
-} from '../../context.js';
+import { is_runes } from '../../context.js';
 import { flushSync, is_flushing_sync } from '../../reactivity/batch.js';
+import { BranchManager } from './branches.js';
+import { capture, unset_context } from '../../reactivity/async.js';
 
 const PENDING = 0;
 const THEN = 1;
@@ -33,7 +25,7 @@ const CATCH = 2;
 /**
  * @template V
  * @param {TemplateNode} node
- * @param {(() => Promise<V>)} get_input
+ * @param {(() => any)} get_input
  * @param {null | ((anchor: Node) => void)} pending_fn
  * @param {null | ((anchor: Node, value: Source<V>) => void)} then_fn
  * @param {null | ((anchor: Node, error: unknown) => void)} catch_fn
@@ -44,149 +36,94 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) {
 		hydrate_next();
 	}
 
-	var anchor = node;
 	var runes = is_runes();
-	var active_component_context = component_context;
-
-	/** @type {any} */
-	var component_function = DEV ? component_context?.function : null;
-	var dev_original_stack = DEV ? dev_stack : null;
-
-	/** @type {V | Promise<V> | typeof UNINITIALIZED} */
-	var input = UNINITIALIZED;
-
-	/** @type {Effect | null} */
-	var pending_effect;
-
-	/** @type {Effect | null} */
-	var then_effect;
-
-	/** @type {Effect | null} */
-	var catch_effect;
-
-	var input_source = runes
-		? source(/** @type {V} */ (undefined))
-		: mutable_source(/** @type {V} */ (undefined), false, false);
-	var error_source = runes ? source(undefined) : mutable_source(undefined, false, false);
-	var resolved = false;
-	/**
-	 * @param {AwaitState} state
-	 * @param {boolean} restore
-	 */
-	function update(state, restore) {
-		resolved = true;
-
-		if (restore) {
-			set_active_effect(effect);
-			set_active_reaction(effect); // TODO do we need both?
-			set_component_context(active_component_context);
-			if (DEV) {
-				set_dev_current_component_function(component_function);
-				set_dev_stack(dev_original_stack);
-			}
-		}
-
-		try {
-			if (state === PENDING && pending_fn) {
-				if (pending_effect) resume_effect(pending_effect);
-				else pending_effect = branch(() => pending_fn(anchor));
-			}
-
-			if (state === THEN && then_fn) {
-				if (then_effect) resume_effect(then_effect);
-				else then_effect = branch(() => then_fn(anchor, input_source));
-			}
-
-			if (state === CATCH && catch_fn) {
-				if (catch_effect) resume_effect(catch_effect);
-				else catch_effect = branch(() => catch_fn(anchor, error_source));
-			}
-
-			if (state !== PENDING && pending_effect) {
-				pause_effect(pending_effect, () => (pending_effect = null));
-			}
-
-			if (state !== THEN && then_effect) {
-				pause_effect(then_effect, () => (then_effect = null));
-			}
-
-			if (state !== CATCH && catch_effect) {
-				pause_effect(catch_effect, () => (catch_effect = null));
-			}
-		} finally {
-			if (restore) {
-				if (DEV) {
-					set_dev_current_component_function(null);
-					set_dev_stack(null);
-				}
 
-				set_component_context(null);
-				set_active_reaction(null);
-				set_active_effect(null);
+	var v = /** @type {V} */ (UNINITIALIZED);
+	var value = runes ? source(v) : mutable_source(v, false, false);
+	var error = runes ? source(v) : mutable_source(v, false, false);
 
-				// without this, the DOM does not update until two ticks after the promise
-				// resolves, which is unexpected behaviour (and somewhat irksome to test)
-				if (!is_flushing_sync) flushSync();
-			}
-		}
-	}
+	var branches = new BranchManager(node);
 
-	var effect = block(() => {
-		if (input === (input = get_input())) return;
+	block(() => {
+		var input = get_input();
+		var destroyed = false;
 
 		/** Whether or not there was a hydration mismatch. Needs to be a `let` or else it isn't treeshaken out */
-		// @ts-ignore coercing `anchor` to a `Comment` causes TypeScript and Prettier to fight
-		let mismatch = hydrating && is_promise(input) === (anchor.data === HYDRATION_START_ELSE);
+		// @ts-ignore coercing `node` to a `Comment` causes TypeScript and Prettier to fight
+		let mismatch = hydrating && is_promise(input) === (node.data === HYDRATION_START_ELSE);
 
 		if (mismatch) {
 			// Hydration mismatch: remove everything inside the anchor and start fresh
-			anchor = skip_nodes();
-
-			set_hydrate_node(anchor);
+			set_hydrate_node(skip_nodes());
 			set_hydrating(false);
-			mismatch = true;
 		}
 
 		if (is_promise(input)) {
-			var promise = input;
+			var restore = capture();
+			var resolved = false;
+
+			/**
+			 * @param {() => void} fn
+			 */
+			const resolve = (fn) => {
+				if (destroyed) return;
+
+				resolved = true;
+				restore();
+
+				if (hydrating) {
+					// `restore()` could set `hydrating` to `true`, which we very much
+					// don't want — we want to restore everything _except_ this
+					set_hydrating(false);
+				}
 
-			resolved = false;
+				try {
+					fn();
+				} finally {
+					unset_context();
 
-			promise.then(
-				(value) => {
-					if (promise !== input) return;
-					// we technically could use `set` here since it's on the next microtick
-					// but let's use internal_set for consistency and just to be safe
-					internal_set(input_source, value);
-					update(THEN, true);
+					// without this, the DOM does not update until two ticks after the promise
+					// resolves, which is unexpected behaviour (and somewhat irksome to test)
+					if (!is_flushing_sync) flushSync();
+				}
+			};
+
+			input.then(
+				(v) => {
+					resolve(() => {
+						internal_set(value, v);
+						branches.ensure(THEN, then_fn && ((target) => then_fn(target, value)));
+					});
 				},
-				(error) => {
-					if (promise !== input) return;
-					// we technically could use `set` here since it's on the next microtick
-					// but let's use internal_set for consistency and just to be safe
-					internal_set(error_source, error);
-					update(CATCH, true);
-					if (!catch_fn) {
-						// Rethrow the error if no catch block exists
-						throw error_source.v;
-					}
+				(e) => {
+					resolve(() => {
+						internal_set(error, e);
+						branches.ensure(THEN, catch_fn && ((target) => catch_fn(target, error)));
+
+						if (!catch_fn) {
+							// Rethrow the error if no catch block exists
+							throw error.v;
+						}
+					});
 				}
 			);
 
 			if (hydrating) {
-				if (pending_fn) {
-					pending_effect = branch(() => pending_fn(anchor));
-				}
+				branches.ensure(PENDING, pending_fn);
 			} else {
 				// Wait a microtask before checking if we should show the pending state as
-				// the promise might have resolved by the next microtask.
+				// the promise might have resolved by then
 				queue_micro_task(() => {
-					if (!resolved) update(PENDING, true);
+					if (!resolved) {
+						resolve(() => {
+							branches.ensure(PENDING, pending_fn);
+						});
+					}
 				});
 			}
 		} else {
-			internal_set(input_source, input);
-			update(THEN, false);
+			internal_set(value, input);
+			branches.ensure(THEN, then_fn && ((target) => then_fn(target, value)));
 		}
 
 		if (mismatch) {
@@ -194,11 +131,8 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) {
 			set_hydrating(true);
 		}
 
-		// Set the input to something else, in order to disable the promise callbacks
-		return () => (input = UNINITIALIZED);
+		return () => {
+			destroyed = true;
+		};
 	});
-
-	if (hydrating) {
-		anchor = hydrate_node;
-	}
 }
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index ca6437e384..026ffb36fc 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -8,7 +8,13 @@ import {
 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';
+import {
+	block,
+	branch,
+	destroy_effect,
+	move_effect,
+	pause_effect
+} from '../../reactivity/effects.js';
 import {
 	active_effect,
 	active_reaction,
@@ -425,24 +431,6 @@ export class Boundary {
 	}
 }
 
-/**
- *
- * @param {Effect} effect
- * @param {DocumentFragment} fragment
- */
-function move_effect(effect, fragment) {
-	var node = effect.nodes_start;
-	var end = effect.nodes_end;
-
-	while (node !== null) {
-		/** @type {TemplateNode | null} */
-		var next = node === end ? null : /** @type {TemplateNode} */ (get_next_sibling(node));
-
-		fragment.append(node);
-		node = next;
-	}
-}
-
 export function get_boundary() {
 	return /** @type {Boundary} */ (/** @type {Effect} */ (active_effect).b);
 }
diff --git a/packages/svelte/src/internal/client/dom/blocks/branches.js b/packages/svelte/src/internal/client/dom/blocks/branches.js
new file mode 100644
index 0000000000..827f9f44fa
--- /dev/null
+++ b/packages/svelte/src/internal/client/dom/blocks/branches.js
@@ -0,0 +1,185 @@
+/** @import { Effect, TemplateNode } from '#client' */
+import { is_runes } from '../../context.js';
+import { Batch, current_batch } from '../../reactivity/batch.js';
+import {
+	branch,
+	destroy_effect,
+	move_effect,
+	pause_effect,
+	resume_effect
+} from '../../reactivity/effects.js';
+import { set_should_intro, should_intro } from '../../render.js';
+import { hydrate_node, hydrating } from '../hydration.js';
+import { create_text, should_defer_append } from '../operations.js';
+
+/**
+ * @typedef {{ effect: Effect, fragment: DocumentFragment }} Branch
+ */
+
+/**
+ * @template Key
+ */
+export class BranchManager {
+	/** @type {TemplateNode} */
+	anchor;
+
+	/** @type {Map<Batch, Key>} */
+	#batches = new Map();
+
+	/** @type {Map<Key, Effect>} */
+	#onscreen = new Map();
+
+	/** @type {Map<Key, Branch>} */
+	#offscreen = new Map();
+
+	/**
+	 * Whether to pause (i.e. outro) on change, or destroy immediately.
+	 * This is necessary for `<svelte:element>`
+	 */
+	#transition = true;
+
+	/**
+	 * @param {TemplateNode} anchor
+	 * @param {boolean} transition
+	 */
+	constructor(anchor, transition = true) {
+		this.anchor = anchor;
+		this.#transition = transition;
+	}
+
+	#commit = () => {
+		var batch = /** @type {Batch} */ (current_batch);
+
+		// if this batch was made obsolete, bail
+		if (!this.#batches.has(batch)) return;
+
+		var key = /** @type {Key} */ (this.#batches.get(batch));
+
+		var onscreen = this.#onscreen.get(key);
+
+		if (onscreen) {
+			// effect is already in the DOM — abort any current outro
+			resume_effect(onscreen);
+		} else {
+			// effect is currently offscreen. put it in the DOM
+			var offscreen = this.#offscreen.get(key);
+
+			if (offscreen) {
+				this.#onscreen.set(key, offscreen.effect);
+				this.#offscreen.delete(key);
+
+				// remove the anchor...
+				/** @type {TemplateNode} */ (offscreen.fragment.lastChild).remove();
+
+				// ...and append the fragment
+				this.anchor.before(offscreen.fragment);
+				onscreen = offscreen.effect;
+			}
+		}
+
+		for (const [b, k] of this.#batches) {
+			this.#batches.delete(b);
+
+			if (b === batch) {
+				// keep values for newer batches
+				break;
+			}
+
+			const offscreen = this.#offscreen.get(k);
+
+			if (offscreen) {
+				// for older batches, destroy offscreen effects
+				// as they will never be committed
+				destroy_effect(offscreen.effect);
+				this.#offscreen.delete(k);
+			}
+		}
+
+		// outro/destroy all onscreen effects...
+		for (const [k, effect] of this.#onscreen) {
+			// ...except the one that was just committed
+			if (k === key) continue;
+
+			const on_destroy = () => {
+				const keys = Array.from(this.#batches.values());
+
+				if (keys.includes(k)) {
+					// keep the effect offscreen, as another batch will need it
+					var fragment = document.createDocumentFragment();
+					move_effect(effect, fragment);
+
+					fragment.append(create_text()); // TODO can we avoid this?
+
+					this.#offscreen.set(k, { effect, fragment });
+				} else {
+					destroy_effect(effect);
+				}
+
+				this.#onscreen.delete(k);
+			};
+
+			if (this.#transition || !onscreen) {
+				pause_effect(effect, on_destroy, false);
+			} else {
+				on_destroy();
+			}
+		}
+	};
+
+	/**
+	 *
+	 * @param {any} key
+	 * @param {null | ((target: TemplateNode) => void)} fn
+	 */
+	ensure(key, fn) {
+		var batch = /** @type {Batch} */ (current_batch);
+		var defer = should_defer_append();
+
+		if (fn && !this.#onscreen.has(key) && !this.#offscreen.has(key)) {
+			if (defer) {
+				var fragment = document.createDocumentFragment();
+				var target = create_text();
+
+				fragment.append(target);
+
+				this.#offscreen.set(key, {
+					effect: branch(() => fn(target)),
+					fragment
+				});
+			} else {
+				this.#onscreen.set(
+					key,
+					branch(() => fn(this.anchor))
+				);
+			}
+		}
+
+		this.#batches.set(batch, key);
+
+		if (defer) {
+			for (const [k, effect] of this.#onscreen) {
+				if (k === key) {
+					batch.skipped_effects.delete(effect);
+				} else {
+					batch.skipped_effects.add(effect);
+				}
+			}
+
+			for (const [k, branch] of this.#offscreen) {
+				if (k === key) {
+					batch.skipped_effects.delete(branch.effect);
+				} else {
+					batch.skipped_effects.add(branch.effect);
+				}
+			}
+
+			batch.add_callback(this.#commit);
+		} else {
+			if (hydrating) {
+				this.anchor = hydrate_node;
+			}
+
+			this.#commit();
+		}
+	}
+}
diff --git a/packages/svelte/src/internal/client/dom/blocks/if.js b/packages/svelte/src/internal/client/dom/blocks/if.js
index 6349ab8399..7fa5ca464d 100644
--- a/packages/svelte/src/internal/client/dom/blocks/if.js
+++ b/packages/svelte/src/internal/client/dom/blocks/if.js
@@ -1,19 +1,16 @@
-/** @import { Effect, TemplateNode } from '#client' */
-/** @import { Batch } from '../../reactivity/batch.js'; */
+/** @import { TemplateNode } from '#client' */
 import { EFFECT_TRANSPARENT } from '#client/constants';
 import {
 	hydrate_next,
-	hydrate_node,
 	hydrating,
 	read_hydration_instruction,
 	skip_nodes,
 	set_hydrate_node,
 	set_hydrating
 } from '../hydration.js';
-import { block, branch, pause_effect, resume_effect } from '../../reactivity/effects.js';
-import { HYDRATION_START_ELSE, UNINITIALIZED } from '../../../../constants.js';
-import { create_text, should_defer_append } from '../operations.js';
-import { current_batch } from '../../reactivity/batch.js';
+import { block } from '../../reactivity/effects.js';
+import { HYDRATION_START_ELSE } from '../../../../constants.js';
+import { BranchManager } from './branches.js';
 
 // TODO reinstate https://github.com/sveltejs/svelte/pull/15250
 
@@ -28,122 +25,46 @@ export function if_block(node, fn, elseif = false) {
 		hydrate_next();
 	}
 
-	var anchor = node;
-
-	/** @type {Effect | null} */
-	var consequent_effect = null;
-
-	/** @type {Effect | null} */
-	var alternate_effect = null;
-
-	/** @type {typeof UNINITIALIZED | boolean | null} */
-	var condition = UNINITIALIZED;
-
+	var branches = new BranchManager(node);
 	var flags = elseif ? EFFECT_TRANSPARENT : 0;
 
-	var has_branch = false;
-
-	const set_branch = (/** @type {(anchor: Node) => void} */ fn, flag = true) => {
-		has_branch = true;
-		update_branch(flag, fn);
-	};
-
-	/** @type {DocumentFragment | null} */
-	var offscreen_fragment = null;
-
-	function commit() {
-		if (offscreen_fragment !== null) {
-			// remove the anchor
-			/** @type {Text} */ (offscreen_fragment.lastChild).remove();
-
-			anchor.before(offscreen_fragment);
-			offscreen_fragment = null;
-		}
-
-		var active = condition ? consequent_effect : alternate_effect;
-		var inactive = condition ? alternate_effect : consequent_effect;
-
-		if (active) {
-			resume_effect(active);
-		}
-
-		if (inactive) {
-			pause_effect(inactive, () => {
-				if (condition) {
-					alternate_effect = null;
-				} else {
-					consequent_effect = null;
-				}
-			});
-		}
-	}
-
-	const update_branch = (
-		/** @type {boolean | null} */ new_condition,
-		/** @type {null | ((anchor: Node) => void)} */ fn
-	) => {
-		if (condition === (condition = new_condition)) return;
-
-		/** Whether or not there was a hydration mismatch. Needs to be a `let` or else it isn't treeshaken out */
-		let mismatch = false;
-
+	/**
+	 * @param {boolean} condition,
+	 * @param {null | ((anchor: Node) => void)} fn
+	 */
+	function update_branch(condition, fn) {
 		if (hydrating) {
-			const is_else = read_hydration_instruction(anchor) === HYDRATION_START_ELSE;
+			const is_else = read_hydration_instruction(node) === HYDRATION_START_ELSE;
 
-			if (!!condition === is_else) {
+			if (condition === is_else) {
 				// Hydration mismatch: remove everything inside the anchor and start fresh.
 				// This could happen with `{#if browser}...{/if}`, for example
-				anchor = skip_nodes();
+				var anchor = skip_nodes();
 
 				set_hydrate_node(anchor);
-				set_hydrating(false);
-				mismatch = true;
-			}
-		}
+				branches.anchor = anchor;
 
-		var defer = should_defer_append();
-		var target = anchor;
-
-		if (defer) {
-			offscreen_fragment = document.createDocumentFragment();
-			offscreen_fragment.append((target = create_text()));
-		}
+				set_hydrating(false);
+				branches.ensure(condition, fn);
+				set_hydrating(true);
 
-		if (condition) {
-			consequent_effect ??= fn && branch(() => fn(target));
-		} else {
-			alternate_effect ??= fn && branch(() => fn(target));
+				return;
+			}
 		}
 
-		if (defer) {
-			var batch = /** @type {Batch} */ (current_batch);
-
-			var active = condition ? consequent_effect : alternate_effect;
-			var inactive = condition ? alternate_effect : consequent_effect;
-
-			if (active) batch.skipped_effects.delete(active);
-			if (inactive) batch.skipped_effects.add(inactive);
+		branches.ensure(condition, fn);
+	}
 
-			batch.add_callback(commit);
-		} else {
-			commit();
-		}
+	block(() => {
+		var has_branch = false;
 
-		if (mismatch) {
-			// continue in hydration mode
-			set_hydrating(true);
-		}
-	};
+		fn((fn, flag = true) => {
+			has_branch = true;
+			update_branch(flag, fn);
+		});
 
-	block(() => {
-		has_branch = false;
-		fn(set_branch);
 		if (!has_branch) {
-			update_branch(null, null);
+			update_branch(false, null);
 		}
 	}, flags);
-
-	if (hydrating) {
-		anchor = hydrate_node;
-	}
 }
diff --git a/packages/svelte/src/internal/client/dom/blocks/key.js b/packages/svelte/src/internal/client/dom/blocks/key.js
index 5e3c42019f..849b1c2447 100644
--- a/packages/svelte/src/internal/client/dom/blocks/key.js
+++ b/packages/svelte/src/internal/client/dom/blocks/key.js
@@ -1,12 +1,8 @@
-/** @import { Effect, TemplateNode } from '#client' */
-/** @import { Batch } from '../../reactivity/batch.js'; */
-import { UNINITIALIZED } from '../../../../constants.js';
-import { block, branch, pause_effect } from '../../reactivity/effects.js';
-import { not_equal, safe_not_equal } from '../../reactivity/equality.js';
+/** @import { TemplateNode } from '#client' */
 import { is_runes } from '../../context.js';
-import { hydrate_next, hydrate_node, hydrating } from '../hydration.js';
-import { create_text, should_defer_append } from '../operations.js';
-import { current_batch } from '../../reactivity/batch.js';
+import { block } from '../../reactivity/effects.js';
+import { hydrate_next, hydrating } from '../hydration.js';
+import { BranchManager } from './branches.js';
 
 /**
  * @template V
@@ -20,60 +16,18 @@ export function key(node, get_key, render_fn) {
 		hydrate_next();
 	}
 
-	var anchor = node;
+	var branches = new BranchManager(node);
 
-	/** @type {V | typeof UNINITIALIZED} */
-	var key = UNINITIALIZED;
-
-	/** @type {Effect} */
-	var effect;
-
-	/** @type {Effect} */
-	var pending_effect;
-
-	/** @type {DocumentFragment | null} */
-	var offscreen_fragment = null;
-
-	var changed = is_runes() ? not_equal : safe_not_equal;
-
-	function commit() {
-		if (effect) {
-			pause_effect(effect);
-		}
-
-		if (offscreen_fragment !== null) {
-			// remove the anchor
-			/** @type {Text} */ (offscreen_fragment.lastChild).remove();
-
-			anchor.before(offscreen_fragment);
-			offscreen_fragment = null;
-		}
-
-		effect = pending_effect;
-	}
+	var legacy = !is_runes();
 
 	block(() => {
-		if (changed(key, (key = get_key()))) {
-			var target = anchor;
-
-			var defer = should_defer_append();
-
-			if (defer) {
-				offscreen_fragment = document.createDocumentFragment();
-				offscreen_fragment.append((target = create_text()));
-			}
-
-			pending_effect = branch(() => render_fn(target));
+		var key = get_key();
 
-			if (defer) {
-				/** @type {Batch} */ (current_batch).add_callback(commit);
-			} else {
-				commit();
-			}
+		// key blocks in Svelte <5 had stupid semantics
+		if (legacy && key !== null && typeof key === 'object') {
+			key = /** @type {V} */ ({});
 		}
-	});
 
-	if (hydrating) {
-		anchor = hydrate_node;
-	}
+		branches.ensure(key, render_fn);
+	});
 }
diff --git a/packages/svelte/src/internal/client/dom/blocks/snippet.js b/packages/svelte/src/internal/client/dom/blocks/snippet.js
index 32d88d4c60..0c4948aca0 100644
--- a/packages/svelte/src/internal/client/dom/blocks/snippet.js
+++ b/packages/svelte/src/internal/client/dom/blocks/snippet.js
@@ -1,8 +1,8 @@
 /** @import { Snippet } from 'svelte' */
-/** @import { Effect, TemplateNode } from '#client' */
+/** @import { TemplateNode } from '#client' */
 /** @import { Getters } from '#shared' */
 import { EFFECT_TRANSPARENT, ELEMENT_NODE } from '#client/constants';
-import { branch, block, destroy_effect, teardown } from '../../reactivity/effects.js';
+import { block, teardown } from '../../reactivity/effects.js';
 import {
 	dev_current_component_function,
 	set_dev_current_component_function
@@ -14,8 +14,8 @@ import * as w from '../../warnings.js';
 import * as e from '../../errors.js';
 import { DEV } from 'esm-env';
 import { get_first_child, get_next_sibling } from '../operations.js';
-import { noop } from '../../../shared/utils.js';
 import { prevent_snippet_stringification } from '../../../shared/validate.js';
+import { BranchManager } from './branches.js';
 
 /**
  * @template {(node: TemplateNode, ...args: any[]) => void} SnippetFn
@@ -25,33 +25,17 @@ import { prevent_snippet_stringification } from '../../../shared/validate.js';
  * @returns {void}
  */
 export function snippet(node, get_snippet, ...args) {
-	var anchor = node;
-
-	/** @type {SnippetFn | null | undefined} */
-	// @ts-ignore
-	var snippet = noop;
-
-	/** @type {Effect | null} */
-	var snippet_effect;
+	var branches = new BranchManager(node);
 
 	block(() => {
-		if (snippet === (snippet = get_snippet())) return;
-
-		if (snippet_effect) {
-			destroy_effect(snippet_effect);
-			snippet_effect = null;
-		}
+		const snippet = get_snippet() ?? null;
 
 		if (DEV && snippet == null) {
 			e.invalid_snippet();
 		}
 
-		snippet_effect = branch(() => /** @type {SnippetFn} */ (snippet)(anchor, ...args));
+		branches.ensure(snippet, snippet && ((anchor) => snippet(anchor, ...args)));
 	}, EFFECT_TRANSPARENT);
-
-	if (hydrating) {
-		anchor = hydrate_node;
-	}
 }
 
 /**
diff --git a/packages/svelte/src/internal/client/dom/blocks/svelte-component.js b/packages/svelte/src/internal/client/dom/blocks/svelte-component.js
index 2697722b39..134e57e627 100644
--- a/packages/svelte/src/internal/client/dom/blocks/svelte-component.js
+++ b/packages/svelte/src/internal/client/dom/blocks/svelte-component.js
@@ -1,10 +1,8 @@
-/** @import { TemplateNode, Dom, Effect } from '#client' */
-/** @import { Batch } from '../../reactivity/batch.js'; */
+/** @import { TemplateNode, Dom } from '#client' */
 import { EFFECT_TRANSPARENT } from '#client/constants';
-import { block, branch, pause_effect } from '../../reactivity/effects.js';
-import { current_batch } from '../../reactivity/batch.js';
-import { hydrate_next, hydrate_node, hydrating } from '../hydration.js';
-import { create_text, should_defer_append } from '../operations.js';
+import { block } from '../../reactivity/effects.js';
+import { hydrate_next, hydrating } from '../hydration.js';
+import { BranchManager } from './branches.js';
 
 /**
  * @template P
@@ -19,64 +17,10 @@ export function component(node, get_component, render_fn) {
 		hydrate_next();
 	}
 
-	var anchor = node;
-
-	/** @type {C} */
-	var component;
-
-	/** @type {Effect | null} */
-	var effect;
-
-	/** @type {DocumentFragment | null} */
-	var offscreen_fragment = null;
-
-	/** @type {Effect | null} */
-	var pending_effect = null;
-
-	function commit() {
-		if (effect) {
-			pause_effect(effect);
-			effect = null;
-		}
-
-		if (offscreen_fragment) {
-			// remove the anchor
-			/** @type {Text} */ (offscreen_fragment.lastChild).remove();
-
-			anchor.before(offscreen_fragment);
-			offscreen_fragment = null;
-		}
-
-		effect = pending_effect;
-		pending_effect = null;
-	}
+	var branches = new BranchManager(node);
 
 	block(() => {
-		if (component === (component = get_component())) return;
-
-		var defer = should_defer_append();
-
-		if (component) {
-			var target = anchor;
-
-			if (defer) {
-				offscreen_fragment = document.createDocumentFragment();
-				offscreen_fragment.append((target = create_text()));
-				if (effect) {
-					/** @type {Batch} */ (current_batch).skipped_effects.add(effect);
-				}
-			}
-			pending_effect = branch(() => render_fn(target, component));
-		}
-
-		if (defer) {
-			/** @type {Batch} */ (current_batch).add_callback(commit);
-		} else {
-			commit();
-		}
+		var component = get_component() ?? null;
+		branches.ensure(component, component && ((target) => render_fn(target, component)));
 	}, EFFECT_TRANSPARENT);
-
-	if (hydrating) {
-		anchor = hydrate_node;
-	}
 }
diff --git a/packages/svelte/src/internal/client/dom/blocks/svelte-element.js b/packages/svelte/src/internal/client/dom/blocks/svelte-element.js
index 231a3621b1..6533ff8921 100644
--- a/packages/svelte/src/internal/client/dom/blocks/svelte-element.js
+++ b/packages/svelte/src/internal/client/dom/blocks/svelte-element.js
@@ -8,13 +8,7 @@ import {
 	set_hydrating
 } from '../hydration.js';
 import { create_text, get_first_child } from '../operations.js';
-import {
-	block,
-	branch,
-	destroy_effect,
-	pause_effect,
-	resume_effect
-} from '../../reactivity/effects.js';
+import { block, teardown } from '../../reactivity/effects.js';
 import { set_should_intro } from '../../render.js';
 import { current_each_item, set_current_each_item } from './each.js';
 import { active_effect } from '../../runtime.js';
@@ -23,6 +17,7 @@ import { DEV } from 'esm-env';
 import { EFFECT_TRANSPARENT, ELEMENT_NODE } from '#client/constants';
 import { assign_nodes } from '../template.js';
 import { is_raw_text_element } from '../../../../utils.js';
+import { BranchManager } from './branches.js';
 
 /**
  * @param {Comment | Element} node
@@ -42,12 +37,6 @@ export function element(node, get_tag, is_svg, render_fn, get_namespace, locatio
 
 	var filename = DEV && location && component_context?.function[FILENAME];
 
-	/** @type {string | null} */
-	var tag;
-
-	/** @type {string | null} */
-	var current_tag;
-
 	/** @type {null | Element} */
 	var element = null;
 
@@ -58,9 +47,6 @@ export function element(node, get_tag, is_svg, render_fn, get_namespace, locatio
 
 	var anchor = /** @type {TemplateNode} */ (hydrating ? hydrate_node : node);
 
-	/** @type {Effect | null} */
-	var effect;
-
 	/**
 	 * The keyed `{#each ...}` item block, if any, that this element is inside.
 	 * We track this so we can set it when changing the element, allowing any
@@ -68,36 +54,24 @@ export function element(node, get_tag, is_svg, render_fn, get_namespace, locatio
 	 */
 	var each_item_block = current_each_item;
 
+	var branches = new BranchManager(anchor, false);
+
 	block(() => {
 		const next_tag = get_tag() || null;
 		var ns = get_namespace ? get_namespace() : is_svg || next_tag === 'svg' ? NAMESPACE_SVG : null;
 
-		// Assumption: Noone changes the namespace but not the tag (what would that even mean?)
-		if (next_tag === tag) return;
-
-		// See explanation of `each_item_block` above
-		var previous_each_item = current_each_item;
-		set_current_each_item(each_item_block);
-
-		if (effect) {
-			if (next_tag === null) {
-				// start outro
-				pause_effect(effect, () => {
-					effect = null;
-					current_tag = null;
-				});
-			} else if (next_tag === current_tag) {
-				// same tag as is currently rendered — abort outro
-				resume_effect(effect);
-			} else {
-				// tag is changing — destroy immediately, render contents without intro transitions
-				destroy_effect(effect);
-				set_should_intro(false);
-			}
+		if (next_tag === null) {
+			branches.ensure(null, null);
+			set_should_intro(true);
+			return;
 		}
 
-		if (next_tag && next_tag !== current_tag) {
-			effect = branch(() => {
+		branches.ensure(next_tag, (anchor) => {
+			// See explanation of `each_item_block` above
+			var previous_each_item = current_each_item;
+			set_current_each_item(each_item_block);
+
+			if (next_tag) {
 				element = hydrating
 					? /** @type {Element} */ (element)
 					: ns
@@ -149,16 +123,31 @@ export function element(node, get_tag, is_svg, render_fn, get_namespace, locatio
 				/** @type {Effect} */ (active_effect).nodes_end = element;
 
 				anchor.before(element);
-			});
-		}
+			}
+
+			set_current_each_item(previous_each_item);
+
+			if (hydrating) {
+				set_hydrate_node(anchor);
+			}
+		});
 
-		tag = next_tag;
-		if (tag) current_tag = tag;
+		// revert to the default state after the effect has been created
 		set_should_intro(true);
 
-		set_current_each_item(previous_each_item);
+		return () => {
+			if (next_tag) {
+				// if we're in this callback because we're re-running the effect,
+				// disable intros (unless no element is currently displayed)
+				set_should_intro(false);
+			}
+		};
 	}, EFFECT_TRANSPARENT);
 
+	teardown(() => {
+		set_should_intro(true);
+	});
+
 	if (was_hydrating) {
 		set_hydrating(true);
 		set_hydrate_node(anchor);
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 45c78ff926..1d408744fd 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -1,8 +1,13 @@
-/** @import { Effect, Value } from '#client' */
-
+/** @import { Effect, TemplateNode, Value } from '#client' */
 import { DESTROYED } from '#client/constants';
 import { DEV } from 'esm-env';
-import { component_context, is_runes, set_component_context } from '../context.js';
+import {
+	component_context,
+	dev_stack,
+	is_runes,
+	set_component_context,
+	set_dev_stack
+} from '../context.js';
 import { get_boundary } from '../dom/blocks/boundary.js';
 import { invoke_error_boundary } from '../error-handling.js';
 import {
@@ -28,6 +33,7 @@ import {
 	set_hydrating,
 	skip_nodes
 } from '../dom/hydration.js';
+import { create_text } from '../dom/operations.js';
 
 /**
  *
@@ -80,7 +86,7 @@ export function flatten(sync, async, fn) {
  * some asynchronous work has happened (so that e.g. `await a + b`
  * causes `b` to be registered as a dependency).
  */
-function capture() {
+export function capture() {
 	var previous_effect = active_effect;
 	var previous_reaction = active_reaction;
 	var previous_component_context = component_context;
@@ -92,6 +98,10 @@ function capture() {
 		var previous_hydrate_node = hydrate_node;
 	}
 
+	if (DEV) {
+		var previous_dev_stack = dev_stack;
+	}
+
 	return function restore() {
 		set_active_effect(previous_effect);
 		set_active_reaction(previous_reaction);
@@ -105,6 +115,7 @@ function capture() {
 
 		if (DEV) {
 			set_from_async_derived(null);
+			set_dev_stack(previous_dev_stack);
 		}
 	};
 }
@@ -193,13 +204,18 @@ export function unset_context() {
 	set_active_effect(null);
 	set_active_reaction(null);
 	set_component_context(null);
-	if (DEV) set_from_async_derived(null);
+
+	if (DEV) {
+		set_from_async_derived(null);
+		set_dev_stack(null);
+	}
 }
 
 /**
- * @param {() => Promise<void>} fn
+ * @param {TemplateNode} anchor
+ * @param {(target: TemplateNode) => Promise<void>} fn
  */
-export async function async_body(fn) {
+export async function async_body(anchor, fn) {
 	var boundary = get_boundary();
 	var batch = /** @type {Batch} */ (current_batch);
 	var pending = boundary.is_pending();
@@ -218,7 +234,7 @@ export async function async_body(fn) {
 	}
 
 	try {
-		var promise = fn();
+		var promise = fn(anchor);
 	} finally {
 		if (next_hydrate_node) {
 			set_hydrate_node(next_hydrate_node);
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 2c9e4db911..bfbb95a8db 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -553,15 +553,16 @@ export function unlink_effect(effect) {
  * A paused effect does not update, and the DOM subtree becomes inert.
  * @param {Effect} effect
  * @param {() => void} [callback]
+ * @param {boolean} [destroy]
  */
-export function pause_effect(effect, callback) {
+export function pause_effect(effect, callback, destroy = true) {
 	/** @type {TransitionManager[]} */
 	var transitions = [];
 
 	pause_children(effect, transitions, true);
 
 	run_out_transitions(transitions, () => {
-		destroy_effect(effect);
+		if (destroy) destroy_effect(effect);
 		if (callback) callback();
 	});
 }
@@ -662,3 +663,20 @@ function resume_children(effect, local) {
 export function aborted(effect = /** @type {Effect} */ (active_effect)) {
 	return (effect.f & DESTROYED) !== 0;
 }
+
+/**
+ * @param {Effect} effect
+ * @param {DocumentFragment} fragment
+ */
+export function move_effect(effect, fragment) {
+	var node = effect.nodes_start;
+	var end = effect.nodes_end;
+
+	while (node !== null) {
+		/** @type {TemplateNode | null} */
+		var next = node === end ? null : /** @type {TemplateNode} */ (get_next_sibling(node));
+
+		fragment.append(node);
+		node = next;
+	}
+}
diff --git a/packages/svelte/tests/runtime-runes/samples/await-pending-destroy/_config.js b/packages/svelte/tests/runtime-runes/samples/await-pending-destroy/_config.js
index 1725cd8f6f..9ef598de6c 100644
--- a/packages/svelte/tests/runtime-runes/samples/await-pending-destroy/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/await-pending-destroy/_config.js
@@ -1,3 +1,4 @@
+import { tick } from 'svelte';
 import { test } from '../../test';
 
 /**
@@ -77,7 +78,7 @@ export default test({
 			const { promise, reject } = promiseWithResolver();
 			component.promise = promise;
 			// wait for rendering
-			await Promise.resolve();
+			await tick();
 
 			// remove the promise
 			component.promise = null;

From 7d9ea8ea99cfaba36dddb5e7c9994e9c44214b8c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 09:30:51 -0400
Subject: [PATCH 110/347] Version Packages (#16984)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/brown-insects-burn.md     |  5 -----
 .changeset/three-wasps-work.md       |  5 -----
 .changeset/yellow-shrimps-provide.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/brown-insects-burn.md
 delete mode 100644 .changeset/three-wasps-work.md
 delete mode 100644 .changeset/yellow-shrimps-provide.md

diff --git a/.changeset/brown-insects-burn.md b/.changeset/brown-insects-burn.md
deleted file mode 100644
index ceccc3fd9b..0000000000
--- a/.changeset/brown-insects-burn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: place `let:` declarations before `{@const}` declarations
diff --git a/.changeset/three-wasps-work.md b/.changeset/three-wasps-work.md
deleted file mode 100644
index 318d8668a4..0000000000
--- a/.changeset/three-wasps-work.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: improve `each_key_without_as` error
diff --git a/.changeset/yellow-shrimps-provide.md b/.changeset/yellow-shrimps-provide.md
deleted file mode 100644
index a29385660a..0000000000
--- a/.changeset/yellow-shrimps-provide.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: centralise branch management
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 81529104d9..4db131114d 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.41.1
+
+### Patch Changes
+
+- fix: place `let:` declarations before `{@const}` declarations ([#16985](https://github.com/sveltejs/svelte/pull/16985))
+
+- fix: improve `each_key_without_as` error ([#16983](https://github.com/sveltejs/svelte/pull/16983))
+
+- chore: centralise branch management ([#16977](https://github.com/sveltejs/svelte/pull/16977))
+
 ## 5.41.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 6d8463a52a..b5a20ce82a 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.41.0",
+  "version": "5.41.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index e88bf0d0ea..e33d22d4c4 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.41.0';
+export const VERSION = '5.41.1';
 export const PUBLIC_VERSION = '5';

From f549478dd0508074ac2b8c31777e598936e6f8c9 Mon Sep 17 00:00:00 2001
From: David <david@hmnd.io>
Date: Tue, 21 Oct 2025 01:07:51 -0700
Subject: [PATCH 111/347] fix: guard contents updated before the guard itself
 (#16930)

Fixes #16850, fixes #16775, fixes #16795, fixes #16982

#16631 introduced a bug that results in the effects within guards being evaluated before the guards themselves. This fix makes sure to iterate the block effects in the correct order (top down)

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .changeset/witty-seas-learn.md                |  5 +++
 .../src/internal/client/reactivity/batch.js   | 31 +++++++++++++++----
 .../src/internal/client/reactivity/sources.js |  2 +-
 .../samples/guard-else-effect/_config.js      | 20 ++++++++++++
 .../samples/guard-else-effect/main.svelte     | 18 +++++++++++
 .../samples/guard-if-nested/_config.js        | 13 ++++++++
 .../samples/guard-if-nested/main.svelte       | 18 +++++++++++
 .../guard-nested-if-pre/Component.svelte      |  6 ++++
 .../samples/guard-nested-if-pre/_config.js    | 13 ++++++++
 .../samples/guard-nested-if-pre/main.svelte   | 18 +++++++++++
 10 files changed, 137 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/witty-seas-learn.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/guard-else-effect/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/guard-else-effect/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/guard-if-nested/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/guard-if-nested/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/main.svelte

diff --git a/.changeset/witty-seas-learn.md b/.changeset/witty-seas-learn.md
new file mode 100644
index 0000000000..aa94c7c35f
--- /dev/null
+++ b/.changeset/witty-seas-learn.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure guards (eg. if, each, key) run before their contents
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index b35e16a409..302d48d03f 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -561,7 +561,7 @@ function infinite_loop_guard() {
 	}
 }
 
-/** @type {Effect[] | null} */
+/** @type {Set<Effect> | null} */
 export let eager_block_effects = null;
 
 /**
@@ -578,7 +578,7 @@ function flush_queued_effects(effects) {
 		var effect = effects[i++];
 
 		if ((effect.f & (DESTROYED | INERT)) === 0 && is_dirty(effect)) {
-			eager_block_effects = [];
+			eager_block_effects = new Set();
 
 			update_effect(effect);
 
@@ -601,15 +601,34 @@ function flush_queued_effects(effects) {
 
 			// If update_effect() has a flushSync() in it, we may have flushed another flush_queued_effects(),
 			// which already handled this logic and did set eager_block_effects to null.
-			if (eager_block_effects?.length > 0) {
-				// TODO this feels incorrect! it gets the tests passing
+			if (eager_block_effects?.size > 0) {
 				old_values.clear();
 
 				for (const e of eager_block_effects) {
-					update_effect(e);
+					// Skip eager effects that have already been unmounted
+					if ((e.f & (DESTROYED | INERT)) !== 0) continue;
+
+					// Run effects in order from ancestor to descendant, else we could run into nullpointers
+					/** @type {Effect[]} */
+					const ordered_effects = [e];
+					let ancestor = e.parent;
+					while (ancestor !== null) {
+						if (eager_block_effects.has(ancestor)) {
+							eager_block_effects.delete(ancestor);
+							ordered_effects.push(ancestor);
+						}
+						ancestor = ancestor.parent;
+					}
+
+					for (let j = ordered_effects.length - 1; j >= 0; j--) {
+						const e = ordered_effects[j];
+						// Skip eager effects that have already been unmounted
+						if ((e.f & (DESTROYED | INERT)) !== 0) continue;
+						update_effect(e);
+					}
 				}
 
-				eager_block_effects = [];
+				eager_block_effects.clear();
 			}
 		}
 	}
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index cd0c28016d..c5dcff9cfb 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -336,7 +336,7 @@ function mark_reactions(signal, status) {
 		} else if (not_dirty) {
 			if ((flags & BLOCK_EFFECT) !== 0) {
 				if (eager_block_effects !== null) {
-					eager_block_effects.push(/** @type {Effect} */ (reaction));
+					eager_block_effects.add(/** @type {Effect} */ (reaction));
 				}
 			}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/guard-else-effect/_config.js b/packages/svelte/tests/runtime-runes/samples/guard-else-effect/_config.js
new file mode 100644
index 0000000000..4e8eec8b16
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/guard-else-effect/_config.js
@@ -0,0 +1,20 @@
+import { test } from '../../test';
+import { flushSync } from 'svelte';
+
+export default test({
+	mode: ['client'],
+	async test({ target, assert, logs }) {
+		const button = target.querySelector('button');
+
+		button?.click();
+		flushSync();
+		button?.click();
+		flushSync();
+		button?.click();
+		flushSync();
+		button?.click();
+		flushSync();
+
+		assert.deepEqual(logs, ['two', 'one', 'two', 'one', 'two']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/guard-else-effect/main.svelte b/packages/svelte/tests/runtime-runes/samples/guard-else-effect/main.svelte
new file mode 100644
index 0000000000..91fd0442bd
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/guard-else-effect/main.svelte
@@ -0,0 +1,18 @@
+<script lang="ts">
+	let b = $state(false);
+	let v = $state("two");
+
+	$effect(() => {
+		v = b ? "one" : "two";
+	})
+</script>
+
+<button onclick={() => b = !b}>Trigger</button>
+
+{#if v === "one"}
+	<div>if1 matched! {console.log('one')}</div>
+{:else if v === "two"}
+	<div>if2 matched! {console.log('two')}</div>
+{:else}
+	<div>nothing matched {console.log('else')}</div>
+{/if}
diff --git a/packages/svelte/tests/runtime-runes/samples/guard-if-nested/_config.js b/packages/svelte/tests/runtime-runes/samples/guard-if-nested/_config.js
new file mode 100644
index 0000000000..881c1545ee
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/guard-if-nested/_config.js
@@ -0,0 +1,13 @@
+import { test } from '../../test';
+import { flushSync } from 'svelte';
+
+export default test({
+	mode: ['client'],
+	async test({ target, assert }) {
+		const button = target.querySelector('button');
+
+		flushSync(() => button?.click());
+
+		assert.equal(target.textContent?.trim(), 'Trigger');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/guard-if-nested/main.svelte b/packages/svelte/tests/runtime-runes/samples/guard-if-nested/main.svelte
new file mode 100644
index 0000000000..4514bd114e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/guard-if-nested/main.svelte
@@ -0,0 +1,18 @@
+<script>
+	let centerRow = $state({ nested: { optional: 2, required: 3 } });
+
+	let someChange = $state(false);
+	$effect(() => {
+		if (someChange) centerRow = undefined;
+	});
+</script>
+
+{#if centerRow?.nested}
+	{#if centerRow?.nested?.optional != undefined && centerRow.nested.optional > 0}
+		op: {centerRow.nested.optional}<br />
+	{:else}
+		req: {centerRow.nested.required}<br />
+	{/if}
+{/if}
+
+<button onclick={() => (someChange = true)}>Trigger</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/Component.svelte b/packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/Component.svelte
new file mode 100644
index 0000000000..b7322e7530
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/Component.svelte
@@ -0,0 +1,6 @@
+<script>
+	let { p } = $props();
+	$effect.pre(() => {
+		console.log('running ' + p)
+	})
+</script>
diff --git a/packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/_config.js b/packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/_config.js
new file mode 100644
index 0000000000..9706855fb4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/_config.js
@@ -0,0 +1,13 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client'],
+	async test({ assert, target, logs }) {
+		const button = target.querySelector('button');
+
+		button?.click();
+		flushSync();
+		assert.deepEqual(logs, ['pre', 'running b', 'pre', 'pre']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/main.svelte b/packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/main.svelte
new file mode 100644
index 0000000000..4ebb13eca3
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/guard-nested-if-pre/main.svelte
@@ -0,0 +1,18 @@
+<script>
+	import Component from './Component.svelte';
+
+	let p = $state('b');
+
+	$effect.pre(() => {
+		console.log('pre')
+		if (p === 'a') p = null;
+	})
+</script>
+
+{#if p || !p}
+	{#if p}
+		<Component {p} />
+	{/if}
+{/if}
+
+<button onclick={() => p = 'a'}>a</button>

From a57868ebce18662a3bb07d7ec71c612692272a37 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 21 Oct 2025 21:56:18 +0200
Subject: [PATCH 112/347] fix: don't preserve reactivity context across
 function boundaries (#17002)

Fixes #16809

We gotta take into account function boundaries when determining whether or not we're inside a derived (or const).
---
 .changeset/short-banks-yell.md                |  5 ++
 .../src/compiler/phases/2-analyze/index.js    |  6 +--
 .../src/compiler/phases/2-analyze/types.d.ts  |  4 +-
 .../2-analyze/visitors/AwaitExpression.js     | 19 ++++---
 .../2-analyze/visitors/CallExpression.js      |  2 +-
 .../phases/2-analyze/visitors/ConstTag.js     |  4 +-
 .../2-analyze/visitors/VariableDeclarator.js  |  6 ---
 .../samples/async-in-derived/_config.js       |  3 ++
 .../_expected/client/index.svelte.js          | 52 +++++++++++++++++++
 .../_expected/server/index.svelte.js          | 40 ++++++++++++++
 .../samples/async-in-derived/index.svelte     | 21 ++++++++
 11 files changed, 143 insertions(+), 19 deletions(-)
 create mode 100644 .changeset/short-banks-yell.md
 create mode 100644 packages/svelte/tests/snapshot/samples/async-in-derived/_config.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-in-derived/index.svelte

diff --git a/.changeset/short-banks-yell.md b/.changeset/short-banks-yell.md
new file mode 100644
index 0000000000..34d5ba66d3
--- /dev/null
+++ b/.changeset/short-banks-yell.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't preserve reactivity context across function boundaries
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 47fe37c44d..52be997374 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -306,7 +306,7 @@ export function analyze_module(source, options) {
 			fragment: null,
 			parent_element: null,
 			reactive_statement: null,
-			in_derived: false
+			derived_function_depth: -1
 		},
 		visitors
 	);
@@ -703,7 +703,7 @@ export function analyze_component(root, source, options) {
 				state_fields: new Map(),
 				function_depth: scope.function_depth,
 				reactive_statement: null,
-				in_derived: false
+				derived_function_depth: -1
 			};
 
 			walk(/** @type {AST.SvelteNode} */ (ast), state, visitors);
@@ -771,7 +771,7 @@ export function analyze_component(root, source, options) {
 				expression: null,
 				state_fields: new Map(),
 				function_depth: scope.function_depth,
-				in_derived: false
+				derived_function_depth: -1
 			};
 
 			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 ae9c5911f6..bad6c7d613 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
+++ b/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
@@ -29,9 +29,9 @@ export interface AnalysisState {
 	reactive_statement: null | ReactiveStatement;
 
 	/**
-	 * True if we're directly inside a `$derived(...)` expression (but not `$derived.by(...)`)
+	 * Set when we're inside a `$derived(...)` expression (but not `$derived.by(...)`) or `@const`
 	 */
-	in_derived: boolean;
+	derived_function_depth: number;
 }
 
 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 9018623570..14757af4a3 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
@@ -15,7 +15,10 @@ export function AwaitExpression(node, context) {
 	//   b) awaits that precede other expressions in template or `$derived(...)`
 	if (
 		tla ||
-		(is_reactive_expression(context.path, context.state.in_derived) &&
+		(is_reactive_expression(
+			context.path,
+			context.state.derived_function_depth === context.state.function_depth
+		) &&
 			!is_last_evaluated_expression(context.path, node))
 	) {
 		context.state.analysis.pickled_awaits.add(node);
@@ -53,9 +56,7 @@ export function AwaitExpression(node, context) {
  * @param {boolean} in_derived
  */
 export function is_reactive_expression(path, in_derived) {
-	if (in_derived) {
-		return true;
-	}
+	if (in_derived) return true;
 
 	let i = path.length;
 
@@ -67,6 +68,7 @@ export function is_reactive_expression(path, in_derived) {
 			parent.type === 'FunctionExpression' ||
 			parent.type === 'FunctionDeclaration'
 		) {
+			// No reactive expression found between function and await
 			return false;
 		}
 
@@ -83,11 +85,16 @@ export function is_reactive_expression(path, in_derived) {
  * @param {AST.SvelteNode[]} path
  * @param {Expression | SpreadElement | Property} node
  */
-export function is_last_evaluated_expression(path, node) {
+function is_last_evaluated_expression(path, node) {
 	let i = path.length;
 
 	while (i--) {
-		const parent = /** @type {Expression | Property | SpreadElement} */ (path[i]);
+		const parent = path[i];
+
+		if (parent.type === 'ConstTag') {
+			// {@const ...} tags are treated as deriveds and its contents should all get the preserve-reactivity treatment
+			return false;
+		}
 
 		// @ts-expect-error we could probably use a neater/more robust mechanism
 		if (parent.metadata) {
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 76d9cecd9a..4b66abe1d1 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
@@ -248,7 +248,7 @@ export function CallExpression(node, context) {
 		context.next({
 			...context.state,
 			function_depth: context.state.function_depth + 1,
-			in_derived: true,
+			derived_function_depth: context.state.function_depth + 1,
 			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 5849d828a3..77ea654905 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/ConstTag.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/ConstTag.js
@@ -38,6 +38,8 @@ export function ConstTag(node, context) {
 	context.visit(declaration.init, {
 		...context.state,
 		expression: node.metadata.expression,
-		in_derived: true
+		// We're treating this like a $derived under the hood
+		function_depth: context.state.function_depth + 1,
+		derived_function_depth: context.state.function_depth + 1
 	});
 }
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 7a85b4a93a..dfb1d54040 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js
@@ -64,12 +64,6 @@ 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/tests/snapshot/samples/async-in-derived/_config.js b/packages/svelte/tests/snapshot/samples/async-in-derived/_config.js
new file mode 100644
index 0000000000..2e30bbeb16
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/_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-in-derived/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
new file mode 100644
index 0000000000..7a97850175
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
@@ -0,0 +1,52 @@
+import 'svelte/internal/disclose-version';
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/client';
+
+export default function Async_in_derived($$anchor, $$props) {
+	$.push($$props, true);
+
+	$.async_body($$anchor, async ($$anchor) => {
+		let yes1 = (await $.save($.async_derived(async () => (await $.save(1))())))();
+		let yes2 = (await $.save($.async_derived(async () => foo((await $.save(1))()))))();
+
+		let no1 = $.derived(async () => {
+			return await 1;
+		});
+
+		let no2 = $.derived(() => async () => {
+			return await 1;
+		});
+
+		if ($.aborted()) return;
+
+		var fragment = $.comment();
+		var node = $.first_child(fragment);
+
+		{
+			var consequent = ($$anchor) => {
+				$.async_body($$anchor, async ($$anchor) => {
+					const yes1 = (await $.save($.async_derived(async () => (await $.save(1))())))();
+					const yes2 = (await $.save($.async_derived(async () => foo((await $.save(1))()))))();
+
+					const no1 = $.derived(() => (async () => {
+						return await 1;
+					})());
+
+					const no2 = $.derived(() => (async () => {
+						return await 1;
+					})());
+
+					if ($.aborted()) return;
+				});
+			};
+
+			$.if(node, ($$render) => {
+				if (true) $$render(consequent);
+			});
+		}
+
+		$.append($$anchor, fragment);
+	});
+
+	$.pop();
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
new file mode 100644
index 0000000000..69eca5a383
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
@@ -0,0 +1,40 @@
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/server';
+
+export default function Async_in_derived($$renderer, $$props) {
+	$$renderer.component(($$renderer) => {
+		$$renderer.async(async ($$renderer) => {
+			let yes1 = (await $.save(1))();
+			let yes2 = foo((await $.save(1))());
+
+			let no1 = (async () => {
+				return await 1;
+			})();
+
+			let no2 = async () => {
+				return await 1;
+			};
+
+			$$renderer.async(async ($$renderer) => {
+				if (true) {
+					$$renderer.push('<!--[-->');
+
+					const yes1 = (await $.save(1))();
+					const yes2 = foo((await $.save(1))());
+
+					const no1 = (async () => {
+						return await 1;
+					})();
+
+					const no2 = (async () => {
+						return await 1;
+					})();
+				} else {
+					$$renderer.push('<!--[!-->');
+				}
+			});
+
+			$$renderer.push(`<!--]-->`);
+		});
+	});
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-in-derived/index.svelte b/packages/svelte/tests/snapshot/samples/async-in-derived/index.svelte
new file mode 100644
index 0000000000..bda88fd3ae
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/index.svelte
@@ -0,0 +1,21 @@
+<script>
+	let yes1 = $derived(await 1);
+	let yes2 = $derived(foo(await 1));
+	let no1 = $derived.by(async () => {
+		return await 1;
+	});
+	let no2 = $derived(async () => {
+		return await 1;
+	});
+</script>
+
+{#if true}
+	{@const yes1 = await 1}
+	{@const yes2 = foo(await 1)}
+	{@const no1 = (async () => {
+		return await 1;
+	})()}
+	{@const no2 = (async () => {
+		return await 1;
+	})()}
+{/if}

From 5bb28c45675f788dc057d9ce37e6cd093e402da0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 20:30:04 -0700
Subject: [PATCH 113/347] chore(deps-dev): bump vite from 7.1.5 to 7.1.11
 (#16989)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 7.1.5 to 7.1.11.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v7.1.11/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 7.1.11
  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                   | 649 +++++++++++++++++++++++++++----
 2 files changed, 574 insertions(+), 77 deletions(-)

diff --git a/playgrounds/sandbox/package.json b/playgrounds/sandbox/package.json
index 84aeab586b..629cb33b5a 100644
--- a/playgrounds/sandbox/package.json
+++ b/playgrounds/sandbox/package.json
@@ -21,7 +21,7 @@
     "polka": "^1.0.0-next.25",
     "svelte": "workspace:*",
     "tinyglobby": "^0.2.12",
-    "vite": "^7.1.5",
+    "vite": "^7.1.11",
     "vite-plugin-devtools-json": "^1.0.0",
     "vite-plugin-inspect": "^11.3.3"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f585619252..7a8075038b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -158,7 +158,7 @@ importers:
     devDependencies:
       '@sveltejs/vite-plugin-svelte':
         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))
+        version: 6.2.0(svelte@packages+svelte)(vite@7.1.11(@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
@@ -172,14 +172,14 @@ importers:
         specifier: ^0.2.12
         version: 0.2.15
       vite:
-        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)
+        specifier: ^7.1.11
+        version: 7.1.11(@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))
+        version: 1.0.0(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
       vite-plugin-inspect:
         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))
+        version: 11.3.3(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
 
 packages:
 
@@ -285,6 +285,12 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.25.11':
+    resolution: {integrity: sha512-Xt1dOL13m8u0WE8iplx9Ibbm+hFAO0GsU2P34UNoDGvZYkY8ifSiy6Zuc1lYxfG7svWE2fzqCUmFp5HCn51gJg==}
+    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'}
@@ -297,6 +303,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.25.11':
+    resolution: {integrity: sha512-9slpyFBc4FPPz48+f6jyiXOx/Y4v34TUeDDXJpZqAWQn/08lKGeD8aDp9TMn9jDz2CiEuHwfhRmGBvpnd/PWIQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm@0.21.5':
     resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
     engines: {node: '>=12'}
@@ -309,6 +321,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.25.11':
+    resolution: {integrity: sha512-uoa7dU+Dt3HYsethkJ1k6Z9YdcHjTrSb5NUy66ZfZaSV8hEYGD5ZHbEMXnqLFlbBflLsl89Zke7CAdDJ4JI+Gg==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-x64@0.21.5':
     resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
     engines: {node: '>=12'}
@@ -321,6 +339,12 @@ packages:
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.25.11':
+    resolution: {integrity: sha512-Sgiab4xBjPU1QoPEIqS3Xx+R2lezu0LKIEcYe6pftr56PqPygbB7+szVnzoShbx64MUupqoE0KyRlN7gezbl8g==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/darwin-arm64@0.21.5':
     resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
     engines: {node: '>=12'}
@@ -333,6 +357,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.25.11':
+    resolution: {integrity: sha512-VekY0PBCukppoQrycFxUqkCojnTQhdec0vevUL/EDOCnXd9LKWqD/bHwMPzigIJXPhC59Vd1WFIL57SKs2mg4w==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.21.5':
     resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
     engines: {node: '>=12'}
@@ -345,6 +375,12 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.25.11':
+    resolution: {integrity: sha512-+hfp3yfBalNEpTGp9loYgbknjR695HkqtY3d3/JjSRUyPg/xd6q+mQqIb5qdywnDxRZykIHs3axEqU6l1+oWEQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/freebsd-arm64@0.21.5':
     resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
     engines: {node: '>=12'}
@@ -357,6 +393,12 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
+  '@esbuild/freebsd-arm64@0.25.11':
+    resolution: {integrity: sha512-CmKjrnayyTJF2eVuO//uSjl/K3KsMIeYeyN7FyDBjsR3lnSJHaXlVoAK8DZa7lXWChbuOk7NjAc7ygAwrnPBhA==}
+    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'}
@@ -369,6 +411,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.25.11':
+    resolution: {integrity: sha512-Dyq+5oscTJvMaYPvW3x3FLpi2+gSZTCE/1ffdwuM6G1ARang/mb3jvjxs0mw6n3Lsw84ocfo9CrNMqc5lTfGOw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/linux-arm64@0.21.5':
     resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
     engines: {node: '>=12'}
@@ -381,6 +429,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.25.11':
+    resolution: {integrity: sha512-Qr8AzcplUhGvdyUF08A1kHU3Vr2O88xxP0Tm8GcdVOUm25XYcMPp2YqSVHbLuXzYQMf9Bh/iKx7YPqECs6ffLA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm@0.21.5':
     resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
     engines: {node: '>=12'}
@@ -393,6 +447,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.25.11':
+    resolution: {integrity: sha512-TBMv6B4kCfrGJ8cUPo7vd6NECZH/8hPpBHHlYI3qzoYFvWu2AdTvZNuU/7hsbKWqu/COU7NIK12dHAAqBLLXgw==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.21.5':
     resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
     engines: {node: '>=12'}
@@ -405,6 +465,12 @@ packages:
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.25.11':
+    resolution: {integrity: sha512-TmnJg8BMGPehs5JKrCLqyWTVAvielc615jbkOirATQvWWB1NMXY77oLMzsUjRLa0+ngecEmDGqt5jiDC6bfvOw==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.21.5':
     resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
     engines: {node: '>=12'}
@@ -417,6 +483,12 @@ packages:
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.25.11':
+    resolution: {integrity: sha512-DIGXL2+gvDaXlaq8xruNXUJdT5tF+SBbJQKbWy/0J7OhU8gOHOzKmGIlfTTl6nHaCOoipxQbuJi7O++ldrxgMw==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.21.5':
     resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
     engines: {node: '>=12'}
@@ -429,6 +501,12 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.25.11':
+    resolution: {integrity: sha512-Osx1nALUJu4pU43o9OyjSCXokFkFbyzjXb6VhGIJZQ5JZi8ylCQ9/LFagolPsHtgw6himDSyb5ETSfmp4rpiKQ==}
+    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'}
@@ -441,6 +519,12 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.25.11':
+    resolution: {integrity: sha512-nbLFgsQQEsBa8XSgSTSlrnBSrpoWh7ioFDUmwo158gIm5NNP+17IYmNWzaIzWmgCxq56vfr34xGkOcZ7jX6CPw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.21.5':
     resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
     engines: {node: '>=12'}
@@ -453,6 +537,12 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.25.11':
+    resolution: {integrity: sha512-HfyAmqZi9uBAbgKYP1yGuI7tSREXwIb438q0nqvlpxAOs3XnZ8RsisRfmVsgV486NdjD7Mw2UrFSw51lzUk1ww==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.21.5':
     resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
     engines: {node: '>=12'}
@@ -465,6 +555,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.25.11':
+    resolution: {integrity: sha512-HjLqVgSSYnVXRisyfmzsH6mXqyvj0SA7pG5g+9W7ESgwA70AXYNpfKBqh1KbTxmQVaYxpzA/SvlB9oclGPbApw==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-x64@0.21.5':
     resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
     engines: {node: '>=12'}
@@ -477,12 +573,24 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.25.11':
+    resolution: {integrity: sha512-HSFAT4+WYjIhrHxKBwGmOOSpphjYkcswF449j6EjsjbinTZbp8PJtjsVK1XFJStdzXdy/jaddAep2FGY+wyFAQ==}
+    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-arm64@0.25.11':
+    resolution: {integrity: sha512-hr9Oxj1Fa4r04dNpWr3P8QKVVsjQhqrMSUzZzf+LZcYjZNqhA3IAfPQdEh1FLVUJSiu6sgAwp3OmwBfbFgG2Xg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.21.5':
     resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
     engines: {node: '>=12'}
@@ -495,12 +603,24 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.25.11':
+    resolution: {integrity: sha512-u7tKA+qbzBydyj0vgpu+5h5AeudxOAGncb8N6C9Kh1N4n7wU1Xw1JDApsRjpShRpXRQlJLb9wY28ELpwdPcZ7A==}
+    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-arm64@0.25.11':
+    resolution: {integrity: sha512-Qq6YHhayieor3DxFOoYM1q0q1uMFYb7cSpLD2qzDSvK1NAvqFi8Xgivv0cFC6J+hWVw2teCYltyy9/m/14ryHg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.21.5':
     resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
     engines: {node: '>=12'}
@@ -513,12 +633,24 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.25.11':
+    resolution: {integrity: sha512-CN+7c++kkbrckTOz5hrehxWN7uIhFFlmS/hqziSFVWpAzpWrQoAG4chH+nN3Be+Kzv/uuo7zhX716x3Sn2Jduw==}
+    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/openharmony-arm64@0.25.11':
+    resolution: {integrity: sha512-rOREuNIQgaiR+9QuNkbkxubbp8MSO9rONmwP5nKncnWJ9v5jQ4JxFnLu4zDSRPf3x4u+2VN4pM4RdyIzDty/wQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@esbuild/sunos-x64@0.21.5':
     resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
     engines: {node: '>=12'}
@@ -531,6 +663,12 @@ packages:
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.25.11':
+    resolution: {integrity: sha512-nq2xdYaWxyg9DcIyXkZhcYulC6pQ2FuCgem3LI92IwMgIZ69KHeY8T4Y88pcwoLIjbed8n36CyKoYRDygNSGhA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/win32-arm64@0.21.5':
     resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
     engines: {node: '>=12'}
@@ -543,6 +681,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.25.11':
+    resolution: {integrity: sha512-3XxECOWJq1qMZ3MN8srCJ/QfoLpL+VaxD/WfNRm1O3B4+AZ/BnLVgFbUV3eiRYDMXetciH16dwPbbHqwe1uU0Q==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.21.5':
     resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
     engines: {node: '>=12'}
@@ -555,6 +699,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.25.11':
+    resolution: {integrity: sha512-3ukss6gb9XZ8TlRyJlgLn17ecsK4NSQTmdIXRASVsiS2sQ6zPPZklNJT5GR5tE/MUarymmy8kCEf5xPCNCqVOA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-x64@0.21.5':
     resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
     engines: {node: '>=12'}
@@ -567,6 +717,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.25.11':
+    resolution: {integrity: sha512-D7Hpz6A2L4hzsRpPaCYkQnGOotdUpDzSGRIv9I+1ITdHROSFUWW95ZPZWQmGka1Fg7W3zFJowyn9WGwMJ0+KPA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@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}
@@ -722,51 +878,106 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@rollup/rollup-android-arm-eabi@4.52.5':
+    resolution: {integrity: sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==}
+    cpu: [arm]
+    os: [android]
+
   '@rollup/rollup-android-arm64@4.50.1':
     resolution: {integrity: sha512-PZlsJVcjHfcH53mOImyt3bc97Ep3FJDXRpk9sMdGX0qgLmY0EIWxCag6EigerGhLVuL8lDVYNnSo8qnTElO4xw==}
     cpu: [arm64]
     os: [android]
 
+  '@rollup/rollup-android-arm64@4.52.5':
+    resolution: {integrity: sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==}
+    cpu: [arm64]
+    os: [android]
+
   '@rollup/rollup-darwin-arm64@4.50.1':
     resolution: {integrity: sha512-xc6i2AuWh++oGi4ylOFPmzJOEeAa2lJeGUGb4MudOtgfyyjr4UPNK+eEWTPLvmPJIY/pgw6ssFIox23SyrkkJw==}
     cpu: [arm64]
     os: [darwin]
 
+  '@rollup/rollup-darwin-arm64@4.52.5':
+    resolution: {integrity: sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==}
+    cpu: [arm64]
+    os: [darwin]
+
   '@rollup/rollup-darwin-x64@4.50.1':
     resolution: {integrity: sha512-2ofU89lEpDYhdLAbRdeyz/kX3Y2lpYc6ShRnDjY35bZhd2ipuDMDi6ZTQ9NIag94K28nFMofdnKeHR7BT0CATw==}
     cpu: [x64]
     os: [darwin]
 
+  '@rollup/rollup-darwin-x64@4.52.5':
+    resolution: {integrity: sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==}
+    cpu: [x64]
+    os: [darwin]
+
   '@rollup/rollup-freebsd-arm64@4.50.1':
     resolution: {integrity: sha512-wOsE6H2u6PxsHY/BeFHA4VGQN3KUJFZp7QJBmDYI983fgxq5Th8FDkVuERb2l9vDMs1D5XhOrhBrnqcEY6l8ZA==}
     cpu: [arm64]
     os: [freebsd]
 
+  '@rollup/rollup-freebsd-arm64@4.52.5':
+    resolution: {integrity: sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==}
+    cpu: [arm64]
+    os: [freebsd]
+
   '@rollup/rollup-freebsd-x64@4.50.1':
     resolution: {integrity: sha512-A/xeqaHTlKbQggxCqispFAcNjycpUEHP52mwMQZUNqDUJFFYtPHCXS1VAG29uMlDzIVr+i00tSFWFLivMcoIBQ==}
     cpu: [x64]
     os: [freebsd]
 
+  '@rollup/rollup-freebsd-x64@4.52.5':
+    resolution: {integrity: sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==}
+    cpu: [x64]
+    os: [freebsd]
+
   '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
     resolution: {integrity: sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg==}
     cpu: [arm]
     os: [linux]
 
+  '@rollup/rollup-linux-arm-gnueabihf@4.52.5':
+    resolution: {integrity: sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==}
+    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-arm-musleabihf@4.52.5':
+    resolution: {integrity: sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==}
+    cpu: [arm]
+    os: [linux]
+
   '@rollup/rollup-linux-arm64-gnu@4.50.1':
     resolution: {integrity: sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw==}
     cpu: [arm64]
     os: [linux]
 
+  '@rollup/rollup-linux-arm64-gnu@4.52.5':
+    resolution: {integrity: sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==}
+    cpu: [arm64]
+    os: [linux]
+
   '@rollup/rollup-linux-arm64-musl@4.50.1':
     resolution: {integrity: sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w==}
     cpu: [arm64]
     os: [linux]
 
+  '@rollup/rollup-linux-arm64-musl@4.52.5':
+    resolution: {integrity: sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@rollup/rollup-linux-loong64-gnu@4.52.5':
+    resolution: {integrity: sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==}
+    cpu: [loong64]
+    os: [linux]
+
   '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
     resolution: {integrity: sha512-RPhTwWMzpYYrHrJAS7CmpdtHNKtt2Ueo+BlLBjfZEhYBhK00OsEqM08/7f+eohiF6poe0YRDDd8nAvwtE/Y62Q==}
     cpu: [loong64]
@@ -777,51 +988,106 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@rollup/rollup-linux-ppc64-gnu@4.52.5':
+    resolution: {integrity: sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==}
+    cpu: [ppc64]
+    os: [linux]
+
   '@rollup/rollup-linux-riscv64-gnu@4.50.1':
     resolution: {integrity: sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ==}
     cpu: [riscv64]
     os: [linux]
 
+  '@rollup/rollup-linux-riscv64-gnu@4.52.5':
+    resolution: {integrity: sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==}
+    cpu: [riscv64]
+    os: [linux]
+
   '@rollup/rollup-linux-riscv64-musl@4.50.1':
     resolution: {integrity: sha512-3Ag8Ls1ggqkGUvSZWYcdgFwriy2lWo+0QlYgEFra/5JGtAd6C5Hw59oojx1DeqcA2Wds2ayRgvJ4qxVTzCHgzg==}
     cpu: [riscv64]
     os: [linux]
 
+  '@rollup/rollup-linux-riscv64-musl@4.52.5':
+    resolution: {integrity: sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==}
+    cpu: [riscv64]
+    os: [linux]
+
   '@rollup/rollup-linux-s390x-gnu@4.50.1':
     resolution: {integrity: sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg==}
     cpu: [s390x]
     os: [linux]
 
+  '@rollup/rollup-linux-s390x-gnu@4.52.5':
+    resolution: {integrity: sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==}
+    cpu: [s390x]
+    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-gnu@4.52.5':
+    resolution: {integrity: sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==}
+    cpu: [x64]
+    os: [linux]
+
   '@rollup/rollup-linux-x64-musl@4.50.1':
     resolution: {integrity: sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg==}
     cpu: [x64]
     os: [linux]
 
+  '@rollup/rollup-linux-x64-musl@4.52.5':
+    resolution: {integrity: sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==}
+    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-openharmony-arm64@4.52.5':
+    resolution: {integrity: sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@rollup/rollup-win32-arm64-msvc@4.50.1':
     resolution: {integrity: sha512-hpZB/TImk2FlAFAIsoElM3tLzq57uxnGYwplg6WDyAxbYczSi8O2eQ+H2Lx74504rwKtZ3N2g4bCUkiamzS6TQ==}
     cpu: [arm64]
     os: [win32]
 
+  '@rollup/rollup-win32-arm64-msvc@4.52.5':
+    resolution: {integrity: sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==}
+    cpu: [arm64]
+    os: [win32]
+
   '@rollup/rollup-win32-ia32-msvc@4.50.1':
     resolution: {integrity: sha512-SXjv8JlbzKM0fTJidX4eVsH+Wmnp0/WcD8gJxIZyR6Gay5Qcsmdbi9zVtnbkGPG8v2vMR1AD06lGWy5FLMcG7A==}
     cpu: [ia32]
     os: [win32]
 
+  '@rollup/rollup-win32-ia32-msvc@4.52.5':
+    resolution: {integrity: sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-gnu@4.52.5':
+    resolution: {integrity: sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==}
+    cpu: [x64]
+    os: [win32]
+
   '@rollup/rollup-win32-x64-msvc@4.50.1':
     resolution: {integrity: sha512-StxAO/8ts62KZVRAm4JZYq9+NqNsV7RvimNK+YM7ry//zebEH6meuugqW/P5OFUCjyQgui+9fUxT6d5NShvMvA==}
     cpu: [x64]
     os: [win32]
 
+  '@rollup/rollup-win32-x64-msvc@4.52.5':
+    resolution: {integrity: sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==}
+    cpu: [x64]
+    os: [win32]
+
   '@stylistic/eslint-plugin-js@1.8.0':
     resolution: {integrity: sha512-jdvnzt+pZPg8TfclZlTZPiUbbima93ylvQ+wNgHLNmup3obY6heQvgewSu9i2CfS61BnRByv+F9fxQLPoNeHag==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -905,8 +1171,8 @@ 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==}
+  '@typescript-eslint/project-service@8.46.2':
+    resolution: {integrity: sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -915,12 +1181,12 @@ packages:
     resolution: {integrity: sha512-E0ntLvsfPqnPwng8b8y4OGuzh/iIOm2z8U3S9zic2TeMLW61u5IH2Q1wu0oSTkfrSzwbDJIB/Lm8O3//8BWMPA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/scope-manager@8.43.0':
-    resolution: {integrity: sha512-daSWlQ87ZhsjrbMLvpuuMAt3y4ba57AuvadcR7f3nl8eS3BjRc8L9VLxFLk92RL5xdXOg6IQ+qKjjqNEimGuAg==}
+  '@typescript-eslint/scope-manager@8.46.2':
+    resolution: {integrity: sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA==}
     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==}
+  '@typescript-eslint/tsconfig-utils@8.46.2':
+    resolution: {integrity: sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -936,8 +1202,8 @@ packages:
     resolution: {integrity: sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/types@8.43.0':
-    resolution: {integrity: sha512-vQ2FZaxJpydjSZJKiSW/LJsabFFvV7KgLC5DiLhkBcykhQj8iK9BOaDmQt74nnKdLvceM5xmhaTF+pLekrxEkw==}
+  '@typescript-eslint/types@8.46.2':
+    resolution: {integrity: sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/typescript-estree@8.26.0':
@@ -946,8 +1212,8 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <5.9.0'
 
-  '@typescript-eslint/typescript-estree@8.43.0':
-    resolution: {integrity: sha512-7Vv6zlAhPb+cvEpP06WXXy/ZByph9iL6BQRBDj4kmBsW98AqEeQHlj/13X+sZOrKSo9/rNKH4Ul4f6EICREFdw==}
+  '@typescript-eslint/typescript-estree@8.46.2':
+    resolution: {integrity: sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -959,8 +1225,8 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
-  '@typescript-eslint/utils@8.43.0':
-    resolution: {integrity: sha512-S1/tEmkUeeswxd0GGcnwuVQPFWo8NzZTOMxCvw8BX7OMxnNae+i8Tm7REQen/SwUIPoPqfKn7EaZ+YLpiB3k9g==}
+  '@typescript-eslint/utils@8.46.2':
+    resolution: {integrity: sha512-sExxzucx0Tud5tE0XqR0lT0psBQvEpnpiul9XbGUB1QwpWJJAps1O/Z7hJxLGiZLBKMCutjTzDgmd1muEhBnVg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -970,8 +1236,8 @@ packages:
     resolution: {integrity: sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/visitor-keys@8.43.0':
-    resolution: {integrity: sha512-T+S1KqRD4sg/bHfLwrpF/K3gQLBM1n7Rp7OjjikjTEssI2YJzQpi5WXoynOaQ93ERIuq3O8RBTOUYDKszUCEHw==}
+  '@typescript-eslint/visitor-keys@8.46.2':
+    resolution: {integrity: sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@vitest/coverage-v8@2.1.9':
@@ -1197,6 +1463,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
 
@@ -1287,6 +1562,11 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  esbuild@0.25.11:
+    resolution: {integrity: sha512-KohQwyzrKTQmhXDW1PjCv3Tyspn9n5GcY2RTDqeORIdIJY8yKIF7sTSopFmn/wpMPW4rdPXI0UE5LJLuq3bx0Q==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
@@ -1475,8 +1755,8 @@ packages:
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  get-tsconfig@4.10.1:
-    resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==}
+  get-tsconfig@4.12.0:
+    resolution: {integrity: sha512-LScr2aNr2FbjAjZh2C6X6BxRx1/x+aTDExct/xyq2XKbYOiG5c0aK7pMsSuyc0brz3ibr/lbQiHD9jzt4lccJw==}
 
   glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
@@ -2062,6 +2342,11 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
+  rollup@4.52.5:
+    resolution: {integrity: sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
+
   rrweb-cssom@0.7.1:
     resolution: {integrity: sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==}
 
@@ -2096,6 +2381,11 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  semver@7.7.3:
+    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   serialize-javascript@6.0.2:
     resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==}
 
@@ -2196,8 +2486,8 @@ packages:
   symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
 
-  tapable@2.2.3:
-    resolution: {integrity: sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==}
+  tapable@2.3.0:
+    resolution: {integrity: sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==}
     engines: {node: '>=6'}
 
   term-size@2.2.1:
@@ -2394,8 +2684,8 @@ packages:
       terser:
         optional: true
 
-  vite@7.1.5:
-    resolution: {integrity: sha512-4cKBO9wR75r0BeIWWWId9XK9Lj6La5X846Zw9dFfzMRw38IlTk2iCcUt6hsyiDRcPidc55ZParFYDXi0nXOeLQ==}
+  vite@7.1.11:
+    resolution: {integrity: sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -2731,147 +3021,225 @@ snapshots:
   '@esbuild/aix-ppc64@0.25.10':
     optional: true
 
+  '@esbuild/aix-ppc64@0.25.11':
+    optional: true
+
   '@esbuild/android-arm64@0.21.5':
     optional: true
 
   '@esbuild/android-arm64@0.25.10':
     optional: true
 
+  '@esbuild/android-arm64@0.25.11':
+    optional: true
+
   '@esbuild/android-arm@0.21.5':
     optional: true
 
   '@esbuild/android-arm@0.25.10':
     optional: true
 
+  '@esbuild/android-arm@0.25.11':
+    optional: true
+
   '@esbuild/android-x64@0.21.5':
     optional: true
 
   '@esbuild/android-x64@0.25.10':
     optional: true
 
+  '@esbuild/android-x64@0.25.11':
+    optional: true
+
   '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
   '@esbuild/darwin-arm64@0.25.10':
     optional: true
 
+  '@esbuild/darwin-arm64@0.25.11':
+    optional: true
+
   '@esbuild/darwin-x64@0.21.5':
     optional: true
 
   '@esbuild/darwin-x64@0.25.10':
     optional: true
 
+  '@esbuild/darwin-x64@0.25.11':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
   '@esbuild/freebsd-arm64@0.25.10':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.25.11':
+    optional: true
+
   '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
   '@esbuild/freebsd-x64@0.25.10':
     optional: true
 
+  '@esbuild/freebsd-x64@0.25.11':
+    optional: true
+
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
   '@esbuild/linux-arm64@0.25.10':
     optional: true
 
+  '@esbuild/linux-arm64@0.25.11':
+    optional: true
+
   '@esbuild/linux-arm@0.21.5':
     optional: true
 
   '@esbuild/linux-arm@0.25.10':
     optional: true
 
+  '@esbuild/linux-arm@0.25.11':
+    optional: true
+
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
   '@esbuild/linux-ia32@0.25.10':
     optional: true
 
+  '@esbuild/linux-ia32@0.25.11':
+    optional: true
+
   '@esbuild/linux-loong64@0.21.5':
     optional: true
 
   '@esbuild/linux-loong64@0.25.10':
     optional: true
 
+  '@esbuild/linux-loong64@0.25.11':
+    optional: true
+
   '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
   '@esbuild/linux-mips64el@0.25.10':
     optional: true
 
+  '@esbuild/linux-mips64el@0.25.11':
+    optional: true
+
   '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
   '@esbuild/linux-ppc64@0.25.10':
     optional: true
 
+  '@esbuild/linux-ppc64@0.25.11':
+    optional: true
+
   '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
   '@esbuild/linux-riscv64@0.25.10':
     optional: true
 
+  '@esbuild/linux-riscv64@0.25.11':
+    optional: true
+
   '@esbuild/linux-s390x@0.21.5':
     optional: true
 
   '@esbuild/linux-s390x@0.25.10':
     optional: true
 
+  '@esbuild/linux-s390x@0.25.11':
+    optional: true
+
   '@esbuild/linux-x64@0.21.5':
     optional: true
 
   '@esbuild/linux-x64@0.25.10':
     optional: true
 
+  '@esbuild/linux-x64@0.25.11':
+    optional: true
+
   '@esbuild/netbsd-arm64@0.25.10':
     optional: true
 
+  '@esbuild/netbsd-arm64@0.25.11':
+    optional: true
+
   '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
   '@esbuild/netbsd-x64@0.25.10':
     optional: true
 
+  '@esbuild/netbsd-x64@0.25.11':
+    optional: true
+
   '@esbuild/openbsd-arm64@0.25.10':
     optional: true
 
+  '@esbuild/openbsd-arm64@0.25.11':
+    optional: true
+
   '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
   '@esbuild/openbsd-x64@0.25.10':
     optional: true
 
+  '@esbuild/openbsd-x64@0.25.11':
+    optional: true
+
   '@esbuild/openharmony-arm64@0.25.10':
     optional: true
 
+  '@esbuild/openharmony-arm64@0.25.11':
+    optional: true
+
   '@esbuild/sunos-x64@0.21.5':
     optional: true
 
   '@esbuild/sunos-x64@0.25.10':
     optional: true
 
+  '@esbuild/sunos-x64@0.25.11':
+    optional: true
+
   '@esbuild/win32-arm64@0.21.5':
     optional: true
 
   '@esbuild/win32-arm64@0.25.10':
     optional: true
 
+  '@esbuild/win32-arm64@0.25.11':
+    optional: true
+
   '@esbuild/win32-ia32@0.21.5':
     optional: true
 
   '@esbuild/win32-ia32@0.25.10':
     optional: true
 
+  '@esbuild/win32-ia32@0.25.11':
+    optional: true
+
   '@esbuild/win32-x64@0.21.5':
     optional: true
 
   '@esbuild/win32-x64@0.25.10':
     optional: true
 
+  '@esbuild/win32-x64@0.25.11':
+    optional: true
+
   '@eslint-community/eslint-utils@4.9.0(eslint@9.9.1)':
     dependencies:
       eslint: 9.9.1
@@ -3036,66 +3404,132 @@ snapshots:
   '@rollup/rollup-android-arm-eabi@4.50.1':
     optional: true
 
+  '@rollup/rollup-android-arm-eabi@4.52.5':
+    optional: true
+
   '@rollup/rollup-android-arm64@4.50.1':
     optional: true
 
+  '@rollup/rollup-android-arm64@4.52.5':
+    optional: true
+
   '@rollup/rollup-darwin-arm64@4.50.1':
     optional: true
 
+  '@rollup/rollup-darwin-arm64@4.52.5':
+    optional: true
+
   '@rollup/rollup-darwin-x64@4.50.1':
     optional: true
 
+  '@rollup/rollup-darwin-x64@4.52.5':
+    optional: true
+
   '@rollup/rollup-freebsd-arm64@4.50.1':
     optional: true
 
+  '@rollup/rollup-freebsd-arm64@4.52.5':
+    optional: true
+
   '@rollup/rollup-freebsd-x64@4.50.1':
     optional: true
 
+  '@rollup/rollup-freebsd-x64@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-arm-gnueabihf@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-arm-musleabihf@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-arm-musleabihf@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-arm64-gnu@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-arm64-gnu@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-arm64-musl@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-arm64-musl@4.52.5':
+    optional: true
+
+  '@rollup/rollup-linux-loong64-gnu@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
     optional: true
 
   '@rollup/rollup-linux-ppc64-gnu@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-ppc64-gnu@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-riscv64-gnu@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-riscv64-gnu@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-riscv64-musl@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-riscv64-musl@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-s390x-gnu@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-s390x-gnu@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-x64-gnu@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-x64-gnu@4.52.5':
+    optional: true
+
   '@rollup/rollup-linux-x64-musl@4.50.1':
     optional: true
 
+  '@rollup/rollup-linux-x64-musl@4.52.5':
+    optional: true
+
   '@rollup/rollup-openharmony-arm64@4.50.1':
     optional: true
 
+  '@rollup/rollup-openharmony-arm64@4.52.5':
+    optional: true
+
   '@rollup/rollup-win32-arm64-msvc@4.50.1':
     optional: true
 
+  '@rollup/rollup-win32-arm64-msvc@4.52.5':
+    optional: true
+
   '@rollup/rollup-win32-ia32-msvc@4.50.1':
     optional: true
 
+  '@rollup/rollup-win32-ia32-msvc@4.52.5':
+    optional: true
+
+  '@rollup/rollup-win32-x64-gnu@4.52.5':
+    optional: true
+
   '@rollup/rollup-win32-x64-msvc@4.50.1':
     optional: true
 
+  '@rollup/rollup-win32-x64-msvc@4.52.5':
+    optional: true
+
   '@stylistic/eslint-plugin-js@1.8.0(eslint@9.9.1)':
     dependencies:
       '@types/eslint': 8.56.12
@@ -3120,24 +3554,24 @@ snapshots:
       typescript: 5.5.4
       typescript-eslint: 8.26.0(eslint@9.9.1)(typescript@5.5.4)
 
-  '@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))':
+  '@sveltejs/vite-plugin-svelte-inspector@5.0.1(@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
-      '@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))
+      '@sveltejs/vite-plugin-svelte': 6.2.0(svelte@packages+svelte)(vite@7.1.11(@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: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@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))':
+  '@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
-      '@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))
+      '@sveltejs/vite-plugin-svelte-inspector': 5.0.1(@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@7.1.11(@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
       magic-string: 0.30.17
       svelte: link:packages/svelte
-      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))
+      vite: 7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vitefu: 1.1.1(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
     transitivePeerDependencies:
       - supports-color
 
@@ -3202,11 +3636,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.43.0(typescript@5.5.4)':
+  '@typescript-eslint/project-service@8.46.2(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-eslint/tsconfig-utils': 8.46.2(typescript@5.5.4)
+      '@typescript-eslint/types': 8.46.2
+      debug: 4.4.3
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
@@ -3216,12 +3650,12 @@ snapshots:
       '@typescript-eslint/types': 8.26.0
       '@typescript-eslint/visitor-keys': 8.26.0
 
-  '@typescript-eslint/scope-manager@8.43.0':
+  '@typescript-eslint/scope-manager@8.46.2':
     dependencies:
-      '@typescript-eslint/types': 8.43.0
-      '@typescript-eslint/visitor-keys': 8.43.0
+      '@typescript-eslint/types': 8.46.2
+      '@typescript-eslint/visitor-keys': 8.46.2
 
-  '@typescript-eslint/tsconfig-utils@8.43.0(typescript@5.5.4)':
+  '@typescript-eslint/tsconfig-utils@8.46.2(typescript@5.5.4)':
     dependencies:
       typescript: 5.5.4
 
@@ -3238,7 +3672,7 @@ snapshots:
 
   '@typescript-eslint/types@8.26.0': {}
 
-  '@typescript-eslint/types@8.43.0': {}
+  '@typescript-eslint/types@8.46.2': {}
 
   '@typescript-eslint/typescript-estree@8.26.0(typescript@5.5.4)':
     dependencies:
@@ -3254,17 +3688,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.43.0(typescript@5.5.4)':
+  '@typescript-eslint/typescript-estree@8.46.2(typescript@5.5.4)':
     dependencies:
-      '@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
+      '@typescript-eslint/project-service': 8.46.2(typescript@5.5.4)
+      '@typescript-eslint/tsconfig-utils': 8.46.2(typescript@5.5.4)
+      '@typescript-eslint/types': 8.46.2
+      '@typescript-eslint/visitor-keys': 8.46.2
+      debug: 4.4.3
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
-      semver: 7.7.2
+      semver: 7.7.3
       ts-api-utils: 2.1.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -3281,12 +3715,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.43.0(eslint@9.9.1)(typescript@5.5.4)':
+  '@typescript-eslint/utils@8.46.2(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
       '@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)
+      '@typescript-eslint/scope-manager': 8.46.2
+      '@typescript-eslint/types': 8.46.2
+      '@typescript-eslint/typescript-estree': 8.46.2(typescript@5.5.4)
       eslint: 9.9.1
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -3297,9 +3731,9 @@ snapshots:
       '@typescript-eslint/types': 8.26.0
       eslint-visitor-keys: 4.2.1
 
-  '@typescript-eslint/visitor-keys@8.43.0':
+  '@typescript-eslint/visitor-keys@8.46.2':
     dependencies:
-      '@typescript-eslint/types': 8.43.0
+      '@typescript-eslint/types': 8.46.2
       eslint-visitor-keys: 4.2.1
 
   '@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))':
@@ -3522,6 +3956,10 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
   decimal.js@10.4.3: {}
 
   deep-eql@5.0.2: {}
@@ -3573,7 +4011,7 @@ snapshots:
   enhanced-resolve@5.18.3:
     dependencies:
       graceful-fs: 4.2.11
-      tapable: 2.2.3
+      tapable: 2.3.0
 
   enquirer@2.4.1:
     dependencies:
@@ -3641,12 +4079,41 @@ snapshots:
       '@esbuild/win32-ia32': 0.25.10
       '@esbuild/win32-x64': 0.25.10
 
+  esbuild@0.25.11:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.25.11
+      '@esbuild/android-arm': 0.25.11
+      '@esbuild/android-arm64': 0.25.11
+      '@esbuild/android-x64': 0.25.11
+      '@esbuild/darwin-arm64': 0.25.11
+      '@esbuild/darwin-x64': 0.25.11
+      '@esbuild/freebsd-arm64': 0.25.11
+      '@esbuild/freebsd-x64': 0.25.11
+      '@esbuild/linux-arm': 0.25.11
+      '@esbuild/linux-arm64': 0.25.11
+      '@esbuild/linux-ia32': 0.25.11
+      '@esbuild/linux-loong64': 0.25.11
+      '@esbuild/linux-mips64el': 0.25.11
+      '@esbuild/linux-ppc64': 0.25.11
+      '@esbuild/linux-riscv64': 0.25.11
+      '@esbuild/linux-s390x': 0.25.11
+      '@esbuild/linux-x64': 0.25.11
+      '@esbuild/netbsd-arm64': 0.25.11
+      '@esbuild/netbsd-x64': 0.25.11
+      '@esbuild/openbsd-arm64': 0.25.11
+      '@esbuild/openbsd-x64': 0.25.11
+      '@esbuild/openharmony-arm64': 0.25.11
+      '@esbuild/sunos-x64': 0.25.11
+      '@esbuild/win32-arm64': 0.25.11
+      '@esbuild/win32-ia32': 0.25.11
+      '@esbuild/win32-x64': 0.25.11
+
   escape-string-regexp@4.0.0: {}
 
   eslint-compat-utils@0.5.1(eslint@9.9.1):
     dependencies:
       eslint: 9.9.1
-      semver: 7.7.2
+      semver: 7.7.3
 
   eslint-config-prettier@9.1.0(eslint@9.9.1):
     dependencies:
@@ -3664,15 +4131,15 @@ snapshots:
   eslint-plugin-n@17.16.1(eslint@9.9.1)(typescript@5.5.4):
     dependencies:
       '@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)
+      '@typescript-eslint/utils': 8.46.2(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.1
+      get-tsconfig: 4.12.0
       globals: 15.15.0
       ignore: 5.3.2
       minimatch: 9.0.5
-      semver: 7.7.2
+      semver: 7.7.3
       ts-declaration-location: 1.0.7(typescript@5.5.4)
     transitivePeerDependencies:
       - supports-color
@@ -3864,7 +4331,7 @@ snapshots:
 
   function-bind@1.1.2: {}
 
-  get-tsconfig@4.10.1:
+  get-tsconfig@4.12.0:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
@@ -4408,6 +4875,34 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.50.1
       fsevents: 2.3.3
 
+  rollup@4.52.5:
+    dependencies:
+      '@types/estree': 1.0.8
+    optionalDependencies:
+      '@rollup/rollup-android-arm-eabi': 4.52.5
+      '@rollup/rollup-android-arm64': 4.52.5
+      '@rollup/rollup-darwin-arm64': 4.52.5
+      '@rollup/rollup-darwin-x64': 4.52.5
+      '@rollup/rollup-freebsd-arm64': 4.52.5
+      '@rollup/rollup-freebsd-x64': 4.52.5
+      '@rollup/rollup-linux-arm-gnueabihf': 4.52.5
+      '@rollup/rollup-linux-arm-musleabihf': 4.52.5
+      '@rollup/rollup-linux-arm64-gnu': 4.52.5
+      '@rollup/rollup-linux-arm64-musl': 4.52.5
+      '@rollup/rollup-linux-loong64-gnu': 4.52.5
+      '@rollup/rollup-linux-ppc64-gnu': 4.52.5
+      '@rollup/rollup-linux-riscv64-gnu': 4.52.5
+      '@rollup/rollup-linux-riscv64-musl': 4.52.5
+      '@rollup/rollup-linux-s390x-gnu': 4.52.5
+      '@rollup/rollup-linux-x64-gnu': 4.52.5
+      '@rollup/rollup-linux-x64-musl': 4.52.5
+      '@rollup/rollup-openharmony-arm64': 4.52.5
+      '@rollup/rollup-win32-arm64-msvc': 4.52.5
+      '@rollup/rollup-win32-ia32-msvc': 4.52.5
+      '@rollup/rollup-win32-x64-gnu': 4.52.5
+      '@rollup/rollup-win32-x64-msvc': 4.52.5
+      fsevents: 2.3.3
+
   rrweb-cssom@0.7.1: {}
 
   run-applescript@7.0.0: {}
@@ -4437,6 +4932,8 @@ snapshots:
 
   semver@7.7.2: {}
 
+  semver@7.7.3: {}
+
   serialize-javascript@6.0.2:
     dependencies:
       randombytes: 2.1.0
@@ -4526,7 +5023,7 @@ snapshots:
 
   symbol-tree@3.2.4: {}
 
-  tapable@2.2.3: {}
+  tapable@2.3.0: {}
 
   term-size@2.2.1: {}
 
@@ -4638,15 +5135,15 @@ snapshots:
 
   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)):
+  vite-dev-rpc@1.1.0(vite@7.1.11(@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: 7.1.11(@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.11(@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.11(@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: 7.1.11(@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.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
@@ -4666,12 +5163,12 @@ snapshots:
       - supports-color
       - terser
 
-  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)):
+  vite-plugin-devtools-json@1.0.0(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
     dependencies:
       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: 7.1.11(@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)):
+  vite-plugin-inspect@11.3.3(vite@7.1.11(@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
@@ -4681,8 +5178,8 @@ snapshots:
       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))
+      vite: 7.1.11(@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.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
     transitivePeerDependencies:
       - supports-color
 
@@ -4698,13 +5195,13 @@ snapshots:
       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):
+  vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0):
     dependencies:
-      esbuild: 0.25.10
+      esbuild: 0.25.11
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.50.1
+      rollup: 4.52.5
       tinyglobby: 0.2.15
     optionalDependencies:
       '@types/node': 24.5.2
@@ -4713,9 +5210,9 @@ snapshots:
       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)):
+  vitefu@1.1.1(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)):
     optionalDependencies:
-      vite: 7.1.5(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
+      vite: 7.1.11(@types/node@24.5.2)(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:

From 4b32d6d8b30fdaf07e9bf4497c39283b5eb421d9 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 22 Oct 2025 03:04:35 -0700
Subject: [PATCH 114/347] fix: make `$inspect` logs come from the callsite
 (#17001)

* fix: make `$inspect` logs come from the callsite

* default to showing stack trace

* reuse id

* DRY out, improve server-side inspect

* update docs

* ugh

* fix the dang tests

* ugh windows is there no punch bowl you won't poop in?

* argh

* how about this

* alright finally
---
 .changeset/silly-penguins-sleep.md            |  5 +++
 documentation/docs/02-runes/07-$inspect.md    |  9 +----
 .../client/visitors/CallExpression.js         | 24 ++++++++++--
 .../server/visitors/CallExpression.js         | 14 +++++--
 .../src/compiler/phases/3-transform/utils.js  | 39 +++++++------------
 .../svelte/src/internal/client/dev/inspect.js | 18 +++++++--
 .../svelte/src/internal/client/dev/tracing.js | 11 +++++-
 packages/svelte/src/internal/server/index.js  |  9 -----
 packages/svelte/tests/helpers.js              | 20 ++++++++++
 .../_config.js                                |  2 +-
 .../samples/inspect-deep-array/_config.js     |  3 +-
 .../samples/inspect-deep/_config.js           |  3 +-
 .../samples/inspect-derived-2/_config.js      |  8 ++--
 .../samples/inspect-derived-3/_config.js      | 12 +++---
 .../samples/inspect-map-set/_config.js        | 11 +++---
 .../samples/inspect-multiple/_config.js       | 12 +++++-
 .../samples/inspect-nested-effect/_config.js  |  3 +-
 .../samples/inspect-nested-state/_config.js   |  8 ++--
 .../samples/inspect-new-property/_config.js   | 10 ++++-
 .../samples/inspect-recursive-2/_config.js    |  2 +-
 .../samples/inspect-recursive/_config.js      |  9 ++++-
 .../runtime-runes/samples/inspect/_config.js  |  3 +-
 22 files changed, 152 insertions(+), 83 deletions(-)
 create mode 100644 .changeset/silly-penguins-sleep.md

diff --git a/.changeset/silly-penguins-sleep.md b/.changeset/silly-penguins-sleep.md
new file mode 100644
index 0000000000..f397f1e8ba
--- /dev/null
+++ b/.changeset/silly-penguins-sleep.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: make `$inspect` logs come from the callsite
diff --git a/documentation/docs/02-runes/07-$inspect.md b/documentation/docs/02-runes/07-$inspect.md
index 13ac8b79a3..6d47e30e27 100644
--- a/documentation/docs/02-runes/07-$inspect.md
+++ b/documentation/docs/02-runes/07-$inspect.md
@@ -18,6 +18,8 @@ The `$inspect` rune is roughly equivalent to `console.log`, with the exception t
 <input bind:value={message} />
 ```
 
+On updates, a stack trace will be printed, making it easy to find the origin of a state change (unless you're in the playground, due to technical limitations).
+
 ## $inspect(...).with
 
 `$inspect` returns a property `with`, which you can invoke with a callback, which will then be invoked instead of `console.log`. The first argument to the callback is either `"init"` or `"update"`; subsequent arguments are the values passed to `$inspect` ([demo](/playground/untitled#H4sIAAAAAAAACkVQ24qDMBD9lSEUqlTqPlsj7ON-w7pQG8c2VCchmVSK-O-bKMs-DefKYRYx6BG9qL4XQd2EohKf1opC8Nsm4F84MkbsTXAqMbVXTltuWmp5RAZlAjFIOHjuGLOP_BKVqB00eYuKs82Qn2fNjyxLtcWeyUE2sCRry3qATQIpJRyD7WPVMf9TW-7xFu53dBcoSzAOrsqQNyOe2XUKr0Xi5kcMvdDB2wSYO-I9vKazplV1-T-d6ltgNgSG1KjVUy7ZtmdbdjqtzRcphxMS1-XubOITJtPrQWMvKnYB15_1F7KKadA_AQAA)):
@@ -36,13 +38,6 @@ The `$inspect` rune is roughly equivalent to `console.log`, with the exception t
 <button onclick={() => count++}>Increment</button>
 ```
 
-A convenient way to find the origin of some change is to pass `console.trace` to `with`:
-
-```js
-// @errors: 2304
-$inspect(stuff).with(console.trace);
-```
-
 ## $inspect.trace(...)
 
 This rune, added in 5.14, causes the surrounding function to be _traced_ in development. Any time the function re-runs as part of an [effect]($effect) or a [derived]($derived), information will be printed to the console about which pieces of reactive state caused the effect to fire.
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 bf9a09bb74..ae60f3be40 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
@@ -1,10 +1,10 @@
-/** @import { CallExpression, Expression } from 'estree' */
+/** @import { CallExpression, Expression, MemberExpression } from 'estree' */
 /** @import { Context } from '../types' */
 import { dev, is_ignored } from '../../../../state.js';
 import * as b from '#compiler/builders';
 import { get_rune } from '../../../scope.js';
-import { transform_inspect_rune } from '../../utils.js';
 import { should_proxy } from '../utils.js';
+import { get_inspect_args } from '../../utils.js';
 
 /**
  * @param {CallExpression} node
@@ -73,7 +73,7 @@ export function CallExpression(node, context) {
 
 		case '$inspect':
 		case '$inspect().with':
-			return transform_inspect_rune(node, context);
+			return transform_inspect_rune(rune, node, context);
 	}
 
 	if (
@@ -104,3 +104,21 @@ export function CallExpression(node, context) {
 
 	context.next();
 }
+
+/**
+ * @param {'$inspect' | '$inspect().with'} rune
+ * @param {CallExpression} node
+ * @param {Context} context
+ */
+function transform_inspect_rune(rune, node, context) {
+	if (!dev) return b.empty;
+
+	const { args, inspector } = get_inspect_args(rune, node, context.visit);
+
+	// by passing an arrow function, the log appears to come from the `$inspect` callsite
+	// rather than the `inspect.js` file containing the utility
+	const id = b.id('$$args');
+	const fn = b.arrow([b.rest(id)], b.call(inspector, b.spread(id)));
+
+	return b.call('$.inspect', b.thunk(b.array(args)), fn, rune === '$inspect' && b.true);
+}
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
index d53b631aa5..bba6511eec 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
@@ -1,9 +1,9 @@
-/** @import { CallExpression, Expression } from 'estree' */
+/** @import { CallExpression, Expression, MemberExpression } from 'estree' */
 /** @import { Context } from '../types.js' */
-import { is_ignored } from '../../../../state.js';
+import { dev, is_ignored } from '../../../../state.js';
 import * as b from '#compiler/builders';
 import { get_rune } from '../../../scope.js';
-import { transform_inspect_rune } from '../../utils.js';
+import { get_inspect_args } from '../../utils.js';
 
 /**
  * @param {CallExpression} node
@@ -51,7 +51,13 @@ export function CallExpression(node, context) {
 	}
 
 	if (rune === '$inspect' || rune === '$inspect().with') {
-		return transform_inspect_rune(node, context);
+		if (!dev) return b.empty;
+
+		const { args, inspector } = get_inspect_args(rune, node, context.visit);
+
+		return rune === '$inspect'
+			? b.call(inspector, b.literal('$inspect('), ...args, b.literal(')'))
+			: b.call(inspector, b.literal('init'), ...args);
 	}
 
 	context.next();
diff --git a/packages/svelte/src/compiler/phases/3-transform/utils.js b/packages/svelte/src/compiler/phases/3-transform/utils.js
index 1445ce3aa6..dfc2ab1de1 100644
--- a/packages/svelte/src/compiler/phases/3-transform/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/utils.js
@@ -1,7 +1,7 @@
 /** @import { Context } from 'zimmerframe' */
 /** @import { TransformState } from './types.js' */
 /** @import { AST, Binding, Namespace, ValidatedCompileOptions } from '#compiler' */
-/** @import { Node, Expression, CallExpression } from 'estree' */
+/** @import { Node, Expression, CallExpression, MemberExpression } from 'estree' */
 import {
 	regex_ends_with_whitespaces,
 	regex_not_whitespace,
@@ -452,30 +452,19 @@ export function determine_namespace_for_children(node, namespace) {
 }
 
 /**
- * @template {TransformState} T
+ * @param {'$inspect' | '$inspect().with'} rune
  * @param {CallExpression} node
- * @param {Context<any, T>} context
+ * @param {(node: AST.SvelteNode) => AST.SvelteNode} visit
  */
-export function transform_inspect_rune(node, context) {
-	const { state, visit } = context;
-	const as_fn = state.options.generate === 'client';
-
-	if (!dev) return b.empty;
-
-	if (node.callee.type === 'MemberExpression') {
-		const raw_inspect_args = /** @type {CallExpression} */ (node.callee.object).arguments;
-		const inspect_args =
-			/** @type {Array<Expression>} */
-			(raw_inspect_args.map((arg) => visit(arg)));
-		const with_arg = /** @type {Expression} */ (visit(node.arguments[0]));
-
-		return b.call(
-			'$.inspect',
-			as_fn ? b.thunk(b.array(inspect_args)) : b.array(inspect_args),
-			with_arg
-		);
-	} else {
-		const arg = node.arguments.map((arg) => /** @type {Expression} */ (visit(arg)));
-		return b.call('$.inspect', as_fn ? b.thunk(b.array(arg)) : b.array(arg));
-	}
+export function get_inspect_args(rune, node, visit) {
+	const call =
+		rune === '$inspect'
+			? node
+			: /** @type {CallExpression} */ (/** @type {MemberExpression} */ (node.callee).object);
+
+	return {
+		args: call.arguments.map((arg) => /** @type {Expression} */ (visit(arg))),
+		inspector:
+			rune === '$inspect' ? 'console.log' : /** @type {Expression} */ (visit(node.arguments[0]))
+	};
 }
diff --git a/packages/svelte/src/internal/client/dev/inspect.js b/packages/svelte/src/internal/client/dev/inspect.js
index f79cf47299..db7ab0d976 100644
--- a/packages/svelte/src/internal/client/dev/inspect.js
+++ b/packages/svelte/src/internal/client/dev/inspect.js
@@ -2,13 +2,14 @@ import { UNINITIALIZED } from '../../../constants.js';
 import { snapshot } from '../../shared/clone.js';
 import { inspect_effect, render_effect, validate_effect } from '../reactivity/effects.js';
 import { untrack } from '../runtime.js';
+import { get_stack } from './tracing.js';
 
 /**
  * @param {() => any[]} get_value
- * @param {Function} [inspector]
+ * @param {Function} inspector
+ * @param {boolean} show_stack
  */
-// eslint-disable-next-line no-console
-export function inspect(get_value, inspector = console.log) {
+export function inspect(get_value, inspector, show_stack = false) {
 	validate_effect('$inspect');
 
 	let initial = true;
@@ -28,7 +29,16 @@ export function inspect(get_value, inspector = console.log) {
 
 		var snap = snapshot(value, true, true);
 		untrack(() => {
-			inspector(initial ? 'init' : 'update', ...snap);
+			if (show_stack) {
+				inspector(...snap);
+
+				if (!initial) {
+					// eslint-disable-next-line no-console
+					console.log(get_stack('UpdatedAt'));
+				}
+			} else {
+				inspector(initial ? 'init' : 'update', ...snap);
+			}
 		});
 
 		initial = false;
diff --git a/packages/svelte/src/internal/client/dev/tracing.js b/packages/svelte/src/internal/client/dev/tracing.js
index 673a710fac..95baefc64a 100644
--- a/packages/svelte/src/internal/client/dev/tracing.js
+++ b/packages/svelte/src/internal/client/dev/tracing.js
@@ -134,7 +134,16 @@ export function trace(label, fn) {
  * @returns {Error & { stack: string } | null}
  */
 export function get_stack(label) {
+	// @ts-ignore stackTraceLimit doesn't exist everywhere
+	const limit = Error.stackTraceLimit;
+
+	// @ts-ignore
+	Error.stackTraceLimit = Infinity;
 	let error = Error();
+
+	// @ts-ignore
+	Error.stackTraceLimit = limit;
+
 	const stack = error.stack;
 
 	if (!stack) return null;
@@ -151,7 +160,7 @@ export function get_stack(label) {
 		if (line.includes('validate_each_keys')) {
 			return null;
 		}
-		if (line.includes('svelte/src/internal')) {
+		if (line.includes('svelte/src/internal') || line.includes('svelte\\src\\internal')) {
 			continue;
 		}
 		new_lines.push(line);
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index 50bb629c4d..74a90a8600 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -418,15 +418,6 @@ export function ensure_array_like(array_like_or_iterator) {
 	return [];
 }
 
-/**
- * @param {any[]} args
- * @param {Function} [inspect]
- */
-// eslint-disable-next-line no-console
-export function inspect(args, inspect = console.log) {
-	inspect('init', ...args);
-}
-
 /**
  * @template V
  * @param {() => V} get_value
diff --git a/packages/svelte/tests/helpers.js b/packages/svelte/tests/helpers.js
index 7a9640636c..bf708878a3 100644
--- a/packages/svelte/tests/helpers.js
+++ b/packages/svelte/tests/helpers.js
@@ -197,6 +197,26 @@ export const fragments = /** @type {'html' | 'tree'} */ (process.env.FRAGMENTS)
 
 export const async_mode = process.env.SVELTE_NO_ASYNC !== 'true';
 
+/**
+ * @param {any[]} logs
+ */
+export function normalise_inspect_logs(logs) {
+	return logs.map((log) => {
+		if (log instanceof Error) {
+			const last_line = log.stack
+				?.trim()
+				.split('\n')
+				.filter((line) => !line.includes('at Module.get_stack'))[1];
+
+			const match = last_line && /(at .+) /.exec(last_line);
+
+			return match && match[1];
+		}
+
+		return log;
+	});
+}
+
 /**
  * @param {any[]} logs
  */
diff --git a/packages/svelte/tests/runtime-runes/samples/class-private-fields-reassigned-this/_config.js b/packages/svelte/tests/runtime-runes/samples/class-private-fields-reassigned-this/_config.js
index 88b806c0f0..0e6bd73220 100644
--- a/packages/svelte/tests/runtime-runes/samples/class-private-fields-reassigned-this/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/class-private-fields-reassigned-this/_config.js
@@ -5,6 +5,6 @@ export default test({
 		dev: true
 	},
 	async test({ assert, logs }) {
-		assert.deepEqual(logs, ['init', 1, 'init', 1]);
+		assert.deepEqual(logs, [1, 1]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-deep-array/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-deep-array/_config.js
index 49f1b5de41..1b331f5b40 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-deep-array/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-deep-array/_config.js
@@ -1,5 +1,6 @@
 import { flushSync } from 'svelte';
 import { test } from '../../test';
+import { normalise_inspect_logs } from '../../../helpers.js';
 
 export default test({
 	compileOptions: {
@@ -13,6 +14,6 @@ export default test({
 			button?.click();
 		});
 
-		assert.deepEqual(logs, ['init', [1, 2, 3, 7], 'update', [2, 3, 7]]);
+		assert.deepEqual(normalise_inspect_logs(logs), [[1, 2, 3, 7], [2, 3, 7], 'at Object.doSplice']);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-deep/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-deep/_config.js
index f7480b0e7b..89b01da499 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-deep/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-deep/_config.js
@@ -1,3 +1,4 @@
+import { normalise_inspect_logs } from '../../../helpers.js';
 import { test } from '../../test';
 
 export default test({
@@ -6,6 +7,6 @@ export default test({
 	},
 
 	async test({ assert, logs }) {
-		assert.deepEqual(logs, ['init', undefined, 'update', [{}]]);
+		assert.deepEqual(normalise_inspect_logs(logs), [undefined, [{}], 'at $effect']);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-derived-2/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-derived-2/_config.js
index 9474397f7f..3742382759 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-derived-2/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-derived-2/_config.js
@@ -1,5 +1,6 @@
 import { flushSync } from 'svelte';
 import { test } from '../../test';
+import { normalise_inspect_logs } from '../../../helpers.js';
 
 export default test({
 	compileOptions: {
@@ -14,8 +15,7 @@ export default test({
 		});
 
 		assert.htmlEqual(target.innerHTML, `<button>update</button>\n1`);
-		assert.deepEqual(logs, [
-			'init',
+		assert.deepEqual(normalise_inspect_logs(logs), [
 			{
 				data: {
 					derived: 0,
@@ -23,14 +23,14 @@ export default test({
 				},
 				derived: []
 			},
-			'update',
 			{
 				data: {
 					derived: 0,
 					list: [1]
 				},
 				derived: [1]
-			}
+			},
+			'at HTMLButtonElement.Main.button.__click'
 		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-derived-3/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-derived-3/_config.js
index d2226f433e..017de6c0c7 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-derived-3/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-derived-3/_config.js
@@ -1,5 +1,6 @@
 import { flushSync } from 'svelte';
 import { test } from '../../test';
+import { normalise_inspect_logs } from '../../../helpers.js';
 
 export default test({
 	compileOptions: {
@@ -13,22 +14,19 @@ export default test({
 			button?.click();
 		});
 
-		assert.deepEqual(logs, [
-			'init',
+		assert.deepEqual(normalise_inspect_logs(logs), [
 			'0',
 			true,
-			'init',
 			'1',
 			false,
-			'init',
 			'2',
 			false,
-			'update',
 			'0',
 			false,
-			'update',
+			'at $effect',
 			'1',
-			true
+			true,
+			'at $effect'
 		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-map-set/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-map-set/_config.js
index 2052cb7f13..2f91e84288 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-map-set/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-map-set/_config.js
@@ -1,5 +1,6 @@
 import { flushSync } from 'svelte';
 import { test } from '../../test';
+import { normalise_inspect_logs } from '../../../helpers.js';
 
 export default test({
 	compileOptions: {
@@ -12,15 +13,13 @@ export default test({
 		btn2.click();
 		flushSync();
 
-		assert.deepEqual(logs, [
-			'init',
+		assert.deepEqual(normalise_inspect_logs(logs), [
 			new Map(),
-			'init',
 			new Set(),
-			'update',
 			new Map([['a', 'a']]),
-			'update',
-			new Set(['a'])
+			'at SvelteMap.set',
+			new Set(['a']),
+			'at SvelteSet.add'
 		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-multiple/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-multiple/_config.js
index fc9a0cda9a..6886f5e53e 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-multiple/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-multiple/_config.js
@@ -1,3 +1,4 @@
+import { normalise_inspect_logs } from '../../../helpers.js';
 import { test } from '../../test';
 
 export default test({
@@ -11,6 +12,15 @@ export default test({
 		b2.click();
 		await Promise.resolve();
 
-		assert.deepEqual(logs, ['init', 0, 0, 'update', 1, 0, 'update', 1, 1]);
+		assert.deepEqual(normalise_inspect_logs(logs), [
+			0,
+			0,
+			1,
+			0,
+			'at HTMLButtonElement.<anonymous>',
+			1,
+			1,
+			'at HTMLButtonElement.<anonymous>'
+		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-nested-effect/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-nested-effect/_config.js
index 82429e5e36..86e65d5044 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-nested-effect/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-nested-effect/_config.js
@@ -1,3 +1,4 @@
+import { normalise_inspect_logs } from '../../../helpers.js';
 import { test } from '../../test';
 
 export default test({
@@ -6,6 +7,6 @@ export default test({
 	},
 
 	async test({ assert, logs }) {
-		assert.deepEqual(logs, ['init', 0, 'update', 1]);
+		assert.deepEqual(normalise_inspect_logs(logs), [0, 1, 'at $effect']);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-nested-state/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-nested-state/_config.js
index e4d9fb5013..34cd74d780 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-nested-state/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-nested-state/_config.js
@@ -1,3 +1,4 @@
+import { normalise_inspect_logs } from '../../../helpers.js';
 import { test } from '../../test';
 
 export default test({
@@ -10,13 +11,12 @@ export default test({
 		b1.click();
 		await Promise.resolve();
 
-		assert.deepEqual(logs, [
-			'init',
+		assert.deepEqual(normalise_inspect_logs(logs), [
 			{ x: { count: 0 } },
 			[{ count: 0 }],
-			'update',
 			{ x: { count: 1 } },
-			[{ count: 1 }]
+			[{ count: 1 }],
+			'at HTMLButtonElement.<anonymous>'
 		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js
index a85972a0f9..8134044b16 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js
@@ -1,3 +1,4 @@
+import { normalise_inspect_logs } from '../../../helpers.js';
 import { test } from '../../test';
 
 export default test({
@@ -10,6 +11,13 @@ export default test({
 		btn.click();
 		await Promise.resolve();
 
-		assert.deepEqual(logs, ['init', {}, 'init', [], 'update', { x: 'hello' }, 'update', ['hello']]);
+		assert.deepEqual(normalise_inspect_logs(logs), [
+			{},
+			[],
+			{ x: 'hello' },
+			'at HTMLButtonElement.on_click',
+			['hello'],
+			'at HTMLButtonElement.on_click'
+		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-recursive-2/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-recursive-2/_config.js
index ab49697195..1bfc2dc68f 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-recursive-2/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-recursive-2/_config.js
@@ -18,6 +18,6 @@ export default test({
 		};
 		b.a.b = b;
 
-		assert.deepEqual(logs, ['init', a, 'init', b]);
+		assert.deepEqual(logs, [a, b]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-recursive/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-recursive/_config.js
index e35917b1f3..9d95956e7d 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-recursive/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-recursive/_config.js
@@ -1,3 +1,4 @@
+import { normalise_inspect_logs } from '../../../helpers.js';
 import { test } from '../../test';
 
 export default test({
@@ -11,6 +12,12 @@ export default test({
 		btn.click();
 		await Promise.resolve();
 
-		assert.deepEqual(logs, ['init', [], 'update', [{}], 'update', [{}, {}]]);
+		assert.deepEqual(normalise_inspect_logs(logs), [
+			[],
+			[{}],
+			'at HTMLButtonElement.on_click',
+			[{}, {}],
+			'at HTMLButtonElement.on_click'
+		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect/_config.js
index 09a921abee..c05c4b15c4 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect/_config.js
@@ -1,3 +1,4 @@
+import { normalise_inspect_logs } from '../../../helpers.js';
 import { test } from '../../test';
 
 export default test({
@@ -11,6 +12,6 @@ export default test({
 		b2.click();
 		await Promise.resolve();
 
-		assert.deepEqual(logs, ['init', 0, 'update', 1]);
+		assert.deepEqual(normalise_inspect_logs(logs), [0, 1, 'at HTMLButtonElement.<anonymous>']);
 	}
 });

From 7e40186a5fc08ddf0c363dc8db49aae5a652a0b0 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 22 Oct 2025 03:07:07 -0700
Subject: [PATCH 115/347] fix: run batch until complete (#16971)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 at present we only call batch.increment() when something async happens if we're not inside a pending boundary, but that's incorrect — it means that a batch is committed before everything resolves. When work inside a pending boundary does resolve, the batch becomes a zombie.

At the same time, we don't handle effects inside pending boundaries correctly. They should be deferred until the boundary (and all its parents) are ready.

This PR attempts to fix that — during traversal, when we exit a pending boundary, any effects that were collected get deferred until the next flush. We also distinguish between batch.#pending (any ongoing async work) and batch.#blocking_pending (any async work that should prevent effects outside pending boundaries from being flushed).
---
 .changeset/mighty-mice-call.md                |   5 +
 .../src/internal/client/dom/blocks/async.js   |   5 +
 .../internal/client/dom/blocks/boundary.js    |   7 -
 .../src/internal/client/reactivity/async.js   |  11 +-
 .../src/internal/client/reactivity/batch.js   | 172 +++++++++++-------
 .../internal/client/reactivity/deriveds.js    |  29 ++-
 .../samples/async-abort-signal/_config.js     |   2 +-
 .../main.svelte                               |   2 +-
 .../main.svelte                               |   2 +-
 .../_config.js                                |   4 +-
 .../samples/async-block-resolve/_config.js    |  63 +++++++
 .../samples/async-block-resolve/main.svelte   |  36 ++++
 .../async-effect-after-await/Child.svelte     |   6 +-
 .../async-effect-after-await/_config.js       |   3 +-
 .../async-effect-after-boundary/Child.svelte  |   5 +
 .../async-effect-after-boundary/_config.js    |  16 ++
 .../async-effect-after-boundary/main.svelte   |  22 +++
 .../samples/async-resolve-stale/_config.js    |  13 +-
 .../samples/async-resolve-stale/main.svelte   |  37 ++--
 19 files changed, 326 insertions(+), 114 deletions(-)
 create mode 100644 .changeset/mighty-mice-call.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-block-resolve/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-block-resolve/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/main.svelte

diff --git a/.changeset/mighty-mice-call.md b/.changeset/mighty-mice-call.md
new file mode 100644
index 0000000000..340b33bd4b
--- /dev/null
+++ b/.changeset/mighty-mice-call.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: keep batches alive until all async work is complete
diff --git a/packages/svelte/src/internal/client/dom/blocks/async.js b/packages/svelte/src/internal/client/dom/blocks/async.js
index 6df0739918..5ee9d25bce 100644
--- a/packages/svelte/src/internal/client/dom/blocks/async.js
+++ b/packages/svelte/src/internal/client/dom/blocks/async.js
@@ -1,5 +1,6 @@
 /** @import { TemplateNode, Value } from '#client' */
 import { flatten } from '../../reactivity/async.js';
+import { Batch, current_batch } from '../../reactivity/batch.js';
 import { get } from '../../runtime.js';
 import {
 	hydrate_next,
@@ -18,8 +19,11 @@ import { get_boundary } from './boundary.js';
  */
 export function async(node, expressions, fn) {
 	var boundary = get_boundary();
+	var batch = /** @type {Batch} */ (current_batch);
+	var blocking = !boundary.is_pending();
 
 	boundary.update_pending_count(1);
+	batch.increment(blocking);
 
 	var was_hydrating = hydrating;
 
@@ -44,6 +48,7 @@ export function async(node, expressions, fn) {
 			fn(node, ...values);
 		} finally {
 			boundary.update_pending_count(-1);
+			batch.decrement(blocking);
 		}
 
 		if (was_hydrating) {
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 026ffb36fc..3da9204571 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -291,13 +291,6 @@ export class Boundary {
 				this.#anchor.before(this.#offscreen_fragment);
 				this.#offscreen_fragment = null;
 			}
-
-			// TODO this feels like a little bit of a kludge, but until we
-			// overhaul the boundary/batch relationship it's probably
-			// the most pragmatic solution available to us
-			queue_micro_task(() => {
-				Batch.ensure().flush();
-			});
 		}
 	}
 
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 1d408744fd..fb836df989 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -218,10 +218,10 @@ export function unset_context() {
 export async function async_body(anchor, fn) {
 	var boundary = get_boundary();
 	var batch = /** @type {Batch} */ (current_batch);
-	var pending = boundary.is_pending();
+	var blocking = !boundary.is_pending();
 
 	boundary.update_pending_count(1);
-	if (!pending) batch.increment();
+	batch.increment(blocking);
 
 	var active = /** @type {Effect} */ (active_effect);
 
@@ -254,12 +254,7 @@ export async function async_body(anchor, fn) {
 		}
 
 		boundary.update_pending_count(-1);
-
-		if (pending) {
-			batch.flush();
-		} else {
-			batch.decrement();
-		}
+		batch.decrement(blocking);
 
 		unset_context();
 	}
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 302d48d03f..91635bd5d2 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -11,7 +11,8 @@ import {
 	RENDER_EFFECT,
 	ROOT_EFFECT,
 	MAYBE_DIRTY,
-	DERIVED
+	DERIVED,
+	BOUNDARY_EFFECT
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
@@ -31,6 +32,16 @@ import { invoke_error_boundary } from '../error-handling.js';
 import { old_values, source, update } from './sources.js';
 import { inspect_effect, unlink_effect } from './effects.js';
 
+/**
+ * @typedef {{
+ *   parent: EffectTarget | null;
+ *   effect: Effect | null;
+ *   effects: Effect[];
+ *   render_effects: Effect[];
+ *   block_effects: Effect[];
+ * }} EffectTarget
+ */
+
 /** @type {Set<Batch>} */
 const batches = new Set();
 
@@ -65,6 +76,8 @@ let is_flushing = false;
 export let is_flushing_sync = false;
 
 export class Batch {
+	committed = false;
+
 	/**
 	 * The current values of any sources that are updated in this batch
 	 * They keys of this map are identical to `this.#previous`
@@ -91,6 +104,11 @@ export class Batch {
 	 */
 	#pending = 0;
 
+	/**
+	 * The number of async effects that are currently in flight, _not_ inside a pending boundary
+	 */
+	#blocking_pending = 0;
+
 	/**
 	 * A deferred that resolves when the batch is committed, used with `settled()`
 	 * TODO replace with Promise.withResolvers once supported widely enough
@@ -98,26 +116,6 @@ export class Batch {
 	 */
 	#deferred = null;
 
-	/**
-	 * Template effects and `$effect.pre` effects, which run when
-	 * a batch is committed
-	 * @type {Effect[]}
-	 */
-	#render_effects = [];
-
-	/**
-	 * The same as `#render_effects`, but for `$effect` (which runs after)
-	 * @type {Effect[]}
-	 */
-	#effects = [];
-
-	/**
-	 * Block effects, which may need to re-run on subsequent flushes
-	 * in order to update internal sources (e.g. each block items)
-	 * @type {Effect[]}
-	 */
-	#block_effects = [];
-
 	/**
 	 * Deferred effects (which run after async work has completed) that are DIRTY
 	 * @type {Effect[]}
@@ -148,41 +146,37 @@ export class Batch {
 
 		this.apply();
 
+		/** @type {EffectTarget} */
+		var target = {
+			parent: null,
+			effect: null,
+			effects: [],
+			render_effects: [],
+			block_effects: []
+		};
+
 		for (const root of root_effects) {
-			this.#traverse_effect_tree(root);
+			this.#traverse_effect_tree(root, target);
 		}
 
-		// if there is no outstanding async work, commit
-		if (this.#pending === 0) {
-			// TODO we need this because we commit _then_ flush effects...
-			// maybe there's a way we can reverse the order?
-			var previous_batch_sources = batch_values;
+		this.#resolve();
 
-			this.#commit();
-
-			var render_effects = this.#render_effects;
-			var effects = this.#effects;
-
-			this.#render_effects = [];
-			this.#effects = [];
-			this.#block_effects = [];
+		if (this.#blocking_pending > 0) {
+			this.#defer_effects(target.effects);
+			this.#defer_effects(target.render_effects);
+			this.#defer_effects(target.block_effects);
+		} else {
+			// TODO append/detach blocks here, not in #commit
 
 			// 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 = this;
 			current_batch = null;
 
-			batch_values = previous_batch_sources;
-			flush_queued_effects(render_effects);
-			flush_queued_effects(effects);
+			flush_queued_effects(target.render_effects);
+			flush_queued_effects(target.effects);
 
 			previous_batch = null;
-
-			this.#deferred?.resolve();
-		} else {
-			this.#defer_effects(this.#render_effects);
-			this.#defer_effects(this.#effects);
-			this.#defer_effects(this.#block_effects);
 		}
 
 		batch_values = null;
@@ -192,8 +186,9 @@ export class Batch {
 	 * Traverse the effect tree, executing effects or stashing
 	 * them for later execution as appropriate
 	 * @param {Effect} root
+	 * @param {EffectTarget} target
 	 */
-	#traverse_effect_tree(root) {
+	#traverse_effect_tree(root, target) {
 		root.f ^= CLEAN;
 
 		var effect = root.first;
@@ -205,15 +200,25 @@ export class Batch {
 
 			var skip = is_skippable_branch || (flags & INERT) !== 0 || this.skipped_effects.has(effect);
 
+			if ((effect.f & BOUNDARY_EFFECT) !== 0 && effect.b?.is_pending()) {
+				target = {
+					parent: target,
+					effect,
+					effects: [],
+					render_effects: [],
+					block_effects: []
+				};
+			}
+
 			if (!skip && effect.fn !== null) {
 				if (is_branch) {
 					effect.f ^= CLEAN;
 				} else if ((flags & EFFECT) !== 0) {
-					this.#effects.push(effect);
+					target.effects.push(effect);
 				} else if (async_mode_flag && (flags & RENDER_EFFECT) !== 0) {
-					this.#render_effects.push(effect);
+					target.render_effects.push(effect);
 				} else if (is_dirty(effect)) {
-					if ((effect.f & BLOCK_EFFECT) !== 0) this.#block_effects.push(effect);
+					if ((effect.f & BLOCK_EFFECT) !== 0) target.block_effects.push(effect);
 					update_effect(effect);
 				}
 
@@ -229,6 +234,17 @@ export class Batch {
 			effect = effect.next;
 
 			while (effect === null && parent !== null) {
+				if (parent === target.effect) {
+					// TODO rather than traversing into pending boundaries and deferring the effects,
+					// could we just attach the effects _to_ the pending boundary and schedule them
+					// once the boundary is ready?
+					this.#defer_effects(target.effects);
+					this.#defer_effects(target.render_effects);
+					this.#defer_effects(target.block_effects);
+
+					target = /** @type {EffectTarget} */ (target.parent);
+				}
+
 				effect = parent.next;
 				parent = parent.parent;
 			}
@@ -246,8 +262,6 @@ export class Batch {
 			// mark as clean so they get scheduled if they depend on pending async state
 			set_signal_status(e, CLEAN);
 		}
-
-		effects.length = 0;
 	}
 
 	/**
@@ -283,8 +297,8 @@ export class Batch {
 				// this can happen if a new batch was created during `flush_effects()`
 				return;
 			}
-		} else if (this.#pending === 0) {
-			this.#commit();
+		} else {
+			this.#resolve();
 		}
 
 		this.deactivate();
@@ -300,16 +314,19 @@ export class Batch {
 		}
 	}
 
-	/**
-	 * Append and remove branches to/from the DOM
-	 */
-	#commit() {
-		for (const fn of this.#callbacks) {
-			fn();
+	#resolve() {
+		if (this.#blocking_pending === 0) {
+			// append/remove branches
+			for (const fn of this.#callbacks) fn();
+			this.#callbacks.clear();
 		}
 
-		this.#callbacks.clear();
+		if (this.#pending === 0) {
+			this.#commit();
+		}
+	}
 
+	#commit() {
 		// 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
@@ -317,7 +334,17 @@ export class Batch {
 		if (batches.size > 1) {
 			this.#previous.clear();
 
-			let is_earlier = true;
+			var previous_batch_values = batch_values;
+			var is_earlier = true;
+
+			/** @type {EffectTarget} */
+			var dummy_target = {
+				parent: null,
+				effect: null,
+				effects: [],
+				render_effects: [],
+				block_effects: []
+			};
 
 			for (const batch of batches) {
 				if (batch === this) {
@@ -359,9 +386,11 @@ export class Batch {
 						batch.apply();
 
 						for (const root of queued_root_effects) {
-							batch.#traverse_effect_tree(root);
+							batch.#traverse_effect_tree(root, dummy_target);
 						}
 
+						// TODO do we need to do anything with `target`? defer block effects?
+
 						queued_root_effects = [];
 						batch.deactivate();
 					}
@@ -369,17 +398,31 @@ export class Batch {
 			}
 
 			current_batch = null;
+			batch_values = previous_batch_values;
 		}
 
+		this.committed = true;
 		batches.delete(this);
+
+		this.#deferred?.resolve();
 	}
 
-	increment() {
+	/**
+	 *
+	 * @param {boolean} blocking
+	 */
+	increment(blocking) {
 		this.#pending += 1;
+		if (blocking) this.#blocking_pending += 1;
 	}
 
-	decrement() {
+	/**
+	 *
+	 * @param {boolean} blocking
+	 */
+	decrement(blocking) {
 		this.#pending -= 1;
+		if (blocking) this.#blocking_pending -= 1;
 
 		for (const e of this.#dirty_effects) {
 			set_signal_status(e, DIRTY);
@@ -391,6 +434,9 @@ export class Batch {
 			schedule_effect(e);
 		}
 
+		this.#dirty_effects = [];
+		this.#maybe_dirty_effects = [];
+
 		this.flush();
 	}
 
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 6aa9a1d9d9..06ae0f6d7a 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -127,7 +127,17 @@ export function async_derived(fn, location) {
 			// 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.
 			// We call `unset_context` to undo any `save` calls that happen inside `fn()`
-			Promise.resolve(fn()).then(d.resolve, d.reject).then(unset_context);
+			Promise.resolve(fn())
+				.then(d.resolve, d.reject)
+				.then(() => {
+					if (batch === current_batch && batch.committed) {
+						// if the batch was rejected as stale, we need to cleanup
+						// after any `$.save(...)` calls inside `fn()`
+						batch.deactivate();
+					}
+
+					unset_context();
+				});
 		} catch (error) {
 			d.reject(error);
 			unset_context();
@@ -136,17 +146,16 @@ export function async_derived(fn, location) {
 		if (DEV) current_async_effect = null;
 
 		var batch = /** @type {Batch} */ (current_batch);
-		var pending = boundary.is_pending();
 
 		if (should_suspend) {
+			var blocking = !boundary.is_pending();
+
 			boundary.update_pending_count(1);
-			if (!pending) {
-				batch.increment();
+			batch.increment(blocking);
 
-				deferreds.get(batch)?.reject(STALE_REACTION);
-				deferreds.delete(batch); // delete to ensure correct order in Map iteration below
-				deferreds.set(batch, d);
-			}
+			deferreds.get(batch)?.reject(STALE_REACTION);
+			deferreds.delete(batch); // delete to ensure correct order in Map iteration below
+			deferreds.set(batch, d);
 		}
 
 		/**
@@ -156,7 +165,7 @@ export function async_derived(fn, location) {
 		const handler = (value, error = undefined) => {
 			current_async_effect = null;
 
-			if (!pending) batch.activate();
+			batch.activate();
 
 			if (error) {
 				if (error !== STALE_REACTION) {
@@ -193,7 +202,7 @@ export function async_derived(fn, location) {
 
 			if (should_suspend) {
 				boundary.update_pending_count(-1);
-				if (!pending) batch.decrement();
+				batch.decrement(blocking);
 			}
 		};
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-abort-signal/_config.js b/packages/svelte/tests/runtime-runes/samples/async-abort-signal/_config.js
index a947a91ab8..af49b1779c 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-abort-signal/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-abort-signal/_config.js
@@ -6,7 +6,7 @@ export default test({
 		const [reset, resolve] = target.querySelectorAll('button');
 
 		reset.click();
-		await settled();
+		await tick();
 		assert.deepEqual(logs, ['aborted']);
 
 		resolve.click();
diff --git a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/main.svelte
index e2f01a66c8..c0e4d862a8 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-2/main.svelte
@@ -12,7 +12,7 @@
 </script>
 
 <button onclick={() => {
-	input.focus();
+	input?.focus();
 	resolvers.shift()?.();
 }}>shift</button>
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/main.svelte
index 566ea60ec5..8f5e2862eb 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-binding-update-while-focused-3/main.svelte
@@ -12,7 +12,7 @@
 </script>
 
 <button onclick={() => {
-	select.focus();
+	select?.focus();
 	resolvers.shift()?.();
 }}>shift</button>
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-block-reject-each-during-init/_config.js b/packages/svelte/tests/runtime-runes/samples/async-block-reject-each-during-init/_config.js
index c5dae7fee2..ca5fd9ca89 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-block-reject-each-during-init/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-block-reject-each-during-init/_config.js
@@ -24,5 +24,7 @@ export default test({
 				<p>1</p>
 			`
 		);
-	}
+	},
+
+	expect_unhandled_rejections: true
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/async-block-resolve/_config.js b/packages/svelte/tests/runtime-runes/samples/async-block-resolve/_config.js
new file mode 100644
index 0000000000..ee403290bc
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-block-resolve/_config.js
@@ -0,0 +1,63 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [increment, shift] = target.querySelectorAll('button');
+
+		shift.click();
+		await tick();
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>0</button>
+				<button>shift</button>
+				<p>even</p>
+				<p>0</p>
+			`
+		);
+
+		increment.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>1</button>
+				<button>shift</button>
+				<p>even</p>
+				<p>0</p>
+			`
+		);
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>1</button>
+				<button>shift</button>
+				<p>odd</p>
+				<p>loading...</p>
+			`
+		);
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>1</button>
+				<button>shift</button>
+				<p>odd</p>
+				<p>1</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-block-resolve/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-block-resolve/main.svelte
new file mode 100644
index 0000000000..73fe83889a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-block-resolve/main.svelte
@@ -0,0 +1,36 @@
+<script>
+	let resolvers = [];
+
+	function push(value) {
+		const { promise, resolve } = Promise.withResolvers();
+		resolvers.push(() => resolve(value));
+		return promise;
+	}
+
+	let count = $state(0);
+</script>
+
+<button onclick={() => count += 1}>{$state.eager(count)}</button>
+<button onclick={() => resolvers.shift()?.()}>shift</button>
+
+<svelte:boundary>
+	{#if await push(count) % 2 === 0}
+		<p>even</p>
+	{:else}
+		<p>odd</p>
+	{/if}
+
+	{#key count}
+		<svelte:boundary>
+			<p>{await push(count)}</p>
+
+			{#snippet pending()}
+				<p>loading...</p>
+			{/snippet}
+		</svelte:boundary>
+	{/key}
+
+	{#snippet pending()}
+		<p>loading...</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
index 682f7a0631..758ebc0004 100644
--- 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
@@ -1,7 +1,11 @@
 <script>
+	$effect(() => {
+		console.log('before');
+	});
+
 	await 1;
 
 	$effect(() => {
-		console.log('hello');
+		console.log('after');
 	});
 </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
index 81548a25ea..0908b6a9fe 100644
--- 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
@@ -3,7 +3,8 @@ import { test } from '../../test';
 
 export default test({
 	async test({ assert, logs }) {
+		assert.deepEqual(logs, []);
 		await tick();
-		assert.deepEqual(logs, ['hello']);
+		assert.deepEqual(logs, ['before', 'after']);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/Child.svelte
new file mode 100644
index 0000000000..65a225431b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/Child.svelte
@@ -0,0 +1,5 @@
+<script>
+	$effect(() => {
+		console.log('in effect')
+	});
+</script>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/_config.js b/packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/_config.js
new file mode 100644
index 0000000000..f7b6c513d4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/_config.js
@@ -0,0 +1,16 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		const [shift] = target.querySelectorAll('button');
+
+		await tick();
+		assert.deepEqual(logs, []);
+
+		shift.click();
+		await tick();
+
+		assert.deepEqual(logs, ['in effect']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/main.svelte
new file mode 100644
index 0000000000..edfd3c4d10
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-effect-after-boundary/main.svelte
@@ -0,0 +1,22 @@
+<script>
+	import Child from './Child.svelte';
+
+	let resolvers = [];
+
+	function push(value) {
+		const { promise, resolve } = Promise.withResolvers();
+		resolvers.push(() => resolve(value));
+		return promise;
+	}
+</script>
+
+<button onclick={() => resolvers.shift()?.()}>shift</button>
+
+<svelte:boundary>
+	<p>{await push('hello')}</p>
+	<Child />
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js
index 50bb414afc..7fb49c473e 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/_config.js
@@ -3,23 +3,28 @@ import { test } from '../../test';
 export default test({
 	async test({ assert, target }) {
 		// We gotta wait a bit more in this test because of the macrotasks in App.svelte
-		function macrotask(t = 3) {
+		function sleep(t = 50) {
 			return new Promise((r) => setTimeout(r, t));
 		}
 
-		await macrotask();
+		await sleep();
 		assert.htmlEqual(target.innerHTML, '<input> 1 | ');
 
 		const [input] = target.querySelectorAll('input');
 
 		input.value = '1';
 		input.dispatchEvent(new Event('input', { bubbles: true }));
-		await macrotask();
+		await sleep();
 		assert.htmlEqual(target.innerHTML, '<input> 1 | ');
 
 		input.value = '12';
 		input.dispatchEvent(new Event('input', { bubbles: true }));
-		await macrotask(6);
+		await sleep();
 		assert.htmlEqual(target.innerHTML, '<input> 3 | 12');
+
+		input.value = '';
+		input.dispatchEvent(new Event('input', { bubbles: true }));
+		await sleep();
+		assert.htmlEqual(target.innerHTML, '<input> 4 | ');
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/main.svelte
index dc4a157928..dec5a55899 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-resolve-stale/main.svelte
@@ -1,26 +1,31 @@
 <script>
 	let count = $state(0);
 	let value = $state('');
-	let prev;
+
+	let resolver;
 
 	function asd(v) {
-		const r = Promise.withResolvers();
-
-		if (prev || v === '') {
-			Promise.resolve().then(async () => {
-				count++;
-				r.resolve(v);
-				await new Promise(r => setTimeout(r, 0));
-				// TODO with a microtask like below it still throws a mutation error
-				// await Promise.resolve();
-				prev?.resolve();
+		let r = Promise.withResolvers();
+
+		function update_and_resolve() {
+			count++;
+			r.resolve(v);
+		}
+
+		// make sure the second promise resolve before the first one
+		if (resolver){
+			new Promise(r => {
+				setTimeout(r);
+			}).then(update_and_resolve).then(() => {
+				setTimeout(() => {
+					resolver();
+					resolver = null;
+				});
 			});
+		} else if (v) {
+			resolver = update_and_resolve;
 		} else {
-			prev = Promise.withResolvers();
-			prev.promise.then(() => {
-				count++;
-				r.resolve(v)
-			});
+			Promise.resolve().then(update_and_resolve);
 		}
 
 		return r.promise;

From 3009a0208fae5d804aaecde00a9182faf7b504bd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 Oct 2025 06:42:14 -0700
Subject: [PATCH 116/347] Version Packages (#16992)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/mighty-mice-call.md     |  5 -----
 .changeset/short-banks-yell.md     |  5 -----
 .changeset/silly-penguins-sleep.md |  5 -----
 .changeset/witty-seas-learn.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/mighty-mice-call.md
 delete mode 100644 .changeset/short-banks-yell.md
 delete mode 100644 .changeset/silly-penguins-sleep.md
 delete mode 100644 .changeset/witty-seas-learn.md

diff --git a/.changeset/mighty-mice-call.md b/.changeset/mighty-mice-call.md
deleted file mode 100644
index 340b33bd4b..0000000000
--- a/.changeset/mighty-mice-call.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: keep batches alive until all async work is complete
diff --git a/.changeset/short-banks-yell.md b/.changeset/short-banks-yell.md
deleted file mode 100644
index 34d5ba66d3..0000000000
--- a/.changeset/short-banks-yell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't preserve reactivity context across function boundaries
diff --git a/.changeset/silly-penguins-sleep.md b/.changeset/silly-penguins-sleep.md
deleted file mode 100644
index f397f1e8ba..0000000000
--- a/.changeset/silly-penguins-sleep.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: make `$inspect` logs come from the callsite
diff --git a/.changeset/witty-seas-learn.md b/.changeset/witty-seas-learn.md
deleted file mode 100644
index aa94c7c35f..0000000000
--- a/.changeset/witty-seas-learn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ensure guards (eg. if, each, key) run before their contents
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 4db131114d..c3f4050a16 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.41.2
+
+### Patch Changes
+
+- fix: keep batches alive until all async work is complete ([#16971](https://github.com/sveltejs/svelte/pull/16971))
+
+- fix: don't preserve reactivity context across function boundaries ([#17002](https://github.com/sveltejs/svelte/pull/17002))
+
+- fix: make `$inspect` logs come from the callsite ([#17001](https://github.com/sveltejs/svelte/pull/17001))
+
+- fix: ensure guards (eg. if, each, key) run before their contents ([#16930](https://github.com/sveltejs/svelte/pull/16930))
+
 ## 5.41.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index b5a20ce82a..29c5042e18 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.41.1",
+  "version": "5.41.2",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index e33d22d4c4..d34bcdc67f 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.41.1';
+export const VERSION = '5.41.2';
 export const PUBLIC_VERSION = '5';

From 851da4b629abe9a50371f904bfafb0e94748df76 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 22 Oct 2025 09:47:22 -0700
Subject: [PATCH 117/347] chore: exclude vite optimized deps from stack traces
 (#17008)

---
 .changeset/dirty-planes-tell.md                    | 5 +++++
 packages/svelte/src/internal/client/dev/tracing.js | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/dirty-planes-tell.md

diff --git a/.changeset/dirty-planes-tell.md b/.changeset/dirty-planes-tell.md
new file mode 100644
index 0000000000..7e057261c4
--- /dev/null
+++ b/.changeset/dirty-planes-tell.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: exclude vite optimized deps from stack traces
diff --git a/packages/svelte/src/internal/client/dev/tracing.js b/packages/svelte/src/internal/client/dev/tracing.js
index 95baefc64a..98be92d4b2 100644
--- a/packages/svelte/src/internal/client/dev/tracing.js
+++ b/packages/svelte/src/internal/client/dev/tracing.js
@@ -153,16 +153,20 @@ export function get_stack(label) {
 
 	for (let i = 0; i < lines.length; i++) {
 		const line = lines[i];
+		const posixified = line.replaceAll('\\', '/');
 
 		if (line === 'Error') {
 			continue;
 		}
+
 		if (line.includes('validate_each_keys')) {
 			return null;
 		}
-		if (line.includes('svelte/src/internal') || line.includes('svelte\\src\\internal')) {
+
+		if (posixified.includes('svelte/src/internal') || posixified.includes('node_modules/.vite')) {
 			continue;
 		}
+
 		new_lines.push(line);
 	}
 

From a28904c87a3c1570fcd4c206ded3962dcb46cc89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Oct 2025 13:58:07 -0700
Subject: [PATCH 118/347] chore(deps): bump vite from 5.4.20 to 7.1.11 (#17006)

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

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 7.1.11
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7a8075038b..0afaef0ceb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -733,6 +733,10 @@ packages:
     resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
+  '@eslint-community/regexpp@4.12.2':
+    resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
   '@eslint/config-array@0.18.0':
     resolution: {integrity: sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1755,8 +1759,8 @@ packages:
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  get-tsconfig@4.12.0:
-    resolution: {integrity: sha512-LScr2aNr2FbjAjZh2C6X6BxRx1/x+aTDExct/xyq2XKbYOiG5c0aK7pMsSuyc0brz3ibr/lbQiHD9jzt4lccJw==}
+  get-tsconfig@4.13.0:
+    resolution: {integrity: sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==}
 
   glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
@@ -3247,6 +3251,8 @@ snapshots:
 
   '@eslint-community/regexpp@4.12.1': {}
 
+  '@eslint-community/regexpp@4.12.2': {}
+
   '@eslint/config-array@0.18.0':
     dependencies:
       '@eslint/object-schema': 2.1.4
@@ -4122,7 +4128,7 @@ snapshots:
   eslint-plugin-es-x@7.8.0(eslint@9.9.1):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
-      '@eslint-community/regexpp': 4.12.1
+      '@eslint-community/regexpp': 4.12.2
       eslint: 9.9.1
       eslint-compat-utils: 0.5.1(eslint@9.9.1)
 
@@ -4135,7 +4141,7 @@ snapshots:
       enhanced-resolve: 5.18.3
       eslint: 9.9.1
       eslint-plugin-es-x: 7.8.0(eslint@9.9.1)
-      get-tsconfig: 4.12.0
+      get-tsconfig: 4.13.0
       globals: 15.15.0
       ignore: 5.3.2
       minimatch: 9.0.5
@@ -4331,7 +4337,7 @@ snapshots:
 
   function-bind@1.1.2: {}
 
-  get-tsconfig@4.12.0:
+  get-tsconfig@4.13.0:
     dependencies:
       resolve-pkg-maps: 1.0.0
 

From 16117d9b692728c0d5b5288d8e3be7b7211e2afc Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 23 Oct 2025 20:29:21 +0200
Subject: [PATCH 119/347] perf: skip repeatedly traversing the same derived
 (#17016)

* perf: skip repeatedly traversing the same derived

We introduce a new flag which marks a derived during the mark_reaction phase and lift it during the execution phase.

* fix

This introduces a new flag which marks a derived as visited during the mark_reaction phase and lifts it during the dirty-check/execution phase (both are necessary because not all deriveds are necessarily executed, but they're always checked).

We could've used a Set on mark_reactions which would've been simpler to reason about, alas it was performing consistenly worse on the kairo_mux_unowned / kairo_mux_owned benchmarks (it kinda makes sense generally, creating and filling a set is more expensive than juggling flags).

Closes #16658, which showcases are particularly gnarly signal graph where many deriveds point to the same deriveds, where we would be traversing the same reactions over and over if we didn't do this.

I also added a similar measure (this time a set/map is unavoidable/makes more sense) for mark_effects, hopefully this helps for #16990
---
 .changeset/slimy-gifts-cough.md               |  5 +++
 .../svelte/src/internal/client/constants.js   | 15 +++++++--
 .../src/internal/client/reactivity/batch.js   | 32 +++++++++++++++----
 .../internal/client/reactivity/deriveds.js    |  5 ++-
 .../src/internal/client/reactivity/sources.js |  8 +++--
 .../svelte/src/internal/client/runtime.js     |  7 +++-
 6 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/slimy-gifts-cough.md

diff --git a/.changeset/slimy-gifts-cough.md b/.changeset/slimy-gifts-cough.md
new file mode 100644
index 0000000000..b6c9897648
--- /dev/null
+++ b/.changeset/slimy-gifts-cough.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+perf: skip repeatedly traversing the same derived
diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js
index 50a7a21ae8..1f35add2a8 100644
--- a/packages/svelte/src/internal/client/constants.js
+++ b/packages/svelte/src/internal/client/constants.js
@@ -1,3 +1,4 @@
+// General flags
 export const DERIVED = 1 << 1;
 export const EFFECT = 1 << 2;
 export const RENDER_EFFECT = 1 << 3;
@@ -5,13 +6,13 @@ export const BLOCK_EFFECT = 1 << 4;
 export const BRANCH_EFFECT = 1 << 5;
 export const ROOT_EFFECT = 1 << 6;
 export const BOUNDARY_EFFECT = 1 << 7;
-export const UNOWNED = 1 << 8;
-export const DISCONNECTED = 1 << 9;
 export const CLEAN = 1 << 10;
 export const DIRTY = 1 << 11;
 export const MAYBE_DIRTY = 1 << 12;
 export const INERT = 1 << 13;
 export const DESTROYED = 1 << 14;
+
+// Flags exclusive to effects
 export const EFFECT_RAN = 1 << 15;
 /** 'Transparent' effects do not create a transition boundary */
 export const EFFECT_TRANSPARENT = 1 << 16;
@@ -20,6 +21,16 @@ export const HEAD_EFFECT = 1 << 18;
 export const EFFECT_PRESERVED = 1 << 19;
 export const USER_EFFECT = 1 << 20;
 
+// Flags exclusive to deriveds
+export const UNOWNED = 1 << 8;
+export const DISCONNECTED = 1 << 9;
+/**
+ * Tells that we marked this derived and its reactions as visited during the "mark as (maybe) dirty"-phase.
+ * Will be lifted during execution of the derived and during checking its dirty state (both are necessary
+ * because a derived might be checked but not executed).
+ */
+export const WAS_MARKED = 1 << 15;
+
 // Flags used for async
 export const REACTION_IS_UPDATING = 1 << 21;
 export const ASYNC = 1 << 22;
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 91635bd5d2..2cef562ac9 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -377,8 +377,12 @@ export class Batch {
 				// Re-run async/block effects that depend on distinct values changed in both batches
 				const others = [...batch.current.keys()].filter((s) => !this.current.has(s));
 				if (others.length > 0) {
+					/** @type {Set<Value>} */
+					const marked = new Set();
+					/** @type {Map<Reaction, boolean>} */
+					const checked = new Map();
 					for (const source of sources) {
-						mark_effects(source, others);
+						mark_effects(source, others, marked, checked);
 					}
 
 					if (queued_root_effects.length > 0) {
@@ -688,15 +692,24 @@ function flush_queued_effects(effects) {
  * these effects can re-run after another batch has been committed
  * @param {Value} value
  * @param {Source[]} sources
+ * @param {Set<Value>} marked
+ * @param {Map<Reaction, boolean>} checked
  */
-function mark_effects(value, sources) {
+function mark_effects(value, sources, marked, checked) {
+	if (marked.has(value)) return;
+	marked.add(value);
+
 	if (value.reactions !== null) {
 		for (const reaction of value.reactions) {
 			const flags = reaction.f;
 
 			if ((flags & DERIVED) !== 0) {
-				mark_effects(/** @type {Derived} */ (reaction), sources);
-			} else if ((flags & (ASYNC | BLOCK_EFFECT)) !== 0 && depends_on(reaction, sources)) {
+				mark_effects(/** @type {Derived} */ (reaction), sources, marked, checked);
+			} else if (
+				(flags & (ASYNC | BLOCK_EFFECT)) !== 0 &&
+				(flags & DIRTY) === 0 && // we may have scheduled this one already
+				depends_on(reaction, sources, checked)
+			) {
 				set_signal_status(reaction, DIRTY);
 				schedule_effect(/** @type {Effect} */ (reaction));
 			}
@@ -707,20 +720,27 @@ function mark_effects(value, sources) {
 /**
  * @param {Reaction} reaction
  * @param {Source[]} sources
+ * @param {Map<Reaction, boolean>} checked
  */
-function depends_on(reaction, sources) {
+function depends_on(reaction, sources, checked) {
+	const depends = checked.get(reaction);
+	if (depends !== undefined) return depends;
+
 	if (reaction.deps !== null) {
 		for (const dep of reaction.deps) {
 			if (sources.includes(dep)) {
 				return true;
 			}
 
-			if ((dep.f & DERIVED) !== 0 && depends_on(/** @type {Derived} */ (dep), sources)) {
+			if ((dep.f & DERIVED) !== 0 && depends_on(/** @type {Derived} */ (dep), sources, checked)) {
+				checked.set(/** @type {Derived} */ (dep), true);
 				return true;
 			}
 		}
 	}
 
+	checked.set(reaction, false);
+
 	return false;
 }
 
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 06ae0f6d7a..5a3dee4b7f 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -10,7 +10,8 @@ import {
 	MAYBE_DIRTY,
 	STALE_REACTION,
 	UNOWNED,
-	ASYNC
+	ASYNC,
+	WAS_MARKED
 } from '#client/constants';
 import {
 	active_reaction,
@@ -326,6 +327,7 @@ export function execute_derived(derived) {
 
 			stack.push(derived);
 
+			derived.f &= ~WAS_MARKED;
 			destroy_derived_effects(derived);
 			value = update_reaction(derived);
 		} finally {
@@ -335,6 +337,7 @@ export function execute_derived(derived) {
 		}
 	} else {
 		try {
+			derived.f &= ~WAS_MARKED;
 			destroy_derived_effects(derived);
 			value = update_reaction(derived);
 		} finally {
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index c5dcff9cfb..2fe8c4f75d 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -27,7 +27,8 @@ import {
 	MAYBE_DIRTY,
 	BLOCK_EFFECT,
 	ROOT_EFFECT,
-	ASYNC
+	ASYNC,
+	WAS_MARKED
 } from '#client/constants';
 import * as e from '../errors.js';
 import { legacy_mode_flag, tracing_mode_flag } from '../../flags/index.js';
@@ -332,7 +333,10 @@ function mark_reactions(signal, status) {
 		}
 
 		if ((flags & DERIVED) !== 0) {
-			mark_reactions(/** @type {Derived} */ (reaction), MAYBE_DIRTY);
+			if ((flags & WAS_MARKED) === 0) {
+				reaction.f |= WAS_MARKED;
+				mark_reactions(/** @type {Derived} */ (reaction), MAYBE_DIRTY);
+			}
 		} else if (not_dirty) {
 			if ((flags & BLOCK_EFFECT) !== 0) {
 				if (eager_block_effects !== null) {
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index a146659bf6..2e6f05b4b1 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -20,7 +20,8 @@ import {
 	DISCONNECTED,
 	REACTION_IS_UPDATING,
 	STALE_REACTION,
-	ERROR_VALUE
+	ERROR_VALUE,
+	WAS_MARKED
 } from './constants.js';
 import { old_values } from './reactivity/sources.js';
 import {
@@ -161,6 +162,10 @@ export function is_dirty(reaction) {
 		var dependencies = reaction.deps;
 		var is_unowned = (flags & UNOWNED) !== 0;
 
+		if (flags & DERIVED) {
+			reaction.f &= ~WAS_MARKED;
+		}
+
 		if (dependencies !== null) {
 			var i;
 			var dependency;

From 86aedaecf9ffd9f18008bcfdd07b364e93ea6c1f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Oct 2025 20:49:22 +0200
Subject: [PATCH 120/347] Version Packages (#17009)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/dirty-planes-tell.md | 5 -----
 .changeset/slimy-gifts-cough.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/dirty-planes-tell.md
 delete mode 100644 .changeset/slimy-gifts-cough.md

diff --git a/.changeset/dirty-planes-tell.md b/.changeset/dirty-planes-tell.md
deleted file mode 100644
index 7e057261c4..0000000000
--- a/.changeset/dirty-planes-tell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: exclude vite optimized deps from stack traces
diff --git a/.changeset/slimy-gifts-cough.md b/.changeset/slimy-gifts-cough.md
deleted file mode 100644
index b6c9897648..0000000000
--- a/.changeset/slimy-gifts-cough.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-perf: skip repeatedly traversing the same derived
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index c3f4050a16..7692383aed 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.41.3
+
+### Patch Changes
+
+- chore: exclude vite optimized deps from stack traces ([#17008](https://github.com/sveltejs/svelte/pull/17008))
+
+- perf: skip repeatedly traversing the same derived ([#17016](https://github.com/sveltejs/svelte/pull/17016))
+
 ## 5.41.2
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 29c5042e18..2cb3bf4ab3 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.41.2",
+  "version": "5.41.3",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index d34bcdc67f..81ead49fca 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.41.2';
+export const VERSION = '5.41.3';
 export const PUBLIC_VERSION = '5';

From cd3a11edff529463376a661fae632122ac49a21a Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Fri, 24 Oct 2025 00:26:41 +0200
Subject: [PATCH 121/347] fix: take into account static blocks when determining
 transition locality (#17018)

The "is this a transparent effect we can ignore" logic for determining whether or not to play a local transition didn't account for pruned block effects. This fix marks the child branch as transparent if the block effect was, and during traversal then checks if the branch is the child of a block - if not that means it's the child of a pruned block effect.

fixes #16826
---
 .changeset/easy-paths-take.md                 |  5 +++++
 .../svelte/src/internal/client/constants.js   |  5 ++++-
 .../src/internal/client/reactivity/effects.js | 10 ++++++++-
 .../transition-if-nested-static/_config.js    | 22 +++++++++++++++++++
 .../transition-if-nested-static/main.svelte   | 18 +++++++++++++++
 5 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/easy-paths-take.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/transition-if-nested-static/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/transition-if-nested-static/main.svelte

diff --git a/.changeset/easy-paths-take.md b/.changeset/easy-paths-take.md
new file mode 100644
index 0000000000..1378322abe
--- /dev/null
+++ b/.changeset/easy-paths-take.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: take into account static blocks when determining transition locality
diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js
index 1f35add2a8..6818fd9d30 100644
--- a/packages/svelte/src/internal/client/constants.js
+++ b/packages/svelte/src/internal/client/constants.js
@@ -14,7 +14,10 @@ export const DESTROYED = 1 << 14;
 
 // Flags exclusive to effects
 export const EFFECT_RAN = 1 << 15;
-/** 'Transparent' effects do not create a transition boundary */
+/**
+ * 'Transparent' effects do not create a transition boundary.
+ * This is on a block effect 99% of the time but may also be on a branch effect if its parent block effect was pruned
+ */
 export const EFFECT_TRANSPARENT = 1 << 16;
 export const INSPECT_EFFECT = 1 << 17;
 export const HEAD_EFFECT = 1 << 18;
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index bfbb95a8db..9b54598f9e 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -149,6 +149,9 @@ function create_effect(type, fn, sync, push = true) {
 			(e.f & EFFECT_PRESERVED) === 0
 		) {
 			e = e.first;
+			if ((type & BLOCK_EFFECT) !== 0 && (type & EFFECT_TRANSPARENT) !== 0 && e !== null) {
+				e.f |= EFFECT_TRANSPARENT;
+			}
 		}
 
 		if (e !== null) {
@@ -604,7 +607,12 @@ export function pause_children(effect, transitions, local) {
 
 	while (child !== null) {
 		var sibling = child.next;
-		var transparent = (child.f & EFFECT_TRANSPARENT) !== 0 || (child.f & BRANCH_EFFECT) !== 0;
+		var transparent =
+			(child.f & EFFECT_TRANSPARENT) !== 0 ||
+			// If this is a branch effect without a block effect parent,
+			// it means the parent block effect was pruned. In that case,
+			// transparency information was transferred to the branch effect.
+			((child.f & BRANCH_EFFECT) !== 0 && (effect.f & BLOCK_EFFECT) !== 0);
 		// TODO we don't need to call pause_children recursively with a linked list in place
 		// it's slightly more involved though as we have to account for `transparent` changing
 		// through the tree.
diff --git a/packages/svelte/tests/runtime-runes/samples/transition-if-nested-static/_config.js b/packages/svelte/tests/runtime-runes/samples/transition-if-nested-static/_config.js
new file mode 100644
index 0000000000..900d6daff8
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/transition-if-nested-static/_config.js
@@ -0,0 +1,22 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const btn = target.querySelector('button');
+
+		btn?.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>Toggle</button>
+			<div>Should not transition out</div>
+		`
+		);
+
+		btn?.click();
+		flushSync();
+		assert.htmlEqual(target.innerHTML, '<button>Toggle</button>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/transition-if-nested-static/main.svelte b/packages/svelte/tests/runtime-runes/samples/transition-if-nested-static/main.svelte
new file mode 100644
index 0000000000..84f6ee77af
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/transition-if-nested-static/main.svelte
@@ -0,0 +1,18 @@
+
+<script>
+	import { slide } from 'svelte/transition';
+	let showText = $state(false);
+	let show = $state(true);
+</script>
+
+<button onclick={() => showText = !showText}>
+	Toggle
+</button>
+
+{#if showText}
+	{#if show}
+		<div transition:slide>
+			Should not transition out
+		</div>
+	{/if}
+{/if}

From bd697c12c6ac31c178e8002d5f11a32161733ad2 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Fri, 24 Oct 2025 00:27:17 +0200
Subject: [PATCH 122/347] fix: flush pending changes after rendering `failed`
 snippet (#16995)

fixes #16730
---
 .changeset/slimy-turtles-yell.md              |  5 +++++
 .../internal/client/dom/blocks/boundary.js    |  2 +-
 .../samples/error-boundary-23/_config.js      | 12 +++++++++++
 .../samples/error-boundary-23/main.svelte     | 20 +++++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/slimy-turtles-yell.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/error-boundary-23/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/error-boundary-23/main.svelte

diff --git a/.changeset/slimy-turtles-yell.md b/.changeset/slimy-turtles-yell.md
new file mode 100644
index 0000000000..e3f3a66264
--- /dev/null
+++ b/.changeset/slimy-turtles-yell.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: flush pending changes after rendering `failed` snippet
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 3da9204571..72e64b1a3a 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -30,7 +30,6 @@ import {
 	skip_nodes,
 	set_hydrate_node
 } from '../hydration.js';
-import { get_next_sibling } from '../operations.js';
 import { queue_micro_task } from '../task.js';
 import * as e from '../../errors.js';
 import * as w from '../../warnings.js';
@@ -402,6 +401,7 @@ export class Boundary {
 		if (failed) {
 			queue_micro_task(() => {
 				this.#failed_effect = this.#run(() => {
+					Batch.ensure();
 					this.#is_creating_fallback = true;
 
 					try {
diff --git a/packages/svelte/tests/runtime-runes/samples/error-boundary-23/_config.js b/packages/svelte/tests/runtime-runes/samples/error-boundary-23/_config.js
new file mode 100644
index 0000000000..7a6a66eb66
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/error-boundary-23/_config.js
@@ -0,0 +1,12 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		const btn = target.querySelector('button');
+		btn?.click();
+		await tick();
+
+		assert.deepEqual(logs, ['attachment']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/error-boundary-23/main.svelte b/packages/svelte/tests/runtime-runes/samples/error-boundary-23/main.svelte
new file mode 100644
index 0000000000..c1fe20d931
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/error-boundary-23/main.svelte
@@ -0,0 +1,20 @@
+<script>
+	let fail = $state(false);
+
+	function error() {
+		throw new Error('oops');
+	}
+
+	function attachment() {
+		console.log('attachment');
+	}
+</script>
+
+<svelte:boundary>
+	{fail ? error() : 'all good'}
+	<button onclick={() => fail = true}>fail</button>
+	
+	{#snippet failed()}
+		<div {@attach attachment}>oops!</div>
+	{/snippet}
+</svelte:boundary>

From 0b477871e870db59ad10c3c0c6be008752db7f2d Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 23 Oct 2025 15:49:29 -0700
Subject: [PATCH 123/347] fix: coordinate mount of snippets with await
 expressions

---
 .changeset/huge-poets-tickle.md               |  5 +++
 .../internal/client/dom/blocks/boundary.js    | 31 +++++++++++++++++--
 .../Child.svelte                              |  8 +++++
 .../_config.js                                | 25 +++++++++++++++
 .../main.svelte                               | 23 ++++++++++++++
 5 files changed, 89 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/huge-poets-tickle.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte

diff --git a/.changeset/huge-poets-tickle.md b/.changeset/huge-poets-tickle.md
new file mode 100644
index 0000000000..f2b1ba6f25
--- /dev/null
+++ b/.changeset/huge-poets-tickle.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: coordinate mount of snippets with await expressions
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 3da9204571..a8932427cd 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -30,7 +30,7 @@ import {
 	skip_nodes,
 	set_hydrate_node
 } from '../hydration.js';
-import { get_next_sibling } from '../operations.js';
+import { create_text, get_next_sibling } from '../operations.js';
 import { queue_micro_task } from '../task.js';
 import * as e from '../../errors.js';
 import * as w from '../../warnings.js';
@@ -93,6 +93,9 @@ export class Boundary {
 	/** @type {DocumentFragment | null} */
 	#offscreen_fragment = null;
 
+	/** @type {TemplateNode | null} */
+	#pending_anchor = null;
+
 	#local_pending_count = 0;
 	#pending_count = 0;
 
@@ -156,8 +159,17 @@ export class Boundary {
 					this.#hydrate_resolved_content();
 				}
 			} else {
+				var anchor = this.#anchor;
+
+				if (this.#pending) {
+					this.#pending_anchor = create_text();
+					this.#anchor.before(this.#pending_anchor);
+
+					anchor = this.#pending_anchor;
+				}
+
 				try {
-					this.#main_effect = branch(() => children(this.#anchor));
+					this.#main_effect = branch(() => children(anchor));
 				} catch (error) {
 					this.error(error);
 				}
@@ -166,6 +178,7 @@ export class Boundary {
 					this.#show_pending_snippet();
 				} else {
 					this.#pending = false;
+					this.#pending_anchor?.remove();
 				}
 			}
 		}, flags);
@@ -195,9 +208,18 @@ export class Boundary {
 		this.#pending_effect = branch(() => pending(this.#anchor));
 
 		Batch.enqueue(() => {
+			var anchor = this.#anchor;
+
+			if (this.#pending) {
+				this.#pending_anchor = create_text();
+				this.#anchor.before(this.#pending_anchor);
+
+				anchor = this.#pending_anchor;
+			}
+
 			this.#main_effect = this.#run(() => {
 				Batch.ensure();
-				return branch(() => this.#children(this.#anchor));
+				return branch(() => this.#children(anchor));
 			});
 
 			if (this.#pending_count > 0) {
@@ -208,6 +230,7 @@ export class Boundary {
 				});
 
 				this.#pending = false;
+				this.#pending_anchor?.remove();
 			}
 		});
 	}
@@ -253,6 +276,7 @@ export class Boundary {
 
 		if (this.#main_effect !== null) {
 			this.#offscreen_fragment = document.createDocumentFragment();
+			this.#offscreen_fragment.append(/** @type {TemplateNode} */ (this.#pending_anchor));
 			move_effect(this.#main_effect, this.#offscreen_fragment);
 		}
 
@@ -288,6 +312,7 @@ export class Boundary {
 			}
 
 			if (this.#offscreen_fragment) {
+				this.#pending_anchor?.remove();
 				this.#anchor.before(this.#offscreen_fragment);
 				this.#offscreen_fragment = null;
 			}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte
new file mode 100644
index 0000000000..9b708ddef4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte
@@ -0,0 +1,8 @@
+<script>
+	let { children, push } = $props();
+
+	let message = await push('hello from child');
+</script>
+
+<p>message: {message}</p>
+{@render children()}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js
new file mode 100644
index 0000000000..b6ca2ae3d2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js
@@ -0,0 +1,25 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [shift] = target.querySelectorAll('button');
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, `<button>shift</button><p>loading...</p>`);
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<p>message: hello from child</p>
+				<p>hello from parent</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte
new file mode 100644
index 0000000000..86768eb59d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	import Child from './Child.svelte';
+
+	const resolvers = [];
+
+	function push(value) {
+		const { promise, resolve } = Promise.withResolvers();
+		resolvers.push(() => resolve(value));
+		return promise;
+	}
+</script>
+
+<button onclick={() => resolvers.shift()?.()}>shift</button>
+
+<svelte:boundary>
+	<Child {push}>
+		<p>{await push('hello from parent')}</p>
+	</Child>
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>

From 523c85bd3d592ab930e81fe29aef2805a41c7bf3 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 23 Oct 2025 15:58:12 -0700
Subject: [PATCH 124/347] merge

---
 .changeset/huge-poets-tickle.md               |  5 ----
 .../internal/client/dom/blocks/boundary.js    | 30 ++-----------------
 .../Child.svelte                              |  8 -----
 .../_config.js                                | 25 ----------------
 .../main.svelte                               | 23 --------------
 5 files changed, 2 insertions(+), 89 deletions(-)
 delete mode 100644 .changeset/huge-poets-tickle.md
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte

diff --git a/.changeset/huge-poets-tickle.md b/.changeset/huge-poets-tickle.md
deleted file mode 100644
index f2b1ba6f25..0000000000
--- a/.changeset/huge-poets-tickle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: coordinate mount of snippets with await expressions
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 3c7e88b9ed..72e64b1a3a 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -30,7 +30,6 @@ import {
 	skip_nodes,
 	set_hydrate_node
 } from '../hydration.js';
-import { create_text } from '../operations.js';
 import { queue_micro_task } from '../task.js';
 import * as e from '../../errors.js';
 import * as w from '../../warnings.js';
@@ -93,9 +92,6 @@ export class Boundary {
 	/** @type {DocumentFragment | null} */
 	#offscreen_fragment = null;
 
-	/** @type {TemplateNode | null} */
-	#pending_anchor = null;
-
 	#local_pending_count = 0;
 	#pending_count = 0;
 
@@ -159,17 +155,8 @@ export class Boundary {
 					this.#hydrate_resolved_content();
 				}
 			} else {
-				var anchor = this.#anchor;
-
-				if (this.#pending) {
-					this.#pending_anchor = create_text();
-					this.#anchor.before(this.#pending_anchor);
-
-					anchor = this.#pending_anchor;
-				}
-
 				try {
-					this.#main_effect = branch(() => children(anchor));
+					this.#main_effect = branch(() => children(this.#anchor));
 				} catch (error) {
 					this.error(error);
 				}
@@ -178,7 +165,6 @@ export class Boundary {
 					this.#show_pending_snippet();
 				} else {
 					this.#pending = false;
-					this.#pending_anchor?.remove();
 				}
 			}
 		}, flags);
@@ -208,18 +194,9 @@ export class Boundary {
 		this.#pending_effect = branch(() => pending(this.#anchor));
 
 		Batch.enqueue(() => {
-			var anchor = this.#anchor;
-
-			if (this.#pending) {
-				this.#pending_anchor = create_text();
-				this.#anchor.before(this.#pending_anchor);
-
-				anchor = this.#pending_anchor;
-			}
-
 			this.#main_effect = this.#run(() => {
 				Batch.ensure();
-				return branch(() => this.#children(anchor));
+				return branch(() => this.#children(this.#anchor));
 			});
 
 			if (this.#pending_count > 0) {
@@ -230,7 +207,6 @@ export class Boundary {
 				});
 
 				this.#pending = false;
-				this.#pending_anchor?.remove();
 			}
 		});
 	}
@@ -276,7 +252,6 @@ export class Boundary {
 
 		if (this.#main_effect !== null) {
 			this.#offscreen_fragment = document.createDocumentFragment();
-			this.#offscreen_fragment.append(/** @type {TemplateNode} */ (this.#pending_anchor));
 			move_effect(this.#main_effect, this.#offscreen_fragment);
 		}
 
@@ -312,7 +287,6 @@ export class Boundary {
 			}
 
 			if (this.#offscreen_fragment) {
-				this.#pending_anchor?.remove();
 				this.#anchor.before(this.#offscreen_fragment);
 				this.#offscreen_fragment = null;
 			}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte
deleted file mode 100644
index 9b708ddef4..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-	let { children, push } = $props();
-
-	let message = await push('hello from child');
-</script>
-
-<p>message: {message}</p>
-{@render children()}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js
deleted file mode 100644
index b6ca2ae3d2..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { tick } from 'svelte';
-import { test } from '../../test';
-
-export default test({
-	async test({ assert, target }) {
-		const [shift] = target.querySelectorAll('button');
-
-		shift.click();
-		await tick();
-
-		assert.htmlEqual(target.innerHTML, `<button>shift</button><p>loading...</p>`);
-
-		shift.click();
-		await tick();
-
-		assert.htmlEqual(
-			target.innerHTML,
-			`
-				<button>shift</button>
-				<p>message: hello from child</p>
-				<p>hello from parent</p>
-			`
-		);
-	}
-});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte
deleted file mode 100644
index 86768eb59d..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte
+++ /dev/null
@@ -1,23 +0,0 @@
-<script>
-	import Child from './Child.svelte';
-
-	const resolvers = [];
-
-	function push(value) {
-		const { promise, resolve } = Promise.withResolvers();
-		resolvers.push(() => resolve(value));
-		return promise;
-	}
-</script>
-
-<button onclick={() => resolvers.shift()?.()}>shift</button>
-
-<svelte:boundary>
-	<Child {push}>
-		<p>{await push('hello from parent')}</p>
-	</Child>
-
-	{#snippet pending()}
-		<p>loading...</p>
-	{/snippet}
-</svelte:boundary>

From 2e1dd489f6703fa3e8d192f2cca8e78e82baacc3 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 24 Oct 2025 10:29:33 -0400
Subject: [PATCH 125/347] fix: coordinate mount of snippets with await
 expressions (#17021)

* fix: coordinate mount of snippets with await expressions

* try this

* deduplicate

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .changeset/huge-poets-tickle.md               |  5 ++++
 .../internal/client/dom/blocks/boundary.js    | 30 +++++++++++++++++--
 .../Child.svelte                              |  7 +++++
 .../_config.js                                | 25 ++++++++++++++++
 .../main.svelte                               | 21 +++++++++++++
 5 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/huge-poets-tickle.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte

diff --git a/.changeset/huge-poets-tickle.md b/.changeset/huge-poets-tickle.md
new file mode 100644
index 0000000000..f2b1ba6f25
--- /dev/null
+++ b/.changeset/huge-poets-tickle.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: coordinate mount of snippets with await expressions
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 72e64b1a3a..febbc00898 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -38,6 +38,7 @@ import { 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';
+import { create_text } from '../operations.js';
 
 /**
  * @typedef {{
@@ -92,6 +93,9 @@ export class Boundary {
 	/** @type {DocumentFragment | null} */
 	#offscreen_fragment = null;
 
+	/** @type {TemplateNode | null} */
+	#pending_anchor = null;
+
 	#local_pending_count = 0;
 	#pending_count = 0;
 
@@ -155,8 +159,10 @@ export class Boundary {
 					this.#hydrate_resolved_content();
 				}
 			} else {
+				var anchor = this.#get_anchor();
+
 				try {
-					this.#main_effect = branch(() => children(this.#anchor));
+					this.#main_effect = branch(() => children(anchor));
 				} catch (error) {
 					this.error(error);
 				}
@@ -167,6 +173,10 @@ export class Boundary {
 					this.#pending = false;
 				}
 			}
+
+			return () => {
+				this.#pending_anchor?.remove();
+			};
 		}, flags);
 
 		if (hydrating) {
@@ -194,9 +204,11 @@ export class Boundary {
 		this.#pending_effect = branch(() => pending(this.#anchor));
 
 		Batch.enqueue(() => {
+			var anchor = this.#get_anchor();
+
 			this.#main_effect = this.#run(() => {
 				Batch.ensure();
-				return branch(() => this.#children(this.#anchor));
+				return branch(() => this.#children(anchor));
 			});
 
 			if (this.#pending_count > 0) {
@@ -211,6 +223,19 @@ export class Boundary {
 		});
 	}
 
+	#get_anchor() {
+		var anchor = this.#anchor;
+
+		if (this.#pending) {
+			this.#pending_anchor = create_text();
+			this.#anchor.before(this.#pending_anchor);
+
+			anchor = this.#pending_anchor;
+		}
+
+		return anchor;
+	}
+
 	/**
 	 * Returns `true` if the effect exists inside a boundary whose pending snippet is shown
 	 * @returns {boolean}
@@ -252,6 +277,7 @@ export class Boundary {
 
 		if (this.#main_effect !== null) {
 			this.#offscreen_fragment = document.createDocumentFragment();
+			this.#offscreen_fragment.append(/** @type {TemplateNode} */ (this.#pending_anchor));
 			move_effect(this.#main_effect, this.#offscreen_fragment);
 		}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte
new file mode 100644
index 0000000000..7085219a5a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/Child.svelte
@@ -0,0 +1,7 @@
+<script>
+	let { children, push } = $props();
+	let message = await push('hello from child');
+</script>
+
+<p>message: {message}</p>
+{@render children()}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js
new file mode 100644
index 0000000000..b6ca2ae3d2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/_config.js
@@ -0,0 +1,25 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [shift] = target.querySelectorAll('button');
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, `<button>shift</button><p>loading...</p>`);
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<p>message: hello from child</p>
+				<p>hello from parent</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte
new file mode 100644
index 0000000000..3ad2c9572a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-snippet-coordinated-mount/main.svelte
@@ -0,0 +1,21 @@
+<script>
+	import Child from './Child.svelte';
+	const resolvers = [];
+	function push(value) {
+		const { promise, resolve } = Promise.withResolvers();
+		resolvers.push(() => resolve(value));
+		return promise;
+	}
+</script>
+
+<button onclick={() => resolvers.shift()?.()}>shift</button>
+
+<svelte:boundary>
+	<Child {push}>
+		<p>{await push('hello from parent')}</p>
+	</Child>
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>

From f45d9cfe2dd59804d46828b1015d8e2a8ad05459 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 24 Oct 2025 10:29:50 -0400
Subject: [PATCH 126/347] fix: better optimization of await expressions
 (#17025)

---
 .changeset/odd-plants-lead.md                        |  5 +++++
 .../svelte/src/compiler/phases/2-analyze/index.js    |  2 +-
 .../3-transform/server/visitors/shared/utils.js      |  4 ++--
 packages/svelte/src/compiler/utils/ast.js            | 12 ++++++++----
 packages/svelte/src/compiler/utils/builders.js       |  4 ++--
 5 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/odd-plants-lead.md

diff --git a/.changeset/odd-plants-lead.md b/.changeset/odd-plants-lead.md
new file mode 100644
index 0000000000..1df2236c2a
--- /dev/null
+++ b/.changeset/odd-plants-lead.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: better optimization of await expressions
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 52be997374..b4c704c34d 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -6,7 +6,7 @@ import { walk } from 'zimmerframe';
 import { parse } from '../1-parse/acorn.js';
 import * as e from '../../errors.js';
 import * as w from '../../warnings.js';
-import { extract_identifiers } from '../../utils/ast.js';
+import { extract_identifiers, has_await_expression } from '../../utils/ast.js';
 import * as b from '#compiler/builders';
 import { Scope, ScopeRoot, create_scopes, get_rune, set_scope } from '../scope.js';
 import check_graph_for_cycles from './utils/check_graph_for_cycles.js';
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 f5132c1cf8..92653ed73c 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
@@ -12,7 +12,7 @@ import {
 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';
+import { has_await_expression } 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);
@@ -315,7 +315,7 @@ export class PromiseOptimiser {
 
 		const promises = b.array(
 			this.expressions.map((expression) => {
-				return expression.type === 'AwaitExpression' && !has_await(expression.argument)
+				return expression.type === 'AwaitExpression' && !has_await_expression(expression.argument)
 					? expression.argument
 					: b.call(b.thunk(expression, true));
 			})
diff --git a/packages/svelte/src/compiler/utils/ast.js b/packages/svelte/src/compiler/utils/ast.js
index 541921befb..bd92dda5d9 100644
--- a/packages/svelte/src/compiler/utils/ast.js
+++ b/packages/svelte/src/compiler/utils/ast.js
@@ -611,16 +611,20 @@ export function build_assignment_value(operator, left, right) {
 }
 
 /**
- * @param {ESTree.Expression} expression
+ * @param {ESTree.Node} node
  */
-export function has_await(expression) {
+export function has_await_expression(node) {
 	let has_await = false;
 
-	walk(expression, null, {
+	walk(node, null, {
 		AwaitExpression(_node, context) {
 			has_await = true;
 			context.stop();
-		}
+		},
+		// don't traverse into these
+		FunctionDeclaration() {},
+		FunctionExpression() {},
+		ArrowFunctionExpression() {}
 	});
 
 	return has_await;
diff --git a/packages/svelte/src/compiler/utils/builders.js b/packages/svelte/src/compiler/utils/builders.js
index 99306ce4d9..f21b0dc8b4 100644
--- a/packages/svelte/src/compiler/utils/builders.js
+++ b/packages/svelte/src/compiler/utils/builders.js
@@ -2,7 +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';
+import { has_await_expression } from './ast.js';
 
 /**
  * @param {Array<ESTree.Expression | ESTree.SpreadElement | null>} elements
@@ -451,7 +451,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') {
-		if (!has_await(expression.body.argument)) {
+		if (!has_await_expression(expression.body.argument)) {
 			return unthunk(arrow(expression.params, expression.body.argument));
 		}
 	}

From 4a214f786f24ffaa20982f3cc68b1c6a02ad0fd3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Oct 2025 12:45:51 -0400
Subject: [PATCH 127/347] Version Packages (#17019)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/easy-paths-take.md    |  5 -----
 .changeset/huge-poets-tickle.md  |  5 -----
 .changeset/odd-plants-lead.md    |  5 -----
 .changeset/slimy-turtles-yell.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/easy-paths-take.md
 delete mode 100644 .changeset/huge-poets-tickle.md
 delete mode 100644 .changeset/odd-plants-lead.md
 delete mode 100644 .changeset/slimy-turtles-yell.md

diff --git a/.changeset/easy-paths-take.md b/.changeset/easy-paths-take.md
deleted file mode 100644
index 1378322abe..0000000000
--- a/.changeset/easy-paths-take.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: take into account static blocks when determining transition locality
diff --git a/.changeset/huge-poets-tickle.md b/.changeset/huge-poets-tickle.md
deleted file mode 100644
index f2b1ba6f25..0000000000
--- a/.changeset/huge-poets-tickle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: coordinate mount of snippets with await expressions
diff --git a/.changeset/odd-plants-lead.md b/.changeset/odd-plants-lead.md
deleted file mode 100644
index 1df2236c2a..0000000000
--- a/.changeset/odd-plants-lead.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: better optimization of await expressions
diff --git a/.changeset/slimy-turtles-yell.md b/.changeset/slimy-turtles-yell.md
deleted file mode 100644
index e3f3a66264..0000000000
--- a/.changeset/slimy-turtles-yell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: flush pending changes after rendering `failed` snippet
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 7692383aed..d63548d3e1 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.41.4
+
+### Patch Changes
+
+- fix: take into account static blocks when determining transition locality ([#17018](https://github.com/sveltejs/svelte/pull/17018))
+
+- fix: coordinate mount of snippets with await expressions ([#17021](https://github.com/sveltejs/svelte/pull/17021))
+
+- fix: better optimization of await expressions ([#17025](https://github.com/sveltejs/svelte/pull/17025))
+
+- fix: flush pending changes after rendering `failed` snippet ([#16995](https://github.com/sveltejs/svelte/pull/16995))
+
 ## 5.41.3
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 2cb3bf4ab3..1d50920d4f 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.41.3",
+  "version": "5.41.4",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 81ead49fca..f5f47c6056 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.41.3';
+export const VERSION = '5.41.4';
 export const PUBLIC_VERSION = '5';

From 7434f21ed44cc9004562164e46a8b028c563d461 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 24 Oct 2025 13:17:19 -0400
Subject: [PATCH 128/347] chore: configurable sandbox output (#17028)

---
 playgrounds/sandbox/run.js | 96 +++++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 38 deletions(-)

diff --git a/playgrounds/sandbox/run.js b/playgrounds/sandbox/run.js
index 639b755020..7ff9f7c4cd 100644
--- a/playgrounds/sandbox/run.js
+++ b/playgrounds/sandbox/run.js
@@ -5,6 +5,13 @@ import { parseArgs } from 'node:util';
 import { globSync } from 'tinyglobby';
 import { compile, compileModule, parse, migrate } from 'svelte/compiler';
 
+// toggle these to change what gets written to sandbox/output
+const AST = false;
+const MIGRATE = false;
+const FROM_HTML = true;
+const FROM_TREE = false;
+const DEV = false;
+
 const argv = parseArgs({ options: { runes: { type: 'boolean' } }, args: process.argv.slice(2) });
 
 const cwd = fileURLToPath(new URL('.', import.meta.url)).slice(0, -1);
@@ -51,48 +58,52 @@ for (const generate of /** @type {const} */ (['client', 'server'])) {
 		mkdirp(path.dirname(output_js));
 
 		if (generate === 'client') {
-			const ast = parse(source, {
-				modern: true
-			});
+			if (AST) {
+				const ast = parse(source, {
+					modern: true
+				});
+
+				write(
+					`${cwd}/output/ast/${file}.json`,
+					JSON.stringify(
+						ast,
+						(key, value) => (typeof value === 'bigint' ? ['BigInt', value.toString()] : value),
+						'\t'
+					)
+				);
+			}
 
-			write(
-				`${cwd}/output/ast/${file}.json`,
-				JSON.stringify(
-					ast,
-					(key, value) => (typeof value === 'bigint' ? ['BigInt', value.toString()] : value),
-					'\t'
-				)
-			);
-
-			try {
-				const migrated = migrate(source);
-				write(`${cwd}/output/migrated/${file}`, migrated.code);
-			} catch (e) {
-				console.warn(`Error migrating ${file}`, e);
+			if (MIGRATE) {
+				try {
+					const migrated = migrate(source);
+					write(`${cwd}/output/migrated/${file}`, migrated.code);
+				} catch (e) {
+					console.warn(`Error migrating ${file}`, e);
+				}
 			}
 		}
 
-		const compiled = compile(source, {
-			dev: false,
-			filename: input,
-			generate,
-			runes: argv.values.runes,
-			experimental: {
-				async: true
-			}
-		});
+		let from_html;
+		let from_tree;
 
-		for (const warning of compiled.warnings) {
-			console.warn(warning.code);
-			console.warn(warning.frame);
-		}
+		if (generate === 'server' || FROM_HTML) {
+			from_html = compile(source, {
+				dev: DEV,
+				filename: input,
+				generate,
+				runes: argv.values.runes,
+				experimental: {
+					async: true
+				}
+			});
 
-		write(output_js, compiled.js.code + '\n//# sourceMappingURL=' + path.basename(output_map));
-		write(output_map, compiled.js.map.toString());
+			write(output_js, from_html.js.code + '\n//# sourceMappingURL=' + path.basename(output_map));
+			write(output_map, from_html.js.map.toString());
+		}
 
 		// generate with fragments: 'tree'
-		if (generate === 'client') {
-			const compiled = compile(source, {
+		if (generate === 'client' && FROM_TREE) {
+			from_tree = compile(source, {
 				dev: false,
 				filename: input,
 				generate,
@@ -106,12 +117,21 @@ for (const generate of /** @type {const} */ (['client', 'server'])) {
 			const output_js = `${cwd}/output/${generate}/${file}.tree.js`;
 			const output_map = `${cwd}/output/${generate}/${file}.tree.js.map`;
 
-			write(output_js, compiled.js.code + '\n//# sourceMappingURL=' + path.basename(output_map));
-			write(output_map, compiled.js.map.toString());
+			write(output_js, from_tree.js.code + '\n//# sourceMappingURL=' + path.basename(output_map));
+			write(output_map, from_tree.js.map.toString());
 		}
 
-		if (compiled.css) {
-			write(output_css, compiled.css.code);
+		const compiled = from_html ?? from_tree;
+
+		if (compiled) {
+			for (const warning of compiled.warnings) {
+				console.warn(warning.code);
+				console.warn(warning.frame);
+			}
+
+			if (compiled.css) {
+				write(output_css, compiled.css.code);
+			}
 		}
 	}
 

From c08ecba1b79a0d91f2c69eab6af2fa0dfb8dffd0 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 24 Oct 2025 14:12:57 -0400
Subject: [PATCH 129/347] feat: forking (#17004)

* chore: run boundary async effects in the context of the current batch

* WIP

* reinstate kludge

* fix test

* WIP

* WIP

* WIP

* remove kludge

* restore batch_values after commit

* make private

* tidy up

* fix tests

* update test

* reset #dirty_effects and #maybe_dirty_effects

* add test

* WIP

* add test, fix block resolution

* bring async-effect-after-await test from defer-effects-in-pending-boundary branch

* avoid reawakening committed batches

* changeset

* cheat

* better API

* regenerate

* slightly better approach

* lint

* revert this whatever it is

* add test

* Update feature description for fork API

* error if missing experimental flag

* rename inspect effects to eager effects, run them in prod

* regenerate

* Apply suggestions from code review

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

* tidy up

* add some minimal prose. probably don't need to go super deep here as it's not really meant for non-framework authors

* bit more detail

* add a fork_timing error, regenerate

* unused

* add note

* add fork_discarded error

* require users to discard forks

* add docs

* regenerate

* tweak docs

* fix leak

* fix

* preload on focusin as well

* missed a spot

* reduce nesting

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
---
 .changeset/small-geckos-camp.md               |   5 +
 .../19-await-expressions.md                   |  48 +++++
 .../98-reference/.generated/client-errors.md  |  18 ++
 .../svelte/messages/client-errors/errors.md   |  12 ++
 packages/svelte/src/index-client.js           |   2 +-
 packages/svelte/src/index-server.js           |   4 +
 packages/svelte/src/index.d.ts                |  16 ++
 .../svelte/src/internal/client/constants.js   |   2 +-
 .../svelte/src/internal/client/dev/inspect.js |   4 +-
 .../internal/client/dom/blocks/branches.js    |  21 +-
 .../src/internal/client/dom/blocks/each.js    |   2 +-
 packages/svelte/src/internal/client/errors.js |  48 +++++
 packages/svelte/src/internal/client/proxy.js  |   8 +-
 .../src/internal/client/reactivity/batch.js   | 182 +++++++++++++++---
 .../internal/client/reactivity/deriveds.js    |   8 +-
 .../src/internal/client/reactivity/effects.js |   8 +-
 .../src/internal/client/reactivity/sources.js |  34 ++--
 .../samples/async-fork/_config.js             |  92 +++++++++
 .../samples/async-fork/main.svelte            |  37 ++++
 packages/svelte/types/index.d.ts              |  44 ++++-
 20 files changed, 531 insertions(+), 64 deletions(-)
 create mode 100644 .changeset/small-geckos-camp.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork/main.svelte

diff --git a/.changeset/small-geckos-camp.md b/.changeset/small-geckos-camp.md
new file mode 100644
index 0000000000..622cbbbfa0
--- /dev/null
+++ b/.changeset/small-geckos-camp.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+feat: experimental `fork` API
diff --git a/documentation/docs/03-template-syntax/19-await-expressions.md b/documentation/docs/03-template-syntax/19-await-expressions.md
index 1c613af870..2f73f6a47c 100644
--- a/documentation/docs/03-template-syntax/19-await-expressions.md
+++ b/documentation/docs/03-template-syntax/19-await-expressions.md
@@ -135,6 +135,54 @@ If a `<svelte:boundary>` with a `pending` snippet is encountered during SSR, tha
 
 > [!NOTE] In the future, we plan to add a streaming implementation that renders the content in the background.
 
+## Forking
+
+The [`fork(...)`](svelte#fork) API, added in 5.42, makes it possible to run `await` expressions that you _expect_ to happen in the near future. This is mainly intended for frameworks like SvelteKit to implement preloading when (for example) users signal an intent to navigate.
+
+```svelte
+<script>
+	import { fork } from 'svelte';
+	import Menu from './Menu.svelte';
+
+	let open = $state(false);
+
+	/** @type {import('svelte').Fork | null} */
+	let pending = null;
+
+	function preload() {
+		pending ??= fork(() => {
+			open = true;
+		});
+	}
+
+	function discard() {
+		pending?.discard();
+		pending = null;
+	}
+</script>
+
+<button
+	onfocusin={preload}
+	onfocusout={discard}
+	onpointerenter={preload}
+	onpointerleave={discard}
+	onclick={() => {
+		pending?.commit();
+		pending = null;
+
+		// in case `pending` didn't exist
+		// (if it did, this is a no-op)
+		open = true;
+	}}
+>open menu</button>
+
+{#if open}
+	<!-- any async work inside this component will start
+	     as soon as the fork is created -->
+	<Menu onclose={() => open = false} />
+{/if}
+```
+
 ## 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.
diff --git a/documentation/docs/98-reference/.generated/client-errors.md b/documentation/docs/98-reference/.generated/client-errors.md
index 8fdb7770aa..74a0674dba 100644
--- a/documentation/docs/98-reference/.generated/client-errors.md
+++ b/documentation/docs/98-reference/.generated/client-errors.md
@@ -130,6 +130,12 @@ $effect(() => {
 
 Often when encountering this issue, the value in question shouldn't be state (for example, if you are pushing to a `logs` array in an effect, make `logs` a normal array rather than `$state([])`). In the rare cases where you really _do_ need to write to state in an effect — [which you should avoid]($effect#When-not-to-use-$effect) — you can read the state with [untrack](svelte#untrack) to avoid adding it as a dependency.
 
+### experimental_async_fork
+
+```
+Cannot use `fork(...)` unless the `experimental.async` compiler option is `true`
+```
+
 ### flush_sync_in_effect
 
 ```
@@ -140,6 +146,18 @@ The `flushSync()` function can be used to flush any pending effects synchronousl
 
 This restriction only applies when using the `experimental.async` option, which will be active by default in Svelte 6.
 
+### fork_discarded
+
+```
+Cannot commit a fork that was already committed or discarded
+```
+
+### fork_timing
+
+```
+Cannot create a fork inside an effect or when state changes are pending
+```
+
 ### get_abort_signal_outside_reaction
 
 ```
diff --git a/packages/svelte/messages/client-errors/errors.md b/packages/svelte/messages/client-errors/errors.md
index 57ecca0489..b5fe51539d 100644
--- a/packages/svelte/messages/client-errors/errors.md
+++ b/packages/svelte/messages/client-errors/errors.md
@@ -100,6 +100,10 @@ $effect(() => {
 
 Often when encountering this issue, the value in question shouldn't be state (for example, if you are pushing to a `logs` array in an effect, make `logs` a normal array rather than `$state([])`). In the rare cases where you really _do_ need to write to state in an effect — [which you should avoid]($effect#When-not-to-use-$effect) — you can read the state with [untrack](svelte#untrack) to avoid adding it as a dependency.
 
+## experimental_async_fork
+
+> Cannot use `fork(...)` unless the `experimental.async` compiler option is `true`
+
 ## flush_sync_in_effect
 
 > Cannot use `flushSync` inside an effect
@@ -108,6 +112,14 @@ The `flushSync()` function can be used to flush any pending effects synchronousl
 
 This restriction only applies when using the `experimental.async` option, which will be active by default in Svelte 6.
 
+## fork_discarded
+
+> Cannot commit a fork that was already committed or discarded
+
+## fork_timing
+
+> Cannot create a fork inside an effect or when state changes are pending
+
 ## get_abort_signal_outside_reaction
 
 > `getAbortSignal()` can only be called inside an effect or derived
diff --git a/packages/svelte/src/index-client.js b/packages/svelte/src/index-client.js
index 337cbb500b..4fcfff980d 100644
--- a/packages/svelte/src/index-client.js
+++ b/packages/svelte/src/index-client.js
@@ -241,7 +241,7 @@ function init_update_callbacks(context) {
 	return (l.u ??= { a: [], b: [], m: [] });
 }
 
-export { flushSync } from './internal/client/reactivity/batch.js';
+export { flushSync, fork } from './internal/client/reactivity/batch.js';
 export {
 	createContext,
 	getContext,
diff --git a/packages/svelte/src/index-server.js b/packages/svelte/src/index-server.js
index 223ce6a4cd..61b0d98c06 100644
--- a/packages/svelte/src/index-server.js
+++ b/packages/svelte/src/index-server.js
@@ -33,6 +33,10 @@ export function unmount() {
 	e.lifecycle_function_unavailable('unmount');
 }
 
+export function fork() {
+	e.lifecycle_function_unavailable('fork');
+}
+
 export async function tick() {}
 
 export async function settled() {}
diff --git a/packages/svelte/src/index.d.ts b/packages/svelte/src/index.d.ts
index 38e6086689..a1782f5b61 100644
--- a/packages/svelte/src/index.d.ts
+++ b/packages/svelte/src/index.d.ts
@@ -352,4 +352,20 @@ export type MountOptions<Props extends Record<string, any> = Record<string, any>
 			props: Props;
 		});
 
+/**
+ * Represents work that is happening off-screen, such as data being preloaded
+ * in anticipation of the user navigating
+ * @since 5.42
+ */
+export interface Fork {
+	/**
+	 * Commit the fork. The promise will resolve once the state change has been applied
+	 */
+	commit(): Promise<void>;
+	/**
+	 * Discard the fork
+	 */
+	discard(): void;
+}
+
 export * from './index-client.js';
diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js
index 6818fd9d30..24dc9e4fb8 100644
--- a/packages/svelte/src/internal/client/constants.js
+++ b/packages/svelte/src/internal/client/constants.js
@@ -19,7 +19,7 @@ export const EFFECT_RAN = 1 << 15;
  * This is on a block effect 99% of the time but may also be on a branch effect if its parent block effect was pruned
  */
 export const EFFECT_TRANSPARENT = 1 << 16;
-export const INSPECT_EFFECT = 1 << 17;
+export const EAGER_EFFECT = 1 << 17;
 export const HEAD_EFFECT = 1 << 18;
 export const EFFECT_PRESERVED = 1 << 19;
 export const USER_EFFECT = 1 << 20;
diff --git a/packages/svelte/src/internal/client/dev/inspect.js b/packages/svelte/src/internal/client/dev/inspect.js
index db7ab0d976..09150d6ee4 100644
--- a/packages/svelte/src/internal/client/dev/inspect.js
+++ b/packages/svelte/src/internal/client/dev/inspect.js
@@ -1,6 +1,6 @@
 import { UNINITIALIZED } from '../../../constants.js';
 import { snapshot } from '../../shared/clone.js';
-import { inspect_effect, render_effect, validate_effect } from '../reactivity/effects.js';
+import { eager_effect, render_effect, validate_effect } from '../reactivity/effects.js';
 import { untrack } from '../runtime.js';
 import { get_stack } from './tracing.js';
 
@@ -19,7 +19,7 @@ export function inspect(get_value, inspector, show_stack = false) {
 	// stack traces. As a consequence, reading the value might result
 	// in an error (an `$inspect(object.property)` will run before the
 	// `{#if object}...{/if}` that contains it)
-	inspect_effect(() => {
+	eager_effect(() => {
 		try {
 			var value = get_value();
 		} catch (e) {
diff --git a/packages/svelte/src/internal/client/dom/blocks/branches.js b/packages/svelte/src/internal/client/dom/blocks/branches.js
index 827f9f44fa..f1b9baf6f6 100644
--- a/packages/svelte/src/internal/client/dom/blocks/branches.js
+++ b/packages/svelte/src/internal/client/dom/blocks/branches.js
@@ -1,5 +1,4 @@
 /** @import { Effect, TemplateNode } from '#client' */
-import { is_runes } from '../../context.js';
 import { Batch, current_batch } from '../../reactivity/batch.js';
 import {
 	branch,
@@ -8,7 +7,6 @@ import {
 	pause_effect,
 	resume_effect
 } from '../../reactivity/effects.js';
-import { set_should_intro, should_intro } from '../../render.js';
 import { hydrate_node, hydrating } from '../hydration.js';
 import { create_text, should_defer_append } from '../operations.js';
 
@@ -126,6 +124,22 @@ export class BranchManager {
 		}
 	};
 
+	/**
+	 * @param {Batch} batch
+	 */
+	#discard = (batch) => {
+		this.#batches.delete(batch);
+
+		const keys = Array.from(this.#batches.values());
+
+		for (const [k, branch] of this.#offscreen) {
+			if (!keys.includes(k)) {
+				destroy_effect(branch.effect);
+				this.#offscreen.delete(k);
+			}
+		}
+	};
+
 	/**
 	 *
 	 * @param {any} key
@@ -173,7 +187,8 @@ export class BranchManager {
 				}
 			}
 
-			batch.add_callback(this.#commit);
+			batch.oncommit(this.#commit);
+			batch.ondiscard(this.#discard);
 		} else {
 			if (hydrating) {
 				this.anchor = hydrate_node;
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index a6369a7211..a0fae37133 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -310,7 +310,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 					}
 				}
 
-				batch.add_callback(commit);
+				batch.oncommit(commit);
 			} else {
 				commit();
 			}
diff --git a/packages/svelte/src/internal/client/errors.js b/packages/svelte/src/internal/client/errors.js
index 937971da5e..2a433ed8f9 100644
--- a/packages/svelte/src/internal/client/errors.js
+++ b/packages/svelte/src/internal/client/errors.js
@@ -229,6 +229,22 @@ export function effect_update_depth_exceeded() {
 	}
 }
 
+/**
+ * Cannot use `fork(...)` unless the `experimental.async` compiler option is `true`
+ * @returns {never}
+ */
+export function experimental_async_fork() {
+	if (DEV) {
+		const error = new Error(`experimental_async_fork\nCannot use \`fork(...)\` unless the \`experimental.async\` compiler option is \`true\`\nhttps://svelte.dev/e/experimental_async_fork`);
+
+		error.name = 'Svelte error';
+
+		throw error;
+	} else {
+		throw new Error(`https://svelte.dev/e/experimental_async_fork`);
+	}
+}
+
 /**
  * Cannot use `flushSync` inside an effect
  * @returns {never}
@@ -245,6 +261,38 @@ export function flush_sync_in_effect() {
 	}
 }
 
+/**
+ * Cannot commit a fork that was already committed or discarded
+ * @returns {never}
+ */
+export function fork_discarded() {
+	if (DEV) {
+		const error = new Error(`fork_discarded\nCannot commit a fork that was already committed or discarded\nhttps://svelte.dev/e/fork_discarded`);
+
+		error.name = 'Svelte error';
+
+		throw error;
+	} else {
+		throw new Error(`https://svelte.dev/e/fork_discarded`);
+	}
+}
+
+/**
+ * Cannot create a fork inside an effect or when state changes are pending
+ * @returns {never}
+ */
+export function fork_timing() {
+	if (DEV) {
+		const error = new Error(`fork_timing\nCannot create a fork inside an effect or when state changes are pending\nhttps://svelte.dev/e/fork_timing`);
+
+		error.name = 'Svelte error';
+
+		throw error;
+	} else {
+		throw new Error(`https://svelte.dev/e/fork_timing`);
+	}
+}
+
 /**
  * `getAbortSignal()` can only be called inside an effect or derived
  * @returns {never}
diff --git a/packages/svelte/src/internal/client/proxy.js b/packages/svelte/src/internal/client/proxy.js
index dae3791eb0..9baacacd0d 100644
--- a/packages/svelte/src/internal/client/proxy.js
+++ b/packages/svelte/src/internal/client/proxy.js
@@ -19,8 +19,8 @@ import {
 	state as source,
 	set,
 	increment,
-	flush_inspect_effects,
-	set_inspect_effects_deferred
+	flush_eager_effects,
+	set_eager_effects_deferred
 } from './reactivity/sources.js';
 import { PROXY_PATH_SYMBOL, STATE_SYMBOL } from '#client/constants';
 import { UNINITIALIZED } from '../../constants.js';
@@ -421,9 +421,9 @@ function inspectable_array(array) {
 			 * @param {any[]} args
 			 */
 			return function (...args) {
-				set_inspect_effects_deferred();
+				set_eager_effects_deferred();
 				var result = value.apply(this, args);
-				flush_inspect_effects();
+				flush_eager_effects();
 				return result;
 			};
 		}
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 2cef562ac9..fdeb111a4d 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -1,3 +1,4 @@
+/** @import { Fork } from 'svelte' */
 /** @import { Derived, Effect, Reaction, Source, Value } from '#client' */
 import {
 	BLOCK_EFFECT,
@@ -12,25 +13,35 @@ import {
 	ROOT_EFFECT,
 	MAYBE_DIRTY,
 	DERIVED,
-	BOUNDARY_EFFECT
+	BOUNDARY_EFFECT,
+	EAGER_EFFECT
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
 import {
 	active_effect,
 	get,
+	increment_write_version,
 	is_dirty,
 	is_updating_effect,
 	set_is_updating_effect,
 	set_signal_status,
+	tick,
 	update_effect
 } from '../runtime.js';
 import * as e from '../errors.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, source, update } from './sources.js';
-import { inspect_effect, unlink_effect } from './effects.js';
+import {
+	flush_eager_effects,
+	eager_effects,
+	old_values,
+	set_eager_effects,
+	source,
+	update
+} from './sources.js';
+import { eager_effect, unlink_effect } from './effects.js';
 
 /**
  * @typedef {{
@@ -90,14 +101,20 @@ export class Batch {
 	 * They keys of this map are identical to `this.#current`
 	 * @type {Map<Source, any>}
 	 */
-	#previous = new Map();
+	previous = new Map();
 
 	/**
 	 * When the batch is committed (and the DOM is updated), we need to remove old branches
 	 * and append new ones by calling the functions added inside (if/each/key/etc) blocks
 	 * @type {Set<() => void>}
 	 */
-	#callbacks = new Set();
+	#commit_callbacks = new Set();
+
+	/**
+	 * If a fork is discarded, we need to destroy any effects that are no longer needed
+	 * @type {Set<(batch: Batch) => void>}
+	 */
+	#discard_callbacks = new Set();
 
 	/**
 	 * The number of async effects that are currently in flight
@@ -135,6 +152,8 @@ export class Batch {
 	 */
 	skipped_effects = new Set();
 
+	is_fork = false;
+
 	/**
 	 *
 	 * @param {Effect[]} root_effects
@@ -159,15 +178,15 @@ export class Batch {
 			this.#traverse_effect_tree(root, target);
 		}
 
-		this.#resolve();
+		if (!this.is_fork) {
+			this.#resolve();
+		}
 
-		if (this.#blocking_pending > 0) {
+		if (this.#blocking_pending > 0 || this.is_fork) {
 			this.#defer_effects(target.effects);
 			this.#defer_effects(target.render_effects);
 			this.#defer_effects(target.block_effects);
 		} else {
-			// TODO append/detach blocks here, not in #commit
-
 			// 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 = this;
@@ -271,8 +290,8 @@ export class Batch {
 	 * @param {any} value
 	 */
 	capture(source, value) {
-		if (!this.#previous.has(source)) {
-			this.#previous.set(source, value);
+		if (!this.previous.has(source)) {
+			this.previous.set(source, value);
 		}
 
 		this.current.set(source, source.v);
@@ -289,16 +308,17 @@ export class Batch {
 	}
 
 	flush() {
+		this.activate();
+
 		if (queued_root_effects.length > 0) {
-			this.activate();
 			flush_effects();
 
 			if (current_batch !== null && current_batch !== this) {
 				// this can happen if a new batch was created during `flush_effects()`
 				return;
 			}
-		} else {
-			this.#resolve();
+		} else if (this.#pending === 0) {
+			this.process([]); // TODO this feels awkward
 		}
 
 		this.deactivate();
@@ -314,11 +334,16 @@ export class Batch {
 		}
 	}
 
+	discard() {
+		for (const fn of this.#discard_callbacks) fn(this);
+		this.#discard_callbacks.clear();
+	}
+
 	#resolve() {
 		if (this.#blocking_pending === 0) {
 			// append/remove branches
-			for (const fn of this.#callbacks) fn();
-			this.#callbacks.clear();
+			for (const fn of this.#commit_callbacks) fn();
+			this.#commit_callbacks.clear();
 		}
 
 		if (this.#pending === 0) {
@@ -332,7 +357,7 @@ export class Batch {
 		// committed state, unless the batch in question has a more
 		// recent value for a given source
 		if (batches.size > 1) {
-			this.#previous.clear();
+			this.previous.clear();
 
 			var previous_batch_values = batch_values;
 			var is_earlier = true;
@@ -428,6 +453,10 @@ export class Batch {
 		this.#pending -= 1;
 		if (blocking) this.#blocking_pending -= 1;
 
+		this.revive();
+	}
+
+	revive() {
 		for (const e of this.#dirty_effects) {
 			set_signal_status(e, DIRTY);
 			schedule_effect(e);
@@ -445,8 +474,13 @@ export class Batch {
 	}
 
 	/** @param {() => void} fn */
-	add_callback(fn) {
-		this.#callbacks.add(fn);
+	oncommit(fn) {
+		this.#commit_callbacks.add(fn);
+	}
+
+	/** @param {(batch: Batch) => void} fn */
+	ondiscard(fn) {
+		this.#discard_callbacks.add(fn);
 	}
 
 	settled() {
@@ -489,7 +523,7 @@ export class Batch {
 		for (const batch of batches) {
 			if (batch === this) continue;
 
-			for (const [source, previous] of batch.#previous) {
+			for (const [source, previous] of batch.previous) {
 				if (!batch_values.has(source)) {
 					batch_values.set(source, previous);
 				}
@@ -717,6 +751,28 @@ function mark_effects(value, sources, marked, checked) {
 	}
 }
 
+/**
+ * When committing a fork, we need to trigger eager effects so that
+ * any `$state.eager(...)` expressions update immediately. This
+ * function allows us to discover them
+ * @param {Value} value
+ * @param {Set<Effect>} effects
+ */
+function mark_eager_effects(value, effects) {
+	if (value.reactions === null) return;
+
+	for (const reaction of value.reactions) {
+		const flags = reaction.f;
+
+		if ((flags & DERIVED) !== 0) {
+			mark_eager_effects(/** @type {Derived} */ (reaction), effects);
+		} else if ((flags & EAGER_EFFECT) !== 0) {
+			set_signal_status(reaction, DIRTY);
+			effects.add(/** @type {Effect} */ (reaction));
+		}
+	}
+}
+
 /**
  * @param {Reaction} reaction
  * @param {Source[]} sources
@@ -798,9 +854,9 @@ export function eager(fn) {
 
 	get(version);
 
-	inspect_effect(() => {
+	eager_effect(() => {
 		if (initial) {
-			// the first time this runs, we create an inspect effect
+			// the first time this runs, we create an eager effect
 			// that will run eagerly whenever the expression changes
 			var previous_batch_values = batch_values;
 
@@ -829,6 +885,88 @@ export function eager(fn) {
 	return value;
 }
 
+/**
+ * Creates a 'fork', in which state changes are evaluated but not applied to the DOM.
+ * This is useful for speculatively loading data (for example) when you suspect that
+ * the user is about to take some action.
+ *
+ * Frameworks like SvelteKit can use this to preload data when the user touches or
+ * hovers over a link, making any subsequent navigation feel instantaneous.
+ *
+ * The `fn` parameter is a synchronous function that modifies some state. The
+ * state changes will be reverted after the fork is initialised, then reapplied
+ * if and when the fork is eventually committed.
+ *
+ * When it becomes clear that a fork will _not_ be committed (e.g. because the
+ * user navigated elsewhere), it must be discarded to avoid leaking memory.
+ *
+ * @param {() => void} fn
+ * @returns {Fork}
+ * @since 5.42
+ */
+export function fork(fn) {
+	if (!async_mode_flag) {
+		e.experimental_async_fork();
+	}
+
+	if (current_batch !== null) {
+		e.fork_timing();
+	}
+
+	const batch = Batch.ensure();
+	batch.is_fork = true;
+
+	const settled = batch.settled();
+
+	flushSync(fn);
+
+	// revert state changes
+	for (const [source, value] of batch.previous) {
+		source.v = value;
+	}
+
+	return {
+		commit: async () => {
+			if (!batches.has(batch)) {
+				e.fork_discarded();
+			}
+
+			batch.is_fork = false;
+
+			// apply changes
+			for (const [source, value] of batch.current) {
+				source.v = value;
+			}
+
+			// trigger any `$state.eager(...)` expressions with the new state.
+			// eager effects don't get scheduled like other effects, so we
+			// can't just encounter them during traversal, we need to
+			// proactively flush them
+			// TODO maybe there's a better implementation?
+			flushSync(() => {
+				/** @type {Set<Effect>} */
+				const eager_effects = new Set();
+
+				for (const source of batch.current.keys()) {
+					mark_eager_effects(source, eager_effects);
+				}
+
+				set_eager_effects(eager_effects);
+				flush_eager_effects();
+			});
+
+			batch.revive();
+			await settled;
+		},
+		discard: () => {
+			if (batches.has(batch)) {
+				batches.delete(batch);
+				batch.discard();
+			}
+		}
+	};
+}
+
 /**
  * Forcibly remove all current batches, to prevent cross-talk between tests
  */
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 5a3dee4b7f..b6a50acc4d 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -28,7 +28,7 @@ import { equals, safe_equals } from './equality.js';
 import * as e from '../errors.js';
 import * as w from '../warnings.js';
 import { async_effect, destroy_effect, teardown } from './effects.js';
-import { inspect_effects, internal_set, set_inspect_effects, source } from './sources.js';
+import { eager_effects, internal_set, set_eager_effects, source } from './sources.js';
 import { get_stack } from '../dev/tracing.js';
 import { async_mode_flag, tracing_mode_flag } from '../../flags/index.js';
 import { Boundary } from '../dom/blocks/boundary.js';
@@ -318,8 +318,8 @@ export function execute_derived(derived) {
 	set_active_effect(get_derived_parent_effect(derived));
 
 	if (DEV) {
-		let prev_inspect_effects = inspect_effects;
-		set_inspect_effects(new Set());
+		let prev_eager_effects = eager_effects;
+		set_eager_effects(new Set());
 		try {
 			if (stack.includes(derived)) {
 				e.derived_references_self();
@@ -332,7 +332,7 @@ export function execute_derived(derived) {
 			value = update_reaction(derived);
 		} finally {
 			set_active_effect(prev_active_effect);
-			set_inspect_effects(prev_inspect_effects);
+			set_eager_effects(prev_eager_effects);
 			stack.pop();
 		}
 	} else {
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 9b54598f9e..4235e9cb24 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -27,7 +27,7 @@ import {
 	DERIVED,
 	UNOWNED,
 	CLEAN,
-	INSPECT_EFFECT,
+	EAGER_EFFECT,
 	HEAD_EFFECT,
 	MAYBE_DIRTY,
 	EFFECT_PRESERVED,
@@ -88,7 +88,7 @@ function create_effect(type, fn, sync, push = true) {
 
 	if (DEV) {
 		// Ensure the parent is never an inspect effect
-		while (parent !== null && (parent.f & INSPECT_EFFECT) !== 0) {
+		while (parent !== null && (parent.f & EAGER_EFFECT) !== 0) {
 			parent = parent.parent;
 		}
 	}
@@ -245,8 +245,8 @@ export function user_pre_effect(fn) {
 }
 
 /** @param {() => void | (() => void)} fn */
-export function inspect_effect(fn) {
-	return create_effect(INSPECT_EFFECT, fn, true);
+export function eager_effect(fn) {
+	return create_effect(EAGER_EFFECT, fn, true);
 }
 
 /**
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 2fe8c4f75d..9534e718a5 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -22,7 +22,7 @@ import {
 	DERIVED,
 	DIRTY,
 	BRANCH_EFFECT,
-	INSPECT_EFFECT,
+	EAGER_EFFECT,
 	UNOWNED,
 	MAYBE_DIRTY,
 	BLOCK_EFFECT,
@@ -39,7 +39,7 @@ import { proxy } from '../proxy.js';
 import { execute_derived } from './deriveds.js';
 
 /** @type {Set<any>} */
-export let inspect_effects = new Set();
+export let eager_effects = new Set();
 
 /** @type {Map<Source, any>} */
 export const old_values = new Map();
@@ -47,14 +47,14 @@ export const old_values = new Map();
 /**
  * @param {Set<any>} v
  */
-export function set_inspect_effects(v) {
-	inspect_effects = v;
+export function set_eager_effects(v) {
+	eager_effects = v;
 }
 
-let inspect_effects_deferred = false;
+let eager_effects_deferred = false;
 
-export function set_inspect_effects_deferred() {
-	inspect_effects_deferred = true;
+export function set_eager_effects_deferred() {
+	eager_effects_deferred = true;
 }
 
 /**
@@ -146,9 +146,9 @@ export function set(source, value, should_proxy = false) {
 		active_reaction !== null &&
 		// since we are untracking the function inside `$inspect.with` we need to add this check
 		// to ensure we error if state is set inside an inspect effect
-		(!untracking || (active_reaction.f & INSPECT_EFFECT) !== 0) &&
+		(!untracking || (active_reaction.f & EAGER_EFFECT) !== 0) &&
 		is_runes() &&
-		(active_reaction.f & (DERIVED | BLOCK_EFFECT | ASYNC | INSPECT_EFFECT)) !== 0 &&
+		(active_reaction.f & (DERIVED | BLOCK_EFFECT | ASYNC | EAGER_EFFECT)) !== 0 &&
 		!current_sources?.includes(source)
 	) {
 		e.state_unsafe_mutation();
@@ -235,18 +235,18 @@ export function internal_set(source, value) {
 			}
 		}
 
-		if (DEV && inspect_effects.size > 0 && !inspect_effects_deferred) {
-			flush_inspect_effects();
+		if (!batch.is_fork && eager_effects.size > 0 && !eager_effects_deferred) {
+			flush_eager_effects();
 		}
 	}
 
 	return value;
 }
 
-export function flush_inspect_effects() {
-	inspect_effects_deferred = false;
+export function flush_eager_effects() {
+	eager_effects_deferred = false;
 
-	const inspects = Array.from(inspect_effects);
+	const inspects = Array.from(eager_effects);
 
 	for (const effect of inspects) {
 		// Mark clean inspect-effects as maybe dirty and then check their dirtiness
@@ -260,7 +260,7 @@ export function flush_inspect_effects() {
 		}
 	}
 
-	inspect_effects.clear();
+	eager_effects.clear();
 }
 
 /**
@@ -320,8 +320,8 @@ function mark_reactions(signal, status) {
 		if (!runes && reaction === active_effect) continue;
 
 		// Inspect effects need to run immediately, so that the stack trace makes sense
-		if (DEV && (flags & INSPECT_EFFECT) !== 0) {
-			inspect_effects.add(reaction);
+		if (DEV && (flags & EAGER_EFFECT) !== 0) {
+			eager_effects.add(reaction);
 			continue;
 		}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork/_config.js b/packages/svelte/tests/runtime-runes/samples/async-fork/_config.js
new file mode 100644
index 0000000000..35b47525a2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork/_config.js
@@ -0,0 +1,92 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, raf }) {
+		const [shift, increment, commit] = target.querySelectorAll('button');
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<button>increment</button>
+				<button>commit</button>
+				<p>count: 0</p>
+				<p>eager: 0</p>
+				<p>even</p>
+			`
+		);
+
+		increment.click();
+		await tick();
+
+		shift.click();
+		await tick();
+
+		// nothing updates until commit
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<button>increment</button>
+				<button>commit</button>
+				<p>count: 0</p>
+				<p>eager: 0</p>
+				<p>even</p>
+			`
+		);
+
+		commit.click();
+		await tick();
+
+		// nothing updates until commit
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<button>increment</button>
+				<button>commit</button>
+				<p>count: 1</p>
+				<p>eager: 1</p>
+				<p>odd</p>
+			`
+		);
+
+		increment.click();
+		await tick();
+
+		commit.click();
+		await tick();
+
+		// eager state updates on commit
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<button>increment</button>
+				<button>commit</button>
+				<p>count: 1</p>
+				<p>eager: 2</p>
+				<p>odd</p>
+			`
+		);
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>shift</button>
+				<button>increment</button>
+				<button>commit</button>
+				<p>count: 2</p>
+				<p>eager: 2</p>
+				<p>even</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-fork/main.svelte
new file mode 100644
index 0000000000..9b1f433f2d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork/main.svelte
@@ -0,0 +1,37 @@
+<script>
+	import { fork } from 'svelte';
+
+	let count = $state(0);
+
+	const resolvers = [];
+	let f = null;
+
+	function push(value) {
+		const { promise, resolve } = Promise.withResolvers();
+		resolvers.push(() => resolve(value));
+		return promise;
+	}
+</script>
+
+<button onclick={() => resolvers.shift()?.()}>shift</button>
+<button onclick={async () => {
+	f = await fork(() => {
+		count += 1;
+	});
+}}>increment</button>
+<button onclick={() => f?.commit()}>commit</button>
+
+<p>count: {count}</p>
+<p>eager: {$state.eager(count)}</p>
+
+<svelte:boundary>
+	{#if await push(count) % 2 === 0}
+		<p>even</p>
+	{:else}
+		<p>odd</p>
+	{/if}
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index d260b738c3..5e3ca77eb5 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -348,6 +348,22 @@ declare module 'svelte' {
 				 */
 				props: Props;
 			});
+
+	/**
+	 * Represents work that is happening off-screen, such as data being preloaded
+	 * in anticipation of the user navigating
+	 * @since 5.42
+	 */
+	export interface Fork {
+		/**
+		 * Commit the fork. The promise will resolve once the state change has been applied
+		 */
+		commit(): Promise<void>;
+		/**
+		 * Discard the fork
+		 */
+		discard(): void;
+	}
 	/**
 	 * Returns an [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) that aborts when the current [derived](https://svelte.dev/docs/svelte/$derived) or [effect](https://svelte.dev/docs/svelte/$effect) re-runs or is destroyed.
 	 *
@@ -434,11 +450,6 @@ declare module 'svelte' {
 	 * @deprecated Use [`$effect`](https://svelte.dev/docs/svelte/$effect) instead
 	 * */
 	export function afterUpdate(fn: () => void): void;
-	/**
-	 * Synchronously flush any pending updates.
-	 * Returns void if no callback is provided, otherwise returns the result of calling the callback.
-	 * */
-	export function flushSync<T = void>(fn?: (() => T) | undefined): T;
 	/**
 	 * Create a snippet programmatically
 	 * */
@@ -448,6 +459,29 @@ declare module 'svelte' {
 	}): Snippet<Params>;
 	/** Anything except a function */
 	type NotFunction<T> = T extends Function ? never : T;
+	/**
+	 * Synchronously flush any pending updates.
+	 * Returns void if no callback is provided, otherwise returns the result of calling the callback.
+	 * */
+	export function flushSync<T = void>(fn?: (() => T) | undefined): T;
+	/**
+	 * Creates a 'fork', in which state changes are evaluated but not applied to the DOM.
+	 * This is useful for speculatively loading data (for example) when you suspect that
+	 * the user is about to take some action.
+	 *
+	 * Frameworks like SvelteKit can use this to preload data when the user touches or
+	 * hovers over a link, making any subsequent navigation feel instantaneous.
+	 *
+	 * The `fn` parameter is a synchronous function that modifies some state. The
+	 * state changes will be reverted after the fork is initialised, then reapplied
+	 * if and when the fork is eventually committed.
+	 *
+	 * When it becomes clear that a fork will _not_ be committed (e.g. because the
+	 * user navigated elsewhere), it must be discarded to avoid leaking memory.
+	 *
+	 * @since 5.42
+	 */
+	export function fork(fn: () => void): Fork;
 	/**
 	 * Returns a `[get, set]` pair of functions for working with context in a type-safe way.
 	 *

From 4eb432e941d4d8ebf1206ea86433b0c778b71737 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 24 Oct 2025 17:27:04 -0400
Subject: [PATCH 130/347] chore: remove event hoisting (#17030)

* chore: get rid of hoisted event handlers

* remove unused stuff

* simplify

* wow we can delete so much more code. this makes me so happy

* even more!
---
 .../phases/2-analyze/visitors/Attribute.js    | 188 +-----------------
 .../2-analyze/visitors/shared/function.js     |   7 -
 .../phases/3-transform/client/utils.js        | 126 +-----------
 .../client/visitors/FunctionDeclaration.js    |  11 -
 .../client/visitors/VariableDeclaration.js    |  18 --
 .../client/visitors/shared/events.js          |  30 +--
 .../client/visitors/shared/function.js        |  13 --
 .../src/compiler/phases/3-transform/utils.js  |  19 --
 packages/svelte/src/compiler/phases/nodes.js  |   2 +-
 .../svelte/src/compiler/phases/types.d.ts     |  26 ---
 .../svelte/src/compiler/types/template.d.ts   |  11 +-
 .../svelte/src/compiler/utils/builders.js     |   9 +-
 .../client/dom/elements/attributes.js         |   4 +-
 .../internal/client/dom/elements/events.js    |   9 +-
 packages/svelte/src/utils.js                  |   2 +-
 .../samples/inspect-new-property/_config.js   |   4 +-
 .../samples/inspect-recursive/_config.js      |   4 +-
 .../_expected/client/index.svelte.js          |  11 +-
 .../_expected/client/index.svelte.js          |  14 +-
 .../_expected/client/index.svelte.js          |   3 +-
 .../_expected/client/index.svelte.js          |  17 +-
 21 files changed, 45 insertions(+), 483 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/Attribute.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/Attribute.js
index b13f3f89b6..2b7d636606 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/Attribute.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/Attribute.js
@@ -1,12 +1,7 @@
-/** @import { ArrowFunctionExpression, Expression, FunctionDeclaration, FunctionExpression } from 'estree' */
-/** @import { AST, DelegatedEvent } from '#compiler' */
+/** @import { AST } from '#compiler' */
 /** @import { Context } from '../types' */
-import { cannot_be_set_statically, is_capture_event, is_delegated } from '../../../../utils.js';
-import {
-	get_attribute_chunks,
-	get_attribute_expression,
-	is_event_attribute
-} from '../../../utils/ast.js';
+import { cannot_be_set_statically, can_delegate_event } from '../../../../utils.js';
+import { get_attribute_chunks, is_event_attribute } from '../../../utils/ast.js';
 import { mark_subtree_dynamic } from './shared/fragment.js';
 
 /**
@@ -64,181 +59,8 @@ export function Attribute(node, context) {
 				context.state.analysis.uses_event_attributes = true;
 			}
 
-			const expression = get_attribute_expression(node);
-			const delegated_event = get_delegated_event(node.name.slice(2), expression, context);
-
-			if (delegated_event !== null) {
-				if (delegated_event.hoisted) {
-					delegated_event.function.metadata.hoisted = true;
-				}
-
-				node.metadata.delegated = delegated_event;
-			}
-		}
-	}
-}
-
-/** @type {DelegatedEvent} */
-const unhoisted = { hoisted: false };
-
-/**
- * Checks if given event attribute can be delegated/hoisted and returns the corresponding info if so
- * @param {string} event_name
- * @param {Expression | null} handler
- * @param {Context} context
- * @returns {null | DelegatedEvent}
- */
-function get_delegated_event(event_name, handler, context) {
-	// Handle delegated event handlers. Bail out if not a delegated event.
-	if (!handler || !is_delegated(event_name)) {
-		return null;
-	}
-
-	// If we are not working with a RegularElement, then bail out.
-	const element = context.path.at(-1);
-	if (element?.type !== 'RegularElement') {
-		return null;
-	}
-
-	/** @type {FunctionExpression | FunctionDeclaration | ArrowFunctionExpression | null} */
-	let target_function = null;
-	let binding = null;
-
-	if (element.metadata.has_spread) {
-		// event attribute becomes part of the dynamic spread array
-		return unhoisted;
-	}
-
-	if (handler.type === 'ArrowFunctionExpression' || handler.type === 'FunctionExpression') {
-		target_function = handler;
-	} else if (handler.type === 'Identifier') {
-		binding = context.state.scope.get(handler.name);
-
-		if (context.state.analysis.module.scope.references.has(handler.name)) {
-			// If a binding with the same name is referenced in the module scope (even if not declared there), bail out
-			return unhoisted;
-		}
-
-		if (binding != null) {
-			for (const { path } of binding.references) {
-				const parent = path.at(-1);
-				if (parent === undefined) return unhoisted;
-
-				const grandparent = path.at(-2);
-
-				/** @type {AST.RegularElement | null} */
-				let element = null;
-				/** @type {string | null} */
-				let event_name = null;
-				if (parent.type === 'OnDirective') {
-					element = /** @type {AST.RegularElement} */ (grandparent);
-					event_name = parent.name;
-				} else if (
-					parent.type === 'ExpressionTag' &&
-					grandparent?.type === 'Attribute' &&
-					is_event_attribute(grandparent)
-				) {
-					element = /** @type {AST.RegularElement} */ (path.at(-3));
-					const attribute = /** @type {AST.Attribute} */ (grandparent);
-					event_name = get_attribute_event_name(attribute.name);
-				}
-
-				if (element && event_name) {
-					if (
-						element.type !== 'RegularElement' ||
-						element.metadata.has_spread ||
-						!is_delegated(event_name)
-					) {
-						return unhoisted;
-					}
-				} else if (parent.type !== 'FunctionDeclaration' && parent.type !== 'VariableDeclarator') {
-					return unhoisted;
-				}
-			}
+			node.metadata.delegated =
+				parent?.type === 'RegularElement' && can_delegate_event(node.name.slice(2));
 		}
-
-		// If the binding is exported, bail out
-		if (context.state.analysis.exports.find((node) => node.name === handler.name)) {
-			return unhoisted;
-		}
-
-		if (binding?.is_function()) {
-			target_function = binding.initial;
-		}
-	}
-
-	// If we can't find a function, or the function has multiple parameters, bail out
-	if (target_function == null || target_function.params.length > 1) {
-		return unhoisted;
-	}
-
-	const visited_references = new Set();
-	const scope = target_function.metadata.scope;
-	for (const [reference] of scope.references) {
-		// Bail out if the arguments keyword is used or $host is referenced
-		if (reference === 'arguments' || reference === '$host') return unhoisted;
-		// Bail out if references a store subscription
-		if (scope.get(`$${reference}`)?.kind === 'store_sub') return unhoisted;
-
-		const binding = scope.get(reference);
-		const local_binding = context.state.scope.get(reference);
-
-		// if the function access a snippet that can't be hoisted we bail out
-		if (
-			local_binding !== null &&
-			local_binding.initial?.type === 'SnippetBlock' &&
-			!local_binding.initial.metadata.can_hoist
-		) {
-			return unhoisted;
-		}
-
-		// If we are referencing a binding that is shadowed in another scope then bail out (unless it's declared within the function).
-		if (
-			local_binding !== null &&
-			binding !== null &&
-			local_binding.node !== binding.node &&
-			scope.declarations.get(reference) !== binding
-		) {
-			return unhoisted;
-		}
-
-		// If we have multiple references to the same store using $ prefix, bail out.
-		if (
-			binding !== null &&
-			binding.kind === 'store_sub' &&
-			visited_references.has(reference.slice(1))
-		) {
-			return unhoisted;
-		}
-
-		// If we reference the index within an each block, then bail out.
-		if (binding !== null && binding.initial?.type === 'EachBlock') return unhoisted;
-
-		if (
-			binding !== null &&
-			// Bail out if the binding is a rest param
-			(binding.declaration_kind === 'rest_param' ||
-				// Bail out if we reference anything from the EachBlock (for now) that mutates in non-runes mode,
-				(((!context.state.analysis.runes && binding.kind === 'each') ||
-					// or any normal not reactive bindings that are mutated.
-					binding.kind === 'normal') &&
-					binding.updated))
-		) {
-			return unhoisted;
-		}
-		visited_references.add(reference);
-	}
-
-	return { hoisted: true, function: target_function };
-}
-
-/**
- * @param {string} event_name
- */
-function get_attribute_event_name(event_name) {
-	event_name = event_name.slice(2);
-	if (is_capture_event(event_name)) {
-		event_name = event_name.slice(0, -7);
 	}
-	return event_name;
 }
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/function.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/function.js
index 1776167850..4d93cd44e0 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/function.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/function.js
@@ -6,13 +6,6 @@
  * @param {Context} context
  */
 export function visit_function(node, context) {
-	// TODO retire this in favour of a more general solution based on bindings
-	node.metadata = {
-		hoisted: false,
-		hoisted_params: [],
-		scope: context.state.scope
-	};
-
 	if (context.state.expression) {
 		for (const [name] of context.state.scope.references) {
 			const binding = context.state.scope.get(name);
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 41ed277898..f21fb43fc1 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/utils.js
@@ -1,6 +1,6 @@
-/** @import { ArrowFunctionExpression, AssignmentExpression, BlockStatement, Expression, FunctionDeclaration, FunctionExpression, Identifier, Node, Pattern, UpdateExpression } from 'estree' */
+/** @import { BlockStatement, Expression, Identifier } from 'estree' */
 /** @import { Binding } from '#compiler' */
-/** @import { ClientTransformState, ComponentClientTransformState, ComponentContext } from './types.js' */
+/** @import { ClientTransformState, ComponentClientTransformState } from './types.js' */
 /** @import { Analysis } from '../../types.js' */
 /** @import { Scope } from '../../scope.js' */
 import * as b from '#compiler/builders';
@@ -12,9 +12,6 @@ import {
 	PROPS_IS_UPDATED,
 	PROPS_IS_BINDABLE
 } from '../../../../constants.js';
-import { dev } from '../../../state.js';
-import { walk } from 'zimmerframe';
-import { validate_mutation } from './visitors/shared/utils.js';
 
 /**
  * @param {Binding} binding
@@ -46,125 +43,6 @@ export function build_getter(node, state) {
 	return node;
 }
 
-/**
- * @param {FunctionDeclaration | FunctionExpression | ArrowFunctionExpression} node
- * @param {ComponentContext} context
- * @returns {Pattern[]}
- */
-function get_hoisted_params(node, context) {
-	const scope = context.state.scope;
-
-	/** @type {Identifier[]} */
-	const params = [];
-
-	/**
-	 * We only want to push if it's not already present to avoid name clashing
-	 * @param {Identifier} id
-	 */
-	function push_unique(id) {
-		if (!params.find((param) => param.name === id.name)) {
-			params.push(id);
-		}
-	}
-
-	for (const [reference] of scope.references) {
-		let binding = scope.get(reference);
-
-		if (binding !== null && !scope.declarations.has(reference) && binding.initial !== node) {
-			if (binding.kind === 'store_sub') {
-				// We need both the subscription for getting the value and the store for updating
-				push_unique(b.id(binding.node.name));
-				binding = /** @type {Binding} */ (scope.get(binding.node.name.slice(1)));
-			}
-
-			let expression = context.state.transform[reference]?.read(b.id(binding.node.name));
-
-			if (
-				// If it's a destructured derived binding, then we can extract the derived signal reference and use that.
-				// TODO this code is bad, we need to kill it
-				expression != null &&
-				typeof expression !== 'function' &&
-				expression.type === 'MemberExpression' &&
-				expression.object.type === 'CallExpression' &&
-				expression.object.callee.type === 'Identifier' &&
-				expression.object.callee.name === '$.get' &&
-				expression.object.arguments[0].type === 'Identifier'
-			) {
-				push_unique(b.id(expression.object.arguments[0].name));
-			} else if (
-				// If we are referencing a simple $$props value, then we need to reference the object property instead
-				(binding.kind === 'prop' || binding.kind === 'bindable_prop') &&
-				!is_prop_source(binding, context.state)
-			) {
-				push_unique(b.id('$$props'));
-			} else if (
-				// imports don't need to be hoisted
-				binding.declaration_kind !== 'import'
-			) {
-				// create a copy to remove start/end tags which would mess up source maps
-				push_unique(b.id(binding.node.name));
-				// rest props are often accessed through the $$props object for optimization reasons,
-				// but we can't know if the delegated event handler will use it, so we need to add both as params
-				if (binding.kind === 'rest_prop' && context.state.analysis.runes) {
-					push_unique(b.id('$$props'));
-				}
-			}
-		}
-	}
-
-	if (dev) {
-		// this is a little hacky, but necessary for ownership validation
-		// to work inside hoisted event handlers
-
-		/**
-		 * @param {AssignmentExpression | UpdateExpression} node
-		 * @param {{ next: () => void, stop: () => void }} context
-		 */
-		function visit(node, { next, stop }) {
-			if (validate_mutation(node, /** @type {any} */ (context), node) !== node) {
-				params.push(b.id('$$ownership_validator'));
-				stop();
-			} else {
-				next();
-			}
-		}
-
-		walk(/** @type {Node} */ (node), null, {
-			AssignmentExpression: visit,
-			UpdateExpression: visit
-		});
-	}
-
-	return params;
-}
-
-/**
- * @param {FunctionDeclaration | FunctionExpression | ArrowFunctionExpression} node
- * @param {ComponentContext} context
- * @returns {Pattern[]}
- */
-export function build_hoisted_params(node, context) {
-	const hoisted_params = get_hoisted_params(node, context);
-	node.metadata.hoisted_params = hoisted_params;
-
-	/** @type {Pattern[]} */
-	const params = [];
-
-	if (node.params.length === 0) {
-		if (hoisted_params.length > 0) {
-			// For the event object
-			params.push(b.id(context.state.scope.generate('_')));
-		}
-	} else {
-		for (const param of node.params) {
-			params.push(/** @type {Pattern} */ (context.visit(param)));
-		}
-	}
-
-	params.push(...hoisted_params);
-	return params;
-}
-
 /**
  * @param {Binding} binding
  * @param {ComponentClientTransformState} state
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/FunctionDeclaration.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/FunctionDeclaration.js
index cd299a710b..17327c21d6 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/FunctionDeclaration.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/FunctionDeclaration.js
@@ -1,7 +1,5 @@
 /** @import { FunctionDeclaration } from 'estree' */
 /** @import { ComponentContext } from '../types' */
-import { build_hoisted_params } from '../utils.js';
-import * as b from '#compiler/builders';
 
 /**
  * @param {FunctionDeclaration} node
@@ -10,14 +8,5 @@ import * as b from '#compiler/builders';
 export function FunctionDeclaration(node, context) {
 	const state = { ...context.state, in_constructor: false, in_derived: false };
 
-	if (node.metadata?.hoisted === true) {
-		const params = build_hoisted_params(node, context);
-		const body = context.visit(node.body, state);
-
-		context.state.hoisted.push(/** @type {FunctionDeclaration} */ ({ ...node, params, body }));
-
-		return b.empty;
-	}
-
 	context.next(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 2fc3a8ed80..0f87baa433 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
@@ -7,7 +7,6 @@ import * as b from '#compiler/builders';
 import * as assert from '../../../../utils/assert.js';
 import { get_rune } from '../../../scope.js';
 import { get_prop_source, is_prop_source, is_state_source, should_proxy } from '../utils.js';
-import { is_hoisted_function } from '../../utils.js';
 import { get_value } from './shared/declarations.js';
 
 /**
@@ -32,13 +31,6 @@ export function VariableDeclaration(node, context) {
 				rune === '$state.snapshot' ||
 				rune === '$host'
 			) {
-				if (init != null && is_hoisted_function(init)) {
-					context.state.hoisted.push(
-						b.const(declarator.id, /** @type {Expression} */ (context.visit(init)))
-					);
-
-					continue;
-				}
 				declarations.push(/** @type {VariableDeclarator} */ (context.visit(declarator)));
 				continue;
 			}
@@ -295,16 +287,6 @@ export function VariableDeclaration(node, context) {
 			const has_props = bindings.some((binding) => binding.kind === 'bindable_prop');
 
 			if (!has_state && !has_props) {
-				const init = declarator.init;
-
-				if (init != null && is_hoisted_function(init)) {
-					context.state.hoisted.push(
-						b.const(declarator.id, /** @type {Expression} */ (context.visit(init)))
-					);
-
-					continue;
-				}
-
 				declarations.push(/** @type {VariableDeclarator} */ (context.visit(declarator)));
 				continue;
 			}
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js
index d252bd5474..d4d6721960 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js
@@ -26,40 +26,12 @@ export function visit_event_attribute(node, context) {
 	let handler = build_event_handler(tag.expression, tag.metadata.expression, context);
 
 	if (node.metadata.delegated) {
-		let delegated_assignment;
-
 		if (!context.state.events.has(event_name)) {
 			context.state.events.add(event_name);
 		}
 
-		// Hoist function if we can, otherwise we leave the function as is
-		if (node.metadata.delegated.hoisted) {
-			if (node.metadata.delegated.function === tag.expression) {
-				const func_name = context.state.scope.root.unique('on_' + event_name);
-				context.state.hoisted.push(b.var(func_name, handler));
-				handler = func_name;
-			}
-
-			const hoisted_params = /** @type {Expression[]} */ (
-				node.metadata.delegated.function.metadata.hoisted_params
-			);
-
-			// When we hoist a function we assign an array with the function and all
-			// hoisted closure params.
-			if (hoisted_params) {
-				const args = [handler, ...hoisted_params];
-				delegated_assignment = b.array(args);
-			} else {
-				delegated_assignment = handler;
-			}
-		} else {
-			delegated_assignment = handler;
-		}
-
 		context.state.init.push(
-			b.stmt(
-				b.assignment('=', b.member(context.state.node, '__' + event_name), delegated_assignment)
-			)
+			b.stmt(b.assignment('=', b.member(context.state.node, '__' + event_name), handler))
 		);
 	} else {
 		const statement = b.stmt(
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/function.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/function.js
index 691ac0b01e..3677b30814 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/function.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/function.js
@@ -1,14 +1,11 @@
 /** @import { ArrowFunctionExpression, FunctionExpression, Node } from 'estree' */
 /** @import { ComponentContext } from '../../types' */
-import { build_hoisted_params } from '../../utils.js';
 
 /**
  * @param {ArrowFunctionExpression | FunctionExpression} node
  * @param {ComponentContext} context
  */
 export const visit_function = (node, context) => {
-	const metadata = node.metadata;
-
 	let state = { ...context.state, in_constructor: false, in_derived: false };
 
 	if (node.type === 'FunctionExpression') {
@@ -16,15 +13,5 @@ export const visit_function = (node, context) => {
 		state.in_constructor = parent.type === 'MethodDefinition' && parent.kind === 'constructor';
 	}
 
-	if (metadata?.hoisted === true) {
-		const params = build_hoisted_params(node, context);
-
-		return /** @type {FunctionExpression} */ ({
-			...node,
-			params,
-			body: context.visit(node.body, state)
-		});
-	}
-
 	context.next(state);
 };
diff --git a/packages/svelte/src/compiler/phases/3-transform/utils.js b/packages/svelte/src/compiler/phases/3-transform/utils.js
index dfc2ab1de1..f61b59f3bd 100644
--- a/packages/svelte/src/compiler/phases/3-transform/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/utils.js
@@ -1,36 +1,17 @@
-/** @import { Context } from 'zimmerframe' */
 /** @import { TransformState } from './types.js' */
 /** @import { AST, Binding, Namespace, ValidatedCompileOptions } from '#compiler' */
 /** @import { Node, Expression, CallExpression, MemberExpression } from 'estree' */
 import {
 	regex_ends_with_whitespaces,
 	regex_not_whitespace,
-	regex_starts_with_newline,
 	regex_starts_with_whitespaces
 } from '../patterns.js';
-import * as b from '#compiler/builders';
 import * as e from '../../errors.js';
 import { walk } from 'zimmerframe';
 import { extract_identifiers } from '../../utils/ast.js';
 import check_graph_for_cycles from '../2-analyze/utils/check_graph_for_cycles.js';
 import is_reference from 'is-reference';
 import { set_scope } from '../scope.js';
-import { dev } from '../../state.js';
-
-/**
- * @param {Node} node
- * @returns {boolean}
- */
-export function is_hoisted_function(node) {
-	if (
-		node.type === 'ArrowFunctionExpression' ||
-		node.type === 'FunctionExpression' ||
-		node.type === 'FunctionDeclaration'
-	) {
-		return node.metadata?.hoisted === true;
-	}
-	return false;
-}
 
 /**
  * Match Svelte 4 behaviour by sorting ConstTag nodes in topological order
diff --git a/packages/svelte/src/compiler/phases/nodes.js b/packages/svelte/src/compiler/phases/nodes.js
index f4127db359..13188681d2 100644
--- a/packages/svelte/src/compiler/phases/nodes.js
+++ b/packages/svelte/src/compiler/phases/nodes.js
@@ -59,7 +59,7 @@ export function create_attribute(name, start, end, value) {
 		name,
 		value,
 		metadata: {
-			delegated: null,
+			delegated: false,
 			needs_clsx: false
 		}
 	};
diff --git a/packages/svelte/src/compiler/phases/types.d.ts b/packages/svelte/src/compiler/phases/types.d.ts
index 4e287fd199..074012e03f 100644
--- a/packages/svelte/src/compiler/phases/types.d.ts
+++ b/packages/svelte/src/compiler/phases/types.d.ts
@@ -109,29 +109,3 @@ export interface ComponentAnalysis extends Analysis {
 	 */
 	snippets: Set<AST.SnippetBlock>;
 }
-
-declare module 'estree' {
-	interface ArrowFunctionExpression {
-		metadata: {
-			hoisted: boolean;
-			hoisted_params: Pattern[];
-			scope: Scope;
-		};
-	}
-
-	interface FunctionExpression {
-		metadata: {
-			hoisted: boolean;
-			hoisted_params: Pattern[];
-			scope: Scope;
-		};
-	}
-
-	interface FunctionDeclaration {
-		metadata: {
-			hoisted: boolean;
-			hoisted_params: Pattern[];
-			scope: Scope;
-		};
-	}
-}
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index 42048c3525..f38706d075 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -5,8 +5,6 @@ import type {
 	VariableDeclaration,
 	VariableDeclarator,
 	Expression,
-	FunctionDeclaration,
-	FunctionExpression,
 	Identifier,
 	MemberExpression,
 	Node,
@@ -27,13 +25,6 @@ import type { _CSS } from './css';
  */
 export type Namespace = 'html' | 'svg' | 'mathml';
 
-export type DelegatedEvent =
-	| {
-			hoisted: true;
-			function: ArrowFunctionExpression | FunctionExpression | FunctionDeclaration;
-	  }
-	| { hoisted: false };
-
 export namespace AST {
 	export interface BaseNode {
 		type: string;
@@ -531,7 +522,7 @@ export namespace AST {
 		/** @internal */
 		metadata: {
 			/** May be set if this is an event attribute */
-			delegated: null | DelegatedEvent;
+			delegated: boolean;
 			/** May be `true` if this is a `class` attribute that needs `clsx` */
 			needs_clsx: boolean;
 		};
diff --git a/packages/svelte/src/compiler/utils/builders.js b/packages/svelte/src/compiler/utils/builders.js
index f21b0dc8b4..1a2d5cab5c 100644
--- a/packages/svelte/src/compiler/utils/builders.js
+++ b/packages/svelte/src/compiler/utils/builders.js
@@ -42,8 +42,7 @@ export function arrow(params, body, async = false) {
 		body,
 		expression: body.type !== 'BlockStatement',
 		generator: false,
-		async,
-		metadata: /** @type {any} */ (null) // should not be used by codegen
+		async
 	};
 }
 
@@ -237,8 +236,7 @@ export function function_declaration(id, params, body, async = false) {
 		params,
 		body,
 		generator: false,
-		async,
-		metadata: /** @type {any} */ (null) // should not be used by codegen
+		async
 	};
 }
 
@@ -595,8 +593,7 @@ function function_builder(id, params, body, async = false) {
 		params,
 		body,
 		generator: false,
-		async,
-		metadata: /** @type {any} */ (null) // should not be used by codegen
+		async
 	};
 }
 
diff --git a/packages/svelte/src/internal/client/dom/elements/attributes.js b/packages/svelte/src/internal/client/dom/elements/attributes.js
index a5f63359c9..55d5d7860a 100644
--- a/packages/svelte/src/internal/client/dom/elements/attributes.js
+++ b/packages/svelte/src/internal/client/dom/elements/attributes.js
@@ -7,7 +7,7 @@ import { add_form_reset_listener, autofocus } from './misc.js';
 import * as w from '../../warnings.js';
 import { LOADING_ATTR_SYMBOL } from '#client/constants';
 import { queue_micro_task } from '../task.js';
-import { is_capture_event, is_delegated, normalize_attribute } from '../../../../utils.js';
+import { is_capture_event, can_delegate_event, normalize_attribute } from '../../../../utils.js';
 import {
 	active_effect,
 	active_reaction,
@@ -378,7 +378,7 @@ function set_attributes(
 			const opts = {};
 			const event_handle_key = '$$' + key;
 			let event_name = key.slice(2);
-			var delegated = is_delegated(event_name);
+			var delegated = can_delegate_event(event_name);
 
 			if (is_capture_event(event_name)) {
 				event_name = event_name.slice(0, -7);
diff --git a/packages/svelte/src/internal/client/dom/elements/events.js b/packages/svelte/src/internal/client/dom/elements/events.js
index 15544d7426..4c64c8364a 100644
--- a/packages/svelte/src/internal/client/dom/elements/events.js
+++ b/packages/svelte/src/internal/client/dom/elements/events.js
@@ -1,5 +1,5 @@
 import { teardown } from '../../reactivity/effects.js';
-import { define_property, is_array } from '../../../shared/utils.js';
+import { define_property } from '../../../shared/utils.js';
 import { hydrating } from '../hydration.js';
 import { queue_micro_task } from '../task.js';
 import { FILENAME } from '../../../../constants.js';
@@ -258,12 +258,7 @@ export function handle_event_propagation(event) {
 						// -> the target could not have been disabled because it emits the event in the first place
 						event.target === current_target)
 				) {
-					if (is_array(delegated)) {
-						var [fn, ...data] = delegated;
-						fn.apply(current_target, [event, ...data]);
-					} else {
-						delegated.call(current_target, event);
-					}
+					delegated.call(current_target, event);
 				}
 			} catch (error) {
 				if (throw_error) {
diff --git a/packages/svelte/src/utils.js b/packages/svelte/src/utils.js
index a54a421418..d63d4ff801 100644
--- a/packages/svelte/src/utils.js
+++ b/packages/svelte/src/utils.js
@@ -137,7 +137,7 @@ const DELEGATED_EVENTS = [
  * Returns `true` if `event_name` is a delegated event
  * @param {string} event_name
  */
-export function is_delegated(event_name) {
+export function can_delegate_event(event_name) {
 	return DELEGATED_EVENTS.includes(event_name);
 }
 
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js
index 8134044b16..43d217977e 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-new-property/_config.js
@@ -15,9 +15,9 @@ export default test({
 			{},
 			[],
 			{ x: 'hello' },
-			'at HTMLButtonElement.on_click',
+			'at HTMLButtonElement.Main.button.__click',
 			['hello'],
-			'at HTMLButtonElement.on_click'
+			'at HTMLButtonElement.Main.button.__click'
 		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-recursive/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-recursive/_config.js
index 9d95956e7d..8bf67159f5 100644
--- a/packages/svelte/tests/runtime-runes/samples/inspect-recursive/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-recursive/_config.js
@@ -15,9 +15,9 @@ export default test({
 		assert.deepEqual(normalise_inspect_logs(logs), [
 			[],
 			[{}],
-			'at HTMLButtonElement.on_click',
+			'at HTMLButtonElement.Main.button.__click',
 			[{}, {}],
-			'at HTMLButtonElement.on_click'
+			'at HTMLButtonElement.Main.button.__click'
 		]);
 	}
 });
diff --git a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/client/index.svelte.js
index 9bb45ebf78..52820c1652 100644
--- a/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/await-block-scope/_expected/client/index.svelte.js
@@ -1,19 +1,20 @@
 import 'svelte/internal/disclose-version';
 import * as $ from 'svelte/internal/client';
 
-function increment(_, counter) {
-	counter.count += 1;
-}
-
 var root = $.from_html(`<button> </button> <!> `, 1);
 
 export default function Await_block_scope($$anchor) {
 	let counter = $.proxy({ count: 0 });
 	const promise = $.derived(() => Promise.resolve(counter));
+
+	function increment() {
+		counter.count += 1;
+	}
+
 	var fragment = root();
 	var button = $.first_child(fragment);
 
-	button.__click = [increment, counter];
+	button.__click = increment;
 
 	var text = $.child(button);
 
diff --git a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/client/index.svelte.js
index 0d95d8d335..ae28419b95 100644
--- a/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/delegated-locally-declared-shadowed/_expected/client/index.svelte.js
@@ -2,12 +2,6 @@ import 'svelte/internal/disclose-version';
 import 'svelte/internal/flags/legacy';
 import * as $ from 'svelte/internal/client';
 
-var on_click = (e) => {
-	const index = Number(e.currentTarget.dataset.index);
-
-	console.log(index);
-};
-
 var root_1 = $.from_html(`<button type="button">B</button>`);
 
 export default function Delegated_locally_declared_shadowed($$anchor) {
@@ -18,7 +12,13 @@ export default function Delegated_locally_declared_shadowed($$anchor) {
 		var button = root_1();
 
 		$.set_attribute(button, 'data-index', index);
-		button.__click = [on_click];
+
+		button.__click = (e) => {
+			const index = Number(e.currentTarget.dataset.index);
+
+			console.log(index);
+		};
+
 		$.append($$anchor, button);
 	});
 
diff --git a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/client/index.svelte.js
index b46acee82e..7025c788be 100644
--- a/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/nullish-coallescence-omittance/_expected/client/index.svelte.js
@@ -1,7 +1,6 @@
 import 'svelte/internal/disclose-version';
 import * as $ from 'svelte/internal/client';
 
-var on_click = (_, count) => $.update(count);
 var root = $.from_html(`<h1></h1> <b></b> <button> </button> <h1></h1>`, 1);
 
 export default function Nullish_coallescence_omittance($$anchor) {
@@ -18,7 +17,7 @@ export default function Nullish_coallescence_omittance($$anchor) {
 
 	var button = $.sibling(b, 2);
 
-	button.__click = [on_click, count];
+	button.__click = () => $.update(count);
 
 	var text = $.child(button);
 
diff --git a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
index c446b3d3ef..30691231f4 100644
--- a/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js
@@ -1,18 +1,19 @@
 import 'svelte/internal/disclose-version';
 import * as $ from 'svelte/internal/client';
 
-function reset(_, str, tpl) {
-	$.set(str, '');
-	$.set(str, ``);
-	$.set(tpl, '');
-	$.set(tpl, ``);
-}
-
 var root = $.from_html(`<input/> <input/> <button>reset</button>`, 1);
 
 export default function State_proxy_literal($$anchor) {
 	let str = $.state('');
 	let tpl = $.state(``);
+
+	function reset() {
+		$.set(str, '');
+		$.set(str, ``);
+		$.set(tpl, '');
+		$.set(tpl, ``);
+	}
+
 	var fragment = root();
 	var input = $.first_child(fragment);
 
@@ -24,7 +25,7 @@ export default function State_proxy_literal($$anchor) {
 
 	var button = $.sibling(input_1, 2);
 
-	button.__click = [reset, str, tpl];
+	button.__click = reset;
 	$.bind_value(input, () => $.get(str), ($$value) => $.set(str, $$value));
 	$.bind_value(input_1, () => $.get(tpl), ($$value) => $.set(tpl, $$value));
 	$.append($$anchor, fragment);

From b7f39b464a00eda8eeb233dbf52d03a1fe0a740b Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Sat, 25 Oct 2025 17:16:29 +0200
Subject: [PATCH 131/347] fix: always allow `setContext` before first await in
 component (#17031)

The previous check was flawed because EFFECT_RAN would be set by the time it is checked, since a promise in a parent component will cause a delay of the inner component being instantiated. Instead we have a new field on the component context checking if the component was already popped (if se we are indeed too late). Don't love it to have a field just for this but I don't see another way to reliably check it.

Fixes #16629
---
 .changeset/itchy-hats-study.md                        |  5 +++++
 packages/svelte/src/internal/client/constants.js      |  1 +
 packages/svelte/src/internal/client/context.js        |  9 ++++++++-
 packages/svelte/src/internal/client/error-handling.js |  4 ++--
 packages/svelte/src/internal/client/types.d.ts        |  4 +++-
 .../async-context-throws-after-await/_config.js       | 11 +++++++++++
 .../async-context-throws-after-await/main.svelte      |  7 +++++++
 .../samples/async-set-context/Inner.svelte            |  7 +++++++
 .../samples/async-set-context/Outer.svelte            |  9 +++++++++
 .../samples/async-set-context/_config.js              | 11 +++++++++++
 .../samples/async-set-context/main.svelte             |  7 +++++++
 11 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/itchy-hats-study.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-context-throws-after-await/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-context-throws-after-await/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-set-context/Inner.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-set-context/Outer.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-set-context/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-set-context/main.svelte

diff --git a/.changeset/itchy-hats-study.md b/.changeset/itchy-hats-study.md
new file mode 100644
index 0000000000..e92ec5affd
--- /dev/null
+++ b/.changeset/itchy-hats-study.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: always allow `setContext` before first await in component
diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js
index 24dc9e4fb8..c2f7861b78 100644
--- a/packages/svelte/src/internal/client/constants.js
+++ b/packages/svelte/src/internal/client/constants.js
@@ -13,6 +13,7 @@ export const INERT = 1 << 13;
 export const DESTROYED = 1 << 14;
 
 // Flags exclusive to effects
+/** Set once an effect that should run synchronously has run */
 export const EFFECT_RAN = 1 << 15;
 /**
  * 'Transparent' effects do not create a transition boundary.
diff --git a/packages/svelte/src/internal/client/context.js b/packages/svelte/src/internal/client/context.js
index 751a35321a..ffdb342adb 100644
--- a/packages/svelte/src/internal/client/context.js
+++ b/packages/svelte/src/internal/client/context.js
@@ -128,7 +128,11 @@ export function setContext(key, context) {
 
 	if (async_mode_flag) {
 		var flags = /** @type {Effect} */ (active_effect).f;
-		var valid = !active_reaction && (flags & BRANCH_EFFECT) !== 0 && (flags & EFFECT_RAN) === 0;
+		var valid =
+			!active_reaction &&
+			(flags & BRANCH_EFFECT) !== 0 &&
+			// pop() runs synchronously, so this indicates we're setting context after an await
+			!(/** @type {ComponentContext} */ (component_context).i);
 
 		if (!valid) {
 			e.set_context_after_init();
@@ -173,6 +177,7 @@ export function getAllContexts() {
 export function push(props, runes = false, fn) {
 	component_context = {
 		p: component_context,
+		i: false,
 		c: null,
 		e: null,
 		s: props,
@@ -208,6 +213,8 @@ export function pop(component) {
 		context.x = component;
 	}
 
+	context.i = true;
+
 	component_context = context.p;
 
 	if (DEV) {
diff --git a/packages/svelte/src/internal/client/error-handling.js b/packages/svelte/src/internal/client/error-handling.js
index 6c83a453d5..dcbbf14e20 100644
--- a/packages/svelte/src/internal/client/error-handling.js
+++ b/packages/svelte/src/internal/client/error-handling.js
@@ -29,7 +29,7 @@ export function handle_error(error) {
 		// if the error occurred while creating this subtree, we let it
 		// bubble up until it hits a boundary that can handle it
 		if ((effect.f & BOUNDARY_EFFECT) === 0) {
-			if (!effect.parent && error instanceof Error) {
+			if (DEV && !effect.parent && error instanceof Error) {
 				apply_adjustments(error);
 			}
 
@@ -61,7 +61,7 @@ export function invoke_error_boundary(error, effect) {
 		effect = effect.parent;
 	}
 
-	if (error instanceof Error) {
+	if (DEV && error instanceof Error) {
 		apply_adjustments(error);
 	}
 
diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts
index d24218c4d3..deb3e82986 100644
--- a/packages/svelte/src/internal/client/types.d.ts
+++ b/packages/svelte/src/internal/client/types.d.ts
@@ -1,6 +1,6 @@
 import type { Store } from '#shared';
 import { STATE_SYMBOL } from './constants.js';
-import type { Effect, Source, Value, Reaction } from './reactivity/types.js';
+import type { Effect, Source, Value } from './reactivity/types.js';
 
 type EventCallback = (event: Event) => boolean;
 export type EventCallbackMap = Record<string, EventCallback | EventCallback[]>;
@@ -16,6 +16,8 @@ export type ComponentContext = {
 	c: null | Map<unknown, unknown>;
 	/** deferred effects */
 	e: null | Array<() => void | (() => void)>;
+	/** True if initialized, i.e. pop() ran */
+	i: boolean;
 	/**
 	 * props — needed for legacy mode lifecycle functions, and for `createEventDispatcher`
 	 * @deprecated remove in 6.0
diff --git a/packages/svelte/tests/runtime-runes/samples/async-context-throws-after-await/_config.js b/packages/svelte/tests/runtime-runes/samples/async-context-throws-after-await/_config.js
new file mode 100644
index 0000000000..be73968a88
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-context-throws-after-await/_config.js
@@ -0,0 +1,11 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client'],
+	async test() {
+		// else runtime_error is checked too soon
+		await tick();
+	},
+	runtime_error: 'set_context_after_init'
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-context-throws-after-await/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-context-throws-after-await/main.svelte
new file mode 100644
index 0000000000..8e770c214b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/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/runtime-runes/samples/async-set-context/Inner.svelte b/packages/svelte/tests/runtime-runes/samples/async-set-context/Inner.svelte
new file mode 100644
index 0000000000..2c7fd5d43d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-set-context/Inner.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+	import { getContext } from "svelte";
+
+  let greeting = getContext("greeting");
+</script>
+
+<p>{greeting}</p>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-set-context/Outer.svelte b/packages/svelte/tests/runtime-runes/samples/async-set-context/Outer.svelte
new file mode 100644
index 0000000000..9a493c5b75
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-set-context/Outer.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+	import { setContext } from "svelte";
+	import Inner from "./Inner.svelte";
+
+	setContext("greeting", "hi");
+	await Promise.resolve();
+</script>
+
+<Inner />
diff --git a/packages/svelte/tests/runtime-runes/samples/async-set-context/_config.js b/packages/svelte/tests/runtime-runes/samples/async-set-context/_config.js
new file mode 100644
index 0000000000..041f67a39e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-set-context/_config.js
@@ -0,0 +1,11 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client', 'async-server'],
+	ssrHtml: `<p>hi</p>`,
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<p>hi</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-set-context/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-set-context/main.svelte
new file mode 100644
index 0000000000..01b46bda93
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-set-context/main.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+	import Outer from "./Outer.svelte";
+
+	await Promise.resolve();
+</script>
+
+<Outer />

From d8137b78a5ab747d0b51fd531288b113b974d830 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sat, 25 Oct 2025 11:29:10 -0400
Subject: [PATCH 132/347] fix: less confusing names for inspect errors (#17026)

* fix: less confusing names for inspect errors

* fix

* Update packages/svelte/src/internal/client/dev/inspect.js

* fix
---
 .changeset/swift-taxes-shake.md                |  5 +++++
 .../svelte/src/internal/client/dev/inspect.js  | 11 ++++++++++-
 .../svelte/src/internal/client/dev/tracing.js  |  3 +--
 packages/svelte/src/internal/client/proxy.js   |  2 +-
 .../src/internal/client/reactivity/deriveds.js |  2 +-
 .../src/internal/client/reactivity/sources.js  |  4 ++--
 packages/svelte/src/internal/client/runtime.js |  4 ++--
 packages/svelte/tests/helpers.js               | 18 ++++++++++++++----
 .../async-reactivity-loss-for-await/_config.js |  2 +-
 .../samples/async-reactivity-loss/_config.js   |  2 +-
 .../samples/effect-loop-infinite/_config.js    |  2 +-
 11 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/swift-taxes-shake.md

diff --git a/.changeset/swift-taxes-shake.md b/.changeset/swift-taxes-shake.md
new file mode 100644
index 0000000000..73b1529d87
--- /dev/null
+++ b/.changeset/swift-taxes-shake.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: less confusing names for inspect errors
diff --git a/packages/svelte/src/internal/client/dev/inspect.js b/packages/svelte/src/internal/client/dev/inspect.js
index 09150d6ee4..34ba508984 100644
--- a/packages/svelte/src/internal/client/dev/inspect.js
+++ b/packages/svelte/src/internal/client/dev/inspect.js
@@ -33,8 +33,17 @@ export function inspect(get_value, inspector, show_stack = false) {
 				inspector(...snap);
 
 				if (!initial) {
+					const stack = get_stack('$inspect(...)');
 					// eslint-disable-next-line no-console
-					console.log(get_stack('UpdatedAt'));
+
+					if (stack) {
+						// eslint-disable-next-line no-console
+						console.groupCollapsed('stack trace');
+						// eslint-disable-next-line no-console
+						console.log(stack);
+						// eslint-disable-next-line no-console
+						console.groupEnd();
+					}
 				}
 			} else {
 				inspector(initial ? 'init' : 'update', ...snap);
diff --git a/packages/svelte/src/internal/client/dev/tracing.js b/packages/svelte/src/internal/client/dev/tracing.js
index 98be92d4b2..4688637f5d 100644
--- a/packages/svelte/src/internal/client/dev/tracing.js
+++ b/packages/svelte/src/internal/client/dev/tracing.js
@@ -179,8 +179,7 @@ export function get_stack(label) {
 	});
 
 	define_property(error, 'name', {
-		// 'Error' suffix is required for stack traces to be rendered properly
-		value: `${label}Error`
+		value: label
 	});
 
 	return /** @type {Error & { stack: string }} */ (error);
diff --git a/packages/svelte/src/internal/client/proxy.js b/packages/svelte/src/internal/client/proxy.js
index 9baacacd0d..49cef451b3 100644
--- a/packages/svelte/src/internal/client/proxy.js
+++ b/packages/svelte/src/internal/client/proxy.js
@@ -53,7 +53,7 @@ export function proxy(value) {
 	var is_proxied_array = is_array(value);
 	var version = source(0);
 
-	var stack = DEV && tracing_mode_flag ? get_stack('CreatedAt') : null;
+	var stack = DEV && tracing_mode_flag ? get_stack('created at') : null;
 	var parent_version = update_version;
 
 	/**
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index b6a50acc4d..1eb640ad26 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -86,7 +86,7 @@ export function derived(fn) {
 	};
 
 	if (DEV && tracing_mode_flag) {
-		signal.created = get_stack('CreatedAt');
+		signal.created = get_stack('created at');
 	}
 
 	return signal;
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 9534e718a5..b480d4155a 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -76,7 +76,7 @@ export function source(v, stack) {
 	};
 
 	if (DEV && tracing_mode_flag) {
-		signal.created = stack ?? get_stack('CreatedAt');
+		signal.created = stack ?? get_stack('created at');
 		signal.updated = null;
 		signal.set_during_effect = false;
 		signal.trace = null;
@@ -186,7 +186,7 @@ export function internal_set(source, value) {
 
 		if (DEV) {
 			if (tracing_mode_flag || active_effect !== null) {
-				const error = get_stack('UpdatedAt');
+				const error = get_stack('updated at');
 
 				if (error !== null) {
 					source.updated ??= new Map();
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 2e6f05b4b1..49396d6feb 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -609,7 +609,7 @@ export function get(signal) {
 			if (!tracking && !untracking && !was_read) {
 				w.await_reactivity_loss(/** @type {string} */ (signal.label));
 
-				var trace = get_stack('TracedAt');
+				var trace = get_stack('traced at');
 				// eslint-disable-next-line no-console
 				if (trace) console.warn(trace);
 			}
@@ -628,7 +628,7 @@ export function get(signal) {
 			if (signal.trace) {
 				signal.trace();
 			} else {
-				trace = get_stack('TracedAt');
+				trace = get_stack('traced at');
 
 				if (trace) {
 					var entry = tracing_expressions.entries.get(signal);
diff --git a/packages/svelte/tests/helpers.js b/packages/svelte/tests/helpers.js
index bf708878a3..d0ec8b6e44 100644
--- a/packages/svelte/tests/helpers.js
+++ b/packages/svelte/tests/helpers.js
@@ -201,7 +201,15 @@ export const async_mode = process.env.SVELTE_NO_ASYNC !== 'true';
  * @param {any[]} logs
  */
 export function normalise_inspect_logs(logs) {
-	return logs.map((log) => {
+	/** @type {string[]} */
+	const normalised = [];
+
+	for (const log of logs) {
+		if (log === 'stack trace') {
+			// ignore `console.group('stack trace')` in default `$inspect(...)` output
+			continue;
+		}
+
 		if (log instanceof Error) {
 			const last_line = log.stack
 				?.trim()
@@ -210,11 +218,13 @@ export function normalise_inspect_logs(logs) {
 
 			const match = last_line && /(at .+) /.exec(last_line);
 
-			return match && match[1];
+			if (match) normalised.push(match[1]);
+		} else {
+			normalised.push(log);
 		}
+	}
 
-		return log;
-	});
+	return normalised;
 }
 
 /**
diff --git a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss-for-await/_config.js b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss-for-await/_config.js
index bde65a499f..2bcb129b12 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss-for-await/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss-for-await/_config.js
@@ -17,7 +17,7 @@ export default test({
 			'Detected reactivity loss when reading `values[1]`. This happens when state is read in an async function after an earlier `await`'
 		);
 
-		assert.equal(warnings[1].name, 'TracedAtError');
+		assert.equal(warnings[1].name, 'traced at');
 
 		assert.equal(warnings.length, 2);
 	}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js
index 16318a3b44..747648e83f 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js
@@ -20,7 +20,7 @@ export default test({
 			'Detected reactivity loss when reading `b`. This happens when state is read in an async function after an earlier `await`'
 		);
 
-		assert.equal(warnings[1].name, 'TracedAtError');
+		assert.equal(warnings[1].name, 'traced at');
 
 		assert.equal(warnings.length, 2);
 	}
diff --git a/packages/svelte/tests/runtime-runes/samples/effect-loop-infinite/_config.js b/packages/svelte/tests/runtime-runes/samples/effect-loop-infinite/_config.js
index 400495050c..57f60c2b44 100644
--- a/packages/svelte/tests/runtime-runes/samples/effect-loop-infinite/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/effect-loop-infinite/_config.js
@@ -14,7 +14,7 @@ export default test({
 		try {
 			flushSync(() => button.click());
 		} catch (e) {
-			assert.equal(errors.length, 1); // for whatever reason we can't get the name which should be UpdatedAtError
+			assert.equal(errors.length, 1); // for whatever reason we can't get the name which should be 'updated at'
 			assert.ok(/** @type {Error} */ (e).message.startsWith('effect_update_depth_exceeded'));
 		}
 	}

From 875a04170ec58e81234a28aea742131391233ae9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 25 Oct 2025 11:35:04 -0400
Subject: [PATCH 133/347] Version Packages (#17029)

* Version Packages

* minor not patch

* Apply suggestions from code review

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/itchy-hats-study.md  |  5 -----
 .changeset/small-geckos-camp.md |  5 -----
 .changeset/swift-taxes-shake.md |  5 -----
 packages/svelte/CHANGELOG.md    | 12 ++++++++++++
 packages/svelte/package.json    |  2 +-
 packages/svelte/src/version.js  |  2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 .changeset/itchy-hats-study.md
 delete mode 100644 .changeset/small-geckos-camp.md
 delete mode 100644 .changeset/swift-taxes-shake.md

diff --git a/.changeset/itchy-hats-study.md b/.changeset/itchy-hats-study.md
deleted file mode 100644
index e92ec5affd..0000000000
--- a/.changeset/itchy-hats-study.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: always allow `setContext` before first await in component
diff --git a/.changeset/small-geckos-camp.md b/.changeset/small-geckos-camp.md
deleted file mode 100644
index 622cbbbfa0..0000000000
--- a/.changeset/small-geckos-camp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"svelte": patch
----
-
-feat: experimental `fork` API
diff --git a/.changeset/swift-taxes-shake.md b/.changeset/swift-taxes-shake.md
deleted file mode 100644
index 73b1529d87..0000000000
--- a/.changeset/swift-taxes-shake.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: less confusing names for inspect errors
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index d63548d3e1..c59d4dbc6e 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.42.0
+
+### Minor Changes
+
+- feat: experimental `fork` API ([#17004](https://github.com/sveltejs/svelte/pull/17004))
+
+### Patch Changes
+
+- fix: always allow `setContext` before first await in component ([#17031](https://github.com/sveltejs/svelte/pull/17031))
+
+- fix: less confusing names for inspect errors ([#17026](https://github.com/sveltejs/svelte/pull/17026))
+
 ## 5.41.4
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 1d50920d4f..c3b7254bd5 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.41.4",
+  "version": "5.42.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index f5f47c6056..abdb12e088 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.41.4';
+export const VERSION = '5.42.0';
 export const PUBLIC_VERSION = '5';

From 657ec89caa93d39d2cf8d8cdbe27b0041615409f Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sat, 25 Oct 2025 14:12:22 -0400
Subject: [PATCH 134/347] fix: ignore fork `discard()` after `commit()`
 (#17034)

* fix: ignore fork `discard()` after `commit()`

* fix message
---
 .changeset/twenty-onions-attack.md            |  5 +++++
 .../98-reference/.generated/client-errors.md  |  2 +-
 .../svelte/messages/client-errors/errors.md   |  2 +-
 packages/svelte/src/internal/client/errors.js |  4 ++--
 .../src/internal/client/reactivity/batch.js   | 22 +++++++++++++------
 5 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/twenty-onions-attack.md

diff --git a/.changeset/twenty-onions-attack.md b/.changeset/twenty-onions-attack.md
new file mode 100644
index 0000000000..c23c8b590b
--- /dev/null
+++ b/.changeset/twenty-onions-attack.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ignore fork `discard()` after `commit()`
diff --git a/documentation/docs/98-reference/.generated/client-errors.md b/documentation/docs/98-reference/.generated/client-errors.md
index 74a0674dba..3f1cb8f76b 100644
--- a/documentation/docs/98-reference/.generated/client-errors.md
+++ b/documentation/docs/98-reference/.generated/client-errors.md
@@ -149,7 +149,7 @@ This restriction only applies when using the `experimental.async` option, which
 ### fork_discarded
 
 ```
-Cannot commit a fork that was already committed or discarded
+Cannot commit a fork that was already discarded
 ```
 
 ### fork_timing
diff --git a/packages/svelte/messages/client-errors/errors.md b/packages/svelte/messages/client-errors/errors.md
index b5fe51539d..ae7d811b2e 100644
--- a/packages/svelte/messages/client-errors/errors.md
+++ b/packages/svelte/messages/client-errors/errors.md
@@ -114,7 +114,7 @@ This restriction only applies when using the `experimental.async` option, which
 
 ## fork_discarded
 
-> Cannot commit a fork that was already committed or discarded
+> Cannot commit a fork that was already discarded
 
 ## fork_timing
 
diff --git a/packages/svelte/src/internal/client/errors.js b/packages/svelte/src/internal/client/errors.js
index 2a433ed8f9..8a5fde4f3b 100644
--- a/packages/svelte/src/internal/client/errors.js
+++ b/packages/svelte/src/internal/client/errors.js
@@ -262,12 +262,12 @@ export function flush_sync_in_effect() {
 }
 
 /**
- * Cannot commit a fork that was already committed or discarded
+ * Cannot commit a fork that was already discarded
  * @returns {never}
  */
 export function fork_discarded() {
 	if (DEV) {
-		const error = new Error(`fork_discarded\nCannot commit a fork that was already committed or discarded\nhttps://svelte.dev/e/fork_discarded`);
+		const error = new Error(`fork_discarded\nCannot commit a fork that was already discarded\nhttps://svelte.dev/e/fork_discarded`);
 
 		error.name = 'Svelte error';
 
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index fdeb111a4d..ab83050cd0 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -913,28 +913,36 @@ export function fork(fn) {
 		e.fork_timing();
 	}
 
-	const batch = Batch.ensure();
+	var batch = Batch.ensure();
 	batch.is_fork = true;
 
-	const settled = batch.settled();
+	var committed = false;
+	var settled = batch.settled();
 
 	flushSync(fn);
 
 	// revert state changes
-	for (const [source, value] of batch.previous) {
+	for (var [source, value] of batch.previous) {
 		source.v = value;
 	}
 
 	return {
 		commit: async () => {
+			if (committed) {
+				await settled;
+				return;
+			}
+
 			if (!batches.has(batch)) {
 				e.fork_discarded();
 			}
 
+			committed = true;
+
 			batch.is_fork = false;
 
 			// apply changes
-			for (const [source, value] of batch.current) {
+			for (var [source, value] of batch.current) {
 				source.v = value;
 			}
 
@@ -945,9 +953,9 @@ export function fork(fn) {
 			// TODO maybe there's a better implementation?
 			flushSync(() => {
 				/** @type {Set<Effect>} */
-				const eager_effects = new Set();
+				var eager_effects = new Set();
 
-				for (const source of batch.current.keys()) {
+				for (var source of batch.current.keys()) {
 					mark_eager_effects(source, eager_effects);
 				}
 
@@ -959,7 +967,7 @@ export function fork(fn) {
 			await settled;
 		},
 		discard: () => {
-			if (batches.has(batch)) {
+			if (!committed && batches.has(batch)) {
 				batches.delete(batch);
 				batch.discard();
 			}

From e33f774877be45cf68fb96f84b4670a9deb52159 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 25 Oct 2025 14:48:43 -0400
Subject: [PATCH 135/347] Version Packages (#17035)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/twenty-onions-attack.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/twenty-onions-attack.md

diff --git a/.changeset/twenty-onions-attack.md b/.changeset/twenty-onions-attack.md
deleted file mode 100644
index c23c8b590b..0000000000
--- a/.changeset/twenty-onions-attack.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ignore fork `discard()` after `commit()`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index c59d4dbc6e..51e6317491 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.42.1
+
+### Patch Changes
+
+- fix: ignore fork `discard()` after `commit()` ([#17034](https://github.com/sveltejs/svelte/pull/17034))
+
 ## 5.42.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index c3b7254bd5..1f8746e72d 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.42.0",
+  "version": "5.42.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index abdb12e088..8d50b983ce 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.42.0';
+export const VERSION = '5.42.1';
 export const PUBLIC_VERSION = '5';

From 8368a4beb98fd9ed07fc34500ddb689916fbf8ad Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Sat, 25 Oct 2025 23:46:58 +0200
Subject: [PATCH 136/347] fix: better error message for global variable
 assignments (#17036)

---
 .changeset/slick-teeth-exist.md                             | 5 +++++
 .../src/compiler/phases/2-analyze/visitors/shared/utils.js  | 5 ++++-
 .../samples/global-variable-assignment/_config.js           | 6 ++++++
 .../samples/global-variable-assignment/foo.svelte.js        | 1 +
 .../samples/global-variable-assignment/main.svelte          | 3 +++
 5 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/slick-teeth-exist.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/global-variable-assignment/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/global-variable-assignment/foo.svelte.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/global-variable-assignment/main.svelte

diff --git a/.changeset/slick-teeth-exist.md b/.changeset/slick-teeth-exist.md
new file mode 100644
index 0000000000..aeeb0f41b9
--- /dev/null
+++ b/.changeset/slick-teeth-exist.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: better error message for global variable assignments
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/utils.js
index d7b682da08..cc4376a0c2 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/utils.js
@@ -22,7 +22,10 @@ export function validate_assignment(node, argument, context) {
 		const binding = context.state.scope.get(argument.name);
 
 		if (context.state.analysis.runes) {
-			if (binding?.node === context.state.analysis.props_id) {
+			if (
+				context.state.analysis.props_id != null &&
+				binding?.node === context.state.analysis.props_id
+			) {
 				e.constant_assignment(node, '$props.id()');
 			}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/global-variable-assignment/_config.js b/packages/svelte/tests/runtime-runes/samples/global-variable-assignment/_config.js
new file mode 100644
index 0000000000..37f4b2814c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/global-variable-assignment/_config.js
@@ -0,0 +1,6 @@
+import { test } from '../../test';
+
+export default test({
+	error: 'x is not defined',
+	async test() {}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/global-variable-assignment/foo.svelte.js b/packages/svelte/tests/runtime-runes/samples/global-variable-assignment/foo.svelte.js
new file mode 100644
index 0000000000..198b8f89e7
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/global-variable-assignment/foo.svelte.js
@@ -0,0 +1 @@
+x = 1;
diff --git a/packages/svelte/tests/runtime-runes/samples/global-variable-assignment/main.svelte b/packages/svelte/tests/runtime-runes/samples/global-variable-assignment/main.svelte
new file mode 100644
index 0000000000..0ac6956b1d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/global-variable-assignment/main.svelte
@@ -0,0 +1,3 @@
+<script>
+	import "./foo.svelte.js";
+</script>

From b01647455c495c4b99b84f9ecd7ce664e593b4f0 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sat, 25 Oct 2025 20:36:01 -0400
Subject: [PATCH 137/347] chore: create_expression_metadata ->
 ExpressionMetadata (#17039)

* chore: create_expression_metadata -> ExpressionMetadata

* err whatever
---
 .../compiler/phases/1-parse/state/element.js  | 17 ++++----
 .../src/compiler/phases/1-parse/state/tag.js  | 18 ++++----
 .../src/compiler/phases/2-analyze/types.d.ts  |  3 +-
 .../2-analyze/visitors/CallExpression.js      |  4 +-
 .../phases/2-analyze/visitors/RenderTag.js    |  4 +-
 .../client/visitors/shared/element.js         |  3 +-
 .../client/visitors/shared/events.js          |  3 +-
 .../client/visitors/shared/utils.js           |  3 +-
 .../server/visitors/shared/element.js         | 12 ++----
 .../server/visitors/shared/utils.js           |  5 ++-
 packages/svelte/src/compiler/phases/nodes.js  | 41 ++++++++++++-------
 packages/svelte/src/compiler/phases/scope.js  |  4 +-
 packages/svelte/src/compiler/types/index.d.ts | 17 --------
 .../svelte/src/compiler/types/template.d.ts   |  3 +-
 14 files changed, 67 insertions(+), 70 deletions(-)

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 b0db9ce178..7b0950ae82 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/element.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/element.js
@@ -9,11 +9,10 @@ import { decode_character_references } from '../utils/html.js';
 import * as e from '../../../errors.js';
 import * as w from '../../../warnings.js';
 import { create_fragment } from '../utils/create.js';
-import { create_attribute, create_expression_metadata, is_element_node } from '../../nodes.js';
+import { create_attribute, ExpressionMetadata, is_element_node } from '../../nodes.js';
 import { get_attribute_expression, is_expression_attribute } from '../../../utils/ast.js';
 import { closing_tag_omitted } from '../../../../html-tree-validation.js';
 import { list } from '../../../utils/string.js';
-import { regex_whitespace } from '../../patterns.js';
 
 const regex_invalid_unquoted_attribute_value = /^(\/>|[\s"'=<>`])/;
 const regex_closing_textarea_tag = /^<\/textarea(\s[^>]*)?>/i;
@@ -297,7 +296,7 @@ export default function element(parser) {
 			element.tag = get_attribute_expression(definition);
 		}
 
-		element.metadata.expression = create_expression_metadata();
+		element.metadata.expression = new ExpressionMetadata();
 	}
 
 	if (is_top_level_script_or_style) {
@@ -508,7 +507,7 @@ function read_attribute(parser) {
 				end: parser.index,
 				expression,
 				metadata: {
-					expression: create_expression_metadata()
+					expression: new ExpressionMetadata()
 				}
 			};
 
@@ -528,7 +527,7 @@ function read_attribute(parser) {
 				end: parser.index,
 				expression,
 				metadata: {
-					expression: create_expression_metadata()
+					expression: new ExpressionMetadata()
 				}
 			};
 
@@ -568,7 +567,7 @@ function read_attribute(parser) {
 					name
 				},
 				metadata: {
-					expression: create_expression_metadata()
+					expression: new ExpressionMetadata()
 				}
 			};
 
@@ -628,7 +627,7 @@ function read_attribute(parser) {
 				modifiers: /** @type {Array<'important'>} */ (modifiers),
 				value,
 				metadata: {
-					expression: create_expression_metadata()
+					expression: new ExpressionMetadata()
 				}
 			};
 		}
@@ -658,7 +657,7 @@ function read_attribute(parser) {
 			name: directive_name,
 			expression,
 			metadata: {
-				expression: create_expression_metadata()
+				expression: new ExpressionMetadata()
 			}
 		};
 
@@ -824,7 +823,7 @@ function read_sequence(parser, done, location) {
 				end: parser.index,
 				expression,
 				metadata: {
-					expression: create_expression_metadata()
+					expression: new ExpressionMetadata()
 				}
 			};
 
diff --git a/packages/svelte/src/compiler/phases/1-parse/state/tag.js b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
index ba091ef7ec..4ff948e165 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/tag.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
@@ -3,7 +3,7 @@
 /** @import { Parser } from '../index.js' */
 import { walk } from 'zimmerframe';
 import * as e from '../../../errors.js';
-import { create_expression_metadata } from '../../nodes.js';
+import { ExpressionMetadata } from '../../nodes.js';
 import { parse_expression_at } from '../acorn.js';
 import read_pattern from '../read/context.js';
 import read_expression, { get_loose_identifier } from '../read/expression.js';
@@ -42,7 +42,7 @@ export default function tag(parser) {
 		end: parser.index,
 		expression,
 		metadata: {
-			expression: create_expression_metadata()
+			expression: new ExpressionMetadata()
 		}
 	});
 }
@@ -65,7 +65,7 @@ function open(parser) {
 			consequent: create_fragment(),
 			alternate: null,
 			metadata: {
-				expression: create_expression_metadata()
+				expression: new ExpressionMetadata()
 			}
 		});
 
@@ -249,7 +249,7 @@ function open(parser) {
 			then: null,
 			catch: null,
 			metadata: {
-				expression: create_expression_metadata()
+				expression: new ExpressionMetadata()
 			}
 		});
 
@@ -334,7 +334,7 @@ function open(parser) {
 			expression,
 			fragment: create_fragment(),
 			metadata: {
-				expression: create_expression_metadata()
+				expression: new ExpressionMetadata()
 			}
 		});
 
@@ -477,7 +477,7 @@ function next(parser) {
 				consequent: create_fragment(),
 				alternate: null,
 				metadata: {
-					expression: create_expression_metadata()
+					expression: new ExpressionMetadata()
 				}
 			});
 
@@ -643,7 +643,7 @@ function special(parser) {
 			end: parser.index,
 			expression,
 			metadata: {
-				expression: create_expression_metadata()
+				expression: new ExpressionMetadata()
 			}
 		});
 
@@ -721,7 +721,7 @@ function special(parser) {
 				end: parser.index - 1
 			},
 			metadata: {
-				expression: create_expression_metadata()
+				expression: new ExpressionMetadata()
 			}
 		});
 	}
@@ -748,7 +748,7 @@ function special(parser) {
 			end: parser.index,
 			expression: /** @type {AST.RenderTag['expression']} */ (expression),
 			metadata: {
-				expression: create_expression_metadata(),
+				expression: new ExpressionMetadata(),
 				dynamic: false,
 				arguments: [],
 				path: [],
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 bad6c7d613..9d24f9dbac 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
+++ b/packages/svelte/src/compiler/phases/2-analyze/types.d.ts
@@ -1,6 +1,7 @@
 import type { Scope } from '../scope.js';
 import type { ComponentAnalysis, ReactiveStatement } from '../types.js';
-import type { AST, ExpressionMetadata, StateField, ValidatedCompileOptions } from '#compiler';
+import type { AST, StateField, ValidatedCompileOptions } from '#compiler';
+import type { ExpressionMetadata } from '../nodes.js';
 
 export interface AnalysisState {
 	scope: Scope;
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 4b66abe1d1..52eba8c735 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js
@@ -7,7 +7,7 @@ import { get_parent } from '../../../utils/ast.js';
 import { is_pure, is_safe_identifier } from './shared/utils.js';
 import { dev, locate_node, source } from '../../../state.js';
 import * as b from '#compiler/builders';
-import { create_expression_metadata } from '../../nodes.js';
+import { ExpressionMetadata } from '../../nodes.js';
 
 /**
  * @param {CallExpression} node
@@ -243,7 +243,7 @@ export function CallExpression(node, context) {
 
 	// `$inspect(foo)` or `$derived(foo) should not trigger the `static-state-reference` warning
 	if (rune === '$derived') {
-		const expression = create_expression_metadata();
+		const expression = new ExpressionMetadata();
 
 		context.next({
 			...context.state,
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/RenderTag.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/RenderTag.js
index 1230ef6b04..d0c994b7a4 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/RenderTag.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/RenderTag.js
@@ -5,7 +5,7 @@ import * as e from '../../../errors.js';
 import { validate_opening_tag } from './shared/utils.js';
 import { mark_subtree_dynamic } from './shared/fragment.js';
 import { is_resolved_snippet } from './shared/snippets.js';
-import { create_expression_metadata } from '../../nodes.js';
+import { ExpressionMetadata } from '../../nodes.js';
 
 /**
  * @param {AST.RenderTag} node
@@ -57,7 +57,7 @@ export function RenderTag(node, context) {
 	context.visit(callee, { ...context.state, expression: node.metadata.expression });
 
 	for (const arg of expression.arguments) {
-		const metadata = create_expression_metadata();
+		const metadata = new ExpressionMetadata();
 		node.metadata.arguments.push(metadata);
 
 		context.visit(arg, {
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 4b32dab82a..dd390c99da 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
@@ -1,5 +1,5 @@
 /** @import { Expression, Identifier, ObjectExpression } from 'estree' */
-/** @import { AST, ExpressionMetadata } from '#compiler' */
+/** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../../types' */
 import { escape_html } from '../../../../../../escaping.js';
 import { normalize_attribute } from '../../../../../../utils.js';
@@ -8,6 +8,7 @@ import { is_event_attribute } from '../../../../../utils/ast.js';
 import * as b from '#compiler/builders';
 import { build_class_directives_object, build_style_directives_object } from '../RegularElement.js';
 import { build_expression, build_template_chunk, Memoizer } from './utils.js';
+import { ExpressionMetadata } from '../../../../nodes.js';
 
 /**
  * @param {Array<AST.Attribute | AST.SpreadAttribute>} attributes
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js
index d4d6721960..3ab1506eb3 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js
@@ -1,9 +1,10 @@
 /** @import { Expression } from 'estree' */
-/** @import { AST, ExpressionMetadata } from '#compiler' */
+/** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../../types' */
 import { is_capture_event, is_passive_event } from '../../../../../../utils.js';
 import { dev, locator } from '../../../../../state.js';
 import * as b from '#compiler/builders';
+import { ExpressionMetadata } from '../../../../nodes.js';
 
 /**
  * @param {AST.Attribute} node
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
index a42063b2e2..46d2f2b777 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
@@ -1,5 +1,5 @@
 /** @import { AssignmentExpression, Expression, Identifier, MemberExpression, SequenceExpression, Literal, Super, UpdateExpression, ExpressionStatement } from 'estree' */
-/** @import { AST, ExpressionMetadata } from '#compiler' */
+/** @import { AST } from '#compiler' */
 /** @import { ComponentClientTransformState, ComponentContext, Context } from '../../types' */
 import { walk } from 'zimmerframe';
 import { object } from '../../../../../utils/ast.js';
@@ -9,6 +9,7 @@ import { regex_is_valid_identifier } from '../../../../patterns.js';
 import is_reference from 'is-reference';
 import { dev, is_ignored, locator, component_name } from '../../../../../state.js';
 import { build_getter } from '../../utils.js';
+import { ExpressionMetadata } from '../../../../nodes.js';
 
 /**
  * A utility for extracting complex expressions (such as call expressions)
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 cfb87b0ce7..b7607f3fb8 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,13 +1,9 @@
 /** @import { ArrayExpression, Expression, Literal, ObjectExpression } from 'estree' */
-/** @import { AST, ExpressionMetadata } from '#compiler' */
+/** @import { AST } 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';
-import {
-	create_attribute,
-	create_expression_metadata,
-	is_custom_element_node
-} from '../../../../nodes.js';
+import { create_attribute, ExpressionMetadata, is_custom_element_node } from '../../../../nodes.js';
 import { regex_starts_with_newline } from '../../../../patterns.js';
 import * as b from '#compiler/builders';
 import {
@@ -160,7 +156,7 @@ export function build_element_attributes(node, context, transform) {
 										build_attribute_value(value_attribute.value, context, transform)
 									),
 							metadata: {
-								expression: create_expression_metadata()
+								expression: new ExpressionMetadata()
 							}
 						}
 					])
@@ -174,7 +170,7 @@ export function build_element_attributes(node, context, transform) {
 							end: -1,
 							expression,
 							metadata: {
-								expression: create_expression_metadata()
+								expression: new ExpressionMetadata()
 							}
 						}
 					])
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 92653ed73c..09a854670c 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,5 +1,5 @@
-/** @import { AssignmentOperator, Expression, Identifier, Node, Statement, BlockStatement } from 'estree' */
-/** @import { AST, ExpressionMetadata } from '#compiler' */
+/** @import { Expression, Identifier, Node, Statement, BlockStatement } from 'estree' */
+/** @import { AST } from '#compiler' */
 /** @import { ComponentContext, ServerTransformState } from '../../types.js' */
 
 import { escape_html } from '../../../../../../escaping.js';
@@ -13,6 +13,7 @@ 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_expression } from '../../../../../utils/ast.js';
+import { ExpressionMetadata } from '../../../../nodes.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);
diff --git a/packages/svelte/src/compiler/phases/nodes.js b/packages/svelte/src/compiler/phases/nodes.js
index 13188681d2..bca9c29a65 100644
--- a/packages/svelte/src/compiler/phases/nodes.js
+++ b/packages/svelte/src/compiler/phases/nodes.js
@@ -1,5 +1,5 @@
 /** @import { Expression, PrivateIdentifier } from 'estree' */
-/** @import { AST, ExpressionMetadata } from '#compiler' */
+/** @import { AST, Binding } from '#compiler' */
 
 /**
  * All nodes that can appear elsewhere than the top level, have attributes and can contain children
@@ -64,20 +64,33 @@ export function create_attribute(name, start, end, value) {
 		}
 	};
 }
+export class ExpressionMetadata {
+	/** True if the expression references state directly, or _might_ (via member/call expressions) */
+	has_state = false;
 
-/**
- * @returns {ExpressionMetadata}
- */
-export function create_expression_metadata() {
-	return {
-		dependencies: new Set(),
-		references: new Set(),
-		has_state: false,
-		has_call: false,
-		has_member_expression: false,
-		has_assignment: false,
-		has_await: false
-	};
+	/** True if the expression involves a call expression (often, it will need to be wrapped in a derived) */
+	has_call = false;
+
+	/** True if the expression contains `await` */
+	has_await = false;
+
+	/** True if the expression includes a member expression */
+	has_member_expression = false;
+
+	/** True if the expression includes an assignment or an update */
+	has_assignment = false;
+
+	/**
+	 * All the bindings that are referenced eagerly (not inside functions) in this expression
+	 * @type {Set<Binding>}
+	 */
+	dependencies = new Set();
+
+	/**
+	 * True if the expression references state directly, or _might_ (via member/call expressions)
+	 * @type {Set<Binding>}
+	 */
+	references = new Set();
 }
 
 /**
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index f7d3dac0f7..7dbdf47967 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -3,7 +3,7 @@
 /** @import { AST, BindingKind, DeclarationKind } from '#compiler' */
 import is_reference from 'is-reference';
 import { walk } from 'zimmerframe';
-import { create_expression_metadata } from './nodes.js';
+import { ExpressionMetadata } from './nodes.js';
 import * as b from '#compiler/builders';
 import * as e from '../errors.js';
 import {
@@ -1201,7 +1201,7 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 			if (node.fallback) visit(node.fallback, { scope });
 
 			node.metadata = {
-				expression: create_expression_metadata(),
+				expression: new ExpressionMetadata(),
 				keyed: false,
 				contains_group_binding: false,
 				index: scope.root.unique('$$index'),
diff --git a/packages/svelte/src/compiler/types/index.d.ts b/packages/svelte/src/compiler/types/index.d.ts
index 9bd4b91d58..fce3f62c5c 100644
--- a/packages/svelte/src/compiler/types/index.d.ts
+++ b/packages/svelte/src/compiler/types/index.d.ts
@@ -294,23 +294,6 @@ export type DeclarationKind =
 	| 'using'
 	| 'await using';
 
-export interface ExpressionMetadata {
-	/** All the bindings that are referenced eagerly (not inside functions) in this expression */
-	dependencies: Set<Binding>;
-	/** All the bindings that are referenced inside this expression, including inside functions */
-	references: Set<Binding>;
-	/** True if the expression references state directly, or _might_ (via member/call expressions) */
-	has_state: boolean;
-	/** True if the expression involves a call expression (often, it will need to be wrapped in a derived) */
-	has_call: boolean;
-	/** True if the expression contains `await` */
-	has_await: boolean;
-	/** True if the expression includes a member expression */
-	has_member_expression: boolean;
-	/** True if the expression includes an assignment or an update */
-	has_assignment: boolean;
-}
-
 export interface StateField {
 	type: StateCreationRuneName;
 	node: PropertyDefinition | AssignmentExpression;
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index f38706d075..fa7484e523 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -1,4 +1,4 @@
-import type { Binding, ExpressionMetadata } from '#compiler';
+import type { Binding } from '#compiler';
 import type {
 	ArrayExpression,
 	ArrowFunctionExpression,
@@ -17,6 +17,7 @@ import type {
 } from 'estree';
 import type { Scope } from '../phases/scope';
 import type { _CSS } from './css';
+import type { ExpressionMetadata } from '../phases/nodes';
 
 /**
  * - `html`    — the default, for e.g. `<div>` or `<span>`

From 9096680c2eef27b7a682c2c71f302a12e5e6991b Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sat, 25 Oct 2025 20:41:13 -0400
Subject: [PATCH 138/347] chore: use ESTree namespace imports (#17040)

---
 .../src/compiler/phases/2-analyze/index.js    | 12 +++++-----
 .../3-transform/server/transform-server.js    | 24 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index b4c704c34d..4c05fd6148 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -1,4 +1,4 @@
-/** @import { Expression, Node, Program } from 'estree' */
+/** @import * as ESTree from 'estree' */
 /** @import { Binding, AST, ValidatedCompileOptions, ValidatedModuleCompileOptions } from '#compiler' */
 /** @import { AnalysisState, Visitors } from './types' */
 /** @import { Analysis, ComponentAnalysis, Js, ReactiveStatement, Template } from '../types' */
@@ -206,7 +206,7 @@ const visitors = {
  * @returns {Js}
  */
 function js(script, root, allow_reactive_declarations, parent) {
-	/** @type {Program} */
+	/** @type {ESTree.Program} */
 	const ast = script?.content ?? {
 		type: 'Program',
 		sourceType: 'module',
@@ -289,7 +289,7 @@ export function analyze_module(source, options) {
 	});
 
 	walk(
-		/** @type {Node} */ (ast),
+		/** @type {ESTree.Node} */ (ast),
 		{
 			scope,
 			scopes,
@@ -347,7 +347,7 @@ export function analyze_component(root, source, options) {
 
 		const store_name = name.slice(1);
 		const declaration = instance.scope.get(store_name);
-		const init = /** @type {Node | undefined} */ (declaration?.initial);
+		const init = /** @type {ESTree.Node | undefined} */ (declaration?.initial);
 
 		// If we're not in legacy mode through the compiler option, assume the user
 		// is referencing a rune and not a global store.
@@ -407,7 +407,7 @@ export function analyze_component(root, source, options) {
 						/** @type {number} */ (node.start) > /** @type {number} */ (module.ast.start) &&
 						/** @type {number} */ (node.end) < /** @type {number} */ (module.ast.end) &&
 						// const state = $state(0) is valid
-						get_rune(/** @type {Node} */ (path.at(-1)), module.scope) === null
+						get_rune(/** @type {ESTree.Node} */ (path.at(-1)), module.scope) === null
 					) {
 						e.store_invalid_subscription(node);
 					}
@@ -636,7 +636,7 @@ export function analyze_component(root, source, options) {
 							// @ts-expect-error
 							_: set_scope,
 							Identifier(node, context) {
-								const parent = /** @type {Expression} */ (context.path.at(-1));
+								const parent = /** @type {ESTree.Expression} */ (context.path.at(-1));
 
 								if (is_reference(node, parent)) {
 									const binding = context.state.scope.get(node.name);
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 b22b95f5aa..1c9764a759 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
@@ -1,4 +1,4 @@
-/** @import { Program, Property, Statement, VariableDeclarator } from 'estree' */
+/** @import * as ESTree from 'estree' */
 /** @import { AST, ValidatedCompileOptions, ValidatedModuleCompileOptions } from '#compiler' */
 /** @import { ComponentServerTransformState, ComponentVisitors, ServerTransformState, Visitors } from './types.js' */
 /** @import { Analysis, ComponentAnalysis } from '../../types.js' */
@@ -86,7 +86,7 @@ const template_visitors = {
 /**
  * @param {ComponentAnalysis} analysis
  * @param {ValidatedCompileOptions} options
- * @returns {Program}
+ * @returns {ESTree.Program}
  */
 export function server_component(analysis, options) {
 	/** @type {ComponentServerTransformState} */
@@ -106,11 +106,11 @@ export function server_component(analysis, options) {
 		skip_hydration_boundaries: false
 	};
 
-	const module = /** @type {Program} */ (
+	const module = /** @type {ESTree.Program} */ (
 		walk(/** @type {AST.SvelteNode} */ (analysis.module.ast), state, global_visitors)
 	);
 
-	const instance = /** @type {Program} */ (
+	const instance = /** @type {ESTree.Program} */ (
 		walk(
 			/** @type {AST.SvelteNode} */ (analysis.instance.ast),
 			{ ...state, scopes: analysis.instance.scopes },
@@ -131,7 +131,7 @@ export function server_component(analysis, options) {
 		)
 	);
 
-	const template = /** @type {Program} */ (
+	const template = /** @type {ESTree.Program} */ (
 		walk(
 			/** @type {AST.SvelteNode} */ (analysis.template.ast),
 			{ ...state, scopes: analysis.template.scopes },
@@ -140,7 +140,7 @@ export function server_component(analysis, options) {
 		)
 	);
 
-	/** @type {VariableDeclarator[]} */
+	/** @type {ESTree.VariableDeclarator[]} */
 	const legacy_reactive_declarations = [];
 
 	for (const [node] of analysis.reactive_statements) {
@@ -192,7 +192,7 @@ export function server_component(analysis, options) {
 			b.function_declaration(
 				b.id('$$render_inner'),
 				[b.id('$$renderer')],
-				b.block(/** @type {Statement[]} */ (rest))
+				b.block(/** @type {ESTree.Statement[]} */ (rest))
 			),
 			b.do_while(
 				b.unary('!', b.id('$$settled')),
@@ -219,7 +219,7 @@ export function server_component(analysis, options) {
 
 	// Propagate values of bound props upwards if they're undefined in the parent and have a value.
 	// Don't do this as part of the props retrieval because people could eagerly mutate the prop in the instance script.
-	/** @type {Property[]} */
+	/** @type {ESTree.Property[]} */
 	const props = [];
 
 	for (const [name, binding] of analysis.instance.scope.declarations) {
@@ -239,8 +239,8 @@ export function server_component(analysis, options) {
 	}
 
 	let component_block = b.block([
-		.../** @type {Statement[]} */ (instance.body),
-		.../** @type {Statement[]} */ (template.body)
+		.../** @type {ESTree.Statement[]} */ (instance.body),
+		.../** @type {ESTree.Statement[]} */ (template.body)
 	]);
 
 	if (analysis.instance.has_await) {
@@ -395,7 +395,7 @@ export function server_component(analysis, options) {
 /**
  * @param {Analysis} analysis
  * @param {ValidatedModuleCompileOptions} options
- * @returns {Program}
+ * @returns {ESTree.Program}
  */
 export function server_module(analysis, options) {
 	/** @type {ServerTransformState} */
@@ -411,7 +411,7 @@ export function server_module(analysis, options) {
 		state_fields: new Map()
 	};
 
-	const module = /** @type {Program} */ (
+	const module = /** @type {ESTree.Program} */ (
 		walk(/** @type {AST.SvelteNode} */ (analysis.module.ast), state, global_visitors)
 	);
 

From fc181cf6110519f693536611f30c2c3cc9618fb4 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sat, 25 Oct 2025 20:54:01 -0400
Subject: [PATCH 139/347] chore: move `$effect` visitors (#17041)

---
 .../3-transform/client/visitors/CallExpression.js     | 11 +++++++++++
 .../client/visitors/ExpressionStatement.js            | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)

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 ae60f3be40..c9e5f49b96 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
@@ -62,6 +62,17 @@ export function CallExpression(node, context) {
 				is_ignored(node, 'state_snapshot_uncloneable') && b.true
 			);
 
+		case '$effect':
+		case '$effect.pre': {
+			const callee = rune === '$effect' ? '$.user_effect' : '$.user_pre_effect';
+			const func = /** @type {Expression} */ (context.visit(node.arguments[0]));
+
+			const expr = b.call(callee, /** @type {Expression} */ (func));
+			expr.callee.loc = node.callee.loc; // ensure correct mapping
+
+			return expr;
+		}
+
 		case '$effect.root':
 			return b.call(
 				'$.effect_root',
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js
index 859842ebc3..96a378747f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js
@@ -11,16 +11,6 @@ export function ExpressionStatement(node, context) {
 	if (node.expression.type === 'CallExpression') {
 		const rune = get_rune(node.expression, context.state.scope);
 
-		if (rune === '$effect' || rune === '$effect.pre') {
-			const callee = rune === '$effect' ? '$.user_effect' : '$.user_pre_effect';
-			const func = /** @type {Expression} */ (context.visit(node.expression.arguments[0]));
-
-			const expr = b.call(callee, /** @type {Expression} */ (func));
-			expr.callee.loc = node.expression.callee.loc; // ensure correct mapping
-
-			return b.stmt(expr);
-		}
-
 		if (rune === '$inspect.trace') {
 			return b.empty;
 		}

From b5e23a6d13d2dfceb2826fe64ea83bf2cd8253fb Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sat, 25 Oct 2025 21:04:13 -0400
Subject: [PATCH 140/347] chore: tweak memoizer logic (#17042)

---
 .changeset/slimy-shirts-lose.md               |  5 ++
 .../client/visitors/RegularElement.js         | 46 +++++++++++--------
 .../3-transform/client/visitors/RenderTag.js  |  2 +-
 .../client/visitors/SlotElement.js            |  2 +-
 .../client/visitors/shared/component.js       |  6 +--
 .../client/visitors/shared/element.js         | 14 ++----
 .../client/visitors/shared/utils.js           | 18 ++++++--
 7 files changed, 55 insertions(+), 38 deletions(-)
 create mode 100644 .changeset/slimy-shirts-lose.md

diff --git a/.changeset/slimy-shirts-lose.md b/.changeset/slimy-shirts-lose.md
new file mode 100644
index 0000000000..084fb07ea7
--- /dev/null
+++ b/.changeset/slimy-shirts-lose.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: tweak memoizer logic
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 ab119e8f80..3998770a71 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 { create_attribute, is_custom_element_node } from '../../../nodes.js';
+import { create_attribute, ExpressionMetadata, is_custom_element_node } from '../../../nodes.js';
 import { clean_nodes, determine_namespace_for_children } from '../../utils.js';
 import { build_getter } from '../utils.js';
 import {
@@ -267,10 +267,7 @@ export function RegularElement(node, context) {
 				const { value, has_state } = build_attribute_value(
 					attribute.value,
 					context,
-					(value, metadata) =>
-						metadata.has_call || metadata.has_await
-							? context.state.memoizer.add(value, metadata.has_await)
-							: value
+					(value, metadata) => context.state.memoizer.add(value, metadata)
 				);
 
 				const update = build_element_attribute_update(node, node_id, name, value, attributes);
@@ -487,11 +484,25 @@ function setup_select_synchronization(value_binding, context) {
 	);
 }
 
+/**
+ * @param {ExpressionMetadata} target
+ * @param {ExpressionMetadata} source
+ */
+function merge_metadata(target, source) {
+	target.has_assignment ||= source.has_assignment;
+	target.has_await ||= source.has_await;
+	target.has_call ||= source.has_call;
+	target.has_member_expression ||= source.has_member_expression;
+	target.has_state ||= source.has_state;
+
+	for (const r of source.references) target.references.add(r);
+	for (const b of source.dependencies) target.dependencies.add(b);
+}
+
 /**
  * @param {AST.ClassDirective[]} class_directives
  * @param {ComponentContext} context
  * @param {Memoizer} memoizer
- * @return {ObjectExpression | Identifier}
  */
 export function build_class_directives_object(
 	class_directives,
@@ -499,26 +510,25 @@ export function build_class_directives_object(
 	memoizer = context.state.memoizer
 ) {
 	let properties = [];
-	let has_call_or_state = false;
-	let has_await = false;
+
+	const metadata = new ExpressionMetadata();
 
 	for (const d of class_directives) {
+		merge_metadata(metadata, d.metadata.expression);
+
 		const expression = /** @type Expression */ (context.visit(d.expression));
 		properties.push(b.init(d.name, expression));
-		has_call_or_state ||= d.metadata.expression.has_call || d.metadata.expression.has_state;
-		has_await ||= d.metadata.expression.has_await;
 	}
 
 	const directives = b.object(properties);
 
-	return has_call_or_state || has_await ? memoizer.add(directives, has_await) : directives;
+	return memoizer.add(directives, metadata);
 }
 
 /**
  * @param {AST.StyleDirective[]} style_directives
  * @param {ComponentContext} context
  * @param {Memoizer} memoizer
- * @return {ObjectExpression | ArrayExpression | Identifier}}
  */
 export function build_style_directives_object(
 	style_directives,
@@ -528,10 +538,11 @@ export function build_style_directives_object(
 	const normal = b.object([]);
 	const important = b.object([]);
 
-	let has_call_or_state = false;
-	let has_await = false;
+	const metadata = new ExpressionMetadata();
 
 	for (const d of style_directives) {
+		merge_metadata(metadata, d.metadata.expression);
+
 		const expression =
 			d.value === true
 				? build_getter(b.id(d.name), context.state)
@@ -539,14 +550,11 @@ export function build_style_directives_object(
 
 		const object = d.modifiers.includes('important') ? important : normal;
 		object.properties.push(b.init(d.name, expression));
-
-		has_call_or_state ||= d.metadata.expression.has_call || d.metadata.expression.has_state;
-		has_await ||= d.metadata.expression.has_await;
 	}
 
 	const directives = important.properties.length ? b.array([normal, important]) : normal;
 
-	return has_call_or_state || has_await ? memoizer.add(directives, has_await) : directives;
+	return memoizer.add(directives, metadata);
 }
 
 /**
@@ -675,7 +683,7 @@ function build_element_special_value_attribute(
 		element === 'select' && attribute.value !== true && !is_text_attribute(attribute);
 
 	const { value, has_state } = build_attribute_value(attribute.value, context, (value, metadata) =>
-		metadata.has_call || metadata.has_await ? state.memoizer.add(value, metadata.has_await) : value
+		state.memoizer.add(value, metadata)
 	);
 
 	const evaluated = context.state.scope.evaluate(value);
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js
index b7a6e65557..b3619e8669 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js
@@ -26,7 +26,7 @@ export function RenderTag(node, context) {
 		let expression = build_expression(context, arg, metadata);
 
 		if (metadata.has_await || metadata.has_call) {
-			expression = b.call('$.get', memoizer.add(expression, metadata.has_await));
+			expression = b.call('$.get', memoizer.add(expression, metadata));
 		}
 
 		args.push(b.thunk(expression));
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js
index b87a13253b..f6db21212b 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js
@@ -35,7 +35,7 @@ export function SlotElement(node, context) {
 				context,
 				(value, metadata) =>
 					metadata.has_call || metadata.has_await
-						? b.call('$.get', memoizer.add(value, metadata.has_await))
+						? b.call('$.get', memoizer.add(value, metadata))
 						: value
 			);
 
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 5ca941fd70..688191fd20 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
@@ -134,7 +134,7 @@ export function build_component(node, component_name, context) {
 				props_and_spreads.push(
 					b.thunk(
 						attribute.metadata.expression.has_await || attribute.metadata.expression.has_call
-							? b.call('$.get', memoizer.add(expression, attribute.metadata.expression.has_await))
+							? b.call('$.get', memoizer.add(expression, attribute.metadata.expression))
 							: expression
 					)
 				);
@@ -149,7 +149,7 @@ export function build_component(node, component_name, context) {
 						build_attribute_value(attribute.value, context, (value, metadata) => {
 							// TODO put the derived in the local block
 							return metadata.has_call || metadata.has_await
-								? b.call('$.get', memoizer.add(value, metadata.has_await))
+								? b.call('$.get', memoizer.add(value, metadata))
 								: value;
 						}).value
 					)
@@ -185,7 +185,7 @@ export function build_component(node, component_name, context) {
 						});
 
 					return should_wrap_in_derived
-						? b.call('$.get', memoizer.add(value, metadata.has_await))
+						? b.call('$.get', memoizer.add(value, metadata, true))
 						: value;
 				}
 			);
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 dd390c99da..29baf2cad5 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
@@ -36,7 +36,7 @@ export function build_attribute_effect(
 	for (const attribute of attributes) {
 		if (attribute.type === 'Attribute') {
 			const { value } = build_attribute_value(attribute.value, context, (value, metadata) =>
-				metadata.has_call || metadata.has_await ? memoizer.add(value, metadata.has_await) : value
+				memoizer.add(value, metadata)
 			);
 
 			if (
@@ -53,9 +53,7 @@ export function build_attribute_effect(
 		} else {
 			let value = /** @type {Expression} */ (context.visit(attribute));
 
-			if (attribute.metadata.expression.has_call || attribute.metadata.expression.has_await) {
-				value = memoizer.add(value, attribute.metadata.expression.has_await);
-			}
+			value = memoizer.add(value, attribute.metadata.expression);
 
 			values.push(b.spread(value));
 		}
@@ -156,9 +154,7 @@ export function build_set_class(element, node_id, attribute, class_directives, c
 			value = b.call('$.clsx', value);
 		}
 
-		return metadata.has_call || metadata.has_await
-			? context.state.memoizer.add(value, metadata.has_await)
-			: value;
+		return context.state.memoizer.add(value, metadata);
 	});
 
 	/** @type {Identifier | undefined} */
@@ -167,7 +163,7 @@ export function build_set_class(element, node_id, attribute, class_directives, c
 	/** @type {ObjectExpression | Identifier | undefined} */
 	let prev;
 
-	/** @type {ObjectExpression | Identifier | undefined} */
+	/** @type {Expression | undefined} */
 	let next;
 
 	if (class_directives.length) {
@@ -228,7 +224,7 @@ export function build_set_class(element, node_id, attribute, class_directives, c
  */
 export function build_set_style(node_id, attribute, style_directives, context) {
 	let { value, has_state } = build_attribute_value(attribute.value, context, (value, metadata) =>
-		metadata.has_call ? context.state.memoizer.add(value, metadata.has_await) : value
+		context.state.memoizer.add(value, metadata)
 	);
 
 	/** @type {Identifier | undefined} */
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
index 46d2f2b777..691b78199e 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
@@ -24,12 +24,21 @@ export class Memoizer {
 
 	/**
 	 * @param {Expression} expression
-	 * @param {boolean} has_await
+	 * @param {ExpressionMetadata} metadata
+	 * @param {boolean} memoize_if_state
 	 */
-	add(expression, has_await) {
+	add(expression, metadata, memoize_if_state = false) {
+		const should_memoize =
+			metadata.has_call || metadata.has_await || (memoize_if_state && metadata.has_state);
+
+		if (!should_memoize) {
+			// no memoization required
+			return expression;
+		}
+
 		const id = b.id('#'); // filled in later
 
-		(has_await ? this.#async : this.#sync).push({ id, expression });
+		(metadata.has_await ? this.#async : this.#sync).push({ id, expression });
 
 		return id;
 	}
@@ -73,8 +82,7 @@ export function build_template_chunk(
 	values,
 	context,
 	state = context.state,
-	memoize = (value, metadata) =>
-		metadata.has_call || metadata.has_await ? state.memoizer.add(value, metadata.has_await) : value
+	memoize = (value, metadata) => state.memoizer.add(value, metadata)
 ) {
 	/** @type {Expression[]} */
 	const expressions = [];

From da00abe1162a8e56455e92b79020c4e33290e10e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 25 Oct 2025 21:13:05 -0400
Subject: [PATCH 141/347] Version Packages (#17037)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/slick-teeth-exist.md | 5 -----
 .changeset/slimy-shirts-lose.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/slick-teeth-exist.md
 delete mode 100644 .changeset/slimy-shirts-lose.md

diff --git a/.changeset/slick-teeth-exist.md b/.changeset/slick-teeth-exist.md
deleted file mode 100644
index aeeb0f41b9..0000000000
--- a/.changeset/slick-teeth-exist.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: better error message for global variable assignments
diff --git a/.changeset/slimy-shirts-lose.md b/.changeset/slimy-shirts-lose.md
deleted file mode 100644
index 084fb07ea7..0000000000
--- a/.changeset/slimy-shirts-lose.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: tweak memoizer logic
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 51e6317491..1d58806694 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.42.2
+
+### Patch Changes
+
+- fix: better error message for global variable assignments ([#17036](https://github.com/sveltejs/svelte/pull/17036))
+
+- chore: tweak memoizer logic ([#17042](https://github.com/sveltejs/svelte/pull/17042))
+
 ## 5.42.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 1f8746e72d..9fb7189d07 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.42.1",
+  "version": "5.42.2",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 8d50b983ce..605e1d9cdc 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.42.1';
+export const VERSION = '5.42.2';
 export const PUBLIC_VERSION = '5';

From cc0143c904ec48dcce1eac2600b5a88ca5df0d17 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 28 Oct 2025 02:39:43 +0100
Subject: [PATCH 142/347] fix: handle `<svelte:head>` rendered asynchronously
 (#17052)

* fix: handle `<svelte:head>` rendered asynchronously

* fix tests
---
 .changeset/khaki-emus-rest.md                 |  5 ++++
 .../3-transform/client/visitors/SvelteHead.js |  3 ++
 .../3-transform/server/visitors/SvelteHead.js | 11 ++++++-
 .../internal/client/dom/blocks/svelte-head.js | 29 +++++++------------
 packages/svelte/src/internal/client/render.js | 10 +------
 packages/svelte/src/internal/server/index.js  |  7 +++--
 packages/svelte/tests/hydration/test.ts       |  6 +++-
 .../runtime-runes/samples/async-head/A.svelte |  7 +++++
 .../runtime-runes/samples/async-head/B.svelte |  8 +++++
 .../samples/async-head/_config.js             | 23 +++++++++++++++
 .../samples/async-head/main.svelte            | 11 +++++++
 11 files changed, 87 insertions(+), 33 deletions(-)
 create mode 100644 .changeset/khaki-emus-rest.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head/A.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head/B.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head/main.svelte

diff --git a/.changeset/khaki-emus-rest.md b/.changeset/khaki-emus-rest.md
new file mode 100644
index 0000000000..5364ff60df
--- /dev/null
+++ b/.changeset/khaki-emus-rest.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: handle `<svelte:head>` rendered asynchronously
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteHead.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteHead.js
index 0701c37c48..3a45389dd7 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteHead.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteHead.js
@@ -2,6 +2,8 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
 import * as b from '#compiler/builders';
+import { hash } from '../../../../../utils.js';
+import { filename } from '../../../../state.js';
 
 /**
  * @param {AST.SvelteHead} node
@@ -13,6 +15,7 @@ export function SvelteHead(node, context) {
 		b.stmt(
 			b.call(
 				'$.head',
+				b.literal(hash(filename)),
 				b.arrow([b.id('$$anchor')], /** @type {BlockStatement} */ (context.visit(node.fragment)))
 			)
 		)
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 a519057cb6..177ec62416 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
@@ -2,6 +2,8 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
+import { hash } from '../../../../../utils.js';
+import { filename } from '../../../../state.js';
 
 /**
  * @param {AST.SvelteHead} node
@@ -11,6 +13,13 @@ 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.literal(hash(filename)),
+				b.id('$$renderer'),
+				b.arrow([b.id('$$renderer')], block)
+			)
+		)
 	);
 }
diff --git a/packages/svelte/src/internal/client/dom/blocks/svelte-head.js b/packages/svelte/src/internal/client/dom/blocks/svelte-head.js
index 66d3371836..13926ccc4b 100644
--- a/packages/svelte/src/internal/client/dom/blocks/svelte-head.js
+++ b/packages/svelte/src/internal/client/dom/blocks/svelte-head.js
@@ -3,22 +3,13 @@ import { hydrate_node, hydrating, set_hydrate_node, set_hydrating } from '../hyd
 import { create_text, get_first_child, get_next_sibling } from '../operations.js';
 import { block } from '../../reactivity/effects.js';
 import { COMMENT_NODE, HEAD_EFFECT } from '#client/constants';
-import { HYDRATION_START } from '../../../../constants.js';
-
-/**
- * @type {Node | undefined}
- */
-let head_anchor;
-
-export function reset_head_anchor() {
-	head_anchor = undefined;
-}
 
 /**
+ * @param {string} hash
  * @param {(anchor: Node) => void} render_fn
  * @returns {void}
  */
-export function head(render_fn) {
+export function head(hash, render_fn) {
 	// The head function may be called after the first hydration pass and ssr comment nodes may still be present,
 	// therefore we need to skip that when we detect that we're not in hydration mode.
 	let previous_hydrate_node = null;
@@ -30,15 +21,13 @@ export function head(render_fn) {
 	if (hydrating) {
 		previous_hydrate_node = hydrate_node;
 
-		// There might be multiple head blocks in our app, so we need to account for each one needing independent hydration.
-		if (head_anchor === undefined) {
-			head_anchor = /** @type {TemplateNode} */ (get_first_child(document.head));
-		}
+		var head_anchor = /** @type {TemplateNode} */ (get_first_child(document.head));
 
+		// There might be multiple head blocks in our app, and they could have been
+		// rendered in an arbitrary order — find one corresponding to this component
 		while (
 			head_anchor !== null &&
-			(head_anchor.nodeType !== COMMENT_NODE ||
-				/** @type {Comment} */ (head_anchor).data !== HYDRATION_START)
+			(head_anchor.nodeType !== COMMENT_NODE || /** @type {Comment} */ (head_anchor).data !== hash)
 		) {
 			head_anchor = /** @type {TemplateNode} */ (get_next_sibling(head_anchor));
 		}
@@ -48,7 +37,10 @@ export function head(render_fn) {
 		if (head_anchor === null) {
 			set_hydrating(false);
 		} else {
-			head_anchor = set_hydrate_node(/** @type {TemplateNode} */ (get_next_sibling(head_anchor)));
+			var start = /** @type {TemplateNode} */ (get_next_sibling(head_anchor));
+			head_anchor.remove(); // in case this component is repeated
+
+			set_hydrate_node(start);
 		}
 	}
 
@@ -61,7 +53,6 @@ export function head(render_fn) {
 	} finally {
 		if (was_hydrating) {
 			set_hydrating(true);
-			head_anchor = hydrate_node; // so that next head block starts from the correct node
 			set_hydrate_node(/** @type {TemplateNode} */ (previous_hydrate_node));
 		}
 	}
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index b1165a6e7a..416627a157 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -12,20 +12,13 @@ import { HYDRATION_END, HYDRATION_ERROR, HYDRATION_START } from '../../constants
 import { active_effect } from './runtime.js';
 import { push, pop, component_context } from './context.js';
 import { component_root } from './reactivity/effects.js';
-import {
-	hydrate_next,
-	hydrate_node,
-	hydrating,
-	set_hydrate_node,
-	set_hydrating
-} from './dom/hydration.js';
+import { hydrate_node, hydrating, set_hydrate_node, set_hydrating } from './dom/hydration.js';
 import { array_from } from '../shared/utils.js';
 import {
 	all_registered_events,
 	handle_event_propagation,
 	root_event_handles
 } from './dom/elements/events.js';
-import { reset_head_anchor } from './dom/blocks/svelte-head.js';
 import * as w from './warnings.js';
 import * as e from './errors.js';
 import { assign_nodes } from './dom/template.js';
@@ -152,7 +145,6 @@ export function hydrate(component, options) {
 	} finally {
 		set_hydrating(was_hydrating);
 		set_hydrate_node(previous_hydrate_node);
-		reset_head_anchor();
 	}
 }
 
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index 74a90a8600..c0dbdbda14 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -64,15 +64,16 @@ export function render(component, options = {}) {
 }
 
 /**
+ * @param {string} hash
  * @param {Renderer} renderer
  * @param {(renderer: Renderer) => Promise<void> | void} fn
  * @returns {void}
  */
-export function head(renderer, fn) {
+export function head(hash, renderer, fn) {
 	renderer.head((renderer) => {
-		renderer.push(BLOCK_OPEN);
+		renderer.push(`<!--${hash}-->`);
 		renderer.child(fn);
-		renderer.push(BLOCK_CLOSE);
+		renderer.push(EMPTY_COMMENT);
 	});
 }
 
diff --git a/packages/svelte/tests/hydration/test.ts b/packages/svelte/tests/hydration/test.ts
index 70d5c5d072..ba13d2c611 100644
--- a/packages/svelte/tests/hydration/test.ts
+++ b/packages/svelte/tests/hydration/test.ts
@@ -132,7 +132,11 @@ const { test, run } = suite<HydrationTest>(async (config, cwd) => {
 		flushSync();
 
 		const normalize = (string: string) =>
-			string.trim().replaceAll('\r\n', '\n').replaceAll('/>', '>');
+			string
+				.trim()
+				.replaceAll('\r\n', '\n')
+				.replaceAll('/>', '>')
+				.replace(/<!--.+?-->/g, '');
 
 		const expected = read(`${cwd}/_expected.html`) ?? rendered.html;
 		assert.equal(normalize(target.innerHTML), normalize(expected));
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head/A.svelte b/packages/svelte/tests/runtime-runes/samples/async-head/A.svelte
new file mode 100644
index 0000000000..d821bb6fa0
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head/A.svelte
@@ -0,0 +1,7 @@
+<script>
+	let { name, content } = $props();
+</script>
+
+<svelte:head>
+	<meta name={name} content={content} />
+</svelte:head>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head/B.svelte b/packages/svelte/tests/runtime-runes/samples/async-head/B.svelte
new file mode 100644
index 0000000000..d725d5f03b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head/B.svelte
@@ -0,0 +1,8 @@
+<script>
+	let { name, content } = $props();
+</script>
+
+<svelte:head>
+	<meta name="{name}-1" content="{content}-1" />
+	<meta name="{name}-2" content="{content}-2" />
+</svelte:head>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head/_config.js b/packages/svelte/tests/runtime-runes/samples/async-head/_config.js
new file mode 100644
index 0000000000..6fdf41b434
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head/_config.js
@@ -0,0 +1,23 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, window }) {
+		await tick();
+
+		const head = window.document.head;
+
+		// we don't care about the order, but we want to ensure that the
+		// elements didn't clobber each other
+		for (let n of ['1', '2', '3']) {
+			const a = head.querySelector(`meta[name="a-${n}"]`);
+			assert.equal(a?.getAttribute('content'), n);
+
+			const b1 = head.querySelector(`meta[name="b-${n}-1"]`);
+			assert.equal(b1?.getAttribute('content'), `${n}-1`);
+
+			const b2 = head.querySelector(`meta[name="b-${n}-2"]`);
+			assert.equal(b2?.getAttribute('content'), `${n}-2`);
+		}
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-head/main.svelte
new file mode 100644
index 0000000000..7f23489373
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head/main.svelte
@@ -0,0 +1,11 @@
+<script lang="ts">
+	import A from './A.svelte';
+	import B from './B.svelte';
+</script>
+
+<A name="a-1" content={await 1} />
+<A name="a-2" content={await 2} />
+<B name="b-1" content={1} />
+<A name="a-3" content={await 3} />
+<B name="b-2" content={2} />
+<B name="b-3" content={3} />

From d2f453f8b099ee46eb5835fc2af2952bda0e2fe6 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 28 Oct 2025 02:40:13 +0100
Subject: [PATCH 143/347] fix: don't restore batch in `#await` (#17051)

#16977 had one slight regression which might contribute to #16990: The batch from earlier was restored, but that doesn't make sense in this situations since this has nothing to do with our new async logic of batches suspending until pending work is done. As a result you could end up with a batch being created, and then the restore then instead reverting to an earlier batch that was already done, which means a ghost-batch ends up in the set of batches, subsequently triggering time traveling when it shouldn't. This may help with #16990

No test because basically impossible to do so
---
 .changeset/shaky-jars-cut.md                            | 5 +++++
 packages/svelte/src/internal/client/dom/blocks/await.js | 8 ++++++--
 packages/svelte/src/internal/client/reactivity/async.js | 5 ++---
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/shaky-jars-cut.md

diff --git a/.changeset/shaky-jars-cut.md b/.changeset/shaky-jars-cut.md
new file mode 100644
index 0000000000..b74b00fa1c
--- /dev/null
+++ b/.changeset/shaky-jars-cut.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't restore batch in `#await`
diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js
index bac01e4c33..87d64df23e 100644
--- a/packages/svelte/src/internal/client/dom/blocks/await.js
+++ b/packages/svelte/src/internal/client/dom/blocks/await.js
@@ -12,7 +12,7 @@ import {
 import { queue_micro_task } from '../task.js';
 import { HYDRATION_START_ELSE, UNINITIALIZED } from '../../../../constants.js';
 import { is_runes } from '../../context.js';
-import { flushSync, is_flushing_sync } from '../../reactivity/batch.js';
+import { Batch, flushSync, is_flushing_sync } from '../../reactivity/batch.js';
 import { BranchManager } from './branches.js';
 import { capture, unset_context } from '../../reactivity/async.js';
 
@@ -69,7 +69,11 @@ export function await_block(node, get_input, pending_fn, then_fn, catch_fn) {
 				if (destroyed) return;
 
 				resolved = true;
-				restore();
+				// We don't want to restore the previous batch here; {#await} blocks don't follow the async logic
+				// we have elsewhere, instead pending/resolve/fail states are each their own batch so to speak.
+				restore(false);
+				// Make sure we have a batch, since the branch manager expects one to exist
+				Batch.ensure();
 
 				if (hydrating) {
 					// `restore()` could set `hydrating` to `true`, which we very much
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index fb836df989..bdd7eed940 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -33,7 +33,6 @@ import {
 	set_hydrating,
 	skip_nodes
 } from '../dom/hydration.js';
-import { create_text } from '../dom/operations.js';
 
 /**
  *
@@ -102,11 +101,11 @@ export function capture() {
 		var previous_dev_stack = dev_stack;
 	}
 
-	return function restore() {
+	return function restore(activate_batch = true) {
 		set_active_effect(previous_effect);
 		set_active_reaction(previous_reaction);
 		set_component_context(previous_component_context);
-		previous_batch?.activate();
+		if (activate_batch) previous_batch?.activate();
 
 		if (was_hydrating) {
 			set_hydrating(true);

From 1b2f7b068e01f0407f4013a292ec9f3f3381233e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Oct 2025 02:43:59 +0100
Subject: [PATCH 144/347] Version Packages (#17053)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/khaki-emus-rest.md  | 5 -----
 .changeset/shaky-jars-cut.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/khaki-emus-rest.md
 delete mode 100644 .changeset/shaky-jars-cut.md

diff --git a/.changeset/khaki-emus-rest.md b/.changeset/khaki-emus-rest.md
deleted file mode 100644
index 5364ff60df..0000000000
--- a/.changeset/khaki-emus-rest.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: handle `<svelte:head>` rendered asynchronously
diff --git a/.changeset/shaky-jars-cut.md b/.changeset/shaky-jars-cut.md
deleted file mode 100644
index b74b00fa1c..0000000000
--- a/.changeset/shaky-jars-cut.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't restore batch in `#await`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 1d58806694..8dabe54b33 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.42.3
+
+### Patch Changes
+
+- fix: handle `<svelte:head>` rendered asynchronously ([#17052](https://github.com/sveltejs/svelte/pull/17052))
+
+- fix: don't restore batch in `#await` ([#17051](https://github.com/sveltejs/svelte/pull/17051))
+
 ## 5.42.2
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 9fb7189d07..1ee6c50121 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.42.2",
+  "version": "5.42.3",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 605e1d9cdc..999aacc998 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.42.2';
+export const VERSION = '5.42.3';
 export const PUBLIC_VERSION = '5';

From 90a8a039889ffdf0566dff6b2aa1b55d6a176b98 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 28 Oct 2025 10:48:35 +0100
Subject: [PATCH 145/347] fix: settle batch after DOM updates (#17054)

---
 .changeset/loud-chairs-tease.md               |  5 ++++
 .../src/internal/client/reactivity/batch.js   |  4 +--
 .../async-settled-after-dom/_config.js        | 27 +++++++++++++++++++
 .../async-settled-after-dom/main.svelte       | 20 ++++++++++++++
 4 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/loud-chairs-tease.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-settled-after-dom/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-settled-after-dom/main.svelte

diff --git a/.changeset/loud-chairs-tease.md b/.changeset/loud-chairs-tease.md
new file mode 100644
index 0000000000..e08d111cdd
--- /dev/null
+++ b/.changeset/loud-chairs-tease.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: settle batch after DOM updates
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index ab83050cd0..bbc05bb1ff 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -196,6 +196,8 @@ export class Batch {
 			flush_queued_effects(target.effects);
 
 			previous_batch = null;
+
+			this.#deferred?.resolve();
 		}
 
 		batch_values = null;
@@ -432,8 +434,6 @@ export class Batch {
 
 		this.committed = true;
 		batches.delete(this);
-
-		this.#deferred?.resolve();
 	}
 
 	/**
diff --git a/packages/svelte/tests/runtime-runes/samples/async-settled-after-dom/_config.js b/packages/svelte/tests/runtime-runes/samples/async-settled-after-dom/_config.js
new file mode 100644
index 0000000000..2c9816f3ed
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-settled-after-dom/_config.js
@@ -0,0 +1,27 @@
+import { settled, tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client'],
+
+	async test({ assert, target }) {
+		const [shift, update] = target.querySelectorAll('button');
+
+		shift.click();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, '<button>shift</button><button>update</button><p>hello</p>');
+
+		update.click();
+		const promise = settled();
+
+		await tick();
+		shift.click();
+		await promise;
+
+		assert.htmlEqual(
+			target.innerHTML,
+			'<button>shift</button><button>update</button><p>goodbye</p>'
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-settled-after-dom/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-settled-after-dom/main.svelte
new file mode 100644
index 0000000000..0db9f80118
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-settled-after-dom/main.svelte
@@ -0,0 +1,20 @@
+<script>
+	let text = $state('hello');
+
+	const resolvers = [];
+
+	function push(value) {
+		const { promise, resolve } = Promise.withResolvers();
+		resolvers.push(() => resolve(value));
+		return promise;
+	}
+</script>
+
+<button onclick={() => resolvers.shift()?.()}>shift</button>
+<button onclick={() => text = 'goodbye'}>update</button>
+
+<svelte:boundary>
+	<p>{await push(text)}</p>
+
+	{#snippet pending()}{/snippet}
+</svelte:boundary>

From 1126ef318650792dcca883eeb72dbe58633b37cc Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 28 Oct 2025 17:50:29 +0100
Subject: [PATCH 146/347] feat: out of order rendering (#17038)

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* revert

* note to self

* unused

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* deprecate

* update tests

* lint

* lint

* WIP

* WIP

* fix

* WIP

* unused

* deopt to ensure state is ready

* fix

* DRY

* reduce diff

* reduce diff

* reduce diff

* handle blocked attributes

* WIP

* pre-transform

* tidy up

* fix

* WIP

* WIP

* fix: handle `<svelte:head>` rendered asynchronously

* fix tests

* fix

* delay resolve

* Revert "fix"

This reverts commit 2e56cd75753abc1fdfabbada9d27829d9eaa496a.

* add error

* simplify/fix hydration restoration

* fix

* use $state.eager mechanism for $effect.pending - way simpler and more robust

* disable these warnings for now, too many false positives

* fix

* changeset was already merged

* changeset

* oops

* lint

* docs + tidy

* prettier

* robustify: logic inside memoizer and outside could get out of sync, introducing bugs. use equality comparison instead

* oops

* uncomment

* use finally

* use is_async

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .changeset/bitter-rings-help.md               |   5 +
 .../src/compiler/phases/2-analyze/index.js    | 203 +++++++++++++++++-
 .../2-analyze/visitors/AwaitExpression.js     |  12 +-
 .../2-analyze/visitors/BindDirective.js       |   1 +
 .../phases/2-analyze/visitors/SnippetBlock.js |   7 +-
 .../3-transform/client/transform-client.js    |  47 ++--
 .../phases/3-transform/client/types.d.ts      |   3 -
 .../client/visitors/BindDirective.js          |  25 ++-
 .../client/visitors/CallExpression.js         |   4 +-
 .../3-transform/client/visitors/EachBlock.js  |  10 +-
 .../client/visitors/ExpressionStatement.js    |   2 +-
 .../3-transform/client/visitors/HtmlTag.js    |  10 +-
 .../3-transform/client/visitors/IfBlock.js    |  10 +-
 .../client/visitors/ImportDeclaration.js      |  16 --
 .../3-transform/client/visitors/KeyBlock.js   |   9 +-
 .../3-transform/client/visitors/Program.js    |  18 +-
 .../3-transform/client/visitors/RenderTag.js  |  10 +-
 .../client/visitors/SlotElement.js            |   4 +-
 .../client/visitors/SvelteElement.js          |   9 +-
 .../client/visitors/VariableDeclaration.js    |  15 +-
 .../client/visitors/shared/component.js       |  36 ++--
 .../client/visitors/shared/element.js         |   1 +
 .../client/visitors/shared/utils.js           |  16 +-
 .../3-transform/server/transform-server.js    |  18 +-
 .../3-transform/server/visitors/AwaitBlock.js |   8 +-
 .../server/visitors/CallExpression.js         |   9 +-
 .../3-transform/server/visitors/EachBlock.js  |  17 +-
 .../3-transform/server/visitors/HtmlTag.js    |   8 +-
 .../3-transform/server/visitors/IfBlock.js    |  16 +-
 .../3-transform/server/visitors/KeyBlock.js   |   8 +-
 .../3-transform/server/visitors/Program.js    |  25 +++
 .../server/visitors/RegularElement.js         |  21 +-
 .../3-transform/server/visitors/RenderTag.js  |  38 +++-
 .../server/visitors/SlotElement.js            |  11 +-
 .../server/visitors/SvelteElement.js          |  28 ++-
 .../server/visitors/shared/component.js       |  14 +-
 .../server/visitors/shared/utils.js           |  87 +++++++-
 .../3-transform/shared/transform-async.js     | 102 +++++++++
 .../compiler/phases/3-transform/types.d.ts    |   3 +
 packages/svelte/src/compiler/phases/nodes.js  |  24 +++
 packages/svelte/src/compiler/phases/scope.js  |  35 ++-
 .../svelte/src/compiler/phases/types.d.ts     |  27 ++-
 .../svelte/src/compiler/types/template.d.ts   |   2 +
 packages/svelte/src/compiler/utils/ast.js     |   2 +-
 .../svelte/src/compiler/utils/builders.js     |  19 +-
 .../src/internal/client/dom/blocks/async.js   |  13 +-
 .../internal/client/dom/blocks/boundary.js    |  13 +-
 .../client/dom/elements/attributes.js         |   4 +-
 packages/svelte/src/internal/client/index.js  |   1 +
 .../src/internal/client/reactivity/async.js   | 151 +++++++++----
 .../src/internal/client/reactivity/batch.js   |  13 --
 .../src/internal/client/reactivity/effects.js |   5 +-
 .../svelte/src/internal/client/runtime.js     |  23 +-
 .../svelte/src/internal/server/renderer.js    |  59 ++++-
 .../svelte/tests/runtime-legacy/shared.ts     |   5 +
 .../async-if-after-await-in-script/_config.js |  16 ++
 .../main.svelte                               |  10 +
 .../_config.js                                |   3 +
 .../samples/async-reactivity-loss/_config.js  |   3 +
 .../_expected/client/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/client/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/client/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/client/index.svelte.js          |   2 +-
 .../_expected/server/index.svelte.js          |   2 +-
 .../_expected/client/index.svelte.js          |  61 +++---
 .../_expected/server/index.svelte.js          |  58 ++---
 69 files changed, 1097 insertions(+), 352 deletions(-)
 create mode 100644 .changeset/bitter-rings-help.md
 delete mode 100644 packages/svelte/src/compiler/phases/3-transform/client/visitors/ImportDeclaration.js
 create mode 100644 packages/svelte/src/compiler/phases/3-transform/server/visitors/Program.js
 create mode 100644 packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-if-after-await-in-script/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-if-after-await-in-script/main.svelte

diff --git a/.changeset/bitter-rings-help.md b/.changeset/bitter-rings-help.md
new file mode 100644
index 0000000000..f71b9f96b2
--- /dev/null
+++ b/.changeset/bitter-rings-help.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: out-of-order rendering
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 4c05fd6148..ed71b898ed 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -6,7 +6,12 @@ import { walk } from 'zimmerframe';
 import { parse } from '../1-parse/acorn.js';
 import * as e from '../../errors.js';
 import * as w from '../../warnings.js';
-import { extract_identifiers, has_await_expression } from '../../utils/ast.js';
+import {
+	extract_identifiers,
+	has_await_expression,
+	object,
+	unwrap_pattern
+} from '../../utils/ast.js';
 import * as b from '#compiler/builders';
 import { Scope, ScopeRoot, create_scopes, get_rune, set_scope } from '../scope.js';
 import check_graph_for_cycles from './utils/check_graph_for_cycles.js';
@@ -543,7 +548,13 @@ export function analyze_component(root, source, options) {
 		snippet_renderers: new Map(),
 		snippets: new Set(),
 		async_deriveds: new Set(),
-		pickled_awaits: new Set()
+		pickled_awaits: new Set(),
+		instance_body: {
+			sync: [],
+			async: [],
+			declarations: [],
+			hoisted: []
+		}
 	};
 
 	if (!runes) {
@@ -676,6 +687,194 @@ export function analyze_component(root, source, options) {
 		}
 	}
 
+	/**
+	 * @param {ESTree.Node} expression
+	 * @param {Scope} scope
+	 * @param {Set<Binding>} touched
+	 * @param {Set<ESTree.Node>} seen
+	 */
+	const touch = (expression, scope, touched, seen = new Set()) => {
+		if (seen.has(expression)) return;
+		seen.add(expression);
+
+		walk(
+			expression,
+			{ scope },
+			{
+				ImportDeclaration(node) {},
+				Identifier(node, context) {
+					const parent = /** @type {ESTree.Node} */ (context.path.at(-1));
+					if (is_reference(node, parent)) {
+						const binding = context.state.scope.get(node.name);
+						if (binding) {
+							touched.add(binding);
+
+							for (const assignment of binding.assignments) {
+								touch(assignment.value, assignment.scope, touched, seen);
+							}
+						}
+					}
+				}
+			}
+		);
+	};
+
+	/**
+	 * @param {ESTree.Node} node
+	 * @param {Set<ESTree.Node>} seen
+	 * @param {Set<Binding>} reads
+	 * @param {Set<Binding>} writes
+	 */
+	const trace_references = (node, reads, writes, seen = new Set()) => {
+		if (seen.has(node)) return;
+		seen.add(node);
+
+		/**
+		 * @param {ESTree.Pattern} node
+		 * @param {Scope} scope
+		 */
+		function update(node, scope) {
+			for (const pattern of unwrap_pattern(node)) {
+				const node = object(pattern);
+				if (!node) return;
+
+				const binding = scope.get(node.name);
+				if (!binding) return;
+
+				writes.add(binding);
+			}
+		}
+
+		walk(
+			node,
+			{ scope: instance.scope },
+			{
+				_(node, context) {
+					const scope = scopes.get(node);
+					if (scope) {
+						context.next({ scope });
+					} else {
+						context.next();
+					}
+				},
+				AssignmentExpression(node, context) {
+					update(node.left, context.state.scope);
+				},
+				UpdateExpression(node, context) {
+					update(
+						/** @type {ESTree.Identifier | ESTree.MemberExpression} */ (node.argument),
+						context.state.scope
+					);
+				},
+				CallExpression(node, context) {
+					// for now, assume everything touched by the callee ends up mutating the object
+					// TODO optimise this better
+
+					// special case — no need to peek inside effects as they only run once async work has completed
+					const rune = get_rune(node, context.state.scope);
+					if (rune === '$effect') return;
+
+					/** @type {Set<Binding>} */
+					const touched = new Set();
+					touch(node, context.state.scope, touched);
+
+					for (const b of touched) {
+						writes.add(b);
+					}
+				},
+				// don't look inside functions until they are called
+				ArrowFunctionExpression(_, context) {},
+				FunctionDeclaration(_, context) {},
+				FunctionExpression(_, context) {},
+				Identifier(node, context) {
+					const parent = /** @type {ESTree.Node} */ (context.path.at(-1));
+					if (is_reference(node, parent)) {
+						const binding = context.state.scope.get(node.name);
+						if (binding) {
+							reads.add(binding);
+						}
+					}
+				}
+			}
+		);
+	};
+
+	let awaited = false;
+
+	// TODO this should probably be attached to the scope?
+	var promises = b.id('$$promises');
+
+	/**
+	 * @param {ESTree.Identifier} id
+	 * @param {ESTree.Expression} blocker
+	 */
+	function push_declaration(id, blocker) {
+		analysis.instance_body.declarations.push(id);
+
+		const binding = /** @type {Binding} */ (instance.scope.get(id.name));
+		binding.blocker = blocker;
+	}
+
+	for (let node of instance.ast.body) {
+		if (node.type === 'ImportDeclaration') {
+			analysis.instance_body.hoisted.push(node);
+			continue;
+		}
+
+		if (node.type === 'ExportDefaultDeclaration' || node.type === 'ExportAllDeclaration') {
+			// these can't exist inside `<script>` but TypeScript doesn't know that
+			continue;
+		}
+
+		if (node.type === 'ExportNamedDeclaration') {
+			if (node.declaration) {
+				node = node.declaration;
+			} else {
+				continue;
+			}
+		}
+
+		const has_await = has_await_expression(node);
+		awaited ||= has_await;
+
+		if (awaited && node.type !== 'FunctionDeclaration') {
+			/** @type {Set<Binding>} */
+			const reads = new Set(); // TODO we're not actually using this yet
+
+			/** @type {Set<Binding>} */
+			const writes = new Set();
+
+			trace_references(node, reads, writes);
+
+			const blocker = b.member(promises, b.literal(analysis.instance_body.async.length), true);
+
+			for (const binding of writes) {
+				binding.blocker = blocker;
+			}
+
+			if (node.type === 'VariableDeclaration') {
+				for (const declarator of node.declarations) {
+					for (const id of extract_identifiers(declarator.id)) {
+						push_declaration(id, blocker);
+					}
+
+					// one declarator per declaration, makes things simpler
+					analysis.instance_body.async.push({
+						node: declarator,
+						has_await
+					});
+				}
+			} else if (node.type === 'ClassDeclaration') {
+				push_declaration(node.id, blocker);
+				analysis.instance_body.async.push({ node, has_await });
+			} else {
+				analysis.instance_body.async.push({ node, has_await });
+			}
+		} else {
+			analysis.instance_body.sync.push(node);
+		}
+	}
+
 	if (analysis.runes) {
 		const props_refs = module.scope.references.get('$$props');
 		if (props_refs) {
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 14757af4a3..22a89db76e 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
@@ -10,16 +10,13 @@ import * as e from '../../../errors.js';
 export function AwaitExpression(node, context) {
 	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(...)`
+	// preserve context for awaits that precede other expressions in template or `$derived(...)`
 	if (
-		tla ||
-		(is_reactive_expression(
+		is_reactive_expression(
 			context.path,
 			context.state.derived_function_depth === context.state.function_depth
 		) &&
-			!is_last_evaluated_expression(context.path, node))
+		!is_last_evaluated_expression(context.path, node)
 	) {
 		context.state.analysis.pickled_awaits.add(node);
 	}
@@ -145,6 +142,9 @@ function is_last_evaluated_expression(path, node) {
 				if (node !== parent.expressions.at(-1)) return false;
 				break;
 
+			case 'VariableDeclarator':
+				return true;
+
 			default:
 				return false;
 		}
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 995d251a2e..38eab5d36e 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js
@@ -172,6 +172,7 @@ export function BindDirective(node, context) {
 	}
 
 	const binding = context.state.scope.get(left.name);
+	node.metadata.binding = binding;
 
 	if (assignee.type === 'Identifier') {
 		// reassignment
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/SnippetBlock.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/SnippetBlock.js
index 7930c2b1a7..c0350f8e6f 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/SnippetBlock.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/SnippetBlock.js
@@ -81,8 +81,13 @@ export function SnippetBlock(node, context) {
 function can_hoist_snippet(scope, scopes, visited = new Set()) {
 	for (const [reference] of scope.references) {
 		const binding = scope.get(reference);
+		if (!binding) continue;
 
-		if (!binding || binding.scope.function_depth === 0) {
+		if (binding.blocker) {
+			return false;
+		}
+
+		if (binding.scope.function_depth === 0) {
 			continue;
 		}
 
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 0dd4ae03b9..f51042eb7c 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
@@ -33,7 +33,6 @@ import { FunctionExpression } from './visitors/FunctionExpression.js';
 import { HtmlTag } from './visitors/HtmlTag.js';
 import { Identifier } from './visitors/Identifier.js';
 import { IfBlock } from './visitors/IfBlock.js';
-import { ImportDeclaration } from './visitors/ImportDeclaration.js';
 import { KeyBlock } from './visitors/KeyBlock.js';
 import { LabeledStatement } from './visitors/LabeledStatement.js';
 import { LetDirective } from './visitors/LetDirective.js';
@@ -111,7 +110,6 @@ const visitors = {
 	HtmlTag,
 	Identifier,
 	IfBlock,
-	ImportDeclaration,
 	KeyBlock,
 	LabeledStatement,
 	LetDirective,
@@ -153,7 +151,7 @@ export function client_component(analysis, options) {
 		scope: analysis.module.scope,
 		scopes: analysis.module.scopes,
 		is_instance: false,
-		hoisted: [b.import_all('$', 'svelte/internal/client')],
+		hoisted: [b.import_all('$', 'svelte/internal/client'), ...analysis.instance_body.hoisted],
 		node: /** @type {any} */ (null), // populated by the root node
 		legacy_reactive_imports: [],
 		legacy_reactive_statements: new Map(),
@@ -370,41 +368,22 @@ export function client_component(analysis, options) {
 		analysis.reactive_statements.size > 0 ||
 		component_returned_object.length > 0;
 
-	if (analysis.instance.has_await) {
-		if (should_inject_context && component_returned_object.length > 0) {
-			component_block.body.push(b.var('$$exports'));
-		}
-		const body = b.block([
-			...store_setup,
-			...state.instance_level_snippets,
-			.../** @type {ESTree.Statement[]} */ (instance.body),
-			...(should_inject_context && component_returned_object.length > 0
-				? [b.stmt(b.assignment('=', b.id('$$exports'), b.object(component_returned_object)))]
-				: []),
-			b.if(b.call('$.aborted'), b.return()),
-			.../** @type {ESTree.Statement[]} */ (template.body)
-		]);
-
-		component_block.body.push(
-			b.stmt(b.call(`$.async_body`, b.id('$$anchor'), b.arrow([b.id('$$anchor')], body, true)))
-		);
-	} else {
-		component_block.body.push(
-			...state.instance_level_snippets,
-			.../** @type {ESTree.Statement[]} */ (instance.body)
-		);
-		if (should_inject_context && component_returned_object.length > 0) {
-			component_block.body.push(b.var('$$exports', b.object(component_returned_object)));
-		}
-		component_block.body.unshift(...store_setup);
+	component_block.body.push(
+		...state.instance_level_snippets,
+		.../** @type {ESTree.Statement[]} */ (instance.body)
+	);
 
-		if (!analysis.runes && analysis.needs_context) {
-			component_block.body.push(b.stmt(b.call('$.init', analysis.immutable ? b.true : undefined)));
-		}
+	if (should_inject_context && component_returned_object.length > 0) {
+		component_block.body.push(b.var('$$exports', b.object(component_returned_object)));
+	}
+	component_block.body.unshift(...store_setup);
 
-		component_block.body.push(.../** @type {ESTree.Statement[]} */ (template.body));
+	if (!analysis.runes && analysis.needs_context) {
+		component_block.body.push(b.stmt(b.call('$.init', analysis.immutable ? b.true : undefined)));
 	}
 
+	component_block.body.push(.../** @type {ESTree.Statement[]} */ (template.body));
+
 	if (analysis.needs_mutation_validation) {
 		component_block.body.unshift(
 			b.var('$$ownership_validator', b.call('$.create_ownership_validator', b.id('$$props')))
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 b9a8691a6b..410ad120d7 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
@@ -21,9 +21,6 @@ export interface ClientTransformState extends TransformState {
 	 */
 	readonly in_constructor: boolean;
 
-	/** `true` if we're transforming the contents of `<script>` */
-	readonly is_instance: boolean;
-
 	readonly transform: Record<
 		string,
 		{
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js
index 506fd4aafd..9a264facce 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js
@@ -243,18 +243,29 @@ export function BindDirective(node, context) {
 		}
 	}
 
+	const defer =
+		node.name !== 'this' &&
+		parent.type === 'RegularElement' &&
+		parent.attributes.find((a) => a.type === 'UseDirective');
+
+	let statement = defer ? b.stmt(b.call('$.effect', b.thunk(call))) : b.stmt(call);
+
+	// TODO this doesn't account for function bindings
+	if (node.metadata.binding?.blocker) {
+		statement = b.stmt(
+			b.call(b.member(node.metadata.binding.blocker, b.id('then')), b.thunk(b.block([statement])))
+		);
+	}
+
 	// Bindings need to happen after attribute updates, therefore after the render effect, and in order with events/actions.
 	// bind:this is a special case as it's one-way and could influence the render effect.
 	if (node.name === 'this') {
-		context.state.init.push(b.stmt(call));
+		context.state.init.push(statement);
 	} else {
-		const has_use =
-			parent.type === 'RegularElement' && parent.attributes.find((a) => a.type === 'UseDirective');
-
-		if (has_use) {
-			context.state.init.push(b.stmt(b.call('$.effect', b.thunk(call))));
+		if (defer) {
+			context.state.init.push(statement);
 		} else {
-			context.state.after_update.push(b.stmt(call));
+			context.state.after_update.push(statement);
 		}
 	}
 }
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 c9e5f49b96..e7468291a0 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
@@ -1,4 +1,4 @@
-/** @import { CallExpression, Expression, MemberExpression } from 'estree' */
+/** @import { CallExpression, Expression } from 'estree' */
 /** @import { Context } from '../types' */
 import { dev, is_ignored } from '../../../../state.js';
 import * as b from '#compiler/builders';
@@ -80,7 +80,7 @@ export function CallExpression(node, context) {
 			);
 
 		case '$effect.pending':
-			return b.call('$.pending');
+			return b.call('$.eager', b.thunk(b.call('$.pending')));
 
 		case '$inspect':
 		case '$inspect().with':
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/EachBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/EachBlock.js
index 225a4f617c..c0bfe272e5 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/EachBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/EachBlock.js
@@ -312,9 +312,10 @@ export function EachBlock(node, context) {
 		declarations.push(b.let(node.index, index));
 	}
 
-	const { has_await } = node.metadata.expression;
-	const get_collection = b.thunk(collection, has_await);
-	const thunk = has_await ? b.thunk(b.call('$.get', b.id('$$collection'))) : get_collection;
+	const is_async = node.metadata.expression.is_async();
+
+	const get_collection = b.thunk(collection, node.metadata.expression.has_await);
+	const thunk = is_async ? b.thunk(b.call('$.get', b.id('$$collection'))) : get_collection;
 
 	const render_args = [b.id('$$anchor'), item];
 	if (uses_index || collection_id) render_args.push(index);
@@ -341,12 +342,13 @@ export function EachBlock(node, context) {
 		statements.unshift(b.stmt(b.call('$.validate_each_keys', thunk, key_function)));
 	}
 
-	if (has_await) {
+	if (is_async) {
 		context.state.init.push(
 			b.stmt(
 				b.call(
 					'$.async',
 					context.state.node,
+					node.metadata.expression.blockers(),
 					b.array([get_collection]),
 					b.arrow([context.state.node, b.id('$$collection')], b.block(statements))
 				)
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js
index 96a378747f..edffcb585c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ExpressionStatement.js
@@ -1,4 +1,4 @@
-/** @import { Expression, ExpressionStatement } from 'estree' */
+/** @import { ExpressionStatement } from 'estree' */
 /** @import { ComponentContext } from '../types' */
 import * as b from '#compiler/builders';
 import { get_rune } from '../../../scope.js';
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/HtmlTag.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/HtmlTag.js
index 64e84ef2ff..0567edc610 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/HtmlTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/HtmlTag.js
@@ -11,9 +11,10 @@ import { build_expression } from './shared/utils.js';
 export function HtmlTag(node, context) {
 	context.state.template.push_comment();
 
-	const { has_await } = node.metadata.expression;
+	const is_async = node.metadata.expression.is_async();
+
 	const expression = build_expression(context, node.expression, node.metadata.expression);
-	const html = has_await ? b.call('$.get', b.id('$$html')) : expression;
+	const html = is_async ? b.call('$.get', b.id('$$html')) : expression;
 
 	const is_svg = context.state.metadata.namespace === 'svg';
 	const is_mathml = context.state.metadata.namespace === 'mathml';
@@ -30,13 +31,14 @@ export function HtmlTag(node, context) {
 	);
 
 	// push into init, so that bindings run afterwards, which might trigger another run and override hydration
-	if (node.metadata.expression.has_await) {
+	if (is_async) {
 		context.state.init.push(
 			b.stmt(
 				b.call(
 					'$.async',
 					context.state.node,
-					b.array([b.thunk(expression, true)]),
+					node.metadata.expression.blockers(),
+					b.array([b.thunk(expression, node.metadata.expression.has_await)]),
 					b.arrow([context.state.node, b.id('$$html')], b.block([statement]))
 				)
 			)
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js
index 3dd36b180b..fcbb59ba74 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/IfBlock.js
@@ -25,9 +25,10 @@ export function IfBlock(node, context) {
 		statements.push(b.var(alternate_id, b.arrow([b.id('$$anchor')], alternate)));
 	}
 
-	const { has_await } = node.metadata.expression;
+	const is_async = node.metadata.expression.is_async();
+
 	const expression = build_expression(context, node.test, node.metadata.expression);
-	const test = has_await ? b.call('$.get', b.id('$$condition')) : expression;
+	const test = is_async ? b.call('$.get', b.id('$$condition')) : expression;
 
 	/** @type {Expression[]} */
 	const args = [
@@ -71,13 +72,14 @@ export function IfBlock(node, context) {
 
 	statements.push(add_svelte_meta(b.call('$.if', ...args), node, 'if'));
 
-	if (has_await) {
+	if (is_async) {
 		context.state.init.push(
 			b.stmt(
 				b.call(
 					'$.async',
 					context.state.node,
-					b.array([b.thunk(expression, true)]),
+					node.metadata.expression.blockers(),
+					b.array([b.thunk(expression, node.metadata.expression.has_await)]),
 					b.arrow([context.state.node, b.id('$$condition')], b.block(statements))
 				)
 			)
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ImportDeclaration.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ImportDeclaration.js
deleted file mode 100644
index b572e1d17f..0000000000
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ImportDeclaration.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @import { ImportDeclaration } from 'estree' */
-/** @import { ComponentContext } from '../types' */
-import * as b from '#compiler/builders';
-
-/**
- * @param {ImportDeclaration} node
- * @param {ComponentContext} context
- */
-export function ImportDeclaration(node, context) {
-	if ('hoisted' in context.state) {
-		context.state.hoisted.push(node);
-		return b.empty;
-	}
-
-	context.next();
-}
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/KeyBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/KeyBlock.js
index 52850090e3..d050155e8b 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/KeyBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/KeyBlock.js
@@ -11,10 +11,10 @@ import { build_expression, add_svelte_meta } from './shared/utils.js';
 export function KeyBlock(node, context) {
 	context.state.template.push_comment();
 
-	const { has_await } = node.metadata.expression;
+	const is_async = node.metadata.expression.is_async();
 
 	const expression = build_expression(context, node.expression, node.metadata.expression);
-	const key = b.thunk(has_await ? b.call('$.get', b.id('$$key')) : expression);
+	const key = b.thunk(is_async ? b.call('$.get', b.id('$$key')) : expression);
 	const body = /** @type {Expression} */ (context.visit(node.fragment));
 
 	let statement = add_svelte_meta(
@@ -23,12 +23,13 @@ export function KeyBlock(node, context) {
 		'key'
 	);
 
-	if (has_await) {
+	if (is_async) {
 		statement = b.stmt(
 			b.call(
 				'$.async',
 				context.state.node,
-				b.array([b.thunk(expression, true)]),
+				node.metadata.expression.blockers(),
+				b.array([b.thunk(expression, node.metadata.expression.has_await)]),
 				b.arrow([context.state.node, b.id('$$key')], b.block([statement]))
 			)
 		);
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Program.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Program.js
index 07342da314..f6352e986c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Program.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Program.js
@@ -1,14 +1,15 @@
-/** @import { Expression, ImportDeclaration, MemberExpression, Program } from 'estree' */
+/** @import { Expression, ImportDeclaration, MemberExpression, Node, Program } from 'estree' */
 /** @import { ComponentContext } from '../types' */
 import { build_getter, is_prop_source } from '../utils.js';
 import * as b from '#compiler/builders';
 import { add_state_transformers } from './shared/declarations.js';
+import { transform_body } from '../../shared/transform-async.js';
 
 /**
- * @param {Program} _
+ * @param {Program} node
  * @param {ComponentContext} context
  */
-export function Program(_, context) {
+export function Program(node, context) {
 	if (!context.state.analysis.runes) {
 		context.state.transform['$$props'] = {
 			read: (node) => ({ ...node, name: '$$sanitized_props' })
@@ -137,5 +138,16 @@ export function Program(_, context) {
 
 	add_state_transformers(context);
 
+	if (context.state.is_instance) {
+		return {
+			...node,
+			body: transform_body(
+				context.state.analysis.instance_body,
+				b.id('$.run'),
+				(node) => /** @type {Node} */ (context.visit(node))
+			)
+		};
+	}
+
 	context.next();
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js
index b3619e8669..d14336bb7e 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/RenderTag.js
@@ -22,11 +22,11 @@ export function RenderTag(node, context) {
 	for (let i = 0; i < call.arguments.length; i++) {
 		const arg = /** @type {Expression} */ (call.arguments[i]);
 		const metadata = node.metadata.arguments[i];
-
 		let expression = build_expression(context, arg, metadata);
+		const memoized = memoizer.add(expression, metadata);
 
-		if (metadata.has_await || metadata.has_call) {
-			expression = b.call('$.get', memoizer.add(expression, metadata));
+		if (expression !== memoized) {
+			expression = b.call('$.get', memoized);
 		}
 
 		args.push(b.thunk(expression));
@@ -71,13 +71,15 @@ export function RenderTag(node, context) {
 	}
 
 	const async_values = memoizer.async_values();
+	const blockers = memoizer.blockers();
 
-	if (async_values) {
+	if (async_values || blockers) {
 		context.state.init.push(
 			b.stmt(
 				b.call(
 					'$.async',
 					context.state.node,
+					blockers,
 					memoizer.async_values(),
 					b.arrow([context.state.node, ...memoizer.async_ids()], b.block(statements))
 				)
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js
index f6db21212b..294e5fdfc2 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SlotElement.js
@@ -74,13 +74,15 @@ export function SlotElement(node, context) {
 	);
 
 	const async_values = memoizer.async_values();
+	const blockers = memoizer.blockers();
 
-	if (async_values) {
+	if (async_values || blockers) {
 		context.state.init.push(
 			b.stmt(
 				b.call(
 					'$.async',
 					context.state.node,
+					blockers,
 					async_values,
 					b.arrow([context.state.node, ...memoizer.async_ids()], b.block(statements))
 				)
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js
index 2062519bb6..cfa79b73ca 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js
@@ -93,10 +93,10 @@ export function SvelteElement(node, context) {
 		);
 	}
 
-	const { has_await } = node.metadata.expression;
+	const is_async = node.metadata.expression.is_async();
 
 	const expression = /** @type {Expression} */ (context.visit(node.tag));
-	const get_tag = b.thunk(has_await ? b.call('$.get', b.id('$$tag')) : expression);
+	const get_tag = b.thunk(is_async ? b.call('$.get', b.id('$$tag')) : expression);
 
 	/** @type {Statement[]} */
 	const inner = inner_context.state.init;
@@ -139,13 +139,14 @@ export function SvelteElement(node, context) {
 		)
 	);
 
-	if (has_await) {
+	if (is_async) {
 		context.state.init.push(
 			b.stmt(
 				b.call(
 					'$.async',
 					context.state.node,
-					b.array([b.thunk(expression, true)]),
+					node.metadata.expression.blockers(),
+					b.array([b.thunk(expression, node.metadata.expression.has_await)]),
 					b.arrow([context.state.node, b.id('$$tag')], b.block(statements))
 				)
 			)
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 0f87baa433..63f942943f 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
@@ -193,18 +193,25 @@ export function VariableDeclaration(node, context) {
 					/** @type {CallExpression} */ (init)
 				);
 
+				// for now, only wrap async derived in $.save if it's not
+				// a top-level instance derived. TODO in future maybe we
+				// can dewaterfall all of them?
+				const should_save = context.state.is_instance && context.state.scope.function_depth > 1;
+
 				if (declarator.id.type === 'Identifier') {
 					let expression = /** @type {Expression} */ (context.visit(value));
 
 					if (is_async) {
 						const location = dev && !is_ignored(init, 'await_waterfall') && locate_node(init);
+
+						/** @type {Expression} */
 						let call = b.call(
 							'$.async_derived',
 							b.thunk(expression, true),
 							location ? b.literal(location) : undefined
 						);
 
-						call = save(call);
+						call = should_save ? save(call) : b.await(call);
 						if (dev) call = b.call('$.tag', call, b.literal(declarator.id.name));
 
 						declarations.push(b.declarator(declarator.id, call));
@@ -224,18 +231,22 @@ export function VariableDeclaration(node, context) {
 
 					if (rune !== '$derived' || init.arguments[0].type !== 'Identifier') {
 						const id = b.id(context.state.scope.generate('$$d'));
+
+						/** @type {Expression} */
 						let call = b.call('$.derived', rune === '$derived' ? b.thunk(expression) : expression);
 
 						rhs = b.call('$.get', id);
 
 						if (is_async) {
 							const location = dev && !is_ignored(init, 'await_waterfall') && locate_node(init);
+
 							call = b.call(
 								'$.async_derived',
 								b.thunk(expression, true),
 								location ? b.literal(location) : undefined
 							);
-							call = save(call);
+
+							call = should_save ? save(call) : b.await(call);
 						}
 
 						if (dev) {
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 688191fd20..e343662ed5 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
@@ -16,12 +16,12 @@ import { determine_slot } from '../../../../../utils/slot.js';
  * @returns {Statement}
  */
 export function build_component(node, component_name, context) {
-	/**
-	 * @type {Expression}
-	 */
+	/** @type {Expression} */
 	const anchor = context.state.node;
+
 	/** @type {Array<Property[] | Expression>} */
 	const props_and_spreads = [];
+
 	/** @type {Array<() => void>} */
 	const delayed_props = [];
 
@@ -129,14 +129,16 @@ export function build_component(node, component_name, context) {
 			(events[attribute.name] ||= []).push(handler);
 		} else if (attribute.type === 'SpreadAttribute') {
 			const expression = /** @type {Expression} */ (context.visit(attribute));
+			const memoized_expression = memoizer.add(expression, attribute.metadata.expression);
+			const is_memoized = expression !== memoized_expression;
 
-			if (attribute.metadata.expression.has_state || attribute.metadata.expression.has_await) {
+			if (
+				is_memoized ||
+				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
-							? b.call('$.get', memoizer.add(expression, attribute.metadata.expression))
-							: expression
-					)
+					b.thunk(is_memoized ? b.call('$.get', memoized_expression) : expression)
 				);
 			} else {
 				props_and_spreads.push(expression);
@@ -147,10 +149,10 @@ export function build_component(node, component_name, context) {
 					b.init(
 						attribute.name,
 						build_attribute_value(attribute.value, context, (value, metadata) => {
+							const memoized = memoizer.add(value, metadata);
+
 							// TODO put the derived in the local block
-							return metadata.has_call || metadata.has_await
-								? b.call('$.get', memoizer.add(value, metadata))
-								: value;
+							return value !== memoized ? b.call('$.get', memoized) : value;
 						}).value
 					)
 				);
@@ -184,9 +186,9 @@ export function build_component(node, component_name, context) {
 							);
 						});
 
-					return should_wrap_in_derived
-						? b.call('$.get', memoizer.add(value, metadata, true))
-						: value;
+					const memoized = memoizer.add(value, metadata, should_wrap_in_derived);
+
+					return value !== memoized ? b.call('$.get', memoized) : value;
 				}
 			);
 
@@ -497,12 +499,14 @@ export function build_component(node, component_name, context) {
 	memoizer.apply();
 
 	const async_values = memoizer.async_values();
+	const blockers = memoizer.blockers();
 
-	if (async_values) {
+	if (async_values || blockers) {
 		return b.stmt(
 			b.call(
 				'$.async',
 				anchor,
+				blockers,
 				async_values,
 				b.arrow([b.id('$$anchor'), ...memoizer.async_ids()], b.block(statements))
 			)
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 29baf2cad5..436d262d3a 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
@@ -89,6 +89,7 @@ export function build_attribute_effect(
 				b.arrow(ids, b.object(values)),
 				memoizer.sync_values(),
 				memoizer.async_values(),
+				memoizer.blockers(),
 				element.metadata.scoped &&
 					context.state.analysis.css.hash !== '' &&
 					b.literal(context.state.analysis.css.hash),
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
index 691b78199e..83bc5da3e3 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
@@ -22,12 +22,21 @@ export class Memoizer {
 	/** @type {Array<{ id: Identifier, expression: Expression }>} */
 	#async = [];
 
+	/** @type {Set<Expression>} */
+	#blockers = new Set();
+
 	/**
 	 * @param {Expression} expression
 	 * @param {ExpressionMetadata} metadata
 	 * @param {boolean} memoize_if_state
 	 */
 	add(expression, metadata, memoize_if_state = false) {
+		for (const binding of metadata.dependencies) {
+			if (binding.blocker) {
+				this.#blockers.add(binding.blocker);
+			}
+		}
+
 		const should_memoize =
 			metadata.has_call || metadata.has_await || (memoize_if_state && metadata.has_state);
 
@@ -50,6 +59,10 @@ export class Memoizer {
 		});
 	}
 
+	blockers() {
+		return this.#blockers.size > 0 ? b.array([...this.#blockers]) : undefined;
+	}
+
 	deriveds(runes = true) {
 		return this.#sync.map((memo) =>
 			b.let(memo.id, b.call(runes ? '$.derived' : '$.derived_safe_equal', b.thunk(memo.expression)))
@@ -185,7 +198,8 @@ export function build_render_statement(state) {
 					: b.block(state.update)
 			),
 			memoizer.sync_values(),
-			memoizer.async_values()
+			memoizer.async_values(),
+			memoizer.blockers()
 		)
 	);
 }
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 1c9764a759..0e2f68d0f5 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
@@ -25,6 +25,7 @@ import { IfBlock } from './visitors/IfBlock.js';
 import { KeyBlock } from './visitors/KeyBlock.js';
 import { LabeledStatement } from './visitors/LabeledStatement.js';
 import { MemberExpression } from './visitors/MemberExpression.js';
+import { Program } from './visitors/Program.js';
 import { PropertyDefinition } from './visitors/PropertyDefinition.js';
 import { RegularElement } from './visitors/RegularElement.js';
 import { RenderTag } from './visitors/RenderTag.js';
@@ -40,7 +41,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_component_renderer, create_async_block } from './visitors/shared/utils.js';
+import { call_component_renderer } from './visitors/shared/utils.js';
 
 /** @type {Visitors} */
 const global_visitors = {
@@ -53,6 +54,7 @@ const global_visitors = {
 	Identifier,
 	LabeledStatement,
 	MemberExpression,
+	Program,
 	PropertyDefinition,
 	UpdateExpression,
 	VariableDeclaration
@@ -95,7 +97,7 @@ export function server_component(analysis, options) {
 		options,
 		scope: analysis.module.scope,
 		scopes: analysis.module.scopes,
-		hoisted: [b.import_all('$', 'svelte/internal/server')],
+		hoisted: [b.import_all('$', 'svelte/internal/server'), ...analysis.instance_body.hoisted],
 		legacy_reactive_statements: new Map(),
 		// these are set inside the `Fragment` visitor, and cannot be used until then
 		init: /** @type {any} */ (null),
@@ -103,7 +105,8 @@ export function server_component(analysis, options) {
 		namespace: options.namespace,
 		preserve_whitespace: options.preserveWhitespace,
 		state_fields: new Map(),
-		skip_hydration_boundaries: false
+		skip_hydration_boundaries: false,
+		is_instance: false
 	};
 
 	const module = /** @type {ESTree.Program} */ (
@@ -113,7 +116,7 @@ export function server_component(analysis, options) {
 	const instance = /** @type {ESTree.Program} */ (
 		walk(
 			/** @type {AST.SvelteNode} */ (analysis.instance.ast),
-			{ ...state, scopes: analysis.instance.scopes },
+			{ ...state, scopes: analysis.instance.scopes, is_instance: true },
 			{
 				...global_visitors,
 				ImportDeclaration(node) {
@@ -243,10 +246,6 @@ export function server_component(analysis, options) {
 		.../** @type {ESTree.Statement[]} */ (template.body)
 	]);
 
-	if (analysis.instance.has_await) {
-		component_block = b.block([create_async_block(component_block)]);
-	}
-
 	// trick esrap into including comments
 	component_block.loc = instance.loc;
 
@@ -408,7 +407,8 @@ export function server_module(analysis, options) {
 		// to be present for `javascript_visitors_legacy` and so is included in module
 		// transform state as well as component transform state
 		legacy_reactive_statements: new Map(),
-		state_fields: new Map()
+		state_fields: new Map(),
+		is_instance: false
 	};
 
 	const module = /** @type {ESTree.Program} */ (
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 132a83ec60..b8d2e42144 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
@@ -25,8 +25,12 @@ export function AwaitBlock(node, context) {
 		)
 	);
 
-	if (node.metadata.expression.has_await) {
-		statement = create_async_block(b.block([statement]));
+	if (node.metadata.expression.is_async()) {
+		statement = create_async_block(
+			b.block([statement]),
+			node.metadata.expression.blockers(),
+			node.metadata.expression.has_await
+		);
 	}
 
 	context.state.template.push(statement, block_close);
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
index bba6511eec..8525fb6366 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/CallExpression.js
@@ -12,7 +12,14 @@ import { get_inspect_args } from '../../utils.js';
 export function CallExpression(node, context) {
 	const rune = get_rune(node, context.state.scope);
 
-	if (rune === '$host') {
+	if (
+		rune === '$host' ||
+		rune === '$effect' ||
+		rune === '$effect.pre' ||
+		rune === '$inspect.trace'
+	) {
+		// we will only encounter `$effect` etc if they are top-level statements in the <script>
+		// following an `await`, otherwise they are removed by the ExpressionStatement visitor
 		return b.void0;
 	}
 
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 2d5b0c8931..f53a3903c2 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
@@ -34,7 +34,11 @@ export function EachBlock(node, context) {
 
 	const new_body = /** @type {BlockStatement} */ (context.visit(node.body)).body;
 
-	each.push(...(node.body.metadata.has_await ? [create_async_block(b.block(new_body))] : new_body));
+	if (node.body)
+		each.push(
+			// TODO get rid of fragment.has_await
+			...(node.body.metadata.has_await ? [create_async_block(b.block(new_body))] : new_body)
+		);
 
 	const for_loop = b.for(
 		b.declaration('let', [
@@ -65,8 +69,15 @@ export function EachBlock(node, context) {
 		block.body.push(for_loop);
 	}
 
-	if (node.metadata.expression.has_await) {
-		state.template.push(create_async_block(block), block_close);
+	if (node.metadata.expression.is_async()) {
+		state.template.push(
+			create_async_block(
+				block,
+				node.metadata.expression.blockers(),
+				node.metadata.expression.has_await
+			),
+			block_close
+		);
 	} else {
 		state.template.push(...block.body, block_close);
 	}
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 9a3d2830ac..08fd2133ee 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
@@ -2,6 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
+import { create_push } from './shared/utils.js';
 
 /**
  * @param {AST.HtmlTag} node
@@ -10,9 +11,6 @@ import * as b from '#compiler/builders';
 export function HtmlTag(node, context) {
 	const expression = /** @type {Expression} */ (context.visit(node.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
-	);
+
+	context.state.template.push(create_push(call, node.metadata.expression, true));
 }
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 a869a8edf1..ca614a93e2 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
@@ -23,12 +23,20 @@ export function IfBlock(node, context) {
 	/** @type {Statement} */
 	let statement = b.if(test, consequent, alternate);
 
-	if (
+	const is_async = node.metadata.expression.is_async();
+
+	const has_await =
 		node.metadata.expression.has_await ||
+		// TODO get rid of this stuff
 		node.consequent.metadata.has_await ||
-		node.alternate?.metadata.has_await
-	) {
-		statement = create_async_block(b.block([statement]));
+		node.alternate?.metadata.has_await;
+
+	if (is_async || has_await) {
+		statement = create_async_block(
+			b.block([statement]),
+			node.metadata.expression.blockers(),
+			!!has_await
+		);
 	}
 
 	context.state.template.push(statement, block_close);
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/KeyBlock.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/KeyBlock.js
index f1dc9fa1b4..1396aa8fad 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/KeyBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/KeyBlock.js
@@ -1,16 +1,22 @@
 /** @import { BlockStatement } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
-import { empty_comment } from './shared/utils.js';
+import { block_close, block_open, empty_comment } from './shared/utils.js';
 
 /**
  * @param {AST.KeyBlock} node
  * @param {ComponentContext} context
  */
 export function KeyBlock(node, context) {
+	const is_async = node.metadata.expression.is_async();
+
+	if (is_async) context.state.template.push(block_open);
+
 	context.state.template.push(
 		empty_comment,
 		/** @type {BlockStatement} */ (context.visit(node.fragment)),
 		empty_comment
 	);
+
+	if (is_async) context.state.template.push(block_close);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/Program.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/Program.js
new file mode 100644
index 0000000000..6b5227d598
--- /dev/null
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/Program.js
@@ -0,0 +1,25 @@
+/** @import { Node, Program } from 'estree' */
+/** @import { Context, ComponentServerTransformState } from '../types' */
+import * as b from '#compiler/builders';
+import { transform_body } from '../../shared/transform-async.js';
+
+/**
+ * @param {Program} node
+ * @param {Context} context
+ */
+export function Program(node, context) {
+	if (context.state.is_instance) {
+		const state = /** @type {ComponentServerTransformState} */ (context.state);
+
+		return {
+			...node,
+			body: transform_body(
+				state.analysis.instance_body,
+				b.id('$$renderer.run'),
+				(node) => /** @type {Node} */ (context.visit(node))
+			)
+		};
+	}
+
+	context.next();
+}
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 df3e2fc37f..2ca16c4a24 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,8 @@ import {
 	process_children,
 	build_template,
 	create_child_block,
-	PromiseOptimiser
+	PromiseOptimiser,
+	create_async_block
 } from './shared/utils.js';
 
 /**
@@ -202,13 +203,19 @@ export function RegularElement(node, context) {
 		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
-			)
+	if (optimiser.is_async()) {
+		let statement = create_child_block(
+			b.block([optimiser.apply(), ...state.init, ...build_template(state.template)]),
+			true
 		);
+
+		const blockers = optimiser.blockers();
+
+		if (blockers.elements.length > 0) {
+			statement = create_async_block(b.block([statement]), blockers, false, false);
+		}
+
+		context.state.template.push(statement);
 	} 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/RenderTag.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RenderTag.js
index 4ec686bb89..6d7cef0d95 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
@@ -3,32 +3,48 @@
 /** @import { ComponentContext } from '../types.js' */
 import { unwrap_optional } from '../../../../utils/ast.js';
 import * as b from '#compiler/builders';
-import { empty_comment } from './shared/utils.js';
+import { create_async_block, empty_comment, PromiseOptimiser } from './shared/utils.js';
 
 /**
  * @param {AST.RenderTag} node
  * @param {ComponentContext} context
  */
 export function RenderTag(node, context) {
+	const optimiser = new PromiseOptimiser();
+
 	const callee = unwrap_optional(node.expression).callee;
 	const raw_args = unwrap_optional(node.expression).arguments;
 
-	const snippet_function = /** @type {Expression} */ (context.visit(callee));
+	const snippet_function = optimiser.transform(
+		/** @type {Expression} */ (context.visit(callee)),
+		node.metadata.expression
+	);
 
-	const snippet_args = raw_args.map((arg) => {
-		return /** @type {Expression} */ (context.visit(arg));
+	const snippet_args = raw_args.map((arg, i) => {
+		return optimiser.transform(
+			/** @type {Expression} */ (context.visit(arg)),
+			node.metadata.arguments[i]
+		);
 	});
 
-	context.state.template.push(
-		b.stmt(
-			(node.expression.type === 'CallExpression' ? b.call : b.maybe_call)(
-				snippet_function,
-				b.id('$$renderer'),
-				...snippet_args
-			)
+	let statement = b.stmt(
+		(node.expression.type === 'CallExpression' ? b.call : b.maybe_call)(
+			snippet_function,
+			b.id('$$renderer'),
+			...snippet_args
 		)
 	);
 
+	if (optimiser.is_async()) {
+		statement = create_async_block(
+			b.block([optimiser.apply(), statement]),
+			optimiser.blockers(),
+			optimiser.has_await
+		);
+	}
+
+	context.state.template.push(statement);
+
 	if (!context.state.skip_hydration_boundaries) {
 		context.state.template.push(empty_comment);
 	}
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 5841aa44d8..d0f8e25d02 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
@@ -65,10 +65,13 @@ export function SlotElement(node, context) {
 		fallback
 	);
 
-	const statement =
-		optimiser.expressions.length > 0
-			? create_async_block(b.block([optimiser.apply(), b.stmt(slot)]))
-			: b.stmt(slot);
+	const statement = optimiser.is_async()
+		? create_async_block(
+				b.block([optimiser.apply(), b.stmt(slot)]),
+				optimiser.blockers(),
+				optimiser.has_await
+			)
+		: b.stmt(slot);
 
 	context.state.template.push(block_open, statement, block_close);
 }
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 2e61897924..145167a690 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
@@ -6,7 +6,12 @@ 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, create_child_block, PromiseOptimiser } from './shared/utils.js';
+import {
+	build_template,
+	create_async_block,
+	create_child_block,
+	PromiseOptimiser
+} from './shared/utils.js';
 
 /**
  * @param {AST.SvelteElement} node
@@ -39,11 +44,14 @@ export function SvelteElement(node, context) {
 
 	const optimiser = new PromiseOptimiser();
 
+	/** @type {Statement[]} */
+	let statements = [];
+
 	build_element_attributes(node, { ...context, state }, optimiser.transform);
 
 	if (dev) {
 		const location = /** @type {Location} */ (locator(node.start));
-		context.state.template.push(
+		statements.push(
 			b.stmt(
 				b.call(
 					'$.push_element',
@@ -74,9 +82,21 @@ export function SvelteElement(node, context) {
 		statement = create_child_block(b.block([optimiser.apply(), statement]), true);
 	}
 
-	context.state.template.push(statement);
+	statements.push(statement);
 
 	if (dev) {
-		context.state.template.push(b.stmt(b.call('$.pop_element')));
+		statements.push(b.stmt(b.call('$.pop_element')));
 	}
+
+	if (node.metadata.expression.is_async()) {
+		statements = [
+			create_async_block(
+				b.block(statements),
+				node.metadata.expression.blockers(),
+				node.metadata.expression.has_await
+			)
+		];
+	}
+
+	context.state.template.push(...statements);
 }
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 e463ea785a..83a5dcf3ec 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
@@ -5,8 +5,7 @@ import {
 	empty_comment,
 	build_attribute_value,
 	create_async_block,
-	PromiseOptimiser,
-	build_template
+	PromiseOptimiser
 } from './utils.js';
 import * as b from '#compiler/builders';
 import { is_element_node } from '../../../../nodes.js';
@@ -323,8 +322,14 @@ export function build_inline_component(node, expression, context) {
 		);
 	}
 
-	if (optimiser.expressions.length > 0) {
-		statement = create_async_block(b.block([optimiser.apply(), statement]));
+	const is_async = optimiser.is_async();
+
+	if (is_async) {
+		statement = create_async_block(
+			b.block([optimiser.apply(), statement]),
+			optimiser.blockers(),
+			optimiser.has_await
+		);
 	}
 
 	if (dynamic && custom_css_props.length === 0) {
@@ -334,6 +339,7 @@ export function build_inline_component(node, expression, context) {
 	context.state.template.push(statement);
 
 	if (
+		!is_async &&
 		!context.state.skip_hydration_boundaries &&
 		custom_css_props.length === 0 &&
 		optimiser.expressions.length === 0
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 09a854670c..6bc0ab3233 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,4 +1,4 @@
-/** @import { Expression, Identifier, Node, Statement, BlockStatement } from 'estree' */
+/** @import { Expression, Identifier, Node, Statement, BlockStatement, ArrayExpression } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext, ServerTransformState } from '../../types.js' */
 
@@ -77,12 +77,11 @@ export function process_children(nodes, { visit, state }) {
 	}
 
 	for (const node of nodes) {
-		if (node.type === 'ExpressionTag' && node.metadata.expression.has_await) {
+		if (node.type === 'ExpressionTag' && node.metadata.expression.is_async()) {
 			flush();
-			const visited = /** @type {Expression} */ (visit(node.expression));
-			state.template.push(
-				b.stmt(b.call('$$renderer.push', b.thunk(b.call('$.escape', visited), true)))
-			);
+
+			const expression = /** @type {Expression} */ (visit(node.expression));
+			state.template.push(create_push(b.call('$.escape', expression), node.metadata.expression));
 		} else if (node.type === 'Text' || node.type === 'Comment' || node.type === 'ExpressionTag') {
 			sequence.push(node);
 		} else {
@@ -275,9 +274,50 @@ export function create_child_block(body, async) {
 /**
  * Creates a `$$renderer.async(...)` expression statement
  * @param {BlockStatement | Expression} body
+ * @param {ArrayExpression} blockers
+ * @param {boolean} has_await
+ * @param {boolean} needs_hydration_markers
+ */
+export function create_async_block(
+	body,
+	blockers = b.array([]),
+	has_await = true,
+	needs_hydration_markers = true
+) {
+	return b.stmt(
+		b.call(
+			needs_hydration_markers ? '$$renderer.async_block' : '$$renderer.async',
+			blockers,
+			b.arrow([b.id('$$renderer')], body, has_await)
+		)
+	);
+}
+
+/**
+ * @param {Expression} expression
+ * @param {ExpressionMetadata} metadata
+ * @param {boolean} needs_hydration_markers
+ * @returns {Expression | Statement}
  */
-export function create_async_block(body) {
-	return b.stmt(b.call('$$renderer.async', b.arrow([b.id('$$renderer')], body, true)));
+export function create_push(expression, metadata, needs_hydration_markers = false) {
+	if (metadata.is_async()) {
+		let statement = b.stmt(b.call('$$renderer.push', b.thunk(expression, metadata.has_await)));
+
+		const blockers = metadata.blockers();
+
+		if (blockers.elements.length > 0) {
+			statement = create_async_block(
+				b.block([statement]),
+				blockers,
+				false,
+				needs_hydration_markers
+			);
+		}
+
+		return statement;
+	}
+
+	return expression;
 }
 
 /**
@@ -291,17 +331,36 @@ export function call_component_renderer(body, component_fn_id) {
 	);
 }
 
+/**
+ * A utility for optimising promises in templates. Without it code like
+ * `<Component foo={await fetch()} bar={await other()} />` would be transformed
+ * into two blocking promises, with it it's using `Promise.all` to await them.
+ * It also keeps track of blocking promises, i.e. those that need to be resolved before continuing.
+ */
 export class PromiseOptimiser {
 	/** @type {Expression[]} */
 	expressions = [];
 
+	has_await = false;
+
+	/** @type {Set<Expression>} */
+	#blockers = new Set();
+
 	/**
 	 *
 	 * @param {Expression} expression
 	 * @param {ExpressionMetadata} metadata
 	 */
 	transform = (expression, metadata) => {
+		for (const binding of metadata.dependencies) {
+			if (binding.blocker) {
+				this.#blockers.add(binding.blocker);
+			}
+		}
+
 		if (metadata.has_await) {
+			this.has_await = true;
+
 			const length = this.expressions.push(expression);
 			return b.id(`$$${length - 1}`);
 		}
@@ -310,6 +369,10 @@ export class PromiseOptimiser {
 	};
 
 	apply() {
+		if (this.expressions.length === 0) {
+			return b.empty;
+		}
+
 		if (this.expressions.length === 1) {
 			return b.const('$$0', this.expressions[0]);
 		}
@@ -327,4 +390,12 @@ export class PromiseOptimiser {
 			b.await(b.call('Promise.all', promises))
 		);
 	}
+
+	blockers() {
+		return b.array([...this.#blockers]);
+	}
+
+	is_async() {
+		return this.expressions.length > 0 || this.#blockers.size > 0;
+	}
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
new file mode 100644
index 0000000000..444b8d7d94
--- /dev/null
+++ b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
@@ -0,0 +1,102 @@
+/** @import * as ESTree from 'estree' */
+/** @import { ComponentAnalysis } from '../../types' */
+import * as b from '#compiler/builders';
+
+/**
+ * Transforms the body of the instance script in such a way that await expressions are made non-blocking as much as possible.
+ *
+ * Example Transformation:
+ * ```js
+ * let x = 1;
+ * let data = await fetch('/api');
+ * let y = data.value;
+ * ```
+ * becomes:
+ * ```js
+ * let x = 1;
+ * var data, y;
+ * var $$promises = $.run([
+ *   () => data = await fetch('/api'),
+ *   () => y = data.value
+ * ]);
+ * ```
+ * where `$$promises` is an array of promises that are resolved in the order they are declared,
+ * and which expressions in the template can await on like `await $$promises[0]` which means they
+ * wouldn't have to wait for e.g. `$$promises[1]` to resolve.
+ *
+ * @param {ComponentAnalysis['instance_body']} instance_body
+ * @param {ESTree.Expression} runner
+ * @param {(node: ESTree.Node) => ESTree.Node} transform
+ * @returns {Array<ESTree.Statement | ESTree.VariableDeclaration>}
+ */
+export function transform_body(instance_body, runner, transform) {
+	// Any sync statements before the first await expression
+	const statements = instance_body.sync.map(
+		(node) => /** @type {ESTree.Statement | ESTree.VariableDeclaration} */ (transform(node))
+	);
+
+	// Declarations for the await expressions (they will asign to them; need to be hoisted to be available in whole instance scope)
+	if (instance_body.declarations.length > 0) {
+		statements.push(
+			b.declaration(
+				'var',
+				instance_body.declarations.map((id) => b.declarator(id))
+			)
+		);
+	}
+
+	// Thunks for the await expressions
+	if (instance_body.async.length > 0) {
+		const thunks = instance_body.async.map((s) => {
+			if (s.node.type === 'VariableDeclarator') {
+				const visited = /** @type {ESTree.VariableDeclaration} */ (
+					transform(b.var(s.node.id, s.node.init))
+				);
+
+				if (visited.declarations.length === 1) {
+					return b.thunk(
+						b.assignment('=', s.node.id, visited.declarations[0].init ?? b.void0),
+						s.has_await
+					);
+				}
+
+				// if we have multiple declarations, it indicates destructuring
+				return b.thunk(
+					b.block([
+						b.var(visited.declarations[0].id, visited.declarations[0].init),
+						...visited.declarations
+							.slice(1)
+							.map((d) => b.stmt(b.assignment('=', d.id, d.init ?? b.void0)))
+					]),
+					s.has_await
+				);
+			}
+
+			if (s.node.type === 'ClassDeclaration') {
+				return b.thunk(
+					b.assignment(
+						'=',
+						s.node.id,
+						/** @type {ESTree.ClassExpression} */ ({ ...s.node, type: 'ClassExpression' })
+					),
+					s.has_await
+				);
+			}
+
+			if (s.node.type === 'ExpressionStatement') {
+				const expression = /** @type {ESTree.Expression} */ (transform(s.node.expression));
+
+				return expression.type === 'AwaitExpression'
+					? b.thunk(expression, true)
+					: b.thunk(b.unary('void', expression), s.has_await);
+			}
+
+			return b.thunk(b.block([/** @type {ESTree.Statement} */ (transform(s.node))]), s.has_await);
+		});
+
+		// TODO get the `$$promises` ID from scope
+		statements.push(b.var('$$promises', b.call(runner, b.array(thunks))));
+	}
+
+	return statements;
+}
diff --git a/packages/svelte/src/compiler/phases/3-transform/types.d.ts b/packages/svelte/src/compiler/phases/3-transform/types.d.ts
index 887ad447b9..8fc03d2d9a 100644
--- a/packages/svelte/src/compiler/phases/3-transform/types.d.ts
+++ b/packages/svelte/src/compiler/phases/3-transform/types.d.ts
@@ -8,5 +8,8 @@ export interface TransformState {
 	readonly scope: Scope;
 	readonly scopes: Map<AST.SvelteNode, Scope>;
 
+	/** `true` if we're transforming the contents of `<script>` */
+	readonly is_instance: boolean;
+
 	readonly state_fields: Map<string, StateField>;
 }
diff --git a/packages/svelte/src/compiler/phases/nodes.js b/packages/svelte/src/compiler/phases/nodes.js
index bca9c29a65..2c7c3fb66b 100644
--- a/packages/svelte/src/compiler/phases/nodes.js
+++ b/packages/svelte/src/compiler/phases/nodes.js
@@ -1,5 +1,6 @@
 /** @import { Expression, PrivateIdentifier } from 'estree' */
 /** @import { AST, Binding } from '#compiler' */
+import * as b from '#compiler/builders';
 
 /**
  * All nodes that can appear elsewhere than the top level, have attributes and can contain children
@@ -91,6 +92,29 @@ export class ExpressionMetadata {
 	 * @type {Set<Binding>}
 	 */
 	references = new Set();
+
+	/** @type {null | Set<Expression>} */
+	#blockers = null;
+
+	#get_blockers() {
+		if (!this.#blockers) {
+			this.#blockers = new Set();
+
+			for (const d of this.dependencies) {
+				if (d.blocker) this.#blockers.add(d.blocker);
+			}
+		}
+
+		return this.#blockers;
+	}
+
+	blockers() {
+		return b.array([...this.#get_blockers()]);
+	}
+
+	is_async() {
+		return this.has_await || this.#get_blockers().size > 0;
+	}
 }
 
 /**
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index 7dbdf47967..c39803318d 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -108,6 +108,9 @@ export class Binding {
 	/** @type {Array<{ node: Identifier; path: AST.SvelteNode[] }>} */
 	references = [];
 
+	/** @type {Array<{ value: Expression; scope: Scope }>} */
+	assignments = [];
+
 	/**
 	 * For `legacy_reactive`: its reactive dependencies
 	 * @type {Binding[]}
@@ -129,6 +132,15 @@ export class Binding {
 	mutated = false;
 	reassigned = false;
 
+	/**
+	 * Instance-level declarations may follow (or contain) a top-level `await`. In these cases,
+	 * any reads that occur in the template must wait for the corresponding promise to resolve
+	 * otherwise the initial value will not have been assigned
+	 * TODO the blocker is set during transform which feels a bit grubby
+	 * @type {Expression | null}
+	 */
+	blocker = null;
+
 	/**
 	 *
 	 * @param {Scope} scope
@@ -143,6 +155,10 @@ export class Binding {
 		this.initial = initial;
 		this.kind = kind;
 		this.declaration_kind = declaration_kind;
+
+		if (initial) {
+			this.assignments.push({ value: /** @type {Expression} */ (initial), scope });
+		}
 	}
 
 	get updated() {
@@ -859,7 +875,7 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 	/** @type {[Scope, { node: Identifier; path: AST.SvelteNode[] }][]} */
 	const references = [];
 
-	/** @type {[Scope, Pattern | MemberExpression][]} */
+	/** @type {[Scope, Pattern | MemberExpression, Expression][]} */
 	const updates = [];
 
 	/**
@@ -1047,12 +1063,13 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 
 		// updates
 		AssignmentExpression(node, { state, next }) {
-			updates.push([state.scope, node.left]);
+			updates.push([state.scope, node.left, node.right]);
 			next();
 		},
 
 		UpdateExpression(node, { state, next }) {
-			updates.push([state.scope, /** @type {Identifier | MemberExpression} */ (node.argument)]);
+			const expression = /** @type {Identifier | MemberExpression} */ (node.argument);
+			updates.push([state.scope, expression, expression]);
 			next();
 		},
 
@@ -1273,10 +1290,11 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 		},
 
 		BindDirective(node, context) {
-			updates.push([
-				context.state.scope,
-				/** @type {Identifier | MemberExpression} */ (node.expression)
-			]);
+			if (node.expression.type !== 'SequenceExpression') {
+				const expression = /** @type {Identifier | MemberExpression} */ (node.expression);
+				updates.push([context.state.scope, expression, expression]);
+			}
+
 			context.next();
 		},
 
@@ -1311,7 +1329,7 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 		scope.reference(node, path);
 	}
 
-	for (const [scope, node] of updates) {
+	for (const [scope, node, value] of updates) {
 		for (const expression of unwrap_pattern(node)) {
 			const left = object(expression);
 			const binding = left && scope.get(left.name);
@@ -1319,6 +1337,7 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 			if (binding !== null && left !== binding.node) {
 				if (left === expression) {
 					binding.reassigned = true;
+					binding.assignments.push({ value, scope });
 				} else {
 					binding.mutated = true;
 				}
diff --git a/packages/svelte/src/compiler/phases/types.d.ts b/packages/svelte/src/compiler/phases/types.d.ts
index 074012e03f..71f77b1a11 100644
--- a/packages/svelte/src/compiler/phases/types.d.ts
+++ b/packages/svelte/src/compiler/phases/types.d.ts
@@ -3,11 +3,19 @@ import type {
 	AwaitExpression,
 	CallExpression,
 	ClassBody,
+	ClassDeclaration,
+	FunctionDeclaration,
 	Identifier,
 	LabeledStatement,
-	Program
+	ModuleDeclaration,
+	Pattern,
+	Program,
+	Statement,
+	VariableDeclaration,
+	VariableDeclarator
 } from 'estree';
 import type { Scope, ScopeRoot } from './scope.js';
+import type { ExpressionMetadata } from './nodes.js';
 
 export interface Js {
 	ast: Program;
@@ -27,6 +35,14 @@ export interface ReactiveStatement {
 	dependencies: Binding[];
 }
 
+export interface AwaitedDeclaration {
+	id: Identifier;
+	has_await: boolean;
+	pattern: Pattern;
+	metadata: ExpressionMetadata;
+	updated_by: Set<Identifier>;
+}
+
 /**
  * Analysis common to modules and components
  */
@@ -108,4 +124,13 @@ export interface ComponentAnalysis extends Analysis {
 	 * Every snippet that is declared locally
 	 */
 	snippets: Set<AST.SnippetBlock>;
+	/**
+	 * Pre-transformed `<script>` block
+	 */
+	instance_body: {
+		hoisted: Array<Statement | ModuleDeclaration>;
+		sync: Array<Statement | ModuleDeclaration | VariableDeclaration>;
+		async: Array<{ node: Statement | VariableDeclarator; has_await: boolean }>;
+		declarations: Array<Identifier>;
+	};
 }
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index fa7484e523..9cf498d187 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -48,6 +48,7 @@ export namespace AST {
 			 * Whether or not we need to traverse into the fragment during mount/hydrate
 			 */
 			dynamic: boolean;
+			/** @deprecated we should get rid of this in favour of the `$$renderer.run` mechanism */
 			has_await: boolean;
 		};
 	}
@@ -206,6 +207,7 @@ export namespace AST {
 		expression: Identifier | MemberExpression | SequenceExpression;
 		/** @internal */
 		metadata: {
+			binding?: Binding | null;
 			binding_group_name: Identifier;
 			parent_each_blocks: EachBlock[];
 		};
diff --git a/packages/svelte/src/compiler/utils/ast.js b/packages/svelte/src/compiler/utils/ast.js
index bd92dda5d9..75aadd905b 100644
--- a/packages/svelte/src/compiler/utils/ast.js
+++ b/packages/svelte/src/compiler/utils/ast.js
@@ -1,4 +1,4 @@
-/** @import { AST } from '#compiler' */
+/** @import { AST, Scope } from '#compiler' */
 /** @import * as ESTree from 'estree' */
 import { walk } from 'zimmerframe';
 import * as b from '#compiler/builders';
diff --git a/packages/svelte/src/compiler/utils/builders.js b/packages/svelte/src/compiler/utils/builders.js
index 1a2d5cab5c..4a44294189 100644
--- a/packages/svelte/src/compiler/utils/builders.js
+++ b/packages/svelte/src/compiler/utils/builders.js
@@ -82,6 +82,17 @@ export function block(body) {
 	return { type: 'BlockStatement', body };
 }
 
+/**
+ * @param {ESTree.Identifier | null} id
+ * @param {ESTree.ClassBody} body
+ * @param {ESTree.Expression | null} [superClass]
+ * @param {ESTree.Decorator[]} [decorators]
+ * @returns {ESTree.ClassExpression}
+ */
+export function class_expression(id, body, superClass, decorators = []) {
+	return { type: 'ClassExpression', body, superClass, decorators };
+}
+
 /**
  * @param {string} name
  * @param {ESTree.Statement} body
@@ -184,7 +195,7 @@ export function declaration(kind, declarations) {
 
 /**
  * @param {ESTree.Pattern | string} pattern
- * @param {ESTree.Expression} [init]
+ * @param {ESTree.Expression | null} [init]
  * @returns {ESTree.VariableDeclarator}
  */
 export function declarator(pattern, init) {
@@ -520,7 +531,7 @@ const this_instance = {
 
 /**
  * @param {string | ESTree.Pattern} pattern
- * @param { ESTree.Expression} [init]
+ * @param {ESTree.Expression | null} [init]
  * @returns {ESTree.VariableDeclaration}
  */
 function let_builder(pattern, init) {
@@ -529,7 +540,7 @@ function let_builder(pattern, init) {
 
 /**
  * @param {string | ESTree.Pattern} pattern
- * @param { ESTree.Expression} init
+ * @param {ESTree.Expression | null} init
  * @returns {ESTree.VariableDeclaration}
  */
 function const_builder(pattern, init) {
@@ -538,7 +549,7 @@ function const_builder(pattern, init) {
 
 /**
  * @param {string | ESTree.Pattern} pattern
- * @param { ESTree.Expression} [init]
+ * @param {ESTree.Expression | null} [init]
  * @returns {ESTree.VariableDeclaration}
  */
 function var_builder(pattern, init) {
diff --git a/packages/svelte/src/internal/client/dom/blocks/async.js b/packages/svelte/src/internal/client/dom/blocks/async.js
index 5ee9d25bce..3d320d2ea9 100644
--- a/packages/svelte/src/internal/client/dom/blocks/async.js
+++ b/packages/svelte/src/internal/client/dom/blocks/async.js
@@ -14,10 +14,11 @@ import { get_boundary } from './boundary.js';
 
 /**
  * @param {TemplateNode} node
+ * @param {Array<Promise<void>>} blockers
  * @param {Array<() => Promise<any>>} expressions
  * @param {(anchor: TemplateNode, ...deriveds: Value[]) => void} fn
  */
-export function async(node, expressions, fn) {
+export function async(node, blockers = [], expressions = [], fn) {
 	var boundary = get_boundary();
 	var batch = /** @type {Batch} */ (current_batch);
 	var blocking = !boundary.is_pending();
@@ -35,7 +36,7 @@ export function async(node, expressions, fn) {
 		set_hydrate_node(end);
 	}
 
-	flatten([], expressions, (values) => {
+	flatten(blockers, [], expressions, (values) => {
 		if (was_hydrating) {
 			set_hydrating(true);
 			set_hydrate_node(previous_hydrate_node);
@@ -47,12 +48,12 @@ export function async(node, expressions, fn) {
 
 			fn(node, ...values);
 		} finally {
+			if (was_hydrating) {
+				set_hydrating(false);
+			}
+
 			boundary.update_pending_count(-1);
 			batch.decrement(blocking);
 		}
-
-		if (was_hydrating) {
-			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 febbc00898..140e876330 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -34,7 +34,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 } 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';
@@ -110,12 +110,6 @@ export class Boundary {
 	 */
 	#effect_pending = null;
 
-	#effect_pending_update = () => {
-		if (this.#effect_pending) {
-			internal_set(this.#effect_pending, this.#local_pending_count);
-		}
-	};
-
 	#effect_pending_subscriber = createSubscriber(() => {
 		this.#effect_pending = source(this.#local_pending_count);
 
@@ -329,7 +323,10 @@ export class Boundary {
 		this.#update_pending_count(d);
 
 		this.#local_pending_count += d;
-		effect_pending_updates.add(this.#effect_pending_update);
+
+		if (this.#effect_pending) {
+			internal_set(this.#effect_pending, this.#local_pending_count);
+		}
 	}
 
 	get_effect_pending() {
diff --git a/packages/svelte/src/internal/client/dom/elements/attributes.js b/packages/svelte/src/internal/client/dom/elements/attributes.js
index 55d5d7860a..d970e7c885 100644
--- a/packages/svelte/src/internal/client/dom/elements/attributes.js
+++ b/packages/svelte/src/internal/client/dom/elements/attributes.js
@@ -483,6 +483,7 @@ function set_attributes(
  * @param {(...expressions: any) => Record<string | symbol, any>} fn
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
+ * @param {Array<Promise<void>>} blockers
  * @param {string} [css_hash]
  * @param {boolean} [should_remove_defaults]
  * @param {boolean} [skip_warning]
@@ -492,11 +493,12 @@ export function attribute_effect(
 	fn,
 	sync = [],
 	async = [],
+	blockers = [],
 	css_hash,
 	should_remove_defaults = false,
 	skip_warning = false
 ) {
-	flatten(sync, async, (values) => {
+	flatten(blockers, sync, async, (values) => {
 		/** @type {Record<string | symbol, any> | undefined} */
 		var prev = undefined;
 
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index 471eed299d..9b5bc54740 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -100,6 +100,7 @@ export {
 export {
 	async_body,
 	for_await_track_reactivity_loss,
+	run,
 	save,
 	track_reactivity_loss
 } from './reactivity/async.js';
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index bdd7eed940..04e544759d 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -1,5 +1,5 @@
 /** @import { Effect, TemplateNode, Value } from '#client' */
-import { DESTROYED } from '#client/constants';
+import { DESTROYED, STALE_REACTION } from '#client/constants';
 import { DEV } from 'esm-env';
 import {
 	component_context,
@@ -25,25 +25,18 @@ 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';
+import { hydrate_next, hydrating, set_hydrate_node, skip_nodes } from '../dom/hydration.js';
 
 /**
- *
+ * @param {Array<Promise<void>>} blockers
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
  * @param {(values: Value[]) => any} fn
  */
-export function flatten(sync, async, fn) {
+export function flatten(blockers, sync, async, fn) {
 	const d = is_runes() ? derived : derived_safe_equal;
 
-	if (async.length === 0) {
+	if (async.length === 0 && blockers.length === 0) {
 		fn(sync.map(d));
 		return;
 	}
@@ -53,31 +46,42 @@ export function flatten(sync, async, fn) {
 
 	var restore = capture();
 
-	var was_hydrating = hydrating;
+	function run() {
+		Promise.all(async.map((expression) => async_derived(expression)))
+			.then((result) => {
+				restore();
+
+				try {
+					fn([...sync.map(d), ...result]);
+				} catch (error) {
+					// ignore errors in blocks that have already been destroyed
+					if ((parent.f & DESTROYED) === 0) {
+						invoke_error_boundary(error, parent);
+					}
+				}
 
-	Promise.all(async.map((expression) => async_derived(expression)))
-		.then((result) => {
+				batch?.deactivate();
+				unset_context();
+			})
+			.catch((error) => {
+				invoke_error_boundary(error, parent);
+			});
+	}
+
+	if (blockers.length > 0) {
+		Promise.all(blockers).then(() => {
 			restore();
 
 			try {
-				fn([...sync.map(d), ...result]);
-			} catch (error) {
-				// ignore errors in blocks that have already been destroyed
-				if ((parent.f & DESTROYED) === 0) {
-					invoke_error_boundary(error, parent);
-				}
+				return run();
+			} finally {
+				batch?.deactivate();
+				unset_context();
 			}
-
-			if (was_hydrating) {
-				set_hydrating(false);
-			}
-
-			batch?.deactivate();
-			unset_context();
-		})
-		.catch((error) => {
-			invoke_error_boundary(error, parent);
 		});
+	} else {
+		run();
+	}
 }
 
 /**
@@ -91,12 +95,6 @@ export 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;
-	}
-
 	if (DEV) {
 		var previous_dev_stack = dev_stack;
 	}
@@ -107,11 +105,6 @@ export function capture() {
 		set_component_context(previous_component_context);
 		if (activate_batch) previous_batch?.activate();
 
-		if (was_hydrating) {
-			set_hydrating(true);
-			set_hydrate_node(previous_hydrate_node);
-		}
-
 		if (DEV) {
 			set_from_async_derived(null);
 			set_dev_stack(previous_dev_stack);
@@ -248,13 +241,79 @@ export async function async_body(anchor, fn) {
 			invoke_error_boundary(error, active);
 		}
 	} finally {
-		if (was_hydrating) {
-			set_hydrating(false);
-		}
-
 		boundary.update_pending_count(-1);
 		batch.decrement(blocking);
 
 		unset_context();
 	}
 }
+
+/**
+ * @param {Array<() => void | Promise<void>>} thunks
+ */
+export function run(thunks) {
+	const restore = capture();
+
+	var boundary = get_boundary();
+	var batch = /** @type {Batch} */ (current_batch);
+	var blocking = !boundary.is_pending();
+
+	boundary.update_pending_count(1);
+	batch.increment(blocking);
+
+	var active = /** @type {Effect} */ (active_effect);
+
+	/** @type {null | { error: any }} */
+	var errored = null;
+
+	/** @param {any} error */
+	const handle_error = (error) => {
+		errored = { error }; // wrap in object in case a promise rejects with a falsy value
+
+		if (!aborted(active)) {
+			invoke_error_boundary(error, active);
+		}
+	};
+
+	var promise = Promise.resolve(thunks[0]()).catch(handle_error);
+
+	var promises = [promise];
+
+	for (const fn of thunks.slice(1)) {
+		promise = promise
+			.then(() => {
+				if (errored) {
+					throw errored.error;
+				}
+
+				if (aborted(active)) {
+					throw STALE_REACTION;
+				}
+
+				try {
+					restore();
+					return fn();
+				} finally {
+					// TODO do we need it here as well as below?
+					unset_context();
+				}
+			})
+			.catch(handle_error)
+			.finally(() => {
+				unset_context();
+			});
+
+		promises.push(promise);
+	}
+
+	promise
+		// wait one more tick, so that template effects are
+		// guaranteed to run before `$effect(...)`
+		.then(() => Promise.resolve())
+		.finally(() => {
+			boundary.update_pending_count(-1);
+			batch.decrement(blocking);
+		});
+
+	return promises;
+}
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index bbc05bb1ff..9d61b6bbf9 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -74,9 +74,6 @@ export let previous_batch = null;
  */
 export let batch_values = null;
 
-/** @type {Set<() => void>} */
-export let effect_pending_updates = new Set();
-
 /** @type {Effect[]} */
 let queued_root_effects = [];
 
@@ -324,16 +321,6 @@ export class Batch {
 		}
 
 		this.deactivate();
-
-		for (const update of effect_pending_updates) {
-			effect_pending_updates.delete(update);
-			update();
-
-			if (current_batch !== null) {
-				// only do one at a time
-				break;
-			}
-		}
 	}
 
 	discard() {
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 4235e9cb24..4a9fce7286 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -365,9 +365,10 @@ export function render_effect(fn, flags = 0) {
  * @param {(...expressions: any) => void | (() => void)} fn
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
+ * @param {Array<Promise<void>>} blockers
  */
-export function template_effect(fn, sync = [], async = []) {
-	flatten(sync, async, (values) => {
+export function template_effect(fn, sync = [], async = [], blockers = []) {
+	flatten(blockers, sync, async, (values) => {
 		create_effect(RENDER_EFFECT, () => fn(...values.map(get)), true);
 	});
 }
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 49396d6feb..2197f34d16 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -602,18 +602,19 @@ export function get(signal) {
 	}
 
 	if (DEV) {
-		if (current_async_effect) {
-			var tracking = (current_async_effect.f & REACTION_IS_UPDATING) !== 0;
-			var was_read = current_async_effect.deps?.includes(signal);
+		// TODO reinstate this, but make it actually work
+		// if (current_async_effect) {
+		// 	var tracking = (current_async_effect.f & REACTION_IS_UPDATING) !== 0;
+		// 	var was_read = current_async_effect.deps?.includes(signal);
 
-			if (!tracking && !untracking && !was_read) {
-				w.await_reactivity_loss(/** @type {string} */ (signal.label));
+		// 	if (!tracking && !untracking && !was_read) {
+		// 		w.await_reactivity_loss(/** @type {string} */ (signal.label));
 
-				var trace = get_stack('traced at');
-				// eslint-disable-next-line no-console
-				if (trace) console.warn(trace);
-			}
-		}
+		// 		var trace = get_stack('traced at');
+		// 		// eslint-disable-next-line no-console
+		// 		if (trace) console.warn(trace);
+		// 	}
+		// }
 
 		recent_async_deriveds.delete(signal);
 
@@ -628,7 +629,7 @@ export function get(signal) {
 			if (signal.trace) {
 				signal.trace();
 			} else {
-				trace = get_stack('traced at');
+				var trace = get_stack('traced at');
 
 				if (trace) {
 					var entry = tracing_expressions.entries.get(signal);
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 602c680c08..5dc845e376 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -100,14 +100,69 @@ export class Renderer {
 	}
 
 	/**
+	 * @param {Array<Promise<void>>} blockers
 	 * @param {(renderer: Renderer) => void} fn
 	 */
-	async(fn) {
+	async_block(blockers, fn) {
 		this.#out.push(BLOCK_OPEN);
-		this.child(fn);
+		this.async(blockers, fn);
 		this.#out.push(BLOCK_CLOSE);
 	}
 
+	/**
+	 * @param {Array<Promise<void>>} blockers
+	 * @param {(renderer: Renderer) => void} fn
+	 */
+	async(blockers, fn) {
+		let callback = fn;
+
+		if (blockers.length > 0) {
+			const context = ssr_context;
+
+			callback = (renderer) => {
+				return Promise.all(blockers).then(() => {
+					const previous_context = ssr_context;
+
+					try {
+						set_ssr_context(context);
+						return fn(renderer);
+					} finally {
+						set_ssr_context(previous_context);
+					}
+				});
+			};
+		}
+
+		this.child(callback);
+	}
+
+	/**
+	 * @param {Array<() => void>} thunks
+	 */
+	run(thunks) {
+		const context = ssr_context;
+
+		let promise = Promise.resolve(thunks[0]());
+		const promises = [promise];
+
+		for (const fn of thunks.slice(1)) {
+			promise = promise.then(() => {
+				const previous_context = ssr_context;
+				set_ssr_context(context);
+
+				try {
+					return fn();
+				} finally {
+					set_ssr_context(previous_context);
+				}
+			});
+
+			promises.push(promise);
+		}
+
+		return promises;
+	}
+
 	/**
 	 * Create a child renderer. The child renderer inherits the state from the parent,
 	 * but has its own content.
diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts
index 7144543242..e0f10ca2dd 100644
--- a/packages/svelte/tests/runtime-legacy/shared.ts
+++ b/packages/svelte/tests/runtime-legacy/shared.ts
@@ -12,6 +12,7 @@ import { raf } from '../animation-helpers.js';
 import type { CompileOptions } from '#compiler';
 import { suite_with_variants, type BaseTest } from '../suite.js';
 import { clear } from '../../src/internal/client/reactivity/batch.js';
+import { hydrating } from '../../src/internal/client/dom/hydration.js';
 
 type Assert = typeof import('vitest').assert & {
 	htmlEqual(a: string, b: string, description?: string): void;
@@ -533,6 +534,10 @@ async function run_test_variant(
 			throw err;
 		}
 	} finally {
+		if (hydrating) {
+			throw new Error('Hydration state was not cleared');
+		}
+
 		config.after_test?.();
 
 		// Free up the microtask queue
diff --git a/packages/svelte/tests/runtime-runes/samples/async-if-after-await-in-script/_config.js b/packages/svelte/tests/runtime-runes/samples/async-if-after-await-in-script/_config.js
new file mode 100644
index 0000000000..2b8ab6e894
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-if-after-await-in-script/_config.js
@@ -0,0 +1,16 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_mode: ['server'],
+
+	ssrHtml: '<p>yep</p>',
+
+	async test({ assert, target, variant }) {
+		if (variant === 'dom') {
+			await tick();
+		}
+
+		assert.htmlEqual(target.innerHTML, '<p>yep</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-if-after-await-in-script/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-if-after-await-in-script/main.svelte
new file mode 100644
index 0000000000..66dc7c718c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-if-after-await-in-script/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	await 0;
+	const condition = await true;
+</script>
+
+{#if condition}
+	<p>yep</p>
+{:else}
+	<p>nope</p>
+{/if}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss-for-await/_config.js b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss-for-await/_config.js
index 2bcb129b12..ce7cd6bd49 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss-for-await/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss-for-await/_config.js
@@ -2,6 +2,9 @@ import { tick } from 'svelte';
 import { test } from '../../test';
 
 export default test({
+	// TODO reinstate
+	skip: true,
+
 	compileOptions: {
 		dev: true
 	},
diff --git a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js
index 747648e83f..ad333a573a 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-reactivity-loss/_config.js
@@ -2,6 +2,9 @@ import { tick } from 'svelte';
 import { test } from '../../test';
 
 export default test({
+	// TODO reinstate this
+	skip: true,
+
 	compileOptions: {
 		dev: 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
index cf667e1624..6f1c40988d 100644
--- 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
@@ -6,7 +6,7 @@ export default function Async_each_fallback_hoisting($$anchor) {
 	var fragment = $.comment();
 	var node = $.first_child(fragment);
 
-	$.async(node, [() => Promise.resolve([])], (node, $$collection) => {
+	$.async(node, [], [() => Promise.resolve([])], (node, $$collection) => {
 		$.each(
 			node,
 			16,
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 c579fda929..7249fd6e4f 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.async(async ($$renderer) => {
+	$$renderer.async_block([], 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/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-each-hoisting/_expected/client/index.svelte.js
index a1535d6886..4045ad4bf4 100644
--- 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
@@ -9,7 +9,7 @@ export default function Async_each_hoisting($$anchor) {
 	var fragment = $.comment();
 	var node = $.first_child(fragment);
 
-	$.async(node, [() => Promise.resolve([first, second, third])], (node, $$collection) => {
+	$.async(node, [], [() => Promise.resolve([first, second, third])], (node, $$collection) => {
 		$.each(node, 17, () => $.get($$collection), $.index, ($$anchor, item) => {
 			$.next();
 
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 e87b50e2a4..43fe9414eb 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.async(async ($$renderer) => {
+	$$renderer.async_block([], 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/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-alternate-hoisting/_expected/client/index.svelte.js
index e385f5d234..d86001e273 100644
--- 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
@@ -6,7 +6,7 @@ export default function Async_if_alternate_hoisting($$anchor) {
 	var fragment = $.comment();
 	var node = $.first_child(fragment);
 
-	$.async(node, [() => Promise.resolve(false)], (node, $$condition) => {
+	$.async(node, [], [() => Promise.resolve(false)], (node, $$condition) => {
 		var consequent = ($$anchor) => {
 			var text = $.text();
 
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 df4ad80899..1e7330429a 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.async(async ($$renderer) => {
+	$$renderer.async_block([], 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/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-if-hoisting/_expected/client/index.svelte.js
index 356e8e9607..5cdb6978d9 100644
--- 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
@@ -6,7 +6,7 @@ export default function Async_if_hoisting($$anchor) {
 	var fragment = $.comment();
 	var node = $.first_child(fragment);
 
-	$.async(node, [() => Promise.resolve(true)], (node, $$condition) => {
+	$.async(node, [], [() => Promise.resolve(true)], (node, $$condition) => {
 		var consequent = ($$anchor) => {
 			var text = $.text();
 
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 1d935f9be8..1ca24cf81a 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.async(async ($$renderer) => {
+	$$renderer.async_block([], 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/async-in-derived/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
index 7a97850175..e4df43c6c2 100644
--- a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
@@ -5,48 +5,47 @@ import * as $ from 'svelte/internal/client';
 export default function Async_in_derived($$anchor, $$props) {
 	$.push($$props, true);
 
-	$.async_body($$anchor, async ($$anchor) => {
-		let yes1 = (await $.save($.async_derived(async () => (await $.save(1))())))();
-		let yes2 = (await $.save($.async_derived(async () => foo((await $.save(1))()))))();
+	var yes1, yes2, no1, no2;
 
-		let no1 = $.derived(async () => {
-			return await 1;
-		});
+	var $$promises = $.run([
+		async () => yes1 = await $.async_derived(() => 1),
+		async () => yes2 = await $.async_derived(async () => foo(await 1)),
 
-		let no2 = $.derived(() => async () => {
+		() => no1 = $.derived(async () => {
 			return await 1;
-		});
+		}),
 
-		if ($.aborted()) return;
-
-		var fragment = $.comment();
-		var node = $.first_child(fragment);
+		() => no2 = $.derived(() => async () => {
+			return await 1;
+		})
+	]);
 
-		{
-			var consequent = ($$anchor) => {
-				$.async_body($$anchor, async ($$anchor) => {
-					const yes1 = (await $.save($.async_derived(async () => (await $.save(1))())))();
-					const yes2 = (await $.save($.async_derived(async () => foo((await $.save(1))()))))();
+	var fragment = $.comment();
+	var node = $.first_child(fragment);
 
-					const no1 = $.derived(() => (async () => {
-						return await 1;
-					})());
+	{
+		var consequent = ($$anchor) => {
+			$.async_body($$anchor, async ($$anchor) => {
+				const yes1 = (await $.save($.async_derived(async () => (await $.save(1))())))();
+				const yes2 = (await $.save($.async_derived(async () => foo((await $.save(1))()))))();
 
-					const no2 = $.derived(() => (async () => {
-						return await 1;
-					})());
+				const no1 = $.derived(() => (async () => {
+					return await 1;
+				})());
 
-					if ($.aborted()) return;
-				});
-			};
+				const no2 = $.derived(() => (async () => {
+					return await 1;
+				})());
 
-			$.if(node, ($$render) => {
-				if (true) $$render(consequent);
+				if ($.aborted()) return;
 			});
-		}
+		};
 
-		$.append($$anchor, fragment);
-	});
+		$.if(node, ($$render) => {
+			if (true) $$render(consequent);
+		});
+	}
 
+	$.append($$anchor, fragment);
 	$.pop();
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
index 69eca5a383..bece6402c6 100644
--- a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
@@ -3,38 +3,40 @@ import * as $ from 'svelte/internal/server';
 
 export default function Async_in_derived($$renderer, $$props) {
 	$$renderer.component(($$renderer) => {
-		$$renderer.async(async ($$renderer) => {
-			let yes1 = (await $.save(1))();
-			let yes2 = foo((await $.save(1))());
+		var yes1, yes2, no1, no2;
 
-			let no1 = (async () => {
-				return await 1;
-			})();
+		var $$promises = $$renderer.run([
+			async () => yes1 = await 1,
+			async () => yes2 = foo(await 1),
 
-			let no2 = async () => {
+			() => no1 = (async () => {
 				return await 1;
-			};
-
-			$$renderer.async(async ($$renderer) => {
-				if (true) {
-					$$renderer.push('<!--[-->');
-
-					const yes1 = (await $.save(1))();
-					const yes2 = foo((await $.save(1))());
-
-					const no1 = (async () => {
-						return await 1;
-					})();
+			})(),
 
-					const no2 = (async () => {
-						return await 1;
-					})();
-				} else {
-					$$renderer.push('<!--[!-->');
-				}
-			});
-
-			$$renderer.push(`<!--]-->`);
+			() => no2 = async () => {
+				return await 1;
+			}
+		]);
+
+		$$renderer.async_block([], async ($$renderer) => {
+			if (true) {
+				$$renderer.push('<!--[-->');
+
+				const yes1 = (await $.save(1))();
+				const yes2 = foo((await $.save(1))());
+
+				const no1 = (async () => {
+					return await 1;
+				})();
+
+				const no2 = (async () => {
+					return await 1;
+				})();
+			} else {
+				$$renderer.push('<!--[!-->');
+			}
 		});
+
+		$$renderer.push(`<!--]-->`);
 	});
 }
\ No newline at end of file

From 83746adcf79c41e9b95b41225ee156dc3c08f5b7 Mon Sep 17 00:00:00 2001
From: Alejandro Torres <Alejandrotorresndro@gmail.com>
Date: Tue, 28 Oct 2025 12:51:19 -0400
Subject: [PATCH 147/347] Fix  spelling in code comments (#17059)

---
 packages/svelte/src/internal/client/proxy.js                    | 2 +-
 packages/svelte/src/internal/server/renderer.js                 | 2 +-
 packages/svelte/tests/runtime-browser/assert.js                 | 2 +-
 .../tests/runtime-runes/samples/mount-props-updates/_config.js  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/svelte/src/internal/client/proxy.js b/packages/svelte/src/internal/client/proxy.js
index 49cef451b3..5b028d8d09 100644
--- a/packages/svelte/src/internal/client/proxy.js
+++ b/packages/svelte/src/internal/client/proxy.js
@@ -267,7 +267,7 @@ export function proxy(value) {
 					if (other_s !== undefined) {
 						set(other_s, UNINITIALIZED);
 					} else if (i in target) {
-						// If the item exists in the original, we need to create a uninitialized source,
+						// If the item exists in the original, we need to create an uninitialized source,
 						// else a later read of the property would result in a source being created with
 						// the value of the original item at that index.
 						other_s = with_parent(() => source(UNINITIALIZED, stack));
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 5dc845e376..479175c2eb 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -441,7 +441,7 @@ export class Renderer {
 	}
 
 	/**
-	 * Collect all of the `onDestroy` callbacks regsitered during rendering. In an async context, this is only safe to call
+	 * Collect all of the `onDestroy` callbacks registered during rendering. In an async context, this is only safe to call
 	 * after awaiting `collect_async`.
 	 *
 	 * Child renderers are "porous" and don't affect execution order, but component body renderers
diff --git a/packages/svelte/tests/runtime-browser/assert.js b/packages/svelte/tests/runtime-browser/assert.js
index e331c8b677..249c5ad33d 100644
--- a/packages/svelte/tests/runtime-browser/assert.js
+++ b/packages/svelte/tests/runtime-browser/assert.js
@@ -166,7 +166,7 @@ export function test(args) {
 	return args;
 }
 
-// TypeScript needs the type of assertions to be directly visible, not infered, which is why
+// TypeScript needs the type of assertions to be directly visible, not inferred, which is why
 // we can't have it on the test suite type.
 /**
  * @param {any} value
diff --git a/packages/svelte/tests/runtime-runes/samples/mount-props-updates/_config.js b/packages/svelte/tests/runtime-runes/samples/mount-props-updates/_config.js
index ff7af2d524..57e4d276ff 100644
--- a/packages/svelte/tests/runtime-runes/samples/mount-props-updates/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/mount-props-updates/_config.js
@@ -22,7 +22,7 @@ export default test({
 			target.innerHTML,
 			// bar is not set in the parent because it's a readonly property
 			// baz is not set in the parent because while it's a bindable property,
-			// it wasn't set initially so it's treated as a readonly proeprty
+			// it wasn't set initially so it's treated as a readonly property
 			`
 			<button>reset</button> foo 3
 			<div><button>update</button> 1 2 3 4</div>

From 70d020bd9128bf0cc596780636c7f4b0081088a6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Oct 2025 21:35:50 +0100
Subject: [PATCH 148/347] Version Packages (#17055)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/bitter-rings-help.md |  5 -----
 .changeset/loud-chairs-tease.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/bitter-rings-help.md
 delete mode 100644 .changeset/loud-chairs-tease.md

diff --git a/.changeset/bitter-rings-help.md b/.changeset/bitter-rings-help.md
deleted file mode 100644
index f71b9f96b2..0000000000
--- a/.changeset/bitter-rings-help.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': minor
----
-
-feat: out-of-order rendering
diff --git a/.changeset/loud-chairs-tease.md b/.changeset/loud-chairs-tease.md
deleted file mode 100644
index e08d111cdd..0000000000
--- a/.changeset/loud-chairs-tease.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: settle batch after DOM updates
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 8dabe54b33..0a8637a321 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.43.0
+
+### Minor Changes
+
+- feat: out-of-order rendering ([#17038](https://github.com/sveltejs/svelte/pull/17038))
+
+### Patch Changes
+
+- fix: settle batch after DOM updates ([#17054](https://github.com/sveltejs/svelte/pull/17054))
+
 ## 5.42.3
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 1ee6c50121..a66afa61fe 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.42.3",
+  "version": "5.43.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 999aacc998..225f50220c 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.42.3';
+export const VERSION = '5.43.0';
 export const PUBLIC_VERSION = '5';

From 9477f18b7705d731ea22bc7dc4e369baec0f31b4 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:51:23 +0100
Subject: [PATCH 149/347] fix: transform `$bindable` after `await` expressions
 (#17066)

Fixes #17064
---
 .changeset/hot-crews-notice.md                |  5 +++
 .../3-transform/shared/transform-async.js     |  2 +-
 .../samples/async-bindable-prop/Child.svelte  |  8 +++++
 .../samples/async-bindable-prop/_config.js    | 35 +++++++++++++++++++
 .../samples/async-bindable-prop/main.svelte   |  9 +++++
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/hot-crews-notice.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-bindable-prop/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-bindable-prop/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-bindable-prop/main.svelte

diff --git a/.changeset/hot-crews-notice.md b/.changeset/hot-crews-notice.md
new file mode 100644
index 0000000000..5b11a82fda
--- /dev/null
+++ b/.changeset/hot-crews-notice.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: transform `$bindable` after `await` expressions
diff --git a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
index 444b8d7d94..6ec7893452 100644
--- a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
+++ b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
@@ -55,7 +55,7 @@ export function transform_body(instance_body, runner, transform) {
 
 				if (visited.declarations.length === 1) {
 					return b.thunk(
-						b.assignment('=', s.node.id, visited.declarations[0].init ?? b.void0),
+						b.assignment('=', visited.declarations[0].id, visited.declarations[0].init ?? b.void0),
 						s.has_await
 					);
 				}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-bindable-prop/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-bindable-prop/Child.svelte
new file mode 100644
index 0000000000..4214a85f37
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-bindable-prop/Child.svelte
@@ -0,0 +1,8 @@
+<script>
+	await Promise.resolve();
+	let { value = $bindable("test") } = $props();
+</script>
+
+<button onclick={() => value = 'updated'}>update</button>
+{value}
+
diff --git a/packages/svelte/tests/runtime-runes/samples/async-bindable-prop/_config.js b/packages/svelte/tests/runtime-runes/samples/async-bindable-prop/_config.js
new file mode 100644
index 0000000000..a4ff70a8dc
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-bindable-prop/_config.js
@@ -0,0 +1,35 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['async-server', 'client', 'hydrate'],
+	ssrHtml: `
+		<button>update</button> initial <p>initial</p>
+	`,
+
+	async test({ assert, target }) {
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>update</button>
+				initial
+				<p>initial</p>
+			`
+		);
+
+		const button = target.querySelector('button');
+		button?.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>update</button>
+				updated
+				<p>updated</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-bindable-prop/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-bindable-prop/main.svelte
new file mode 100644
index 0000000000..e053fdda6a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-bindable-prop/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	import Child from './Child.svelte';
+
+	let value = $state('initial');
+</script>
+
+<Child bind:value />
+<p>{value}</p>
+

From 8ebc3b1337bd12931f5608ab608b9668e10aa6c2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:56:25 +0100
Subject: [PATCH 150/347] Version Packages (#17076)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/hot-crews-notice.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/hot-crews-notice.md

diff --git a/.changeset/hot-crews-notice.md b/.changeset/hot-crews-notice.md
deleted file mode 100644
index 5b11a82fda..0000000000
--- a/.changeset/hot-crews-notice.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: transform `$bindable` after `await` expressions
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 0a8637a321..2a2cd28698 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.43.1
+
+### Patch Changes
+
+- fix: transform `$bindable` after `await` expressions ([#17066](https://github.com/sveltejs/svelte/pull/17066))
+
 ## 5.43.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index a66afa61fe..a7e0c618bf 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.43.0",
+  "version": "5.43.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 225f50220c..4c0a8f05c8 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.43.0';
+export const VERSION = '5.43.1';
 export const PUBLIC_VERSION = '5';

From a791e9178b229e720adbbc0156eb03aa08941698 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 30 Oct 2025 15:15:47 +0100
Subject: [PATCH 151/347] fix: treat each blocks with async dependencies as
 uncontrolled (#17077)

---
 .changeset/fair-files-cover.md                               | 5 +++++
 .../phases/3-transform/client/visitors/shared/fragment.js    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fair-files-cover.md

diff --git a/.changeset/fair-files-cover.md b/.changeset/fair-files-cover.md
new file mode 100644
index 0000000000..1009773e5b
--- /dev/null
+++ b/.changeset/fair-files-cover.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: treat each blocks with async dependencies as uncontrolled
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
index 3588f2843a..c7f843af48 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
@@ -105,7 +105,7 @@ export function process_children(nodes, initial, is_element, context) {
 				is_element &&
 				// In case it's wrapped in async the async logic will want to skip sibling nodes up until the end, hence we cannot make this controlled
 				// TODO switch this around and instead optimize for elements with a single block child and not require extra comments (neither for async nor normally)
-				!(node.body.metadata.has_await || node.metadata.expression.has_await)
+				!(node.body.metadata.has_await || node.metadata.expression.is_async())
 			) {
 				node.metadata.is_controlled = true;
 			} else {

From 723c421fbb1abb8e50d13505b9ef5999df884a9d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 Oct 2025 16:14:11 +0100
Subject: [PATCH 152/347] Version Packages (#17078)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/fair-files-cover.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/fair-files-cover.md

diff --git a/.changeset/fair-files-cover.md b/.changeset/fair-files-cover.md
deleted file mode 100644
index 1009773e5b..0000000000
--- a/.changeset/fair-files-cover.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: treat each blocks with async dependencies as uncontrolled
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 2a2cd28698..bcf17fe45e 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.43.2
+
+### Patch Changes
+
+- fix: treat each blocks with async dependencies as uncontrolled ([#17077](https://github.com/sveltejs/svelte/pull/17077))
+
 ## 5.43.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index a7e0c618bf..f7a1cca616 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.43.1",
+  "version": "5.43.2",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 4c0a8f05c8..0a28702778 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.43.1';
+export const VERSION = '5.43.2';
 export const PUBLIC_VERSION = '5';

From 0e709e3fec59a66635962b8fac3bbbacdd765e9e Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Fri, 31 Oct 2025 07:17:12 +0100
Subject: [PATCH 153/347] fix: change title only after any pending work has
 completed (#17061)

* fix: change title only after any pending work has completed

We have to use an effect - not a render effect - for updating the title, and always. That way we change the title only after any pending work has completed.

Fixes #17060

* fix
---
 .changeset/legal-mangos-peel.md               |  5 ++++
 .../client/visitors/TitleElement.js           | 23 ++++++++++++++----
 .../src/internal/client/reactivity/batch.js   | 21 +++++++---------
 .../src/internal/client/reactivity/effects.js |  5 ++--
 .../samples/async-head-title-1/Inner.svelte   | 15 ++++++++++++
 .../samples/async-head-title-1/_config.js     | 24 +++++++++++++++++++
 .../samples/async-head-title-1/main.svelte    | 12 ++++++++++
 .../samples/async-head-title-2/Inner.svelte   | 13 ++++++++++
 .../samples/async-head-title-2/_config.js     | 23 ++++++++++++++++++
 .../samples/async-head-title-2/main.svelte    | 12 ++++++++++
 10 files changed, 135 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/legal-mangos-peel.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head-title-1/Inner.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head-title-1/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head-title-1/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head-title-2/Inner.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head-title-2/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head-title-2/main.svelte

diff --git a/.changeset/legal-mangos-peel.md b/.changeset/legal-mangos-peel.md
new file mode 100644
index 0000000000..bddad21bff
--- /dev/null
+++ b/.changeset/legal-mangos-peel.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: change title only after any pending work has completed
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 98d7880b25..edd8835e00 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
@@ -1,16 +1,19 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
 import * as b from '#compiler/builders';
-import { build_template_chunk } from './shared/utils.js';
+import { build_template_chunk, Memoizer } from './shared/utils.js';
 
 /**
  * @param {AST.TitleElement} node
  * @param {ComponentContext} context
  */
 export function TitleElement(node, context) {
+	const memoizer = new Memoizer();
 	const { has_state, value } = build_template_chunk(
 		/** @type {any} */ (node.fragment.nodes),
-		context
+		context,
+		context.state,
+		(value, metadata) => memoizer.add(value, metadata)
 	);
 	const evaluated = context.state.scope.evaluate(value);
 
@@ -26,9 +29,21 @@ export function TitleElement(node, context) {
 		)
 	);
 
+	// Always in an $effect so it only changes the title once async work is done
 	if (has_state) {
-		context.state.update.push(statement);
+		context.state.after_update.push(
+			b.stmt(
+				b.call(
+					'$.template_effect',
+					b.arrow(memoizer.apply(), b.block([statement])),
+					memoizer.sync_values(),
+					memoizer.async_values(),
+					memoizer.blockers(),
+					b.true
+				)
+			)
+		);
 	} else {
-		context.state.init.push(statement);
+		context.state.after_update.push(b.stmt(b.call('$.effect', b.thunk(b.block([statement])))));
 	}
 }
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 9d61b6bbf9..27c90d7708 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -14,33 +14,25 @@ import {
 	MAYBE_DIRTY,
 	DERIVED,
 	BOUNDARY_EFFECT,
-	EAGER_EFFECT
+	EAGER_EFFECT,
+	HEAD_EFFECT
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
 import {
 	active_effect,
 	get,
-	increment_write_version,
 	is_dirty,
 	is_updating_effect,
 	set_is_updating_effect,
 	set_signal_status,
-	tick,
 	update_effect
 } from '../runtime.js';
 import * as e from '../errors.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 {
-	flush_eager_effects,
-	eager_effects,
-	old_values,
-	set_eager_effects,
-	source,
-	update
-} from './sources.js';
+import { flush_eager_effects, old_values, set_eager_effects, source, update } from './sources.js';
 import { eager_effect, unlink_effect } from './effects.js';
 
 /**
@@ -800,7 +792,12 @@ export function schedule_effect(signal) {
 
 		// if the effect is being scheduled because a parent (each/await/etc) block
 		// updated an internal source, bail out or we'll cause a second flush
-		if (is_flushing && effect === active_effect && (flags & BLOCK_EFFECT) !== 0) {
+		if (
+			is_flushing &&
+			effect === active_effect &&
+			(flags & BLOCK_EFFECT) !== 0 &&
+			(flags & HEAD_EFFECT) === 0
+		) {
 			return;
 		}
 
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 4a9fce7286..8c4b84438c 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -366,10 +366,11 @@ export function render_effect(fn, flags = 0) {
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
  * @param {Array<Promise<void>>} blockers
+ * @param {boolean} defer
  */
-export function template_effect(fn, sync = [], async = [], blockers = []) {
+export function template_effect(fn, sync = [], async = [], blockers = [], defer = false) {
 	flatten(blockers, sync, async, (values) => {
-		create_effect(RENDER_EFFECT, () => fn(...values.map(get)), true);
+		create_effect(defer ? EFFECT : RENDER_EFFECT, () => fn(...values.map(get)), true);
 	});
 }
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head-title-1/Inner.svelte b/packages/svelte/tests/runtime-runes/samples/async-head-title-1/Inner.svelte
new file mode 100644
index 0000000000..089ba43607
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head-title-1/Inner.svelte
@@ -0,0 +1,15 @@
+<script>
+	let { deferred } = $props();
+
+	function push() {
+		const d = Promise.withResolvers();
+		deferred.push(() => d.resolve());
+		return d.promise;
+	}
+</script>
+
+<svelte:head>
+	<title>title</title>
+</svelte:head>
+
+<p>{await push()}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head-title-1/_config.js b/packages/svelte/tests/runtime-runes/samples/async-head-title-1/_config.js
new file mode 100644
index 0000000000..39cbf5becb
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head-title-1/_config.js
@@ -0,0 +1,24 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [toggle, resolve] = target.querySelectorAll('button');
+		toggle.click();
+		await tick();
+		assert.equal(window.document.title, '');
+
+		toggle.click();
+		await tick();
+		assert.equal(window.document.title, '');
+
+		toggle.click();
+		await tick();
+		assert.equal(window.document.title, '');
+
+		resolve.click();
+		await tick();
+		await tick();
+		assert.equal(window.document.title, 'title');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head-title-1/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-head-title-1/main.svelte
new file mode 100644
index 0000000000..3535157087
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head-title-1/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	import Inner from './Inner.svelte';
+
+	let deferred = [];
+	let show = $state(false);
+</script>
+
+<button onclick={() => show = !show}>toggle</button>
+<button onclick={() => deferred.pop()()}>resolve</button>
+{#if show}
+	<Inner {deferred} />
+{/if}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head-title-2/Inner.svelte b/packages/svelte/tests/runtime-runes/samples/async-head-title-2/Inner.svelte
new file mode 100644
index 0000000000..b2a8656276
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head-title-2/Inner.svelte
@@ -0,0 +1,13 @@
+<script>
+	let { deferred } = $props();
+
+	function push() {
+		const d = Promise.withResolvers();
+		deferred.push(() => d.resolve('title'));
+		return d.promise;
+	}
+</script>
+
+<svelte:head>
+	<title>{await push()}</title>
+</svelte:head>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head-title-2/_config.js b/packages/svelte/tests/runtime-runes/samples/async-head-title-2/_config.js
new file mode 100644
index 0000000000..b89dce62d1
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head-title-2/_config.js
@@ -0,0 +1,23 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [toggle, resolve] = target.querySelectorAll('button');
+		toggle.click();
+		await tick();
+		assert.equal(window.document.title, '');
+
+		toggle.click();
+		await tick();
+		assert.equal(window.document.title, '');
+
+		toggle.click();
+		await tick();
+		assert.equal(window.document.title, '');
+
+		resolve.click();
+		await tick();
+		assert.equal(window.document.title, 'title');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head-title-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-head-title-2/main.svelte
new file mode 100644
index 0000000000..3535157087
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head-title-2/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	import Inner from './Inner.svelte';
+
+	let deferred = [];
+	let show = $state(false);
+</script>
+
+<button onclick={() => show = !show}>toggle</button>
+<button onclick={() => deferred.pop()()}>resolve</button>
+{#if show}
+	<Inner {deferred} />
+{/if}

From 8ebbb3c7bccfba4f509456b5b4f5b81ccf13d65c Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sat, 1 Nov 2025 23:35:20 +0100
Subject: [PATCH 154/347] fix: preserve symbols when creating derived rest
 properties (#17096)

fixes #17094
---
 .changeset/sixty-comics-bow.md                     |  5 +++++
 packages/svelte/src/internal/client/runtime.js     | 14 ++++++++++----
 .../derived-rest-includes-symbol/_config.js        |  5 +++++
 .../derived-rest-includes-symbol/main.svelte       |  8 ++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/sixty-comics-bow.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/main.svelte

diff --git a/.changeset/sixty-comics-bow.md b/.changeset/sixty-comics-bow.md
new file mode 100644
index 0000000000..2463e52430
--- /dev/null
+++ b/.changeset/sixty-comics-bow.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: preserve symbols when creating derived rest properties
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 2197f34d16..6485d21ec2 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -763,12 +763,12 @@ export function set_signal_status(signal, status) {
 }
 
 /**
- * @param {Record<string, unknown>} obj
- * @param {string[]} keys
- * @returns {Record<string, unknown>}
+ * @param {Record<string | symbol, unknown>} obj
+ * @param {Array<string | symbol>} keys
+ * @returns {Record<string | symbol, unknown>}
  */
 export function exclude_from_object(obj, keys) {
-	/** @type {Record<string, unknown>} */
+	/** @type {Record<string | symbol, unknown>} */
 	var result = {};
 
 	for (var key in obj) {
@@ -777,6 +777,12 @@ export function exclude_from_object(obj, keys) {
 		}
 	}
 
+	for (var symbol of Object.getOwnPropertySymbols(obj)) {
+		if (!keys.includes(symbol)) {
+			result[symbol] = obj[symbol];
+		}
+	}
+
 	return result;
 }
 
diff --git a/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/_config.js b/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/_config.js
new file mode 100644
index 0000000000..eec60928a2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	html: `<p>42</p>`
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/main.svelte b/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/main.svelte
new file mode 100644
index 0000000000..ee161696e1
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	const symbol = Symbol();
+
+	let a = { [symbol]: 42 };
+	let { ...b } = $derived(a);
+</script>
+
+<p>{b[symbol]}</p>

From b7625fd42c067b7cd03fea9589ef45349f9dedbe Mon Sep 17 00:00:00 2001
From: 7nik <kifiranet@gmail.com>
Date: Sun, 2 Nov 2025 11:40:32 +0200
Subject: [PATCH 155/347] fix: do not spread non-enumerable symbols (#17097)

---
 packages/svelte/src/internal/client/runtime.js           | 2 +-
 .../samples/derived-rest-includes-symbol/_config.js      | 2 +-
 .../samples/derived-rest-includes-symbol/main.svelte     | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 6485d21ec2..76531d3320 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -778,7 +778,7 @@ export function exclude_from_object(obj, keys) {
 	}
 
 	for (var symbol of Object.getOwnPropertySymbols(obj)) {
-		if (!keys.includes(symbol)) {
+		if (Object.propertyIsEnumerable.call(obj, symbol) && !keys.includes(symbol)) {
 			result[symbol] = obj[symbol];
 		}
 	}
diff --git a/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/_config.js b/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/_config.js
index eec60928a2..d0633983d2 100644
--- a/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/_config.js
@@ -1,5 +1,5 @@
 import { test } from '../../test';
 
 export default test({
-	html: `<p>42</p>`
+	html: `<p>true false</p>`
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/main.svelte b/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/main.svelte
index ee161696e1..2454e98ab7 100644
--- a/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/derived-rest-includes-symbol/main.svelte
@@ -1,8 +1,11 @@
 <script>
-	const symbol = Symbol();
+	const symbol1 = Symbol();
+	const symbol2 = Symbol();
+
+	let a = { [symbol1]: 42 };
+	Object.defineProperty(a, symbol2, { enumerable: false, value: "nope" })
 
-	let a = { [symbol]: 42 };
 	let { ...b } = $derived(a);
 </script>
 
-<p>{b[symbol]}</p>
+<p>{symbol1 in b} {symbol2 in b}</p>

From eea8a18cf2ff8245f0687e8012d5923c5d508d03 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 3 Nov 2025 21:02:09 +0100
Subject: [PATCH 156/347] fix: ensure fork always accesses correct values
 (#17098)

Not all batches will flush right after being activated, some will be activated and then `get` is called on a signal. In that case the value was wrong because we did not apply the changes of that batch. By doing `this.apply()` during `activate()` we ensure we do, which fixes (among other things, likely) a forking bug where old values where sneaking in.

Fixes #17079
---
 .changeset/eight-news-laugh.md                  |  5 +++++
 .../src/internal/client/reactivity/batch.js     | 13 +++++++++----
 .../samples/async-fork-if/Child.svelte          |  8 ++++++++
 .../samples/async-fork-if/_config.js            | 12 ++++++++++++
 .../samples/async-fork-if/main.svelte           | 17 +++++++++++++++++
 5 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/eight-news-laugh.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-if/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-if/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-if/main.svelte

diff --git a/.changeset/eight-news-laugh.md b/.changeset/eight-news-laugh.md
new file mode 100644
index 0000000000..e120b19f5e
--- /dev/null
+++ b/.changeset/eight-news-laugh.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure fork always accesses correct values
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 27c90d7708..57aa185a31 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -15,7 +15,8 @@ import {
 	DERIVED,
 	BOUNDARY_EFFECT,
 	EAGER_EFFECT,
-	HEAD_EFFECT
+	HEAD_EFFECT,
+	ERROR_VALUE
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
@@ -285,12 +286,16 @@ export class Batch {
 			this.previous.set(source, value);
 		}
 
-		this.current.set(source, source.v);
-		batch_values?.set(source, source.v);
+		// Don't save errors in `batch_values`, or they won't be thrown in `runtime.js#get`
+		if ((source.f & ERROR_VALUE) === 0) {
+			this.current.set(source, source.v);
+			batch_values?.set(source, source.v);
+		}
 	}
 
 	activate() {
 		current_batch = this;
+		this.apply();
 	}
 
 	deactivate() {
@@ -492,7 +497,7 @@ export class Batch {
 	}
 
 	apply() {
-		if (!async_mode_flag || batches.size === 1) return;
+		if (!async_mode_flag || (!this.is_fork && batches.size === 1)) return;
 
 		// if there are multiple batches, we are 'time travelling' —
 		// we need to override values with the ones in this batch...
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-if/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-fork-if/Child.svelte
new file mode 100644
index 0000000000..6ef7d03eea
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-if/Child.svelte
@@ -0,0 +1,8 @@
+<script>
+	let { x } = $props();
+	console.log(x);
+	await Promise.resolve();
+	console.log(x);
+</script>
+
+{x}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-if/_config.js b/packages/svelte/tests/runtime-runes/samples/async-fork-if/_config.js
new file mode 100644
index 0000000000..1bc168d9ae
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-if/_config.js
@@ -0,0 +1,12 @@
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		const btn = target.querySelector('button');
+
+		btn?.click();
+		await new Promise((r) => setTimeout(r, 2));
+		assert.htmlEqual(target.innerHTML, `<button>fork</button> universe`);
+		assert.deepEqual(logs, ['universe', 'universe']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-if/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-fork-if/main.svelte
new file mode 100644
index 0000000000..625040ec13
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-if/main.svelte
@@ -0,0 +1,17 @@
+<script>
+	import { fork } from 'svelte';
+	import Child from './Child.svelte';
+	let x = $state('world');
+</script>
+
+<button onclick={async () => {
+	const f = fork(() => {
+		x = 'universe'
+	});
+	await new Promise(r => setTimeout(r));
+	f.commit();
+}}>fork</button>
+
+{#if x === 'universe'}
+	<Child {x} />
+{/if}

From 7a2435471c96c43d6f00144cdb5889772703d786 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 3 Nov 2025 20:53:51 -0500
Subject: [PATCH 157/347] Version Packages (#17087)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/eight-news-laugh.md  |  5 -----
 .changeset/legal-mangos-peel.md |  5 -----
 .changeset/sixty-comics-bow.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/eight-news-laugh.md
 delete mode 100644 .changeset/legal-mangos-peel.md
 delete mode 100644 .changeset/sixty-comics-bow.md

diff --git a/.changeset/eight-news-laugh.md b/.changeset/eight-news-laugh.md
deleted file mode 100644
index e120b19f5e..0000000000
--- a/.changeset/eight-news-laugh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ensure fork always accesses correct values
diff --git a/.changeset/legal-mangos-peel.md b/.changeset/legal-mangos-peel.md
deleted file mode 100644
index bddad21bff..0000000000
--- a/.changeset/legal-mangos-peel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: change title only after any pending work has completed
diff --git a/.changeset/sixty-comics-bow.md b/.changeset/sixty-comics-bow.md
deleted file mode 100644
index 2463e52430..0000000000
--- a/.changeset/sixty-comics-bow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: preserve symbols when creating derived rest properties
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index bcf17fe45e..bc2f815908 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.43.3
+
+### Patch Changes
+
+- fix: ensure fork always accesses correct values ([#17098](https://github.com/sveltejs/svelte/pull/17098))
+
+- fix: change title only after any pending work has completed ([#17061](https://github.com/sveltejs/svelte/pull/17061))
+
+- fix: preserve symbols when creating derived rest properties ([#17096](https://github.com/sveltejs/svelte/pull/17096))
+
 ## 5.43.2
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index f7a1cca616..f178444593 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.43.2",
+  "version": "5.43.3",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 0a28702778..5ad40ddee6 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.43.2';
+export const VERSION = '5.43.3';
 export const PUBLIC_VERSION = '5';

From 46e9d2d357d724479fbf6db6c0d9ebb22bab9796 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 6 Nov 2025 05:47:39 -0500
Subject: [PATCH 158/347] chore: remove `UNOWNED` flag (#17105)

Fixes #17024
Fixes #17049 (comment) (and therefore everything that was still buggy in that issue I think)

* chore: remove unowned check when calling `e.effect_in_unowned_derived`

* WIP

* all non-unit tests passing

* tidy

* WIP

* WIP

* WIP

* note to self

* fix

* fix

* hmm maybe not

* try this

* simplify

* remove skip_reaction

* docs

* add changeset, in case this results in changed behaviour

* Update packages/svelte/src/internal/client/reactivity/effects.js

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

* fix #17024

* fix comment

* revert

* fix

* dry

* changeset

* fix WAS_MARKED logic

* failing test (that uncovered other unrelated bug) + fix

* fix: delete from batch_values on updates (#17115)

* fix: delete from batch_values on updates

This fixes a bug where a derived would still show its old value even after it was indirectly updated again within the same batch. This can for example happen by reading a derived on an effect, then writing to a source in that same effect that makes the derived update, and then read the derived value in a sibling effect - it still shows the old value without the fix.

The fix is to _delete_ the value from batch_values, as it's now the newest value across all batches. In order to not prevent breakage on other batches we have to leave the status of deriveds as-is, i.e. within is_dirty and update_derived we cannot update its status. That might be a bit more inefficient as you now have to traverse the graph for each `get` of that derived (it's a bit like they are all disconnected) but we can always optimize that later if need be.

Another advantage of this fix is that we can get rid of duplicate logic we had to add about unmarking and reconnecting deriveds, because that logic was only needed for the case where deriveds are read after they are updated, which now no longer hits that if-branch

* keep derived cache, but clear it in mark_reactions (#17116)

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .changeset/four-paths-cheer.md                |   5 +
 .changeset/whole-webs-stick.md                |   5 +
 .../svelte/src/internal/client/constants.js   |   9 +-
 .../internal/client/reactivity/deriveds.js    |  23 ++--
 .../src/internal/client/reactivity/effects.js |  14 +-
 .../src/internal/client/reactivity/sources.js |  21 ++-
 .../svelte/src/internal/client/runtime.js     | 130 ++++++------------
 .../Component.svelte                          |  27 ++++
 .../_config.js                                |  16 +++
 .../main.svelte                               |  19 +++
 .../async-derived-unowned/Component.svelte    |   6 +
 .../samples/async-derived-unowned/_config.js  |  30 ++++
 .../samples/async-derived-unowned/main.svelte |  19 +++
 13 files changed, 212 insertions(+), 112 deletions(-)
 create mode 100644 .changeset/four-paths-cheer.md
 create mode 100644 .changeset/whole-webs-stick.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-unowned/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-unowned/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-unowned/main.svelte

diff --git a/.changeset/four-paths-cheer.md b/.changeset/four-paths-cheer.md
new file mode 100644
index 0000000000..54a697a8a4
--- /dev/null
+++ b/.changeset/four-paths-cheer.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: simplify connection/disconnection logic
diff --git a/.changeset/whole-webs-stick.md b/.changeset/whole-webs-stick.md
new file mode 100644
index 0000000000..fe8b614a01
--- /dev/null
+++ b/.changeset/whole-webs-stick.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: reconnect deriveds to effect tree when time-travelling
diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js
index c2f7861b78..b39afef516 100644
--- a/packages/svelte/src/internal/client/constants.js
+++ b/packages/svelte/src/internal/client/constants.js
@@ -6,6 +6,13 @@ export const BLOCK_EFFECT = 1 << 4;
 export const BRANCH_EFFECT = 1 << 5;
 export const ROOT_EFFECT = 1 << 6;
 export const BOUNDARY_EFFECT = 1 << 7;
+/**
+ * Indicates that a reaction is connected to an effect root — either it is an effect,
+ * or it is a derived that is depended on by at least one effect. If a derived has
+ * no dependents, we can disconnect it from the graph, allowing it to either be
+ * GC'd or reconnected later if an effect comes to depend on it again
+ */
+export const CONNECTED = 1 << 9;
 export const CLEAN = 1 << 10;
 export const DIRTY = 1 << 11;
 export const MAYBE_DIRTY = 1 << 12;
@@ -26,8 +33,6 @@ export const EFFECT_PRESERVED = 1 << 19;
 export const USER_EFFECT = 1 << 20;
 
 // Flags exclusive to deriveds
-export const UNOWNED = 1 << 8;
-export const DISCONNECTED = 1 << 9;
 /**
  * Tells that we marked this derived and its reactions as visited during the "mark as (maybe) dirty"-phase.
  * Will be lifted during execution of the derived and during checking its dirty state (both are necessary
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 1eb640ad26..7e6f3c6f60 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -9,15 +9,14 @@ import {
 	EFFECT_PRESERVED,
 	MAYBE_DIRTY,
 	STALE_REACTION,
-	UNOWNED,
 	ASYNC,
-	WAS_MARKED
+	WAS_MARKED,
+	CONNECTED
 } from '#client/constants';
 import {
 	active_reaction,
 	active_effect,
 	set_signal_status,
-	skip_reaction,
 	update_reaction,
 	increment_write_version,
 	set_active_effect,
@@ -27,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, teardown } from './effects.js';
+import { async_effect, destroy_effect, effect_tracking, teardown } from './effects.js';
 import { eager_effects, internal_set, set_eager_effects, source } from './sources.js';
 import { get_stack } from '../dev/tracing.js';
 import { async_mode_flag, tracing_mode_flag } from '../../flags/index.js';
@@ -61,9 +60,7 @@ export function derived(fn) {
 			? /** @type {Derived} */ (active_reaction)
 			: null;
 
-	if (active_effect === null || (parent_derived !== null && (parent_derived.f & UNOWNED) !== 0)) {
-		flags |= UNOWNED;
-	} else {
+	if (active_effect !== null) {
 		// Since deriveds are evaluated lazily, any effects created inside them are
 		// created too late to ensure that the parent effect is added to the tree
 		active_effect.f |= EFFECT_PRESERVED;
@@ -368,12 +365,16 @@ export function update_derived(derived) {
 		return;
 	}
 
+	// During time traveling we don't want to reset the status so that
+	// traversal of the graph in the other batches still happens
 	if (batch_values !== null) {
-		batch_values.set(derived, derived.v);
+		// only cache the value if we're in a tracking context, otherwise we won't
+		// clear the cache in `mark_reactions` when dependencies are updated
+		if (effect_tracking()) {
+			batch_values.set(derived, derived.v);
+		}
 	} else {
-		var status =
-			(skip_reaction || (derived.f & UNOWNED) !== 0) && derived.deps !== null ? MAYBE_DIRTY : CLEAN;
-
+		var status = (derived.f & CONNECTED) === 0 ? MAYBE_DIRTY : CLEAN;
 		set_signal_status(derived, status);
 	}
 }
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 8c4b84438c..5d7c0ef871 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -25,7 +25,6 @@ import {
 	ROOT_EFFECT,
 	EFFECT_TRANSPARENT,
 	DERIVED,
-	UNOWNED,
 	CLEAN,
 	EAGER_EFFECT,
 	HEAD_EFFECT,
@@ -33,7 +32,8 @@ import {
 	EFFECT_PRESERVED,
 	STALE_REACTION,
 	USER_EFFECT,
-	ASYNC
+	ASYNC,
+	CONNECTED
 } from '#client/constants';
 import * as e from '../errors.js';
 import { DEV } from 'esm-env';
@@ -48,11 +48,11 @@ import { without_reactive_context } from '../dom/elements/bindings/shared.js';
  * @param {'$effect' | '$effect.pre' | '$inspect'} rune
  */
 export function validate_effect(rune) {
-	if (active_effect === null && active_reaction === null) {
-		e.effect_orphan(rune);
-	}
+	if (active_effect === null) {
+		if (active_reaction === null) {
+			e.effect_orphan(rune);
+		}
 
-	if (active_reaction !== null && (active_reaction.f & UNOWNED) !== 0 && active_effect === null) {
 		e.effect_in_unowned_derived();
 	}
 
@@ -103,7 +103,7 @@ function create_effect(type, fn, sync, push = true) {
 		deps: null,
 		nodes_start: null,
 		nodes_end: null,
-		f: type | DIRTY,
+		f: type | DIRTY | CONNECTED,
 		first: null,
 		fn,
 		last: null,
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index b480d4155a..8ae406b57b 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -23,18 +23,18 @@ import {
 	DIRTY,
 	BRANCH_EFFECT,
 	EAGER_EFFECT,
-	UNOWNED,
 	MAYBE_DIRTY,
 	BLOCK_EFFECT,
 	ROOT_EFFECT,
 	ASYNC,
-	WAS_MARKED
+	WAS_MARKED,
+	CONNECTED
 } from '#client/constants';
 import * as e from '../errors.js';
 import { legacy_mode_flag, tracing_mode_flag } from '../../flags/index.js';
 import { get_stack, tag_proxy } from '../dev/tracing.js';
 import { component_context, is_runes } from '../context.js';
-import { Batch, eager_block_effects, schedule_effect } from './batch.js';
+import { Batch, batch_values, eager_block_effects, schedule_effect } from './batch.js';
 import { proxy } from '../proxy.js';
 import { execute_derived } from './deriveds.js';
 
@@ -211,7 +211,8 @@ export function internal_set(source, value) {
 			if ((source.f & DIRTY) !== 0) {
 				execute_derived(/** @type {Derived} */ (source));
 			}
-			set_signal_status(source, (source.f & UNOWNED) === 0 ? CLEAN : MAYBE_DIRTY);
+
+			set_signal_status(source, (source.f & CONNECTED) !== 0 ? CLEAN : MAYBE_DIRTY);
 		}
 
 		source.wv = increment_write_version();
@@ -333,9 +334,17 @@ function mark_reactions(signal, status) {
 		}
 
 		if ((flags & DERIVED) !== 0) {
+			var derived = /** @type {Derived} */ (reaction);
+
+			batch_values?.delete(derived);
+
 			if ((flags & WAS_MARKED) === 0) {
-				reaction.f |= WAS_MARKED;
-				mark_reactions(/** @type {Derived} */ (reaction), MAYBE_DIRTY);
+				// Only connected deriveds can be reliably unmarked right away
+				if (flags & CONNECTED) {
+					reaction.f |= WAS_MARKED;
+				}
+
+				mark_reactions(derived, MAYBE_DIRTY);
 			}
 		} else if (not_dirty) {
 			if ((flags & BLOCK_EFFECT) !== 0) {
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 76531d3320..258f6962fa 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -4,6 +4,7 @@ import { get_descriptors, get_prototype_of, index_of } from '../shared/utils.js'
 import {
 	destroy_block_effect_children,
 	destroy_effect_children,
+	effect_tracking,
 	execute_effect_teardown
 } from './reactivity/effects.js';
 import {
@@ -11,13 +12,12 @@ import {
 	MAYBE_DIRTY,
 	CLEAN,
 	DERIVED,
-	UNOWNED,
 	DESTROYED,
 	BRANCH_EFFECT,
 	STATE_SYMBOL,
 	BLOCK_EFFECT,
 	ROOT_EFFECT,
-	DISCONNECTED,
+	CONNECTED,
 	REACTION_IS_UPDATING,
 	STALE_REACTION,
 	ERROR_VALUE,
@@ -137,10 +137,6 @@ export function set_update_version(value) {
 	update_version = value;
 }
 
-// If we are working with a get() chain that has no active container,
-// to prevent memory leaks, we skip adding the reaction.
-export let skip_reaction = false;
-
 export function increment_write_version() {
 	return ++write_version;
 }
@@ -158,55 +154,18 @@ export function is_dirty(reaction) {
 		return true;
 	}
 
+	if (flags & DERIVED) {
+		reaction.f &= ~WAS_MARKED;
+	}
+
 	if ((flags & MAYBE_DIRTY) !== 0) {
 		var dependencies = reaction.deps;
-		var is_unowned = (flags & UNOWNED) !== 0;
-
-		if (flags & DERIVED) {
-			reaction.f &= ~WAS_MARKED;
-		}
 
 		if (dependencies !== null) {
-			var i;
-			var dependency;
-			var is_disconnected = (flags & DISCONNECTED) !== 0;
-			var is_unowned_connected = is_unowned && active_effect !== null && !skip_reaction;
 			var length = dependencies.length;
 
-			// If we are working with a disconnected or an unowned signal that is now connected (due to an active effect)
-			// then we need to re-connect the reaction to the dependency, unless the effect has already been destroyed
-			// (which can happen if the derived is read by an async derived)
-			if (
-				(is_disconnected || is_unowned_connected) &&
-				(active_effect === null || (active_effect.f & DESTROYED) === 0)
-			) {
-				var derived = /** @type {Derived} */ (reaction);
-				var parent = derived.parent;
-
-				for (i = 0; i < length; i++) {
-					dependency = dependencies[i];
-
-					// We always re-add all reactions (even duplicates) if the derived was
-					// previously disconnected, however we don't if it was unowned as we
-					// de-duplicate dependencies in that case
-					if (is_disconnected || !dependency?.reactions?.includes(derived)) {
-						(dependency.reactions ??= []).push(derived);
-					}
-				}
-
-				if (is_disconnected) {
-					derived.f ^= DISCONNECTED;
-				}
-				// If the unowned derived is now fully connected to the graph again (it's unowned and reconnected, has a parent
-				// and the parent is not unowned), then we can mark it as connected again, removing the need for the unowned
-				// flag
-				if (is_unowned_connected && parent !== null && (parent.f & UNOWNED) === 0) {
-					derived.f ^= UNOWNED;
-				}
-			}
-
-			for (i = 0; i < length; i++) {
-				dependency = dependencies[i];
+			for (var i = 0; i < length; i++) {
+				var dependency = dependencies[i];
 
 				if (is_dirty(/** @type {Derived} */ (dependency))) {
 					update_derived(/** @type {Derived} */ (dependency));
@@ -218,9 +177,12 @@ export function is_dirty(reaction) {
 			}
 		}
 
-		// Unowned signals should never be marked as clean unless they
-		// are used within an active_effect without skip_reaction
-		if (!is_unowned || (active_effect !== null && !skip_reaction)) {
+		if (
+			(flags & CONNECTED) !== 0 &&
+			// During time traveling we don't want to reset the status so that
+			// traversal of the graph in the other batches still happens
+			batch_values === null
+		) {
 			set_signal_status(reaction, CLEAN);
 		}
 	}
@@ -263,7 +225,6 @@ export function update_reaction(reaction) {
 	var previous_skipped_deps = skipped_deps;
 	var previous_untracked_writes = untracked_writes;
 	var previous_reaction = active_reaction;
-	var previous_skip_reaction = skip_reaction;
 	var previous_sources = current_sources;
 	var previous_component_context = component_context;
 	var previous_untracking = untracking;
@@ -274,8 +235,6 @@ export function update_reaction(reaction) {
 	new_deps = /** @type {null | Value[]} */ (null);
 	skipped_deps = 0;
 	untracked_writes = null;
-	skip_reaction =
-		(flags & UNOWNED) !== 0 && (untracking || !is_updating_effect || active_reaction === null);
 	active_reaction = (flags & (BRANCH_EFFECT | ROOT_EFFECT)) === 0 ? reaction : null;
 
 	current_sources = null;
@@ -311,12 +270,7 @@ export function update_reaction(reaction) {
 				reaction.deps = deps = new_deps;
 			}
 
-			if (
-				!skip_reaction ||
-				// Deriveds that already have reactions can cleanup, so we still add them as reactions
-				((flags & DERIVED) !== 0 &&
-					/** @type {import('#client').Derived} */ (reaction).reactions !== null)
-			) {
+			if (is_updating_effect && effect_tracking() && (reaction.f & CONNECTED) !== 0) {
 				for (i = skipped_deps; i < deps.length; i++) {
 					(deps[i].reactions ??= []).push(reaction);
 				}
@@ -373,7 +327,6 @@ export function update_reaction(reaction) {
 		skipped_deps = previous_skipped_deps;
 		untracked_writes = previous_untracked_writes;
 		active_reaction = previous_reaction;
-		skip_reaction = previous_skip_reaction;
 		current_sources = previous_sources;
 		set_component_context(previous_component_context);
 		untracking = previous_untracking;
@@ -415,9 +368,10 @@ function remove_reaction(signal, dependency) {
 	) {
 		set_signal_status(dependency, MAYBE_DIRTY);
 		// If we are working with a derived that is owned by an effect, then mark it as being
-		// disconnected.
-		if ((dependency.f & (UNOWNED | DISCONNECTED)) === 0) {
-			dependency.f ^= DISCONNECTED;
+		// disconnected and remove the mark flag, as it cannot be reliably removed otherwise
+		if ((dependency.f & CONNECTED) !== 0) {
+			dependency.f ^= CONNECTED;
+			dependency.f &= ~WAS_MARKED;
 		}
 		// Disconnect any reactions owned by this reaction
 		destroy_derived_effects(/** @type {Derived} **/ (dependency));
@@ -564,10 +518,7 @@ export function get(signal) {
 						skipped_deps++;
 					} else if (new_deps === null) {
 						new_deps = [signal];
-					} else if (!skip_reaction || !new_deps.includes(signal)) {
-						// Normally we can push duplicated dependencies to `new_deps`, but if we're inside
-						// an unowned derived because skip_reaction is true, then we need to ensure that
-						// we don't have duplicates
+					} else if (!new_deps.includes(signal)) {
 						new_deps.push(signal);
 					}
 				}
@@ -585,20 +536,6 @@ export function get(signal) {
 				}
 			}
 		}
-	} else if (
-		is_derived &&
-		/** @type {Derived} */ (signal).deps === null &&
-		/** @type {Derived} */ (signal).effects === null
-	) {
-		var derived = /** @type {Derived} */ (signal);
-		var parent = derived.parent;
-
-		if (parent !== null && (parent.f & UNOWNED) === 0) {
-			// If the derived is owned by another derived then mark it as unowned
-			// as the derived value might have been referenced in a different context
-			// since and thus its parent might not be its true owner anymore
-			derived.f ^= UNOWNED;
-		}
 	}
 
 	if (DEV) {
@@ -657,7 +594,7 @@ export function get(signal) {
 		}
 
 		if (is_derived) {
-			derived = /** @type {Derived} */ (signal);
+			var derived = /** @type {Derived} */ (signal);
 
 			var value = derived.v;
 
@@ -684,9 +621,11 @@ export function get(signal) {
 		if (is_dirty(derived)) {
 			update_derived(derived);
 		}
-	}
 
-	if (batch_values?.has(signal)) {
+		if (is_updating_effect && effect_tracking() && (derived.f & CONNECTED) === 0) {
+			reconnect(derived);
+		}
+	} else if (batch_values?.has(signal)) {
 		return batch_values.get(signal);
 	}
 
@@ -697,6 +636,25 @@ export function get(signal) {
 	return signal.v;
 }
 
+/**
+ * (Re)connect a disconnected derived, so that it is notified
+ * of changes in `mark_reactions`
+ * @param {Derived} derived
+ */
+function reconnect(derived) {
+	if (derived.deps === null) return;
+
+	derived.f ^= CONNECTED;
+
+	for (const dep of derived.deps) {
+		(dep.reactions ??= []).push(derived);
+
+		if ((dep.f & DERIVED) !== 0 && (dep.f & CONNECTED) === 0) {
+			reconnect(/** @type {Derived} */ (dep));
+		}
+	}
+}
+
 /** @param {Derived} derived */
 function depends_on_old_values(derived) {
 	if (derived.v === UNINITIALIZED) return true; // we don't know, so assume the worst
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/Component.svelte b/packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/Component.svelte
new file mode 100644
index 0000000000..200778dc5b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/Component.svelte
@@ -0,0 +1,27 @@
+<script>
+	import { untrack } from "svelte";
+
+	let { double } = $props();
+
+	// Test setup:
+	// - component initialized while pending work
+	// - derived that depends on mulitple sources
+	// - indirect updates to subsequent deriveds
+	// - two sibling effects where the former influences the latter
+	// - first effect reads derived of second inside untrack
+	let x = $state(0);
+	const other = $derived(double + x);
+	const another = $derived(other + 1);
+	const another2 = $derived(another + 1);
+
+	$effect(() => {
+		untrack(() => {
+			another2;
+			x++
+		});
+	});
+
+	$effect(() => {
+		console.log(another2);
+	})
+</script>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/_config.js b/packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/_config.js
new file mode 100644
index 0000000000..15bb42074f
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/_config.js
@@ -0,0 +1,16 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		const button = target.querySelector('button');
+
+		button?.click();
+		await tick();
+		assert.deepEqual(logs, [5]);
+
+		button?.click();
+		await tick();
+		assert.deepEqual(logs, [5, 7]);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/main.svelte
new file mode 100644
index 0000000000..bd82e35a3b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-in-multiple-effects/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	import Component from './Component.svelte';
+	let count = $state(0);
+	const double = $derived(count * 2);
+</script>
+
+<svelte:boundary>
+	{await new Promise((r) => {
+		// long enough for the test to do all its other stuff while this is pending
+		setTimeout(r, 10);
+	})}
+	{#snippet pending()}{/snippet}
+</svelte:boundary>
+
+<button onclick={() => count += 1}>{count}</button>
+
+{#if count > 0}
+	<Component {double} />
+{/if}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/Component.svelte b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/Component.svelte
new file mode 100644
index 0000000000..f7d138a3ed
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/Component.svelte
@@ -0,0 +1,6 @@
+<script>
+	let { double } = $props();
+	double; // derived is first read outside an active_reaction
+</script>
+
+<p>{double}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/_config.js b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/_config.js
new file mode 100644
index 0000000000..fc0135623d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/_config.js
@@ -0,0 +1,30 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const button = target.querySelector('button');
+
+		button?.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>1</button>
+				<p>2</p>
+			`
+		);
+
+		button?.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>2</button>
+				<p>4</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/main.svelte
new file mode 100644
index 0000000000..bd82e35a3b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-unowned/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	import Component from './Component.svelte';
+	let count = $state(0);
+	const double = $derived(count * 2);
+</script>
+
+<svelte:boundary>
+	{await new Promise((r) => {
+		// long enough for the test to do all its other stuff while this is pending
+		setTimeout(r, 10);
+	})}
+	{#snippet pending()}{/snippet}
+</svelte:boundary>
+
+<button onclick={() => count += 1}>{count}</button>
+
+{#if count > 0}
+	<Component {double} />
+{/if}

From 3a4dc7d83de9ccdbb1ae46827cd6ef01138e27e7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 13:46:51 +0100
Subject: [PATCH 159/347] Version Packages (#17119)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/four-paths-cheer.md | 5 -----
 .changeset/whole-webs-stick.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/four-paths-cheer.md
 delete mode 100644 .changeset/whole-webs-stick.md

diff --git a/.changeset/four-paths-cheer.md b/.changeset/four-paths-cheer.md
deleted file mode 100644
index 54a697a8a4..0000000000
--- a/.changeset/four-paths-cheer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: simplify connection/disconnection logic
diff --git a/.changeset/whole-webs-stick.md b/.changeset/whole-webs-stick.md
deleted file mode 100644
index fe8b614a01..0000000000
--- a/.changeset/whole-webs-stick.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: reconnect deriveds to effect tree when time-travelling
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index bc2f815908..9543ad4d7b 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.43.4
+
+### Patch Changes
+
+- chore: simplify connection/disconnection logic ([#17105](https://github.com/sveltejs/svelte/pull/17105))
+
+- fix: reconnect deriveds to effect tree when time-travelling ([#17105](https://github.com/sveltejs/svelte/pull/17105))
+
 ## 5.43.3
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index f178444593..0988828c44 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.43.3",
+  "version": "5.43.4",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 5ad40ddee6..9fe92195c4 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.43.3';
+export const VERSION = '5.43.4';
 export const PUBLIC_VERSION = '5';

From 68d4f9c3b68040c7e8e5260d399008c0ad43fa66 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Fri, 7 Nov 2025 23:40:33 +0100
Subject: [PATCH 160/347] fix: wait on dependencies of async bindings (#17120)

* fix: wait on dependencies of async bindings

Correctly takes into account blockers for bindings. Also ensures it works for functional bindings.

During that I also noticed a bug in our `nodes_end` assignment logic, which the added test also regresses against.

Fixes #17092
Fixes #17090

* ensure async static props/attributes are awaited

* wait on blockers in binding validation

* await dependencies of style directives

* tidy
---
 .changeset/eleven-cases-sing.md               |  5 ++
 .changeset/five-coats-travel.md               |  5 ++
 .changeset/huge-walls-hang.md                 |  5 ++
 .../2-analyze/visitors/BindDirective.js       | 15 +++++-
 .../2-analyze/visitors/StyleDirective.js      |  7 +--
 .../client/visitors/BindDirective.js          |  9 ++--
 .../client/visitors/RegularElement.js         | 19 +------
 .../client/visitors/shared/component.js       |  9 ++--
 .../client/visitors/shared/element.js         |  6 +--
 .../client/visitors/shared/utils.js           | 18 +++++--
 .../server/visitors/shared/component.js       |  3 ++
 .../server/visitors/shared/element.js         |  2 +
 .../server/visitors/shared/utils.js           | 18 ++++---
 packages/svelte/src/compiler/phases/nodes.js  | 15 ++++++
 .../svelte/src/compiler/types/template.d.ts   |  1 +
 .../src/internal/client/dom/template.js       | 10 +++-
 packages/svelte/src/internal/client/index.js  |  3 +-
 .../src/internal/client/reactivity/async.js   |  8 +++
 .../svelte/src/internal/client/validate.js    | 50 ++++++++++---------
 .../async-binding-after-await/Child.svelte    |  5 ++
 .../async-binding-after-await/_config.js      | 14 ++++++
 .../async-binding-after-await/main.svelte     | 17 +++++++
 .../Child.svelte                              |  5 ++
 .../async-static-prop-after-await/_config.js  | 11 ++++
 .../async-static-prop-after-await/main.svelte | 10 ++++
 .../async-style-after-await/_config.js        | 30 +++++++++++
 .../async-style-after-await/main.svelte       | 25 ++++++++++
 27 files changed, 257 insertions(+), 68 deletions(-)
 create mode 100644 .changeset/eleven-cases-sing.md
 create mode 100644 .changeset/five-coats-travel.md
 create mode 100644 .changeset/huge-walls-hang.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-binding-after-await/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-binding-after-await/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-binding-after-await/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-style-after-await/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-style-after-await/main.svelte

diff --git a/.changeset/eleven-cases-sing.md b/.changeset/eleven-cases-sing.md
new file mode 100644
index 0000000000..fa6edda180
--- /dev/null
+++ b/.changeset/eleven-cases-sing.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure async static props/attributes are awaited
diff --git a/.changeset/five-coats-travel.md b/.changeset/five-coats-travel.md
new file mode 100644
index 0000000000..f1235043df
--- /dev/null
+++ b/.changeset/five-coats-travel.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: wait on dependencies of async bindings
diff --git a/.changeset/huge-walls-hang.md b/.changeset/huge-walls-hang.md
new file mode 100644
index 0000000000..63dd6c21c4
--- /dev/null
+++ b/.changeset/huge-walls-hang.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: await dependencies of style directives
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 38eab5d36e..aeae121278 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js
@@ -159,6 +159,16 @@ export function BindDirective(node, context) {
 
 		mark_subtree_dynamic(context.path);
 
+		const [get, set] = node.expression.expressions;
+		// We gotta jump across the getter/setter functions to avoid the expression metadata field being reset to null
+		context.visit(get.type === 'ArrowFunctionExpression' ? get.body : get, {
+			...context.state,
+			expression: node.metadata.expression
+		});
+		context.visit(set.type === 'ArrowFunctionExpression' ? set.body : set, {
+			...context.state,
+			expression: node.metadata.expression
+		});
 		return;
 	}
 
@@ -247,7 +257,8 @@ export function BindDirective(node, context) {
 
 		node.metadata = {
 			binding_group_name: group_name,
-			parent_each_blocks: each_blocks
+			parent_each_blocks: each_blocks,
+			expression: node.metadata.expression
 		};
 	}
 
@@ -255,5 +266,5 @@ export function BindDirective(node, context) {
 		w.bind_invalid_each_rest(binding.node, binding.node.name);
 	}
 
-	context.next();
+	context.next({ ...context.state, expression: node.metadata.expression });
 }
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/StyleDirective.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/StyleDirective.js
index 9699d3c03b..8f4036cf89 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/StyleDirective.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/StyleDirective.js
@@ -23,6 +23,9 @@ export function StyleDirective(node, context) {
 			if (binding.kind !== 'normal') {
 				node.metadata.expression.has_state = true;
 			}
+			if (binding.blocker) {
+				node.metadata.expression.dependencies.add(binding);
+			}
 		}
 	} else {
 		context.next();
@@ -30,9 +33,7 @@ export function StyleDirective(node, context) {
 		for (const chunk of get_attribute_chunks(node.value)) {
 			if (chunk.type !== 'ExpressionTag') continue;
 
-			node.metadata.expression.has_state ||= chunk.metadata.expression.has_state;
-			node.metadata.expression.has_call ||= chunk.metadata.expression.has_call;
-			node.metadata.expression.has_await ||= chunk.metadata.expression.has_await;
+			node.metadata.expression.merge(chunk.metadata.expression);
 		}
 	}
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js
index 9a264facce..12118d9f69 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js
@@ -250,10 +250,13 @@ export function BindDirective(node, context) {
 
 	let statement = defer ? b.stmt(b.call('$.effect', b.thunk(call))) : b.stmt(call);
 
-	// TODO this doesn't account for function bindings
-	if (node.metadata.binding?.blocker) {
+	if (node.metadata.expression.is_async()) {
 		statement = b.stmt(
-			b.call(b.member(node.metadata.binding.blocker, b.id('then')), b.thunk(b.block([statement])))
+			b.call(
+				'$.run_after_blockers',
+				node.metadata.expression.blockers(),
+				b.thunk(b.block([statement]))
+			)
 		);
 	}
 
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 3998770a71..971f93e1d8 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
@@ -484,21 +484,6 @@ function setup_select_synchronization(value_binding, context) {
 	);
 }
 
-/**
- * @param {ExpressionMetadata} target
- * @param {ExpressionMetadata} source
- */
-function merge_metadata(target, source) {
-	target.has_assignment ||= source.has_assignment;
-	target.has_await ||= source.has_await;
-	target.has_call ||= source.has_call;
-	target.has_member_expression ||= source.has_member_expression;
-	target.has_state ||= source.has_state;
-
-	for (const r of source.references) target.references.add(r);
-	for (const b of source.dependencies) target.dependencies.add(b);
-}
-
 /**
  * @param {AST.ClassDirective[]} class_directives
  * @param {ComponentContext} context
@@ -514,7 +499,7 @@ export function build_class_directives_object(
 	const metadata = new ExpressionMetadata();
 
 	for (const d of class_directives) {
-		merge_metadata(metadata, d.metadata.expression);
+		metadata.merge(d.metadata.expression);
 
 		const expression = /** @type Expression */ (context.visit(d.expression));
 		properties.push(b.init(d.name, expression));
@@ -541,7 +526,7 @@ export function build_style_directives_object(
 	const metadata = new ExpressionMetadata();
 
 	for (const d of style_directives) {
-		merge_metadata(metadata, d.metadata.expression);
+		metadata.merge(d.metadata.expression);
 
 		const expression =
 			d.value === true
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 e343662ed5..2b57f61c77 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
@@ -171,8 +171,6 @@ export function build_component(node, component_name, context) {
 				attribute.value,
 				context,
 				(value, metadata) => {
-					if (!metadata.has_state && !metadata.has_await) return value;
-
 					// When we have a non-simple computation, anything other than an Identifier or Member expression,
 					// then there's a good chance it needs to be memoized to avoid over-firing when read within the
 					// child component (e.g. `active={i === index}`)
@@ -198,7 +196,12 @@ export function build_component(node, component_name, context) {
 				push_prop(b.init(attribute.name, value));
 			}
 		} else if (attribute.type === 'BindDirective') {
-			const expression = /** @type {Expression} */ (context.visit(attribute.expression));
+			const expression = /** @type {Expression} */ (
+				context.visit(attribute.expression, { ...context.state, memoizer })
+			);
+
+			// Bindings are a bit special: we don't want to add them to (async) deriveds but we need to check if they have blockers
+			memoizer.check_blockers(attribute.metadata.expression);
 
 			if (
 				dev &&
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 436d262d3a..58ed88855f 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
@@ -122,7 +122,7 @@ export function build_attribute_value(value, context, memoize = (value) => value
 
 		return {
 			value: memoize(expression, chunk.metadata.expression),
-			has_state: chunk.metadata.expression.has_state || chunk.metadata.expression.has_await
+			has_state: chunk.metadata.expression.has_state || chunk.metadata.expression.is_async()
 		};
 	}
 
@@ -170,7 +170,7 @@ export function build_set_class(element, node_id, attribute, class_directives, c
 	if (class_directives.length) {
 		next = build_class_directives_object(class_directives, context);
 		has_state ||= class_directives.some(
-			(d) => d.metadata.expression.has_state || d.metadata.expression.has_await
+			(d) => d.metadata.expression.has_state || d.metadata.expression.is_async()
 		);
 
 		if (has_state) {
@@ -240,7 +240,7 @@ export function build_set_style(node_id, attribute, style_directives, context) {
 	if (style_directives.length) {
 		next = build_style_directives_object(style_directives, context);
 		has_state ||= style_directives.some(
-			(d) => d.metadata.expression.has_state || d.metadata.expression.has_await
+			(d) => d.metadata.expression.has_state || d.metadata.expression.is_async()
 		);
 
 		if (has_state) {
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
index 83bc5da3e3..e7a4f6059b 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
@@ -31,11 +31,7 @@ export class Memoizer {
 	 * @param {boolean} memoize_if_state
 	 */
 	add(expression, metadata, memoize_if_state = false) {
-		for (const binding of metadata.dependencies) {
-			if (binding.blocker) {
-				this.#blockers.add(binding.blocker);
-			}
-		}
+		this.check_blockers(metadata);
 
 		const should_memoize =
 			metadata.has_call || metadata.has_await || (memoize_if_state && metadata.has_state);
@@ -52,6 +48,17 @@ export class Memoizer {
 		return id;
 	}
 
+	/**
+	 * @param {ExpressionMetadata} metadata
+	 */
+	check_blockers(metadata) {
+		for (const binding of metadata.dependencies) {
+			if (binding.blocker) {
+				this.#blockers.add(binding.blocker);
+			}
+		}
+	}
+
 	apply() {
 		return [...this.#sync, ...this.#async].map((memo, i) => {
 			memo.id.name = `$${i}`;
@@ -348,6 +355,7 @@ export function validate_binding(state, binding, expression) {
 			b.call(
 				'$.validate_binding',
 				b.literal(state.analysis.source.slice(binding.start, binding.end)),
+				binding.metadata.expression.blockers(),
 				b.thunk(
 					state.store_to_invalidate ? b.sequence([b.call('$.mark_store_binding'), obj]) : obj
 				),
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 83a5dcf3ec..70c790fc57 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
@@ -107,6 +107,9 @@ export function build_inline_component(node, expression, context) {
 
 			push_prop(b.prop('init', b.key(attribute.name), value));
 		} else if (attribute.type === 'BindDirective' && attribute.name !== 'this') {
+			// Bindings are a bit special: we don't want to add them to (async) deriveds but we need to check if they have blockers
+			optimiser.check_blockers(attribute.metadata.expression);
+
 			if (attribute.expression.type === 'SequenceExpression') {
 				const [get, set] = /** @type {SequenceExpression} */ (context.visit(attribute.expression))
 					.expressions;
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 b7607f3fb8..31ffe19139 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
@@ -121,6 +121,8 @@ export function build_element_attributes(node, context, transform) {
 				expression = b.call(expression.expressions[0]);
 			}
 
+			expression = transform(expression, attribute.metadata.expression);
+
 			if (is_content_editable_binding(attribute.name)) {
 				content = expression;
 			} else if (attribute.name === 'value' && node.name === 'textarea') {
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 6bc0ab3233..4736a7c5da 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
@@ -347,16 +347,11 @@ export class PromiseOptimiser {
 	#blockers = new Set();
 
 	/**
-	 *
 	 * @param {Expression} expression
 	 * @param {ExpressionMetadata} metadata
 	 */
 	transform = (expression, metadata) => {
-		for (const binding of metadata.dependencies) {
-			if (binding.blocker) {
-				this.#blockers.add(binding.blocker);
-			}
-		}
+		this.check_blockers(metadata);
 
 		if (metadata.has_await) {
 			this.has_await = true;
@@ -368,6 +363,17 @@ export class PromiseOptimiser {
 		return expression;
 	};
 
+	/**
+	 * @param {ExpressionMetadata} metadata
+	 */
+	check_blockers(metadata) {
+		for (const binding of metadata.dependencies) {
+			if (binding.blocker) {
+				this.#blockers.add(binding.blocker);
+			}
+		}
+	}
+
 	apply() {
 		if (this.expressions.length === 0) {
 			return b.empty;
diff --git a/packages/svelte/src/compiler/phases/nodes.js b/packages/svelte/src/compiler/phases/nodes.js
index 2c7c3fb66b..9d1a8f1890 100644
--- a/packages/svelte/src/compiler/phases/nodes.js
+++ b/packages/svelte/src/compiler/phases/nodes.js
@@ -115,6 +115,21 @@ export class ExpressionMetadata {
 	is_async() {
 		return this.has_await || this.#get_blockers().size > 0;
 	}
+
+	/**
+	 * @param {ExpressionMetadata} source
+	 */
+	merge(source) {
+		this.has_state ||= source.has_state;
+		this.has_call ||= source.has_call;
+		this.has_await ||= source.has_await;
+		this.has_member_expression ||= source.has_member_expression;
+		this.has_assignment ||= source.has_assignment;
+		this.#blockers = null; // so that blockers are recalculated
+
+		for (const r of source.references) this.references.add(r);
+		for (const b of source.dependencies) this.dependencies.add(b);
+	}
 }
 
 /**
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index 9cf498d187..f9bbe28333 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -210,6 +210,7 @@ export namespace AST {
 			binding?: Binding | null;
 			binding_group_name: Identifier;
 			parent_each_blocks: EachBlock[];
+			expression: ExpressionMetadata;
 		};
 	}
 
diff --git a/packages/svelte/src/internal/client/dom/template.js b/packages/svelte/src/internal/client/dom/template.js
index c2443fda7a..2ad0538b43 100644
--- a/packages/svelte/src/internal/client/dom/template.js
+++ b/packages/svelte/src/internal/client/dom/template.js
@@ -20,7 +20,7 @@ import {
 	TEMPLATE_USE_MATHML,
 	TEMPLATE_USE_SVG
 } from '../../../constants.js';
-import { COMMENT_NODE, DOCUMENT_FRAGMENT_NODE, TEXT_NODE } from '#client/constants';
+import { COMMENT_NODE, DOCUMENT_FRAGMENT_NODE, EFFECT_RAN, TEXT_NODE } from '#client/constants';
 
 /**
  * @param {TemplateNode} start
@@ -344,7 +344,13 @@ export function comment() {
  */
 export function append(anchor, dom) {
 	if (hydrating) {
-		/** @type {Effect} */ (active_effect).nodes_end = hydrate_node;
+		var effect = /** @type {Effect} */ (active_effect);
+		// When hydrating and outer component and an inner component is async, i.e. blocked on a promise,
+		// then by the time the inner resolves we have already advanced to the end of the hydrated nodes
+		// of the parent component. Check for defined for that reason to avoid rewinding the parent's end marker.
+		if ((effect.f & EFFECT_RAN) === 0 || effect.nodes_end === null) {
+			effect.nodes_end = hydrate_node;
+		}
 		hydrate_next();
 		return;
 	}
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index 9b5bc54740..3807c63c20 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -102,7 +102,8 @@ export {
 	for_await_track_reactivity_loss,
 	run,
 	save,
-	track_reactivity_loss
+	track_reactivity_loss,
+	run_after_blockers
 } from './reactivity/async.js';
 export { eager, flushSync as flush } from './reactivity/batch.js';
 export {
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 04e544759d..e48aff3d7f 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -84,6 +84,14 @@ export function flatten(blockers, sync, async, fn) {
 	}
 }
 
+/**
+ * @param {Array<Promise<void>>} blockers
+ * @param {(values: Value[]) => any} fn
+ */
+export function run_after_blockers(blockers, fn) {
+	flatten(blockers, [], [], fn);
+}
+
 /**
  * Captures the current effect context so that we can restore it after
  * some asynchronous work has happened (so that e.g. `await a + b`
diff --git a/packages/svelte/src/internal/client/validate.js b/packages/svelte/src/internal/client/validate.js
index ec3d805447..0daecdb480 100644
--- a/packages/svelte/src/internal/client/validate.js
+++ b/packages/svelte/src/internal/client/validate.js
@@ -5,6 +5,7 @@ import { FILENAME } from '../../constants.js';
 import { render_effect } from './reactivity/effects.js';
 import * as w from './warnings.js';
 import { capture_store_binding } from './reactivity/store.js';
+import { run_after_blockers } from './reactivity/async.js';
 
 /**
  * @param {() => any} collection
@@ -40,44 +41,47 @@ export function validate_each_keys(collection, key_fn) {
 
 /**
  * @param {string} binding
+ * @param {Array<Promise<void>>} blockers
  * @param {() => Record<string, any>} get_object
  * @param {() => string} get_property
  * @param {number} line
  * @param {number} column
  */
-export function validate_binding(binding, get_object, get_property, line, column) {
-	var warned = false;
+export function validate_binding(binding, blockers, get_object, get_property, line, column) {
+	run_after_blockers(blockers, () => {
+		var warned = false;
 
-	var filename = dev_current_component_function?.[FILENAME];
+		var filename = dev_current_component_function?.[FILENAME];
 
-	render_effect(() => {
-		if (warned) return;
+		render_effect(() => {
+			if (warned) return;
 
-		var [object, is_store_sub] = capture_store_binding(get_object);
+			var [object, is_store_sub] = capture_store_binding(get_object);
 
-		if (is_store_sub) return;
+			if (is_store_sub) return;
 
-		var property = get_property();
+			var property = get_property();
 
-		var ran = false;
+			var ran = false;
 
-		// by making the (possibly false, but it would be an extreme edge case) assumption
-		// that a getter has a corresponding setter, we can determine if a property is
-		// reactive by seeing if this effect has dependencies
-		var effect = render_effect(() => {
-			if (ran) return;
+			// by making the (possibly false, but it would be an extreme edge case) assumption
+			// that a getter has a corresponding setter, we can determine if a property is
+			// reactive by seeing if this effect has dependencies
+			var effect = render_effect(() => {
+				if (ran) return;
 
-			// eslint-disable-next-line @typescript-eslint/no-unused-expressions
-			object[property];
-		});
+				// eslint-disable-next-line @typescript-eslint/no-unused-expressions
+				object[property];
+			});
 
-		ran = true;
+			ran = true;
 
-		if (effect.deps === null) {
-			var location = `${filename}:${line}:${column}`;
-			w.binding_property_non_reactive(binding, location);
+			if (effect.deps === null) {
+				var location = `${filename}:${line}:${column}`;
+				w.binding_property_non_reactive(binding, location);
 
-			warned = true;
-		}
+				warned = true;
+			}
+		});
 	});
 }
diff --git a/packages/svelte/tests/runtime-runes/samples/async-binding-after-await/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-binding-after-await/Child.svelte
new file mode 100644
index 0000000000..6cb93933ec
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-binding-after-await/Child.svelte
@@ -0,0 +1,5 @@
+<script>
+	let { value = $bindable() } = $props();
+</script>
+
+{value}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-binding-after-await/_config.js b/packages/svelte/tests/runtime-runes/samples/async-binding-after-await/_config.js
new file mode 100644
index 0000000000..3068cace2d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-binding-after-await/_config.js
@@ -0,0 +1,14 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['async-server', 'client', 'hydrate'],
+	ssrHtml: 'value value <div>false</div> <input value="value"> <input value="value">',
+
+	async test({ assert, target, logs }) {
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, 'value value <div>true</div> <input> <input>');
+		assert.deepEqual(logs, [false, 'value', true, 'value']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-binding-after-await/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-binding-after-await/main.svelte
new file mode 100644
index 0000000000..9e4096581e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-binding-after-await/main.svelte
@@ -0,0 +1,17 @@
+<script>
+	import Child from './Child.svelte';
+	
+	await Promise.resolve();
+
+	let ref = $state(null);
+
+	$effect(() => console.log(!!ref, value))
+
+	let value = $state('value');
+</script>
+
+<Child bind:value />
+<Child bind:value={() => value, v => value = v} />
+<div bind:this={ref}>{!!ref}</div>
+<input bind:value />
+<input bind:value={() => value, v => value = v} />
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/Child.svelte
new file mode 100644
index 0000000000..e93bbe3dc0
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/Child.svelte
@@ -0,0 +1,5 @@
+<script>
+	let { value } = $props();
+</script>
+
+{value}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/_config.js b/packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/_config.js
new file mode 100644
index 0000000000..eff988e0d6
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/_config.js
@@ -0,0 +1,11 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['async-server', 'client', 'hydrate'],
+	ssrHtml: 'value <div class="value"></div>',
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, 'value <div class="value"></div>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/main.svelte
new file mode 100644
index 0000000000..1083882e1f
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-static-prop-after-await/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	import Child from './Child.svelte';
+	
+	await Promise.resolve();
+
+	let value = 'value';
+</script>
+ 
+<Child {value} />
+<div class={value}></div>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-style-after-await/_config.js b/packages/svelte/tests/runtime-runes/samples/async-style-after-await/_config.js
new file mode 100644
index 0000000000..472e7076c3
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-style-after-await/_config.js
@@ -0,0 +1,30 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['async-server', 'client', 'hydrate'],
+	ssrHtml: `
+		<div style="color: red;"></div>
+		<div style="width: 100px;"></div>
+		<button>width</button>
+		<div style="color: red;"></div>
+		<div style="width: 100px;"></div>
+		<button>width</button>
+	`,
+
+	async test({ assert, target }) {
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<div style="color: red;"></div>
+				<div style="width: 100px;"></div>
+				<button>width</button>
+				<div style="color: red;"></div>
+				<div style="width: 100px;"></div>
+				<button>width</button>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-style-after-await/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-style-after-await/main.svelte
new file mode 100644
index 0000000000..7c1abeda2c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-style-after-await/main.svelte
@@ -0,0 +1,25 @@
+<script>
+	await Promise.resolve();
+
+	// static
+	let color = $state('red');
+
+	// dynamic
+	let width = $state('100px');
+</script>
+
+<!-- force them into their own template effects -->
+
+<!-- normal -->
+{#if color}
+	<div style:color={color}></div>
+	<div style:width={width}></div>
+	<button onclick={() => width = '1px'}>width</button>
+{/if}
+
+<!-- shorthand -->
+{#if color}
+	<div style:color></div>
+	<div style:width></div>
+	<button onclick={() => width = '1px'}>width</button>
+{/if}

From 554202ecf461bc8b1a52934c497fd7f88ab4dd66 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 8 Nov 2025 10:55:36 -0800
Subject: [PATCH 161/347] Version Packages (#17127)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/eleven-cases-sing.md |  5 -----
 .changeset/five-coats-travel.md |  5 -----
 .changeset/huge-walls-hang.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/eleven-cases-sing.md
 delete mode 100644 .changeset/five-coats-travel.md
 delete mode 100644 .changeset/huge-walls-hang.md

diff --git a/.changeset/eleven-cases-sing.md b/.changeset/eleven-cases-sing.md
deleted file mode 100644
index fa6edda180..0000000000
--- a/.changeset/eleven-cases-sing.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ensure async static props/attributes are awaited
diff --git a/.changeset/five-coats-travel.md b/.changeset/five-coats-travel.md
deleted file mode 100644
index f1235043df..0000000000
--- a/.changeset/five-coats-travel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: wait on dependencies of async bindings
diff --git a/.changeset/huge-walls-hang.md b/.changeset/huge-walls-hang.md
deleted file mode 100644
index 63dd6c21c4..0000000000
--- a/.changeset/huge-walls-hang.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: await dependencies of style directives
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 9543ad4d7b..e13b36d4d3 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.43.5
+
+### Patch Changes
+
+- fix: ensure async static props/attributes are awaited ([#17120](https://github.com/sveltejs/svelte/pull/17120))
+
+- fix: wait on dependencies of async bindings ([#17120](https://github.com/sveltejs/svelte/pull/17120))
+
+- fix: await dependencies of style directives ([#17120](https://github.com/sveltejs/svelte/pull/17120))
+
 ## 5.43.4
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 0988828c44..507d156e29 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.43.4",
+  "version": "5.43.5",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 9fe92195c4..2a5ebbfef5 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.43.4';
+export const VERSION = '5.43.5';
 export const PUBLIC_VERSION = '5';

From 14b09260089c9a333be1b67c3f6c5c729af9d3c8 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 11 Nov 2025 06:55:13 +0100
Subject: [PATCH 162/347] fix: don't deactivate other batches (#17132)

There's a possibility of a race condition where `batch.deactivate()` is called while `current_batch !== batch`, and so it would deactivate another batch, which can lead to zombie batches that are never flushed, subsequently leading to wrong `batch_values`. This fixes that by checking if the current batch is the own batch.

Fixes #17109
---
 .changeset/eleven-moons-smash.md              |  5 ++++
 .../src/internal/client/reactivity/batch.js   |  4 ++++
 .../async-batch-timing/Component.svelte       | 14 +++++++++++
 .../samples/async-batch-timing/_config.js     | 23 +++++++++++++++++++
 .../samples/async-batch-timing/main.svelte    | 15 ++++++++++++
 5 files changed, 61 insertions(+)
 create mode 100644 .changeset/eleven-moons-smash.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-batch-timing/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-batch-timing/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-batch-timing/main.svelte

diff --git a/.changeset/eleven-moons-smash.md b/.changeset/eleven-moons-smash.md
new file mode 100644
index 0000000000..d37d55d9fe
--- /dev/null
+++ b/.changeset/eleven-moons-smash.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't deactivate other batches
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 57aa185a31..84308ef3ed 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -299,6 +299,10 @@ export class Batch {
 	}
 
 	deactivate() {
+		// If we're not the current batch, don't deactivate,
+		// else we could create zombie batches that are never flushed
+		if (current_batch !== this) return;
+
 		current_batch = null;
 		batch_values = null;
 	}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-batch-timing/Component.svelte b/packages/svelte/tests/runtime-runes/samples/async-batch-timing/Component.svelte
new file mode 100644
index 0000000000..275860ad9c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-batch-timing/Component.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+	let { ref } = $props();
+
+	let tick = $state(0);
+	let ref_exists = $state(true);
+ 
+	$effect(() => {
+		tick;
+		ref_exists = ref !== null;
+	});
+</script>
+
+<p>{ref_exists}</p>
+<button onclick={() => tick++}>check</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-batch-timing/_config.js b/packages/svelte/tests/runtime-runes/samples/async-batch-timing/_config.js
new file mode 100644
index 0000000000..1da4fdc0bd
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-batch-timing/_config.js
@@ -0,0 +1,23 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+// This test regresses against batches deactivating other batches than themselves
+export default test({
+	async test({ assert, target }) {
+		await tick(); // settle initial await
+
+		const button = target.querySelector('button');
+
+		button?.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<div>div</div>
+				<p>true</p>
+				<button>check</button>
+				<p></p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-batch-timing/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-batch-timing/main.svelte
new file mode 100644
index 0000000000..8b582f41d0
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-batch-timing/main.svelte
@@ -0,0 +1,15 @@
+<script>
+	import Component from "./Component.svelte";
+
+	let ref = $state(null);
+
+	let foo = $derived(await 1);
+</script>
+
+<div bind:this={ref}>div</div>
+
+<Component {ref} />
+
+{#if foo} 
+	<p></p>
+{/if}

From e238e6611e1faddf19b57fc41e5e3eb930c04f22 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Nov 2025 07:45:25 +0100
Subject: [PATCH 163/347] Version Packages (#17135)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/eleven-moons-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/eleven-moons-smash.md

diff --git a/.changeset/eleven-moons-smash.md b/.changeset/eleven-moons-smash.md
deleted file mode 100644
index d37d55d9fe..0000000000
--- a/.changeset/eleven-moons-smash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't deactivate other batches
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index e13b36d4d3..10ea609b04 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.43.6
+
+### Patch Changes
+
+- fix: don't deactivate other batches ([#17132](https://github.com/sveltejs/svelte/pull/17132))
+
 ## 5.43.5
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 507d156e29..731ae6f004 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.43.5",
+  "version": "5.43.6",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 2a5ebbfef5..81bd62b554 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.43.5';
+export const VERSION = '5.43.6';
 export const PUBLIC_VERSION = '5';

From a0c7c3b327a6c84c963d428b7de7e7b609cd8376 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Sun, 16 Nov 2025 02:40:35 +0100
Subject: [PATCH 164/347] fix: properly defer document title until async work
 is complete (#17158)

#17061 didn't properly handle the case where the title is sync but reactive and async work outside is pending. Handle this by creating a proper effect for the document title, and make sure to wait on it and flush it once ready.

Fixes #17114
---
 .changeset/cold-beds-look.md                  |  5 ++++
 .../client/visitors/TitleElement.js           |  7 +++--
 packages/svelte/src/internal/client/index.js  |  1 +
 .../src/internal/client/reactivity/batch.js   |  6 ++++-
 .../src/internal/client/reactivity/effects.js | 26 ++++++++++++++++---
 .../samples/async-head-title-3/Inner.svelte   | 15 +++++++++++
 .../samples/async-head-title-3/_config.js     | 24 +++++++++++++++++
 .../samples/async-head-title-3/main.svelte    | 12 +++++++++
 8 files changed, 87 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/cold-beds-look.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head-title-3/Inner.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head-title-3/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-head-title-3/main.svelte

diff --git a/.changeset/cold-beds-look.md b/.changeset/cold-beds-look.md
new file mode 100644
index 0000000000..0929e42a89
--- /dev/null
+++ b/.changeset/cold-beds-look.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: properly defer document title until async work is complete
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 edd8835e00..f815f3ae05 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
@@ -29,17 +29,16 @@ export function TitleElement(node, context) {
 		)
 	);
 
-	// Always in an $effect so it only changes the title once async work is done
+	// Make sure it only changes the title once async work is done
 	if (has_state) {
 		context.state.after_update.push(
 			b.stmt(
 				b.call(
-					'$.template_effect',
+					'$.deferred_template_effect',
 					b.arrow(memoizer.apply(), b.block([statement])),
 					memoizer.sync_values(),
 					memoizer.async_values(),
-					memoizer.blockers(),
-					b.true
+					memoizer.blockers()
 				)
 			)
 		);
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index 3807c63c20..a2add3ec59 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -119,6 +119,7 @@ export {
 	legacy_pre_effect_reset,
 	render_effect,
 	template_effect,
+	deferred_template_effect,
 	effect,
 	user_effect,
 	user_pre_effect
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 84308ef3ed..ab5bd0b788 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -144,6 +144,10 @@ export class Batch {
 
 	is_fork = false;
 
+	is_deferred() {
+		return this.is_fork || this.#blocking_pending > 0;
+	}
+
 	/**
 	 *
 	 * @param {Effect[]} root_effects
@@ -172,7 +176,7 @@ export class Batch {
 			this.#resolve();
 		}
 
-		if (this.#blocking_pending > 0 || this.is_fork) {
+		if (this.is_deferred()) {
 			this.#defer_effects(target.effects);
 			this.#defer_effects(target.render_effects);
 			this.#defer_effects(target.block_effects);
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 5d7c0ef871..658e23842f 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -40,7 +40,7 @@ import { DEV } from 'esm-env';
 import { define_property } from '../../shared/utils.js';
 import { get_next_sibling } from '../dom/operations.js';
 import { component_context, dev_current_component_function, dev_stack } from '../context.js';
-import { Batch, schedule_effect } from './batch.js';
+import { Batch, current_batch, schedule_effect } from './batch.js';
 import { flatten } from './async.js';
 import { without_reactive_context } from '../dom/elements/bindings/shared.js';
 
@@ -366,11 +366,29 @@ export function render_effect(fn, flags = 0) {
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
  * @param {Array<Promise<void>>} blockers
- * @param {boolean} defer
  */
-export function template_effect(fn, sync = [], async = [], blockers = [], defer = false) {
+export function template_effect(fn, sync = [], async = [], blockers = []) {
 	flatten(blockers, sync, async, (values) => {
-		create_effect(defer ? EFFECT : RENDER_EFFECT, () => fn(...values.map(get)), true);
+		create_effect(RENDER_EFFECT, () => fn(...values.map(get)), true);
+	});
+}
+
+/**
+ * Like `template_effect`, but with an effect which is deferred until the batch commits
+ * @param {(...expressions: any) => void | (() => void)} fn
+ * @param {Array<() => any>} sync
+ * @param {Array<() => Promise<any>>} async
+ * @param {Array<Promise<void>>} blockers
+ */
+export function deferred_template_effect(fn, sync = [], async = [], blockers = []) {
+	var batch = /** @type {Batch} */ (current_batch);
+	var is_async = async.length > 0 || blockers.length > 0;
+
+	if (is_async) batch.increment(true);
+
+	flatten(blockers, sync, async, (values) => {
+		create_effect(EFFECT, () => fn(...values.map(get)), false);
+		if (is_async) batch.decrement(true);
 	});
 }
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head-title-3/Inner.svelte b/packages/svelte/tests/runtime-runes/samples/async-head-title-3/Inner.svelte
new file mode 100644
index 0000000000..4d761c92ef
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head-title-3/Inner.svelte
@@ -0,0 +1,15 @@
+<script>
+	let { deferred, title } = $props();
+
+	function push() {
+		const d = Promise.withResolvers();
+		deferred.push(() => d.resolve());
+		return d.promise;
+	}
+</script>
+
+<svelte:head>
+	<title>{title}</title>
+</svelte:head>
+
+<p>{await push()}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head-title-3/_config.js b/packages/svelte/tests/runtime-runes/samples/async-head-title-3/_config.js
new file mode 100644
index 0000000000..39cbf5becb
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head-title-3/_config.js
@@ -0,0 +1,24 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [toggle, resolve] = target.querySelectorAll('button');
+		toggle.click();
+		await tick();
+		assert.equal(window.document.title, '');
+
+		toggle.click();
+		await tick();
+		assert.equal(window.document.title, '');
+
+		toggle.click();
+		await tick();
+		assert.equal(window.document.title, '');
+
+		resolve.click();
+		await tick();
+		await tick();
+		assert.equal(window.document.title, 'title');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-head-title-3/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-head-title-3/main.svelte
new file mode 100644
index 0000000000..be4f04afe8
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-head-title-3/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	import Inner from './Inner.svelte';
+
+	let deferred = [];
+	let show = $state(false);
+</script>
+
+<button onclick={() => show = !show}>toggle</button>
+<button onclick={() => deferred.pop()()}>resolve</button>
+{#if show}
+	<Inner {deferred} title="title" />
+{/if}

From a7a7d1e0144f36721809c3876b42b4841f22e2e4 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Sun, 16 Nov 2025 03:01:27 +0100
Subject: [PATCH 165/347] fix: take blockers of components into account
 (#17153)

Fixes #17122
---
 .changeset/ready-flies-invite.md                |  5 +++++
 .../compiler/phases/1-parse/state/element.js    |  5 +++++
 .../phases/2-analyze/visitors/Component.js      |  6 ++++++
 .../2-analyze/visitors/SvelteComponent.js       |  2 +-
 .../client/visitors/shared/component.js         |  5 +++++
 .../server/visitors/shared/component.js         | 17 +++++++++++++----
 .../svelte/src/compiler/types/template.d.ts     |  2 ++
 .../async-dynamic-component/Component.svelte    |  1 +
 .../samples/async-dynamic-component/_config.js  | 11 +++++++++++
 .../samples/async-dynamic-component/main.svelte | 10 ++++++++++
 10 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/ready-flies-invite.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-dynamic-component/Component.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-dynamic-component/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-dynamic-component/main.svelte

diff --git a/.changeset/ready-flies-invite.md b/.changeset/ready-flies-invite.md
new file mode 100644
index 0000000000..660fa0d67e
--- /dev/null
+++ b/.changeset/ready-flies-invite.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: take blockers of components into account
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 7b0950ae82..9167888e37 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/element.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/element.js
@@ -242,6 +242,10 @@ export default function element(parser) {
 		parser.allow_whitespace();
 	}
 
+	if (element.type === 'Component') {
+		element.metadata.expression = new ExpressionMetadata();
+	}
+
 	if (element.type === 'SvelteComponent') {
 		const index = element.attributes.findIndex(
 			/** @param {any} attr */
@@ -257,6 +261,7 @@ export default function element(parser) {
 		}
 
 		element.expression = get_attribute_expression(definition);
+		element.metadata.expression = new ExpressionMetadata();
 	}
 
 	if (element.type === 'SvelteElement') {
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/Component.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/Component.js
index 350719dedd..5a4d3fce3f 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/Component.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/Component.js
@@ -16,5 +16,11 @@ export function Component(node, context) {
 		binding !== null &&
 		(binding.kind !== 'normal' || node.name.includes('.'));
 
+	if (binding) {
+		node.metadata.expression.has_state = node.metadata.dynamic;
+		node.metadata.expression.dependencies.add(binding);
+		node.metadata.expression.references.add(binding);
+	}
+
 	visit_component(node, context);
 }
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/SvelteComponent.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/SvelteComponent.js
index 3c7630cb25..18500f6154 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/SvelteComponent.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/SvelteComponent.js
@@ -12,7 +12,7 @@ export function SvelteComponent(node, context) {
 		w.svelte_component_deprecated(node);
 	}
 
-	context.visit(node.expression);
+	context.visit(node.expression, { ...context.state, expression: node.metadata.expression });
 
 	visit_component(node, context);
 }
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 2b57f61c77..b3139a29aa 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
@@ -451,6 +451,11 @@ export function build_component(node, component_name, context) {
 		};
 	}
 
+	if (node.type !== 'SvelteSelf') {
+		// Component name itself could be blocked on async values
+		memoizer.check_blockers(node.metadata.expression);
+	}
+
 	const statements = [...snippet_declarations, ...memoizer.deriveds(context.state.analysis.runes)];
 
 	if (is_component_dynamic) {
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 70c790fc57..2e7b4a186c 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
@@ -325,17 +325,26 @@ export function build_inline_component(node, expression, context) {
 		);
 	}
 
+	if (node.type !== 'SvelteSelf') {
+		// Component name itself could be blocked on async values
+		optimiser.check_blockers(node.metadata.expression);
+	}
+
 	const is_async = optimiser.is_async();
 
 	if (is_async) {
 		statement = create_async_block(
-			b.block([optimiser.apply(), statement]),
+			b.block([
+				optimiser.apply(),
+				dynamic && custom_css_props.length === 0
+					? b.stmt(b.call('$$renderer.push', empty_comment))
+					: b.empty,
+				statement
+			]),
 			optimiser.blockers(),
 			optimiser.has_await
 		);
-	}
-
-	if (dynamic && custom_css_props.length === 0) {
+	} else if (dynamic && custom_css_props.length === 0) {
 		context.state.template.push(empty_comment);
 	}
 
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index f9bbe28333..3960c95c8f 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -308,6 +308,7 @@ export namespace AST {
 		type: 'Component';
 		/** @internal */
 		metadata: {
+			expression: ExpressionMetadata;
 			scopes: Record<string, Scope>;
 			dynamic: boolean;
 			/** The set of locally-defined snippets that this component tag could render,
@@ -355,6 +356,7 @@ export namespace AST {
 		expression: Expression;
 		/** @internal */
 		metadata: {
+			expression: ExpressionMetadata;
 			scopes: Record<string, Scope>;
 			/** The set of locally-defined snippets that this component tag could render,
 			 * used for CSS pruning purposes */
diff --git a/packages/svelte/tests/runtime-runes/samples/async-dynamic-component/Component.svelte b/packages/svelte/tests/runtime-runes/samples/async-dynamic-component/Component.svelte
new file mode 100644
index 0000000000..40816a2b5a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-dynamic-component/Component.svelte
@@ -0,0 +1 @@
+Hi
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-dynamic-component/_config.js b/packages/svelte/tests/runtime-runes/samples/async-dynamic-component/_config.js
new file mode 100644
index 0000000000..bf13a9b120
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-dynamic-component/_config.js
@@ -0,0 +1,11 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['async-server', 'client', 'hydrate'],
+	ssrHtml: 'Hi Hi Hi Hi',
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, 'Hi Hi Hi Hi');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-dynamic-component/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-dynamic-component/main.svelte
new file mode 100644
index 0000000000..d959f80694
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-dynamic-component/main.svelte
@@ -0,0 +1,10 @@
+<script>
+	import Component from './Component.svelte'
+	const X = $derived(await Promise.resolve(Component))
+	const Y = await Promise.resolve(Component)
+</script>
+
+<X />
+<svelte:component this={X} />
+<Y />
+<svelte:component this={Y} />

From 6e571dc9095e292bd58e69846ac93aa2660258a7 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Sun, 16 Nov 2025 03:19:30 +0100
Subject: [PATCH 166/347] fix: ensure deferred effects can be rescheduled later
 on (#17147)

When deferring effects we didn't unmark the deriveds that lead to those effects. This means that they might not be reached in subsequent runs of `mark_reactions`.

Fixes https://github.com/sveltejs/svelte/issues/17118#issuecomment-3521488865
---
 .changeset/grumpy-gifts-sit.md                |  5 ++
 .../src/internal/client/reactivity/batch.js   | 24 ++++++++-
 .../async-fork-update-same-state/_config.js   | 49 +++++++++++++++++++
 .../async-fork-update-same-state/main.svelte  | 37 ++++++++++++++
 4 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/grumpy-gifts-sit.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-update-same-state/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-update-same-state/main.svelte

diff --git a/.changeset/grumpy-gifts-sit.md b/.changeset/grumpy-gifts-sit.md
new file mode 100644
index 0000000000..fab1bd9ccc
--- /dev/null
+++ b/.changeset/grumpy-gifts-sit.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure deferred effects can be rescheduled later on
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index ab5bd0b788..03a0721057 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -16,7 +16,8 @@ import {
 	BOUNDARY_EFFECT,
 	EAGER_EFFECT,
 	HEAD_EFFECT,
-	ERROR_VALUE
+	ERROR_VALUE,
+	WAS_MARKED
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
@@ -274,11 +275,32 @@ export class Batch {
 			const target = (e.f & DIRTY) !== 0 ? this.#dirty_effects : this.#maybe_dirty_effects;
 			target.push(e);
 
+			// Since we're not executing these effects now, we need to clear any WAS_MARKED flags
+			// so that other batches can correctly reach these effects during their own traversal
+			this.#clear_marked(e.deps);
+
 			// mark as clean so they get scheduled if they depend on pending async state
 			set_signal_status(e, CLEAN);
 		}
 	}
 
+	/**
+	 * @param {Value[] | null} deps
+	 */
+	#clear_marked(deps) {
+		if (deps === null) return;
+
+		for (const dep of deps) {
+			if ((dep.f & DERIVED) === 0 || (dep.f & WAS_MARKED) === 0) {
+				continue;
+			}
+
+			dep.f ^= WAS_MARKED;
+
+			this.#clear_marked(/** @type {Derived} */ (dep).deps);
+		}
+	}
+
 	/**
 	 * Associate a change to a given source with the current
 	 * batch, noting its previous and current values
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-update-same-state/_config.js b/packages/svelte/tests/runtime-runes/samples/async-fork-update-same-state/_config.js
new file mode 100644
index 0000000000..b3e04204b4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-update-same-state/_config.js
@@ -0,0 +1,49 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		assert.deepEqual(logs, [0]);
+
+		const [fork1, fork2, commit] = target.querySelectorAll('button');
+
+		fork1.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork 1</button>
+			<button>fork 2</button>
+			<button>commit</button>
+			<p>0</p>
+		`
+		);
+		assert.deepEqual(logs, [0]);
+
+		fork2.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork 1</button>
+			<button>fork 2</button>
+			<button>commit</button>
+			<p>0</p>
+		`
+		);
+		assert.deepEqual(logs, [0]);
+
+		commit.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork 1</button>
+			<button>fork 2</button>
+			<button>commit</button>
+			<p>1</p>
+		`
+		);
+		assert.deepEqual(logs, [0, 1]);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-update-same-state/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-fork-update-same-state/main.svelte
new file mode 100644
index 0000000000..45645b4085
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-update-same-state/main.svelte
@@ -0,0 +1,37 @@
+<script>
+	import { fork } from "svelte";
+	
+	let state = $state(0);
+
+	let count = $derived(state);
+
+	$effect.pre(() => {
+		console.log(count);
+	});
+
+	let forked;
+</script>
+
+<button onclick={()=>{
+	forked?.discard?.();
+	forked = fork(()=>{
+		state++;
+	});
+}}>
+	fork 1
+</button>
+
+<button onclick={()=>{
+	forked?.discard?.();
+	forked = fork(()=>{
+		state++;
+	})
+}}>
+	fork 2
+</button>
+
+<button onclick={()=>{
+	forked?.commit();
+}}>commit</button>
+
+<p>{count}</p>

From 1e0c8c544ca18c9102babb963969af996a28b3a9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 15 Nov 2025 21:23:10 -0500
Subject: [PATCH 167/347] Version Packages (#17159)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/cold-beds-look.md     |  5 -----
 .changeset/grumpy-gifts-sit.md   |  5 -----
 .changeset/ready-flies-invite.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/cold-beds-look.md
 delete mode 100644 .changeset/grumpy-gifts-sit.md
 delete mode 100644 .changeset/ready-flies-invite.md

diff --git a/.changeset/cold-beds-look.md b/.changeset/cold-beds-look.md
deleted file mode 100644
index 0929e42a89..0000000000
--- a/.changeset/cold-beds-look.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: properly defer document title until async work is complete
diff --git a/.changeset/grumpy-gifts-sit.md b/.changeset/grumpy-gifts-sit.md
deleted file mode 100644
index fab1bd9ccc..0000000000
--- a/.changeset/grumpy-gifts-sit.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ensure deferred effects can be rescheduled later on
diff --git a/.changeset/ready-flies-invite.md b/.changeset/ready-flies-invite.md
deleted file mode 100644
index 660fa0d67e..0000000000
--- a/.changeset/ready-flies-invite.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: take blockers of components into account
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 10ea609b04..8bceee7a32 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.43.7
+
+### Patch Changes
+
+- fix: properly defer document title until async work is complete ([#17158](https://github.com/sveltejs/svelte/pull/17158))
+
+- fix: ensure deferred effects can be rescheduled later on ([#17147](https://github.com/sveltejs/svelte/pull/17147))
+
+- fix: take blockers of components into account ([#17153](https://github.com/sveltejs/svelte/pull/17153))
+
 ## 5.43.6
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 731ae6f004..330c5e3ca5 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.43.6",
+  "version": "5.43.7",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 81bd62b554..7472a6d612 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.43.6';
+export const VERSION = '5.43.7';
 export const PUBLIC_VERSION = '5';

From c02ad03bfd5a5dbd85270ca4124a730c493aa338 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sun, 16 Nov 2025 12:35:33 -0500
Subject: [PATCH 168/347] fix: overhaul `each` blocks (#17150)

* state.items -> state.onscreen

* offscreen_items -> state.offscreen

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* always push

* fix

* note to self

* tweak/fix

* tidy up

* simplify

* unused

* clarity

* note to self

* simplify

* one test to go

* holy shit i think it works

* unused

* reduce number of bitwise checks

* revert

* small tweak

* better comment

* update note to self

* fix: each block losing reactivity when items removed while promise pending (#17151)

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

* add commented-out test, todo investigate

---------

Co-authored-by: dylan1951 <58990501+dylan1951@users.noreply.github.com>
Co-authored-by: dylan <dylanbradshaw107@hotmail.com>
Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .changeset/clean-toes-joke.md                 |   5 +
 .../src/internal/client/dom/blocks/each.js    | 400 +++++++-----------
 .../src/internal/client/reactivity/effects.js |  70 ++-
 .../svelte/src/internal/client/types.d.ts     |   2 +
 .../samples/async-each-derived/_config.js     |  20 +
 .../samples/async-each-derived/main.svelte    |  11 +
 .../samples/async-each-overlap/_config.js     | 102 +++++
 .../samples/async-each-overlap/main.svelte    |  48 +++
 8 files changed, 380 insertions(+), 278 deletions(-)
 create mode 100644 .changeset/clean-toes-joke.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-each-derived/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-each-derived/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-each-overlap/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-each-overlap/main.svelte

diff --git a/.changeset/clean-toes-joke.md b/.changeset/clean-toes-joke.md
new file mode 100644
index 0000000000..2c3aa4415f
--- /dev/null
+++ b/.changeset/clean-toes-joke.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: each block losing reactivity when items removed while promise pending
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index a0fae37133..3f12593d01 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -38,7 +38,7 @@ import { source, mutable_source, internal_set } from '../../reactivity/sources.j
 import { array_from, is_array } from '../../../shared/utils.js';
 import { COMMENT_NODE, INERT } from '#client/constants';
 import { queue_micro_task } from '../task.js';
-import { active_effect, get } from '../../runtime.js';
+import { get } from '../../runtime.js';
 import { DEV } from 'esm-env';
 import { derived_safe_equal } from '../../reactivity/deriveds.js';
 import { current_batch } from '../../reactivity/batch.js';
@@ -67,41 +67,51 @@ export function index(_, i) {
  * Pause multiple effects simultaneously, and coordinate their
  * subsequent destruction. Used in each blocks
  * @param {EachState} state
- * @param {EachItem[]} items
+ * @param {EachItem[]} to_destroy
  * @param {null | Node} controlled_anchor
  */
-function pause_effects(state, items, controlled_anchor) {
-	var items_map = state.items;
-
+function pause_effects(state, to_destroy, controlled_anchor) {
 	/** @type {TransitionManager[]} */
 	var transitions = [];
-	var length = items.length;
+	var length = to_destroy.length;
 
 	for (var i = 0; i < length; i++) {
-		pause_children(items[i].e, transitions, true);
-	}
-
-	var is_controlled = length > 0 && transitions.length === 0 && controlled_anchor !== null;
-	// If we have a controlled anchor, it means that the each block is inside a single
-	// DOM element, so we can apply a fast-path for clearing the contents of the element.
-	if (is_controlled) {
-		var parent_node = /** @type {Element} */ (
-			/** @type {Element} */ (controlled_anchor).parentNode
-		);
-		clear_text_content(parent_node);
-		parent_node.append(/** @type {Element} */ (controlled_anchor));
-		items_map.clear();
-		link(state, items[0].prev, items[length - 1].next);
+		pause_children(to_destroy[i].e, transitions, true);
 	}
 
 	run_out_transitions(transitions, () => {
+		// If we're in a controlled each block (i.e. the block is the only child of an
+		// element), and we are removing all items, _and_ there are no out transitions,
+		// we can use the fast path — emptying the element and replacing the anchor
+		var fast_path = transitions.length === 0 && controlled_anchor !== null;
+
+		// TODO only destroy effects if no pending batch needs them. otherwise,
+		// just set `item.o` back to `false`
+
+		if (fast_path) {
+			var anchor = /** @type {Element} */ (controlled_anchor);
+			var parent_node = /** @type {Element} */ (anchor.parentNode);
+
+			clear_text_content(parent_node);
+			parent_node.append(anchor);
+
+			state.items.clear();
+			link(state, to_destroy[0].prev, to_destroy[length - 1].next);
+		}
+
 		for (var i = 0; i < length; i++) {
-			var item = items[i];
-			if (!is_controlled) {
-				items_map.delete(item.k);
+			var item = to_destroy[i];
+
+			if (!fast_path) {
+				state.items.delete(item.k);
 				link(state, item.prev, item.next);
 			}
-			destroy_effect(item.e, !is_controlled);
+
+			destroy_effect(item.e, !fast_path);
+		}
+
+		if (state.first === to_destroy[0]) {
+			state.first = to_destroy[0].prev;
 		}
 	});
 }
@@ -123,6 +133,8 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 	var state = { flags, items: new Map(), first: null };
 
 	var is_controlled = (flags & EACH_IS_CONTROLLED) !== 0;
+	var is_reactive_value = (flags & EACH_ITEM_REACTIVE) !== 0;
+	var is_reactive_index = (flags & EACH_INDEX_REACTIVE) !== 0;
 
 	if (is_controlled) {
 		var parent_node = /** @type {Element} */ (node);
@@ -136,14 +148,9 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 		hydrate_next();
 	}
 
-	/** @type {Effect | null} */
+	/** @type {{ fragment: DocumentFragment | null, effect: Effect } | null} */
 	var fallback = null;
 
-	var was_empty = false;
-
-	/** @type {Map<any, EachItem>} */
-	var offscreen_items = new Map();
-
 	// TODO: ideally we could use derived for runes mode but because of the ability
 	// to use a store which can be mutated, we can't do that here as mutating a store
 	// will still result in the collection array being the same from the store
@@ -156,51 +163,36 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 	/** @type {V[]} */
 	var array;
 
-	/** @type {Effect} */
-	var each_effect;
+	var first_run = true;
 
 	function commit() {
-		reconcile(
-			each_effect,
-			array,
-			state,
-			offscreen_items,
-			anchor,
-			render_fn,
-			flags,
-			get_key,
-			get_collection
-		);
-
-		if (fallback_fn !== null) {
+		reconcile(each_effect, array, state, anchor, flags, get_key);
+
+		if (fallback !== null) {
 			if (array.length === 0) {
-				if (fallback) {
-					resume_effect(fallback);
+				if (fallback.fragment) {
+					anchor.before(fallback.fragment);
+					fallback.fragment = null;
 				} else {
-					fallback = branch(() => fallback_fn(anchor));
+					resume_effect(fallback.effect);
 				}
-			} else if (fallback !== null) {
-				pause_effect(fallback, () => {
+
+				each_effect.first = fallback.effect;
+			} else {
+				pause_effect(fallback.effect, () => {
+					// TODO only null out if no pending batch needs it,
+					// otherwise re-add `fallback.fragment` and move the
+					// effect into it
 					fallback = null;
 				});
 			}
 		}
 	}
 
-	block(() => {
-		// store a reference to the effect so that we can update the start/end nodes in reconciliation
-		each_effect ??= /** @type {Effect} */ (active_effect);
-
+	var each_effect = block(() => {
 		array = /** @type {V[]} */ (get(each_array));
 		var length = array.length;
 
-		if (was_empty && length === 0) {
-			// ignore updates if the array is empty,
-			// and it already was empty on previous run
-			return;
-		}
-		was_empty = length === 0;
-
 		/** `true` if there was a hydration mismatch. Needs to be a `let` or else it isn't treeshaken out */
 		let mismatch = false;
 
@@ -217,34 +209,46 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 			}
 		}
 
-		// this is separate to the previous block because `hydrating` might change
-		if (hydrating) {
-			/** @type {EachItem | null} */
-			var prev = null;
-
-			/** @type {EachItem} */
-			var item;
-
-			for (var i = 0; i < length; i++) {
-				if (
-					hydrate_node.nodeType === COMMENT_NODE &&
-					/** @type {Comment} */ (hydrate_node).data === HYDRATION_END
-				) {
-					// The server rendered fewer items than expected,
-					// so break out and continue appending non-hydrated items
-					anchor = /** @type {Comment} */ (hydrate_node);
-					mismatch = true;
-					set_hydrating(false);
-					break;
+		var keys = new Set();
+		var batch = /** @type {Batch} */ (current_batch);
+		var prev = null;
+		var defer = should_defer_append();
+
+		for (var i = 0; i < length; i += 1) {
+			if (
+				hydrating &&
+				hydrate_node.nodeType === COMMENT_NODE &&
+				/** @type {Comment} */ (hydrate_node).data === HYDRATION_END
+			) {
+				// The server rendered fewer items than expected,
+				// so break out and continue appending non-hydrated items
+				anchor = /** @type {Comment} */ (hydrate_node);
+				mismatch = true;
+				set_hydrating(false);
+			}
+
+			var value = array[i];
+			var key = get_key(value, i);
+
+			var item = first_run ? null : state.items.get(key);
+
+			if (item) {
+				// update before reconciliation, to trigger any async updates
+				if (is_reactive_value) {
+					internal_set(item.v, value);
 				}
 
-				var value = array[i];
-				var key = get_key(value, i);
+				if (is_reactive_index) {
+					internal_set(/** @type {Value<number>} */ (item.i), i);
+				} else {
+					item.i = i;
+				}
+
+				batch.skipped_effects.delete(item.e);
+			} else {
 				item = create_item(
-					hydrate_node,
-					state,
+					first_run ? anchor : null,
 					prev,
-					null,
 					value,
 					key,
 					i,
@@ -252,65 +256,60 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 					flags,
 					get_collection
 				);
-				state.items.set(key, item);
 
-				prev = item;
-			}
+				if (first_run) {
+					item.o = true;
+
+					if (prev === null) {
+						state.first = item;
+					} else {
+						prev.next = item;
+					}
 
-			// remove excess nodes
-			if (length > 0) {
-				set_hydrate_node(skip_nodes());
+					prev = item;
+				}
+
+				state.items.set(key, item);
 			}
+
+			keys.add(key);
 		}
 
-		if (hydrating) {
-			if (length === 0 && fallback_fn) {
-				fallback = branch(() => fallback_fn(anchor));
+		if (length === 0 && fallback_fn && !fallback) {
+			if (first_run) {
+				fallback = {
+					fragment: null,
+					effect: branch(() => fallback_fn(anchor))
+				};
+			} else {
+				var fragment = document.createDocumentFragment();
+				var target = create_text();
+				fragment.append(target);
+
+				fallback = {
+					fragment,
+					effect: branch(() => fallback_fn(target))
+				};
 			}
-		} else {
-			if (should_defer_append()) {
-				var keys = new Set();
-				var batch = /** @type {Batch} */ (current_batch);
-
-				for (i = 0; i < length; i += 1) {
-					value = array[i];
-					key = get_key(value, i);
-
-					var existing = state.items.get(key) ?? offscreen_items.get(key);
-
-					if (existing) {
-						// update before reconciliation, to trigger any async updates
-						if ((flags & (EACH_ITEM_REACTIVE | EACH_INDEX_REACTIVE)) !== 0) {
-							update_item(existing, value, i, flags);
-						}
-					} else {
-						item = create_item(
-							null,
-							state,
-							null,
-							null,
-							value,
-							key,
-							i,
-							render_fn,
-							flags,
-							get_collection,
-							true
-						);
-
-						offscreen_items.set(key, item);
-					}
+		}
 
-					keys.add(key);
-				}
+		// remove excess nodes
+		if (hydrating && length > 0) {
+			set_hydrate_node(skip_nodes());
+		}
 
-				for (const [key, item] of state.items) {
-					if (!keys.has(key)) {
-						batch.skipped_effects.add(item.e);
-					}
-				}
+		for (const [key, item] of state.items) {
+			if (!keys.has(key)) {
+				batch.skipped_effects.add(item.e);
+			}
+		}
 
+		if (!first_run) {
+			if (defer) {
 				batch.oncommit(commit);
+				batch.ondiscard(() => {
+					// TODO presumably we need to do something here?
+				});
 			} else {
 				commit();
 			}
@@ -330,6 +329,8 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 		get(each_array);
 	});
 
+	first_run = false;
+
 	if (hydrating) {
 		anchor = hydrate_node;
 	}
@@ -341,32 +342,17 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
  * @param {Effect} each_effect
  * @param {Array<V>} array
  * @param {EachState} state
- * @param {Map<any, EachItem>} offscreen_items
  * @param {Element | Comment | Text} anchor
- * @param {(anchor: Node, item: MaybeSource<V>, index: number | Source<number>, collection: () => V[]) => void} render_fn
  * @param {number} flags
  * @param {(value: V, index: number) => any} get_key
- * @param {() => V[]} get_collection
  * @returns {void}
  */
-function reconcile(
-	each_effect,
-	array,
-	state,
-	offscreen_items,
-	anchor,
-	render_fn,
-	flags,
-	get_key,
-	get_collection
-) {
+function reconcile(each_effect, array, state, anchor, flags, get_key) {
 	var is_animated = (flags & EACH_IS_ANIMATED) !== 0;
-	var should_update = (flags & (EACH_ITEM_REACTIVE | EACH_INDEX_REACTIVE)) !== 0;
 
 	var length = array.length;
 	var items = state.items;
-	var first = state.first;
-	var current = first;
+	var current = state.first;
 
 	/** @type {undefined | Set<EachItem>} */
 	var seen;
@@ -399,12 +385,10 @@ function reconcile(
 		for (i = 0; i < length; i += 1) {
 			value = array[i];
 			key = get_key(value, i);
-			item = items.get(key);
+			item = /** @type {EachItem} */ (items.get(key));
 
-			if (item !== undefined) {
-				item.a?.measure();
-				(to_animate ??= new Set()).add(item);
-			}
+			item.a?.measure();
+			(to_animate ??= new Set()).add(item);
 		}
 	}
 
@@ -412,40 +396,20 @@ function reconcile(
 		value = array[i];
 		key = get_key(value, i);
 
-		item = items.get(key);
-
-		if (item === undefined) {
-			var pending = offscreen_items.get(key);
+		item = /** @type {EachItem} */ (items.get(key));
 
-			if (pending !== undefined) {
-				offscreen_items.delete(key);
-				items.set(key, pending);
+		state.first ??= item;
 
-				var next = prev ? prev.next : current;
+		if (!item.o) {
+			item.o = true;
 
-				link(state, prev, pending);
-				link(state, pending, next);
+			var next = prev ? prev.next : current;
 
-				move(pending, next, anchor);
-				prev = pending;
-			} else {
-				var child_anchor = current ? /** @type {TemplateNode} */ (current.e.nodes_start) : anchor;
-
-				prev = create_item(
-					child_anchor,
-					state,
-					prev,
-					prev === null ? state.first : prev.next,
-					value,
-					key,
-					i,
-					render_fn,
-					flags,
-					get_collection
-				);
-			}
+			link(state, prev, item);
+			link(state, item, next);
 
-			items.set(key, prev);
+			move(item, next, anchor);
+			prev = item;
 
 			matched = [];
 			stashed = [];
@@ -454,10 +418,6 @@ function reconcile(
 			continue;
 		}
 
-		if (should_update) {
-			update_item(item, value, i, flags);
-		}
-
 		if ((item.e.f & INERT) !== 0) {
 			resume_effect(item.e);
 			if (is_animated) {
@@ -575,63 +535,30 @@ function reconcile(
 		});
 	}
 
+	// TODO i have an inkling that the rest of this function is wrong...
+	// the offscreen items need to be linked, so that they all update correctly.
+	// the last onscreen item should link to the first offscreen item, etc
 	each_effect.first = state.first && state.first.e;
 	each_effect.last = prev && prev.e;
 
-	for (var unused of offscreen_items.values()) {
-		destroy_effect(unused.e);
-	}
-
-	offscreen_items.clear();
-}
-
-/**
- * @param {EachItem} item
- * @param {any} value
- * @param {number} index
- * @param {number} type
- * @returns {void}
- */
-function update_item(item, value, index, type) {
-	if ((type & EACH_ITEM_REACTIVE) !== 0) {
-		internal_set(item.v, value);
-	}
-
-	if ((type & EACH_INDEX_REACTIVE) !== 0) {
-		internal_set(/** @type {Value<number>} */ (item.i), index);
-	} else {
-		item.i = index;
+	if (prev) {
+		prev.e.next = null;
 	}
 }
 
 /**
  * @template V
  * @param {Node | null} anchor
- * @param {EachState} state
  * @param {EachItem | null} prev
- * @param {EachItem | null} next
  * @param {V} value
  * @param {unknown} key
  * @param {number} index
  * @param {(anchor: Node, item: V | Source<V>, index: number | Value<number>, collection: () => V[]) => void} render_fn
  * @param {number} flags
  * @param {() => V[]} get_collection
- * @param {boolean} [deferred]
  * @returns {EachItem}
  */
-function create_item(
-	anchor,
-	state,
-	prev,
-	next,
-	value,
-	key,
-	index,
-	render_fn,
-	flags,
-	get_collection,
-	deferred
-) {
+function create_item(anchor, prev, value, key, index, render_fn, flags, get_collection) {
 	var previous_each_item = current_each_item;
 	var reactive = (flags & EACH_ITEM_REACTIVE) !== 0;
 	var mutable = (flags & EACH_ITEM_IMMUTABLE) === 0;
@@ -657,8 +584,9 @@ function create_item(
 		a: null,
 		// @ts-expect-error
 		e: null,
+		o: false,
 		prev,
-		next
+		next: null
 	};
 
 	current_each_item = item;
@@ -669,25 +597,15 @@ function create_item(
 			fragment.append((anchor = create_text()));
 		}
 
-		item.e = branch(() => render_fn(/** @type {Node} */ (anchor), v, i, get_collection), hydrating);
+		item.e = branch(() => render_fn(/** @type {Node} */ (anchor), v, i, get_collection));
 
 		item.e.prev = prev && prev.e;
-		item.e.next = next && next.e;
 
-		if (prev === null) {
-			if (!deferred) {
-				state.first = item;
-			}
-		} else {
+		if (prev !== null) {
 			prev.next = item;
 			prev.e.next = item.e;
 		}
 
-		if (next !== null) {
-			next.prev = item;
-			next.e.prev = item.e;
-		}
-
 		return item;
 	} finally {
 		current_each_item = previous_each_item;
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 658e23842f..abf7c43c29 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -80,10 +80,9 @@ function push_effect(effect, parent_effect) {
  * @param {number} type
  * @param {null | (() => void | (() => void))} fn
  * @param {boolean} sync
- * @param {boolean} push
  * @returns {Effect}
  */
-function create_effect(type, fn, sync, push = true) {
+function create_effect(type, fn, sync) {
 	var parent = active_effect;
 
 	if (DEV) {
@@ -133,43 +132,41 @@ function create_effect(type, fn, sync, push = true) {
 		schedule_effect(effect);
 	}
 
-	if (push) {
-		/** @type {Effect | null} */
-		var e = effect;
+	/** @type {Effect | null} */
+	var e = effect;
 
-		// if an effect has already ran and doesn't need to be kept in the tree
-		// (because it won't re-run, has no DOM, and has no teardown etc)
-		// then we skip it and go to its child (if any)
-		if (
-			sync &&
-			e.deps === null &&
-			e.teardown === null &&
-			e.nodes_start === null &&
-			e.first === e.last && // either `null`, or a singular child
-			(e.f & EFFECT_PRESERVED) === 0
-		) {
-			e = e.first;
-			if ((type & BLOCK_EFFECT) !== 0 && (type & EFFECT_TRANSPARENT) !== 0 && e !== null) {
-				e.f |= EFFECT_TRANSPARENT;
-			}
+	// if an effect has already ran and doesn't need to be kept in the tree
+	// (because it won't re-run, has no DOM, and has no teardown etc)
+	// then we skip it and go to its child (if any)
+	if (
+		sync &&
+		e.deps === null &&
+		e.teardown === null &&
+		e.nodes_start === null &&
+		e.first === e.last && // either `null`, or a singular child
+		(e.f & EFFECT_PRESERVED) === 0
+	) {
+		e = e.first;
+		if ((type & BLOCK_EFFECT) !== 0 && (type & EFFECT_TRANSPARENT) !== 0 && e !== null) {
+			e.f |= EFFECT_TRANSPARENT;
 		}
+	}
 
-		if (e !== null) {
-			e.parent = parent;
+	if (e !== null) {
+		e.parent = parent;
 
-			if (parent !== null) {
-				push_effect(e, parent);
-			}
+		if (parent !== null) {
+			push_effect(e, parent);
+		}
 
-			// if we're in a derived, add the effect there too
-			if (
-				active_reaction !== null &&
-				(active_reaction.f & DERIVED) !== 0 &&
-				(type & ROOT_EFFECT) === 0
-			) {
-				var derived = /** @type {Derived} */ (active_reaction);
-				(derived.effects ??= []).push(e);
-			}
+		// if we're in a derived, add the effect there too
+		if (
+			active_reaction !== null &&
+			(active_reaction.f & DERIVED) !== 0 &&
+			(type & ROOT_EFFECT) === 0
+		) {
+			var derived = /** @type {Derived} */ (active_reaction);
+			(derived.effects ??= []).push(e);
 		}
 	}
 
@@ -406,10 +403,9 @@ export function block(fn, flags = 0) {
 
 /**
  * @param {(() => void)} fn
- * @param {boolean} [push]
  */
-export function branch(fn, push = true) {
-	return create_effect(BRANCH_EFFECT | EFFECT_PRESERVED, fn, true, push);
+export function branch(fn) {
+	return create_effect(BRANCH_EFFECT | EFFECT_PRESERVED, fn, true);
 }
 
 /**
diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts
index deb3e82986..19645fcc32 100644
--- a/packages/svelte/src/internal/client/types.d.ts
+++ b/packages/svelte/src/internal/client/types.d.ts
@@ -83,6 +83,8 @@ export type EachItem = {
 	i: number | Source<number>;
 	/** key */
 	k: unknown;
+	/** true if onscreen */
+	o: boolean;
 	prev: EachItem | null;
 	next: EachItem | null;
 };
diff --git a/packages/svelte/tests/runtime-runes/samples/async-each-derived/_config.js b/packages/svelte/tests/runtime-runes/samples/async-each-derived/_config.js
new file mode 100644
index 0000000000..62a09bfc7c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-each-derived/_config.js
@@ -0,0 +1,20 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		await tick(); // settle initial await
+
+		const checkBox = target.querySelector('input');
+
+		checkBox?.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<input type="checkbox"/>
+				<p>true</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-each-derived/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-each-derived/main.svelte
new file mode 100644
index 0000000000..7e3b5c54bc
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-each-derived/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	let checked = $state(false);
+
+	const foo = $derived(await checked);
+</script>
+
+<input type="checkbox" bind:checked />
+
+{#each checked === foo && [1]}
+	<p>{checked}</p>
+{/each}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-each-overlap/_config.js b/packages/svelte/tests/runtime-runes/samples/async-each-overlap/_config.js
new file mode 100644
index 0000000000..d03f9ad09d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-each-overlap/_config.js
@@ -0,0 +1,102 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip: true,
+	async test({ assert, target }) {
+		const [add, shift] = target.querySelectorAll('button');
+
+		add.click();
+		await tick();
+		add.click();
+		await tick();
+		add.click();
+		await tick();
+
+		// TODO pending count / number of pushes is off
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>add</button>
+			<button>shift</button>
+			<p>pending=6 values.length=1 values=[1]</p>
+			<div>not keyed:
+				<div>1</div>
+			</div>
+			<div>keyed:
+				<div>1</div>
+			</div>
+		`
+		);
+
+		shift.click();
+		await tick();
+		shift.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>add</button>
+			<button>shift</button>
+			<p>pending=4 values.length=2 values=[1,2]</p>
+			<div>not keyed:
+				<div>1</div>
+				<div>2</div>
+			</div>
+			<div>keyed:
+				<div>1</div>
+				<div>2</div>
+			</div>
+		`
+		);
+
+		shift.click();
+		await tick();
+		shift.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>add</button>
+			<button>shift</button>
+			<p>pending=2 values.length=3 values=[1,2,3]</p>
+			<div>not keyed:
+				<div>1</div>
+				<div>2</div>
+				<div>3</div>
+			</div>
+			<div>keyed:
+				<div>1</div>
+				<div>2</div>
+				<div>3</div>
+			</div>
+		`
+		);
+
+		shift.click();
+		await tick();
+		shift.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>add</button>
+			<button>shift</button>
+			<p>pending=0 values.length=4 values=[1,2,3,4]</p>
+			<div>not keyed:
+				<div>1</div>
+				<div>2</div>
+				<div>3</div>
+				<div>4</div>
+			</div>
+			<div>keyed:
+				<div>1</div>
+				<div>2</div>
+				<div>3</div>
+				<div>4</div>
+			</div>
+		`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-each-overlap/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-each-overlap/main.svelte
new file mode 100644
index 0000000000..af9d395457
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-each-overlap/main.svelte
@@ -0,0 +1,48 @@
+<script>
+	let values = $state([1]);
+
+	const queue = [];
+
+	function push(v) {
+		if (v === 1) return v;
+
+		const p = Promise.withResolvers();
+		queue.push(() => p.resolve(v));
+		return p.promise;
+	}
+
+	function shift() {
+		const fn = queue.shift();
+		if (fn) fn();
+	}
+
+	function addValue() {
+		values.push(values.length+1);
+	}
+</script>
+
+<button onclick={addValue}>add</button>
+<button onclick={shift}>shift</button>
+
+<p>
+	pending={$effect.pending()}
+	values.length={values.length}
+	values=[{values}]
+</p>
+
+<div>
+	not keyed:
+	{#each values as v}
+		<div>
+			{await push(v)}
+		</div>
+	{/each}
+</div>
+<div>
+	keyed:
+	{#each values as v(v)}
+		<div>
+			{await push(v)}
+		</div>
+	{/each}
+</div>

From b9c7e45408bdec5237e8b3b9cccd340db3a1683f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 16 Nov 2025 12:37:54 -0500
Subject: [PATCH 169/347] Version Packages (#17161)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/clean-toes-joke.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/clean-toes-joke.md

diff --git a/.changeset/clean-toes-joke.md b/.changeset/clean-toes-joke.md
deleted file mode 100644
index 2c3aa4415f..0000000000
--- a/.changeset/clean-toes-joke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: each block losing reactivity when items removed while promise pending
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 8bceee7a32..1fd67f455d 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.43.8
+
+### Patch Changes
+
+- fix: each block losing reactivity when items removed while promise pending ([#17150](https://github.com/sveltejs/svelte/pull/17150))
+
 ## 5.43.7
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 330c5e3ca5..dfecc8d62d 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.43.7",
+  "version": "5.43.8",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 7472a6d612..191a36da84 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.43.7';
+export const VERSION = '5.43.8';
 export const PUBLIC_VERSION = '5';

From 7fd2d8660fb0e9cc2f325f1cca2e99c94d418935 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 17 Nov 2025 16:18:20 +0100
Subject: [PATCH 170/347] fix: parallelize async `@const`s in the template
 (#17165)

* fix: parallelize async `@const`s in the template

This fixes #17075 by solving the TODO of #17038 to add out of order rendering for async `@const` declarations in the template.

It's implemented by a new field on the component state which is set as soon as we come across an async const. All async const declarations and those after it will be added to that field, and the existing blockers mechanism is then used to line up the async work correctly. After processing a fragment a `run` command is created from the collected consts.

* fix

* tweak

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/social-taxis-tell.md               |  5 ++
 .changeset/stale-items-know.md                |  5 ++
 .../compiler/phases/1-parse/utils/create.js   |  3 +-
 .../2-analyze/visitors/AwaitExpression.js     |  4 --
 .../phases/3-transform/client/types.d.ts      |  5 ++
 .../3-transform/client/visitors/ConstTag.js   | 64 +++++++++++++++----
 .../3-transform/client/visitors/Fragment.js   | 19 ++----
 .../client/visitors/SnippetBlock.js           | 10 +--
 .../client/visitors/SvelteBoundary.js         | 14 +++-
 .../client/visitors/shared/fragment.js        |  2 +-
 .../phases/3-transform/server/types.d.ts      | 13 +++-
 .../3-transform/server/visitors/ConstTag.js   | 26 +++++++-
 .../3-transform/server/visitors/EachBlock.js  |  8 +--
 .../3-transform/server/visitors/Fragment.js   |  9 ++-
 .../3-transform/server/visitors/IfBlock.js    |  6 +-
 .../server/visitors/SnippetBlock.js           |  5 --
 .../server/visitors/SvelteBoundary.js         | 13 +---
 .../server/visitors/shared/component.js       |  7 +-
 .../svelte/src/compiler/types/template.d.ts   |  2 -
 .../samples/async-const/_config.js            |  5 +-
 .../samples/async-const/main.svelte           | 10 +--
 .../_expected/client/index.svelte.js          | 23 ++++---
 .../_expected/server/index.svelte.js          | 50 +++++++++------
 23 files changed, 191 insertions(+), 117 deletions(-)
 create mode 100644 .changeset/social-taxis-tell.md
 create mode 100644 .changeset/stale-items-know.md

diff --git a/.changeset/social-taxis-tell.md b/.changeset/social-taxis-tell.md
new file mode 100644
index 0000000000..ea23a01def
--- /dev/null
+++ b/.changeset/social-taxis-tell.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure async `@const` in boundary hydrates correctly
diff --git a/.changeset/stale-items-know.md b/.changeset/stale-items-know.md
new file mode 100644
index 0000000000..60fa85f595
--- /dev/null
+++ b/.changeset/stale-items-know.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: parallelize async `@const`s in the template
diff --git a/packages/svelte/src/compiler/phases/1-parse/utils/create.js b/packages/svelte/src/compiler/phases/1-parse/utils/create.js
index 2fba918f20..6030f1bd7b 100644
--- a/packages/svelte/src/compiler/phases/1-parse/utils/create.js
+++ b/packages/svelte/src/compiler/phases/1-parse/utils/create.js
@@ -10,8 +10,7 @@ export function create_fragment(transparent = false) {
 		nodes: [],
 		metadata: {
 			transparent,
-			dynamic: false,
-			has_await: false
+			dynamic: false
 		}
 	};
 }
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 22a89db76e..545bc3be27 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/AwaitExpression.js
@@ -26,10 +26,6 @@ export function AwaitExpression(node, context) {
 	if (context.state.expression) {
 		context.state.expression.has_await = true;
 
-		if (context.state.fragment && context.path.some((node) => node.type === 'ConstTag')) {
-			context.state.fragment.metadata.has_await = true;
-		}
-
 		suspend = true;
 	}
 
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 410ad120d7..d64b1d4126 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
@@ -51,6 +51,11 @@ export interface ComponentClientTransformState extends ClientTransformState {
 	readonly after_update: Statement[];
 	/** Transformed `{@const }` declarations */
 	readonly consts: Statement[];
+	/** Transformed async `{@const }` declarations (if any) and those coming after them */
+	async_consts?: {
+		id: Identifier;
+		thunks: Expression[];
+	};
 	/** Transformed `let:` directives */
 	readonly let_directives: Statement[];
 	/** Memoized expressions */
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 81dd9e07ed..f3d7a3549c 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
@@ -24,15 +24,15 @@ export function ConstTag(node, context) {
 			expression = b.call('$.tag', expression, b.literal(declaration.id.name));
 		}
 
-		context.state.consts.push(b.const(declaration.id, expression));
-
 		context.state.transform[declaration.id.name] = { read: get_value };
 
-		// we need to eagerly evaluate the expression in order to hit any
-		// 'Cannot access x before initialization' errors
-		if (dev) {
-			context.state.consts.push(b.stmt(b.call('$.get', declaration.id)));
-		}
+		add_const_declaration(
+			context.state,
+			declaration.id,
+			expression,
+			node.metadata.expression.has_await,
+			context.state.scope.get_bindings(declaration)
+		);
 	} else {
 		const identifiers = extract_identifiers(declaration.id);
 		const tmp = b.id(context.state.scope.generate('computed_const'));
@@ -69,13 +69,13 @@ export function ConstTag(node, context) {
 			expression = b.call('$.tag', expression, b.literal('[@const]'));
 		}
 
-		context.state.consts.push(b.const(tmp, expression));
-
-		// we need to eagerly evaluate the expression in order to hit any
-		// 'Cannot access x before initialization' errors
-		if (dev) {
-			context.state.consts.push(b.stmt(b.call('$.get', tmp)));
-		}
+		add_const_declaration(
+			context.state,
+			tmp,
+			expression,
+			node.metadata.expression.has_await,
+			context.state.scope.get_bindings(declaration)
+		);
 
 		for (const node of identifiers) {
 			context.state.transform[node.name] = {
@@ -84,3 +84,39 @@ export function ConstTag(node, context) {
 		}
 	}
 }
+
+/**
+ * @param {ComponentContext['state']} state
+ * @param {import('estree').Identifier} id
+ * @param {import('estree').Expression} expression
+ * @param {boolean} has_await
+ * @param {import('#compiler').Binding[]} bindings
+ */
+function add_const_declaration(state, id, expression, has_await, bindings) {
+	// we need to eagerly evaluate the expression in order to hit any
+	// 'Cannot access x before initialization' errors
+	const after = dev ? [b.stmt(b.call('$.get', id))] : [];
+
+	if (has_await || state.async_consts) {
+		const run = (state.async_consts ??= {
+			id: b.id(state.scope.generate('promises')),
+			thunks: []
+		});
+
+		state.consts.push(b.let(id));
+
+		const assignment = b.assignment('=', id, expression);
+		const body = after.length === 0 ? assignment : b.block([b.stmt(assignment), ...after]);
+
+		run.thunks.push(b.thunk(body, has_await));
+
+		const blocker = b.member(run.id, b.literal(run.thunks.length - 1), true);
+
+		for (const binding of bindings) {
+			binding.blocker = blocker;
+		}
+	} else {
+		state.consts.push(b.const(id, expression));
+		state.consts.push(...after);
+	}
+}
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
index 8d6a2fac88..ff2436779b 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
@@ -48,8 +48,6 @@ export function Fragment(node, context) {
 	const is_single_child_not_needing_template =
 		trimmed.length === 1 &&
 		(trimmed[0].type === 'SvelteFragment' || trimmed[0].type === 'TitleElement');
-	const has_await = context.state.init !== null && (node.metadata.has_await || false);
-
 	const template_name = context.state.scope.root.unique('root'); // TODO infer name from parent
 
 	/** @type {Statement[]} */
@@ -72,7 +70,8 @@ export function Fragment(node, context) {
 		metadata: {
 			namespace,
 			bound_contenteditable: context.state.metadata.bound_contenteditable
-		}
+		},
+		async_consts: undefined
 	};
 
 	for (const node of hoisted) {
@@ -153,8 +152,8 @@ export function Fragment(node, context) {
 
 	body.push(...state.let_directives, ...state.consts);
 
-	if (has_await) {
-		body.push(b.if(b.call('$.aborted'), b.return()));
+	if (state.async_consts && state.async_consts.thunks.length > 0) {
+		body.push(b.var(state.async_consts.id, b.call('$.run', b.array(state.async_consts.thunks))));
 	}
 
 	if (is_text_first) {
@@ -177,13 +176,5 @@ export function Fragment(node, context) {
 		body.push(close);
 	}
 
-	if (has_await) {
-		return b.block([
-			b.stmt(
-				b.call('$.async_body', b.id('$$anchor'), b.arrow([b.id('$$anchor')], b.block(body), true))
-			)
-		]);
-	} else {
-		return b.block(body);
-	}
+	return b.block(body);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SnippetBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SnippetBlock.js
index 895522d47a..1af737f05b 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SnippetBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SnippetBlock.js
@@ -14,8 +14,6 @@ export function SnippetBlock(node, context) {
 	// TODO hoist where possible
 	/** @type {(Identifier | AssignmentPattern)[]} */
 	const args = [b.id('$$anchor')];
-	const has_await = node.body.metadata.has_await || false;
-
 	/** @type {BlockStatement} */
 	let body;
 
@@ -78,12 +76,8 @@ export function SnippetBlock(node, context) {
 
 	// in dev we use a FunctionExpression (not arrow function) so we can use `arguments`
 	let snippet = dev
-		? b.call(
-				'$.wrap_snippet',
-				b.id(context.state.analysis.name),
-				b.function(null, args, body, has_await)
-			)
-		: b.arrow(args, body, has_await);
+		? b.call('$.wrap_snippet', b.id(context.state.analysis.name), b.function(null, args, body))
+		: b.arrow(args, body);
 
 	const declaration = b.const(node.expression, snippet);
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js
index 49c89bc438..d64fcda2e8 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js
@@ -48,7 +48,11 @@ export function SvelteBoundary(node, context) {
 		if (child.type === 'ConstTag') {
 			has_const = true;
 			if (!context.state.options.experimental.async) {
-				context.visit(child, { ...context.state, consts: const_tags });
+				context.visit(child, {
+					...context.state,
+					consts: const_tags,
+					scope: context.state.scopes.get(node.fragment) ?? context.state.scope
+				});
 			}
 		}
 	}
@@ -101,7 +105,13 @@ export function SvelteBoundary(node, context) {
 		nodes.push(child);
 	}
 
-	const block = /** @type {BlockStatement} */ (context.visit({ ...node.fragment, nodes }));
+	const block = /** @type {BlockStatement} */ (
+		context.visit(
+			{ ...node.fragment, nodes },
+			// Since we're creating a new fragment the reference in scopes can't match, so we gotta attach the right scope manually
+			{ ...context.state, scope: context.state.scopes.get(node.fragment) ?? context.state.scope }
+		)
+	);
 
 	if (!context.state.options.experimental.async) {
 		block.body.unshift(...const_tags);
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
index c7f843af48..67982b6150 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
@@ -105,7 +105,7 @@ export function process_children(nodes, initial, is_element, context) {
 				is_element &&
 				// In case it's wrapped in async the async logic will want to skip sibling nodes up until the end, hence we cannot make this controlled
 				// TODO switch this around and instead optimize for elements with a single block child and not require extra comments (neither for async nor normally)
-				!(node.body.metadata.has_await || node.metadata.expression.is_async())
+				!node.metadata.expression.is_async()
 			) {
 				node.metadata.is_controlled = true;
 			} else {
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/types.d.ts b/packages/svelte/src/compiler/phases/3-transform/server/types.d.ts
index adde7480cb..e7a72fb8ad 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/types.d.ts
+++ b/packages/svelte/src/compiler/phases/3-transform/server/types.d.ts
@@ -1,4 +1,10 @@
-import type { Expression, Statement, ModuleDeclaration, LabeledStatement } from 'estree';
+import type {
+	Expression,
+	Statement,
+	ModuleDeclaration,
+	LabeledStatement,
+	Identifier
+} from 'estree';
 import type { AST, Namespace, ValidatedCompileOptions } from '#compiler';
 import type { TransformState } from '../types.js';
 import type { ComponentAnalysis } from '../../types.js';
@@ -21,6 +27,11 @@ export interface ComponentServerTransformState extends ServerTransformState {
 	readonly namespace: Namespace;
 	readonly preserve_whitespace: boolean;
 	readonly skip_hydration_boundaries: boolean;
+	/** Transformed async `{@const }` declarations (if any) and those coming after them */
+	async_consts?: {
+		id: Identifier;
+		thunks: Expression[];
+	};
 }
 
 export type Context = import('zimmerframe').Context<AST.SvelteNode, ServerTransformState>;
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js
index a8e4e575cc..c549d1d009 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js
@@ -2,6 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
+import { extract_identifiers } from '../../../../utils/ast.js';
 
 /**
  * @param {AST.ConstTag} node
@@ -11,6 +12,29 @@ export function ConstTag(node, context) {
 	const declaration = node.declaration.declarations[0];
 	const id = /** @type {Pattern} */ (context.visit(declaration.id));
 	const init = /** @type {Expression} */ (context.visit(declaration.init));
+	const has_await = node.metadata.expression.has_await;
 
-	context.state.init.push(b.const(id, init));
+	if (has_await || context.state.async_consts) {
+		const run = (context.state.async_consts ??= {
+			id: b.id(context.state.scope.generate('promises')),
+			thunks: []
+		});
+
+		const identifiers = extract_identifiers(declaration.id);
+		const bindings = context.state.scope.get_bindings(declaration);
+
+		for (const identifier of identifiers) {
+			context.state.init.push(b.let(identifier.name));
+		}
+
+		const assignment = b.assignment('=', id, init);
+		run.thunks.push(b.thunk(b.block([b.stmt(assignment)]), has_await));
+
+		const blocker = b.member(run.id, b.literal(run.thunks.length - 1), true);
+		for (const binding of bindings) {
+			binding.blocker = blocker;
+		}
+	} else {
+		context.state.init.push(b.const(id, init));
+	}
 }
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 f53a3903c2..3c0a8c1676 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
@@ -34,11 +34,7 @@ export function EachBlock(node, context) {
 
 	const new_body = /** @type {BlockStatement} */ (context.visit(node.body)).body;
 
-	if (node.body)
-		each.push(
-			// TODO get rid of fragment.has_await
-			...(node.body.metadata.has_await ? [create_async_block(b.block(new_body))] : new_body)
-		);
+	if (node.body) each.push(...new_body);
 
 	const for_loop = b.for(
 		b.declaration('let', [
@@ -61,7 +57,7 @@ export function EachBlock(node, context) {
 			b.if(
 				b.binary('!==', b.member(array_id, 'length'), b.literal(0)),
 				b.block([open, for_loop]),
-				node.fallback.metadata.has_await ? create_async_block(fallback) : fallback
+				fallback
 			)
 		);
 	} else {
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/Fragment.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/Fragment.js
index a1d25980c4..ef5bd985ae 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/Fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/Fragment.js
@@ -28,7 +28,8 @@ export function Fragment(node, context) {
 		init: [],
 		template: [],
 		namespace,
-		skip_hydration_boundaries: is_standalone
+		skip_hydration_boundaries: is_standalone,
+		async_consts: undefined
 	};
 
 	for (const node of hoisted) {
@@ -42,5 +43,11 @@ export function Fragment(node, context) {
 
 	process_children(trimmed, { ...context, state });
 
+	if (state.async_consts && state.async_consts.thunks.length > 0) {
+		state.init.push(
+			b.var(state.async_consts.id, b.call('$$renderer.run', b.array(state.async_consts.thunks)))
+		);
+	}
+
 	return b.block([...state.init, ...build_template(state.template)]);
 }
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 ca614a93e2..e8418343be 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
@@ -25,11 +25,7 @@ export function IfBlock(node, context) {
 
 	const is_async = node.metadata.expression.is_async();
 
-	const has_await =
-		node.metadata.expression.has_await ||
-		// TODO get rid of this stuff
-		node.consequent.metadata.has_await ||
-		node.alternate?.metadata.has_await;
+	const has_await = node.metadata.expression.has_await;
 
 	if (is_async || has_await) {
 		statement = create_async_block(
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 5fc865ec58..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
@@ -3,7 +3,6 @@
 /** @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
@@ -16,10 +15,6 @@ 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/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/SvelteBoundary.js
index 45f1b5aad2..8a30e765c2 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,8 +7,7 @@ import {
 	block_open,
 	block_open_else,
 	build_attribute_value,
-	build_template,
-	create_async_block
+	build_template
 } from './shared/utils.js';
 
 /**
@@ -43,14 +42,11 @@ export function SvelteBoundary(node, context) {
 			);
 			const pending = b.call(callee, b.id('$$renderer'));
 			const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
-			const statement = node.fragment.metadata.has_await
-				? create_async_block(b.block([block]))
-				: block;
 			context.state.template.push(
 				b.if(
 					callee,
 					b.block(build_template([block_open_else, b.stmt(pending), block_close])),
-					b.block(build_template([block_open, statement, block_close]))
+					b.block(build_template([block_open, block, block_close]))
 				)
 			);
 		} else {
@@ -70,9 +66,6 @@ export function SvelteBoundary(node, context) {
 		}
 	} else {
 		const block = /** @type {BlockStatement} */ (context.visit(node.fragment));
-		const statement = node.fragment.metadata.has_await
-			? create_async_block(b.block([block]))
-			: block;
-		context.state.template.push(block_open, statement, block_close);
+		context.state.template.push(block_open, block, block_close);
 	}
 }
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 2e7b4a186c..6f2ff38bc1 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
@@ -244,12 +244,7 @@ export function build_inline_component(node, expression, context) {
 			params.push(pattern);
 		}
 
-		const slot_fn = b.arrow(
-			params,
-			node.fragment.metadata.has_await
-				? b.block([create_async_block(b.block(block.body))])
-				: b.block(block.body)
-		);
+		const slot_fn = b.arrow(params, b.block(block.body));
 
 		if (slot_name === 'default' && !has_children_prop) {
 			if (
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index 3960c95c8f..fd664f107c 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -48,8 +48,6 @@ export namespace AST {
 			 * Whether or not we need to traverse into the fragment during mount/hydrate
 			 */
 			dynamic: boolean;
-			/** @deprecated we should get rid of this in favour of the `$$renderer.run` mechanism */
-			has_await: boolean;
 		};
 	}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-const/_config.js b/packages/svelte/tests/runtime-runes/samples/async-const/_config.js
index 8aeca875f3..c3e74e886a 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-const/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-const/_config.js
@@ -2,11 +2,12 @@ import { tick } from 'svelte';
 import { test } from '../../test';
 
 export default test({
-	html: `<h1>Loading...</h1>`,
+	mode: ['async-server', 'client', 'hydrate'],
+	ssrHtml: `<h1>Hello, world!</h1> 5 01234 5 sync 6 5 0`,
 
 	async test({ assert, target }) {
 		await tick();
 
-		assert.htmlEqual(target.innerHTML, `<h1>Hello, world!</h1> 5 01234`);
+		assert.htmlEqual(target.innerHTML, `<h1>Hello, world!</h1> 5 01234 5 sync 6 5 0`);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/async-const/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-const/main.svelte
index 7410ff6a6f..b7e00803c5 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-const/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-const/main.svelte
@@ -3,17 +3,16 @@
 </script>
 
 <svelte:boundary>
+	{@const sync = 'sync'}
 	{@const number = await Promise.resolve(5)}
-
-	{#snippet pending()}
-		<h1>Loading...</h1>
-	{/snippet}
+	{@const after_async = number + 1}
+	{@const { length, 0: first } = await '01234'}
 
 	{#snippet greet()}
 		{@const greeting = await `Hello, ${name}!`}
 		<h1>{greeting}</h1>
 		{number}
-		{#if number > 4}
+		{#if number > 4 && after_async && greeting}
 			{@const length = await number}
 			{#each { length }, index}
 				{@const i = await index}
@@ -23,4 +22,5 @@
 	{/snippet}
 
 	{@render greet()}
+	{number} {sync} {after_async} {length} {first}
 </svelte:boundary>
diff --git a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
index e4df43c6c2..7d1fe4ec67 100644
--- a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
@@ -25,20 +25,23 @@ export default function Async_in_derived($$anchor, $$props) {
 
 	{
 		var consequent = ($$anchor) => {
-			$.async_body($$anchor, async ($$anchor) => {
-				const yes1 = (await $.save($.async_derived(async () => (await $.save(1))())))();
-				const yes2 = (await $.save($.async_derived(async () => foo((await $.save(1))()))))();
+			let yes1;
+			let yes2;
+			let no1;
+			let no2;
 
-				const no1 = $.derived(() => (async () => {
-					return await 1;
-				})());
+			var promises = $.run([
+				async () => yes1 = (await $.save($.async_derived(async () => (await $.save(1))())))(),
+				async () => yes2 = (await $.save($.async_derived(async () => foo((await $.save(1))()))))(),
 
-				const no2 = $.derived(() => (async () => {
+				() => no1 = $.derived(() => (async () => {
 					return await 1;
-				})());
+				})()),
 
-				if ($.aborted()) return;
-			});
+				() => no2 = $.derived(() => (async () => {
+					return await 1;
+				})())
+			]);
 		};
 
 		$.if(node, ($$render) => {
diff --git a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
index bece6402c6..1fd184fa79 100644
--- a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
@@ -18,24 +18,38 @@ export default function Async_in_derived($$renderer, $$props) {
 			}
 		]);
 
-		$$renderer.async_block([], async ($$renderer) => {
-			if (true) {
-				$$renderer.push('<!--[-->');
-
-				const yes1 = (await $.save(1))();
-				const yes2 = foo((await $.save(1))());
-
-				const no1 = (async () => {
-					return await 1;
-				})();
-
-				const no2 = (async () => {
-					return await 1;
-				})();
-			} else {
-				$$renderer.push('<!--[!-->');
-			}
-		});
+		if (true) {
+			$$renderer.push('<!--[-->');
+
+			let yes1;
+			let yes2;
+			let no1;
+			let no2;
+
+			var promises = $$renderer.run([
+				async () => {
+					yes1 = (await $.save(1))();
+				},
+
+				async () => {
+					yes2 = foo((await $.save(1))());
+				},
+
+				() => {
+					no1 = (async () => {
+						return await 1;
+					})();
+				},
+
+				() => {
+					no2 = (async () => {
+						return await 1;
+					})();
+				}
+			]);
+		} else {
+			$$renderer.push('<!--[!-->');
+		}
 
 		$$renderer.push(`<!--]-->`);
 	});

From 686720070be0f9ace0a4efe735a0b5a6e11dd012 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 17 Nov 2025 19:26:18 +0100
Subject: [PATCH 171/347] fix: keep deriveds reactive after their original
 parent effect was destroyed (#17171)

Use case: Remote queries that are created on one screen, then are used again on another screen. Original parent effect is destroyed in that case but derived should still be reactive. It wasn't prior to this fix because inside `get` the `destroyed` variable would be true and so deps would not properly be recorded.

Fixes https://github.com/sveltejs/kit/issues/14814
---
 .changeset/sad-forks-go.md                    |  5 ++++
 .../internal/client/reactivity/deriveds.js    |  7 +++--
 packages/svelte/tests/signals/test.ts         | 27 +++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/sad-forks-go.md

diff --git a/.changeset/sad-forks-go.md b/.changeset/sad-forks-go.md
new file mode 100644
index 0000000000..da27e11642
--- /dev/null
+++ b/.changeset/sad-forks-go.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: keep deriveds reactive after their original parent effect was destroyed
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 7e6f3c6f60..070230a461 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -11,7 +11,8 @@ import {
 	STALE_REACTION,
 	ASYNC,
 	WAS_MARKED,
-	CONNECTED
+	CONNECTED,
+	DESTROYED
 } from '#client/constants';
 import {
 	active_reaction,
@@ -296,7 +297,9 @@ function get_derived_parent_effect(derived) {
 	var parent = derived.parent;
 	while (parent !== null) {
 		if ((parent.f & DERIVED) === 0) {
-			return /** @type {Effect} */ (parent);
+			// The original parent effect might've been destroyed but the derived
+			// is used elsewhere now - do not return the destroyed effect in that case
+			return (parent.f & DESTROYED) === 0 ? /** @type {Effect} */ (parent) : null;
 		}
 		parent = parent.parent;
 	}
diff --git a/packages/svelte/tests/signals/test.ts b/packages/svelte/tests/signals/test.ts
index eff6d6166a..13430609a8 100644
--- a/packages/svelte/tests/signals/test.ts
+++ b/packages/svelte/tests/signals/test.ts
@@ -1391,6 +1391,33 @@ describe('signals', () => {
 		};
 	});
 
+	test('derived whose original parent effect has been destroyed keeps updating', () => {
+		return () => {
+			let count: Source<number>;
+			let double: Derived<number>;
+			const destroy = effect_root(() => {
+				render_effect(() => {
+					count = state(0);
+					double = derived(() => $.get(count) * 2);
+				});
+			});
+
+			flushSync();
+			assert.equal($.get(double!), 0);
+
+			destroy();
+			flushSync();
+
+			set(count!, 1);
+			flushSync();
+			assert.equal($.get(double!), 2);
+
+			set(count!, 2);
+			flushSync();
+			assert.equal($.get(double!), 4);
+		};
+	});
+
 	test('$effect.root inside deriveds stay alive independently', () => {
 		const log: any[] = [];
 		const c = state(0);

From e0501ede035c459c6fdad4dba79b075c64a1d3d3 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 17 Nov 2025 14:09:12 -0500
Subject: [PATCH 172/347] chore: only skip effects when deferring (#17169)

* chore: only skip effects when deferring

* more
---
 .../src/internal/client/dom/blocks/each.js       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 3f12593d01..0eb8f889c3 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -244,7 +244,9 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 					item.i = i;
 				}
 
-				batch.skipped_effects.delete(item.e);
+				if (defer) {
+					batch.skipped_effects.delete(item.e);
+				}
 			} else {
 				item = create_item(
 					first_run ? anchor : null,
@@ -298,14 +300,14 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 			set_hydrate_node(skip_nodes());
 		}
 
-		for (const [key, item] of state.items) {
-			if (!keys.has(key)) {
-				batch.skipped_effects.add(item.e);
-			}
-		}
-
 		if (!first_run) {
 			if (defer) {
+				for (const [key, item] of state.items) {
+					if (!keys.has(key)) {
+						batch.skipped_effects.add(item.e);
+					}
+				}
+
 				batch.oncommit(commit);
 				batch.ondiscard(() => {
 					// TODO presumably we need to do something here?

From a7a6d898d56cc0ff0518d0e744d23cb76c2ae1c3 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 17 Nov 2025 22:58:41 +0100
Subject: [PATCH 173/347] fix: correctly handle functions when determining
 async blockers (#17137)

* fix: correctly handle functions when determining async blockers

We didn't properly handle functions (function declarations/expressions/arrow functions) when calculating what is a blocker. More specifically
- we did defer assignment of variable declarations even for arrow functions and function expressions, which is unnecessary and causes bugs when they're then referenced eagerly further below
- we did not compute blockers for functions. They could reference blockers themselves, as such other code referencing them should wait on the related blockers

Fixes #17129

* put into its own function

* fix: take blockers into account when creating `#await` blocks

The unrelated-but-in-the-same-issue-referenced-bug

* oops

* fix

* minimize compiled output changes

* no idea why editor showed these as unused
---
 .changeset/gentle-showers-speak.md            |   5 +
 .changeset/soft-radios-make.md                |   5 +
 .../src/compiler/phases/2-analyze/index.js    | 456 +++++++++++-------
 .../3-transform/client/visitors/AwaitBlock.js |  44 +-
 packages/svelte/src/compiler/phases/nodes.js  |   4 +
 packages/svelte/src/compiler/phases/scope.js  |  12 +-
 .../svelte/src/compiler/utils/builders.js     |   2 +-
 .../samples/async-await-block/_config.js      |   9 +
 .../samples/async-await-block/main.svelte     |   7 +
 .../async-indirect-blockers/Component1.svelte |  13 +
 .../async-indirect-blockers/Component2.svelte |  11 +
 .../async-indirect-blockers/Component3.svelte |  16 +
 .../async-indirect-blockers/Component4.svelte |  19 +
 .../async-indirect-blockers/_config.js        |  27 ++
 .../async-indirect-blockers/main.svelte       |  11 +
 15 files changed, 434 insertions(+), 207 deletions(-)
 create mode 100644 .changeset/gentle-showers-speak.md
 create mode 100644 .changeset/soft-radios-make.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-await-block/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-await-block/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component1.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component2.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component3.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component4.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/main.svelte

diff --git a/.changeset/gentle-showers-speak.md b/.changeset/gentle-showers-speak.md
new file mode 100644
index 0000000000..9cc1adee94
--- /dev/null
+++ b/.changeset/gentle-showers-speak.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly handle functions when determining async blockers
diff --git a/.changeset/soft-radios-make.md b/.changeset/soft-radios-make.md
new file mode 100644
index 0000000000..15a9dbe35a
--- /dev/null
+++ b/.changeset/soft-radios-make.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: take blockers into account when creating `#await` blocks
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index ed71b898ed..34490ff9c8 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -687,193 +687,7 @@ export function analyze_component(root, source, options) {
 		}
 	}
 
-	/**
-	 * @param {ESTree.Node} expression
-	 * @param {Scope} scope
-	 * @param {Set<Binding>} touched
-	 * @param {Set<ESTree.Node>} seen
-	 */
-	const touch = (expression, scope, touched, seen = new Set()) => {
-		if (seen.has(expression)) return;
-		seen.add(expression);
-
-		walk(
-			expression,
-			{ scope },
-			{
-				ImportDeclaration(node) {},
-				Identifier(node, context) {
-					const parent = /** @type {ESTree.Node} */ (context.path.at(-1));
-					if (is_reference(node, parent)) {
-						const binding = context.state.scope.get(node.name);
-						if (binding) {
-							touched.add(binding);
-
-							for (const assignment of binding.assignments) {
-								touch(assignment.value, assignment.scope, touched, seen);
-							}
-						}
-					}
-				}
-			}
-		);
-	};
-
-	/**
-	 * @param {ESTree.Node} node
-	 * @param {Set<ESTree.Node>} seen
-	 * @param {Set<Binding>} reads
-	 * @param {Set<Binding>} writes
-	 */
-	const trace_references = (node, reads, writes, seen = new Set()) => {
-		if (seen.has(node)) return;
-		seen.add(node);
-
-		/**
-		 * @param {ESTree.Pattern} node
-		 * @param {Scope} scope
-		 */
-		function update(node, scope) {
-			for (const pattern of unwrap_pattern(node)) {
-				const node = object(pattern);
-				if (!node) return;
-
-				const binding = scope.get(node.name);
-				if (!binding) return;
-
-				writes.add(binding);
-			}
-		}
-
-		walk(
-			node,
-			{ scope: instance.scope },
-			{
-				_(node, context) {
-					const scope = scopes.get(node);
-					if (scope) {
-						context.next({ scope });
-					} else {
-						context.next();
-					}
-				},
-				AssignmentExpression(node, context) {
-					update(node.left, context.state.scope);
-				},
-				UpdateExpression(node, context) {
-					update(
-						/** @type {ESTree.Identifier | ESTree.MemberExpression} */ (node.argument),
-						context.state.scope
-					);
-				},
-				CallExpression(node, context) {
-					// for now, assume everything touched by the callee ends up mutating the object
-					// TODO optimise this better
-
-					// special case — no need to peek inside effects as they only run once async work has completed
-					const rune = get_rune(node, context.state.scope);
-					if (rune === '$effect') return;
-
-					/** @type {Set<Binding>} */
-					const touched = new Set();
-					touch(node, context.state.scope, touched);
-
-					for (const b of touched) {
-						writes.add(b);
-					}
-				},
-				// don't look inside functions until they are called
-				ArrowFunctionExpression(_, context) {},
-				FunctionDeclaration(_, context) {},
-				FunctionExpression(_, context) {},
-				Identifier(node, context) {
-					const parent = /** @type {ESTree.Node} */ (context.path.at(-1));
-					if (is_reference(node, parent)) {
-						const binding = context.state.scope.get(node.name);
-						if (binding) {
-							reads.add(binding);
-						}
-					}
-				}
-			}
-		);
-	};
-
-	let awaited = false;
-
-	// TODO this should probably be attached to the scope?
-	var promises = b.id('$$promises');
-
-	/**
-	 * @param {ESTree.Identifier} id
-	 * @param {ESTree.Expression} blocker
-	 */
-	function push_declaration(id, blocker) {
-		analysis.instance_body.declarations.push(id);
-
-		const binding = /** @type {Binding} */ (instance.scope.get(id.name));
-		binding.blocker = blocker;
-	}
-
-	for (let node of instance.ast.body) {
-		if (node.type === 'ImportDeclaration') {
-			analysis.instance_body.hoisted.push(node);
-			continue;
-		}
-
-		if (node.type === 'ExportDefaultDeclaration' || node.type === 'ExportAllDeclaration') {
-			// these can't exist inside `<script>` but TypeScript doesn't know that
-			continue;
-		}
-
-		if (node.type === 'ExportNamedDeclaration') {
-			if (node.declaration) {
-				node = node.declaration;
-			} else {
-				continue;
-			}
-		}
-
-		const has_await = has_await_expression(node);
-		awaited ||= has_await;
-
-		if (awaited && node.type !== 'FunctionDeclaration') {
-			/** @type {Set<Binding>} */
-			const reads = new Set(); // TODO we're not actually using this yet
-
-			/** @type {Set<Binding>} */
-			const writes = new Set();
-
-			trace_references(node, reads, writes);
-
-			const blocker = b.member(promises, b.literal(analysis.instance_body.async.length), true);
-
-			for (const binding of writes) {
-				binding.blocker = blocker;
-			}
-
-			if (node.type === 'VariableDeclaration') {
-				for (const declarator of node.declarations) {
-					for (const id of extract_identifiers(declarator.id)) {
-						push_declaration(id, blocker);
-					}
-
-					// one declarator per declaration, makes things simpler
-					analysis.instance_body.async.push({
-						node: declarator,
-						has_await
-					});
-				}
-			} else if (node.type === 'ClassDeclaration') {
-				push_declaration(node.id, blocker);
-				analysis.instance_body.async.push({ node, has_await });
-			} else {
-				analysis.instance_body.async.push({ node, has_await });
-			}
-		} else {
-			analysis.instance_body.sync.push(node);
-		}
-	}
+	calculate_blockers(instance, scopes, analysis);
 
 	if (analysis.runes) {
 		const props_refs = module.scope.references.get('$$props');
@@ -1118,6 +932,274 @@ export function analyze_component(root, source, options) {
 	return analysis;
 }
 
+/**
+ * Analyzes the instance's top level statements to calculate which bindings need to wait on which
+ * top level statements. This includes indirect blockers such as functions referencing async top level statements.
+ *
+ * @param {Js} instance
+ * @param {Map<AST.SvelteNode, Scope>} scopes
+ * @param {ComponentAnalysis} analysis
+ * @returns {void}
+ */
+function calculate_blockers(instance, scopes, analysis) {
+	/**
+	 * @param {ESTree.Node} expression
+	 * @param {Scope} scope
+	 * @param {Set<Binding>} touched
+	 * @param {Set<ESTree.Node>} seen
+	 */
+	const touch = (expression, scope, touched, seen = new Set()) => {
+		if (seen.has(expression)) return;
+		seen.add(expression);
+
+		walk(
+			expression,
+			{ scope },
+			{
+				ImportDeclaration(node) {},
+				Identifier(node, context) {
+					const parent = /** @type {ESTree.Node} */ (context.path.at(-1));
+					if (is_reference(node, parent)) {
+						const binding = context.state.scope.get(node.name);
+						if (binding) {
+							touched.add(binding);
+
+							for (const assignment of binding.assignments) {
+								touch(assignment.value, assignment.scope, touched, seen);
+							}
+						}
+					}
+				}
+			}
+		);
+	};
+
+	/**
+	 * @param {ESTree.Node} node
+	 * @param {Set<ESTree.Node>} seen
+	 * @param {Set<Binding>} reads
+	 * @param {Set<Binding>} writes
+	 */
+	const trace_references = (node, reads, writes, seen = new Set()) => {
+		if (seen.has(node)) return;
+		seen.add(node);
+
+		/**
+		 * @param {ESTree.Pattern} node
+		 * @param {Scope} scope
+		 */
+		function update(node, scope) {
+			for (const pattern of unwrap_pattern(node)) {
+				const node = object(pattern);
+				if (!node) return;
+
+				const binding = scope.get(node.name);
+				if (!binding) return;
+
+				writes.add(binding);
+			}
+		}
+
+		walk(
+			node,
+			{ scope: instance.scope },
+			{
+				_(node, context) {
+					const scope = scopes.get(node);
+					if (scope) {
+						context.next({ scope });
+					} else {
+						context.next();
+					}
+				},
+				AssignmentExpression(node, context) {
+					update(node.left, context.state.scope);
+				},
+				UpdateExpression(node, context) {
+					update(
+						/** @type {ESTree.Identifier | ESTree.MemberExpression} */ (node.argument),
+						context.state.scope
+					);
+				},
+				CallExpression(node, context) {
+					// for now, assume everything touched by the callee ends up mutating the object
+					// TODO optimise this better
+
+					// special case — no need to peek inside effects as they only run once async work has completed
+					const rune = get_rune(node, context.state.scope);
+					if (rune === '$effect') return;
+
+					/** @type {Set<Binding>} */
+					const touched = new Set();
+					touch(node, context.state.scope, touched);
+
+					for (const b of touched) {
+						writes.add(b);
+					}
+				},
+				// don't look inside functions until they are called
+				ArrowFunctionExpression(_, context) {},
+				FunctionDeclaration(_, context) {},
+				FunctionExpression(_, context) {},
+				Identifier(node, context) {
+					const parent = /** @type {ESTree.Node} */ (context.path.at(-1));
+					if (is_reference(node, parent)) {
+						const binding = context.state.scope.get(node.name);
+						if (binding) {
+							reads.add(binding);
+						}
+					}
+				}
+			}
+		);
+	};
+
+	let awaited = false;
+
+	// TODO this should probably be attached to the scope?
+	const promises = b.id('$$promises');
+
+	/**
+	 * @param {ESTree.Identifier} id
+	 * @param {NonNullable<Binding['blocker']>} blocker
+	 */
+	function push_declaration(id, blocker) {
+		analysis.instance_body.declarations.push(id);
+
+		const binding = /** @type {Binding} */ (instance.scope.get(id.name));
+		binding.blocker = blocker;
+	}
+
+	/**
+	 * Analysis of blockers for functions is deferred until we know which statements are async/blockers
+	 * @type {Array<ESTree.FunctionDeclaration | ESTree.VariableDeclarator>}
+	 */
+	const functions = [];
+
+	for (let node of instance.ast.body) {
+		if (node.type === 'ImportDeclaration') {
+			analysis.instance_body.hoisted.push(node);
+			continue;
+		}
+
+		if (node.type === 'ExportDefaultDeclaration' || node.type === 'ExportAllDeclaration') {
+			// these can't exist inside `<script>` but TypeScript doesn't know that
+			continue;
+		}
+
+		if (node.type === 'ExportNamedDeclaration') {
+			if (node.declaration) {
+				node = node.declaration;
+			} else {
+				continue;
+			}
+		}
+
+		const has_await = has_await_expression(node);
+		awaited ||= has_await;
+
+		if (node.type === 'FunctionDeclaration') {
+			analysis.instance_body.sync.push(node);
+			functions.push(node);
+		} else if (node.type === 'VariableDeclaration') {
+			for (const declarator of node.declarations) {
+				if (
+					declarator.init?.type === 'ArrowFunctionExpression' ||
+					declarator.init?.type === 'FunctionExpression'
+				) {
+					// One declarator per declaration, makes things simpler. The ternary ensures more accurate source maps in the common case
+					analysis.instance_body.sync.push(
+						node.declarations.length === 1 ? node : b.declaration(node.kind, [declarator])
+					);
+					functions.push(declarator);
+				} else if (!awaited) {
+					// One declarator per declaration, makes things simpler. The ternary ensures more accurate source maps in the common case
+					analysis.instance_body.sync.push(
+						node.declarations.length === 1 ? node : b.declaration(node.kind, [declarator])
+					);
+				} else {
+					/** @type {Set<Binding>} */
+					const reads = new Set(); // TODO we're not actually using this yet
+
+					/** @type {Set<Binding>} */
+					const writes = new Set();
+
+					trace_references(declarator, reads, writes);
+
+					const blocker = /** @type {NonNullable<Binding['blocker']>} */ (
+						b.member(promises, b.literal(analysis.instance_body.async.length), true)
+					);
+
+					for (const binding of writes) {
+						binding.blocker = blocker;
+					}
+
+					for (const id of extract_identifiers(declarator.id)) {
+						push_declaration(id, blocker);
+					}
+
+					// one declarator per declaration, makes things simpler
+					analysis.instance_body.async.push({
+						node: declarator,
+						has_await
+					});
+				}
+			}
+		} else if (awaited) {
+			/** @type {Set<Binding>} */
+			const reads = new Set(); // TODO we're not actually using this yet
+
+			/** @type {Set<Binding>} */
+			const writes = new Set();
+
+			trace_references(node, reads, writes);
+
+			const blocker = /** @type {NonNullable<Binding['blocker']>} */ (
+				b.member(promises, b.literal(analysis.instance_body.async.length), true)
+			);
+
+			for (const binding of writes) {
+				binding.blocker = blocker;
+			}
+
+			if (node.type === 'ClassDeclaration') {
+				push_declaration(node.id, blocker);
+				analysis.instance_body.async.push({ node, has_await });
+			} else {
+				analysis.instance_body.async.push({ node, has_await });
+			}
+		} else {
+			analysis.instance_body.sync.push(node);
+		}
+	}
+
+	for (const fn of functions) {
+		/** @type {Set<Binding>} */
+		const reads_writes = new Set();
+		const body =
+			fn.type === 'VariableDeclarator'
+				? /** @type {ESTree.FunctionExpression | ESTree.ArrowFunctionExpression} */ (fn.init).body
+				: fn.body;
+
+		trace_references(body, reads_writes, reads_writes);
+
+		const max = [...reads_writes].reduce((max, binding) => {
+			return binding.blocker ? Math.max(binding.blocker.property.value, max) : max;
+		}, -1);
+
+		if (max === -1) continue;
+
+		const blocker = b.member(promises, b.literal(max), true);
+		const binding = /** @type {Binding} */ (
+			fn.type === 'FunctionDeclaration'
+				? instance.scope.get(fn.id.name)
+				: instance.scope.get(/** @type {ESTree.Identifier} */ (fn.id).name)
+		);
+
+		binding.blocker = /** @type {typeof binding['blocker']} */ (blocker);
+	}
+}
+
 /**
  * @param {Map<import('estree').LabeledStatement, ReactiveStatement>} unsorted_reactive_declarations
  */
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitBlock.js
index e2e8e93f76..832c56818b 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitBlock.js
@@ -56,22 +56,36 @@ export function AwaitBlock(node, context) {
 		catch_block = b.arrow(args, b.block([...declarations, ...block.body]));
 	}
 
-	context.state.init.push(
-		add_svelte_meta(
-			b.call(
-				'$.await',
-				context.state.node,
-				expression,
-				node.pending
-					? b.arrow([b.id('$$anchor')], /** @type {BlockStatement} */ (context.visit(node.pending)))
-					: b.null,
-				then_block,
-				catch_block
-			),
-			node,
-			'await'
-		)
+	const stmt = add_svelte_meta(
+		b.call(
+			'$.await',
+			context.state.node,
+			expression,
+			node.pending
+				? b.arrow([b.id('$$anchor')], /** @type {BlockStatement} */ (context.visit(node.pending)))
+				: b.null,
+			then_block,
+			catch_block
+		),
+		node,
+		'await'
 	);
+
+	if (node.metadata.expression.has_blockers()) {
+		context.state.init.push(
+			b.stmt(
+				b.call(
+					'$.async',
+					context.state.node,
+					node.metadata.expression.blockers(),
+					b.array([]),
+					b.arrow([context.state.node], b.block([stmt]))
+				)
+			)
+		);
+	} else {
+		context.state.init.push(stmt);
+	}
 }
 
 /**
diff --git a/packages/svelte/src/compiler/phases/nodes.js b/packages/svelte/src/compiler/phases/nodes.js
index 9d1a8f1890..e9717eb404 100644
--- a/packages/svelte/src/compiler/phases/nodes.js
+++ b/packages/svelte/src/compiler/phases/nodes.js
@@ -112,6 +112,10 @@ export class ExpressionMetadata {
 		return b.array([...this.#get_blockers()]);
 	}
 
+	has_blockers() {
+		return this.#get_blockers().size > 0;
+	}
+
 	is_async() {
 		return this.has_await || this.#get_blockers().size > 0;
 	}
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index c39803318d..94b4994bc5 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -1,4 +1,4 @@
-/** @import { ArrowFunctionExpression, BinaryOperator, ClassDeclaration, Expression, FunctionDeclaration, FunctionExpression, Identifier, ImportDeclaration, MemberExpression, LogicalOperator, Node, Pattern, UnaryOperator, VariableDeclarator, Super } from 'estree' */
+/** @import { BinaryOperator, ClassDeclaration, Expression, FunctionDeclaration, Identifier, ImportDeclaration, MemberExpression, LogicalOperator, Node, Pattern, UnaryOperator, VariableDeclarator, Super, SimpleLiteral, FunctionExpression, ArrowFunctionExpression } from 'estree' */
 /** @import { Context, Visitor } from 'zimmerframe' */
 /** @import { AST, BindingKind, DeclarationKind } from '#compiler' */
 import is_reference from 'is-reference';
@@ -108,7 +108,10 @@ export class Binding {
 	/** @type {Array<{ node: Identifier; path: AST.SvelteNode[] }>} */
 	references = [];
 
-	/** @type {Array<{ value: Expression; scope: Scope }>} */
+	/**
+	 * (Re)assignments of this binding. Includes declarations such as `function x() {}`.
+	 * @type {Array<{ value: Expression; scope: Scope }>}
+	 */
 	assignments = [];
 
 	/**
@@ -135,9 +138,10 @@ export class Binding {
 	/**
 	 * Instance-level declarations may follow (or contain) a top-level `await`. In these cases,
 	 * any reads that occur in the template must wait for the corresponding promise to resolve
-	 * otherwise the initial value will not have been assigned
+	 * otherwise the initial value will not have been assigned.
+	 * It is a member expression of the form `$$blockers[n]`.
 	 * TODO the blocker is set during transform which feels a bit grubby
-	 * @type {Expression | null}
+	 * @type {MemberExpression & { object: Identifier, property: SimpleLiteral & { value: number } } | null}
 	 */
 	blocker = null;
 
diff --git a/packages/svelte/src/compiler/utils/builders.js b/packages/svelte/src/compiler/utils/builders.js
index 4a44294189..82fce262b9 100644
--- a/packages/svelte/src/compiler/utils/builders.js
+++ b/packages/svelte/src/compiler/utils/builders.js
@@ -181,7 +181,7 @@ export function logical(operator, left, right) {
 }
 
 /**
- * @param {'const' | 'let' | 'var'} kind
+ * @param {ESTree.VariableDeclaration['kind']} kind
  * @param {ESTree.VariableDeclarator[]} declarations
  * @returns {ESTree.VariableDeclaration}
  */
diff --git a/packages/svelte/tests/runtime-runes/samples/async-await-block/_config.js b/packages/svelte/tests/runtime-runes/samples/async-await-block/_config.js
new file mode 100644
index 0000000000..1f354a5175
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-await-block/_config.js
@@ -0,0 +1,9 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<p>1</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-await-block/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-await-block/main.svelte
new file mode 100644
index 0000000000..d746cd979c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-await-block/main.svelte
@@ -0,0 +1,7 @@
+<script>
+    let foo = $derived(await 1);
+</script>
+
+{#await foo then x}
+    <p>{x}</p>
+{/await}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component1.svelte b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component1.svelte
new file mode 100644
index 0000000000..a3bb9d92b3
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component1.svelte
@@ -0,0 +1,13 @@
+<script>
+	await 1;
+
+    // Test arrow function style
+	let value = $state('');
+	const getValue = () => { 
+		return value;
+	};
+	const setValue = (v) => { value = v }
+</script>
+
+<input bind:value={getValue, setValue} />
+<p>{getValue()}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component2.svelte b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component2.svelte
new file mode 100644
index 0000000000..8b28cf5708
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component2.svelte
@@ -0,0 +1,11 @@
+<script>
+	await 1;
+
+    // Test function declaration style
+	let value = $state('');
+	function getValue() { return value }
+	function setValue(v) { value = v }
+</script>
+
+<input bind:value={getValue, setValue} />
+<p>{getValue()}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component3.svelte b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component3.svelte
new file mode 100644
index 0000000000..f26daeb4f2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component3.svelte
@@ -0,0 +1,16 @@
+<script>
+	await 1;
+
+    // Test indirect blocker dependencies
+	let value = $state('');
+	function x() {
+		return value;
+	}
+	function getValue() { 
+		return x()
+	}
+	function setValue(v) { value = v }
+</script>
+
+<input bind:value={getValue, setValue} />
+<p>{getValue()}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component4.svelte b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component4.svelte
new file mode 100644
index 0000000000..564cb2660a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/Component4.svelte
@@ -0,0 +1,19 @@
+<script>
+	await 1;
+
+	let value = $state('');
+
+	// getValue is declared BEFORE x
+	function getValue() { 
+		return x()
+	}
+
+	function x() {
+		return value;
+	}
+
+	function setValue(v) { value = v }
+</script>
+
+<input bind:value={getValue, setValue} />
+<p>{getValue()}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/_config.js b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/_config.js
new file mode 100644
index 0000000000..7b7ee5b122
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/_config.js
@@ -0,0 +1,27 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['async-server', 'client', 'hydrate'],
+	ssrHtml:
+		'<input value=""> <p></p> <input value=""> <p></p> <input value=""> <p></p> <input value=""> <p></p>',
+
+	async test({ assert, target }) {
+		await tick();
+
+		const inputs = Array.from(target.querySelectorAll('input'));
+		const paragraphs = Array.from(target.querySelectorAll('p'));
+
+		for (let i = 0; i < 4; i++) {
+			assert.equal(inputs[i].value, '');
+			assert.htmlEqual(paragraphs[i].innerHTML, '');
+
+			inputs[i].value = 'hello';
+			inputs[i].dispatchEvent(new InputEvent('input', { bubbles: true }));
+			await tick();
+
+			assert.equal(inputs[i].value, 'hello');
+			assert.htmlEqual(paragraphs[i].innerHTML, 'hello');
+		}
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/main.svelte
new file mode 100644
index 0000000000..c30111fd2b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-indirect-blockers/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	import Component1 from './Component1.svelte';
+	import Component2 from './Component2.svelte';
+	import Component3 from './Component3.svelte';
+	import Component4 from './Component4.svelte';
+</script>
+
+<Component1 />
+<Component2 />
+<Component3 />
+<Component4 />

From 99e670f63297ca86831cd4d786ef2adf8fdca5a4 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 17 Nov 2025 23:00:00 +0100
Subject: [PATCH 174/347] fix: ensure eager effects don't break reactions chain
 (#17138)

Execution of eager effects didn't set `is_updating_effect`, which meant the logic in `get` would wrongfully prevent dependencies being added to `reactions` of sources/deriveds.

Fixes #17133
---
 .changeset/silent-teeth-invent.md             |  5 +++
 .../src/internal/client/reactivity/sources.js | 26 +++++++++-----
 .../samples/inspect-derived-4/_config.js      | 35 +++++++++++++++++++
 .../samples/inspect-derived-4/main.svelte     | 14 ++++++++
 4 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/silent-teeth-invent.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/inspect-derived-4/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/inspect-derived-4/main.svelte

diff --git a/.changeset/silent-teeth-invent.md b/.changeset/silent-teeth-invent.md
new file mode 100644
index 0000000000..54603cc27e
--- /dev/null
+++ b/.changeset/silent-teeth-invent.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure eager effects don't break reactions chain
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 8ae406b57b..052ca97dc0 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -14,7 +14,9 @@ import {
 	is_dirty,
 	untracking,
 	is_destroying_effect,
-	push_reaction_value
+	push_reaction_value,
+	set_is_updating_effect,
+	is_updating_effect
 } from '../runtime.js';
 import { equals, safe_equals } from './equality.js';
 import {
@@ -246,19 +248,25 @@ export function internal_set(source, value) {
 
 export function flush_eager_effects() {
 	eager_effects_deferred = false;
+	var prev_is_updating_effect = is_updating_effect;
+	set_is_updating_effect(true);
 
 	const inspects = Array.from(eager_effects);
 
-	for (const effect of inspects) {
-		// Mark clean inspect-effects as maybe dirty and then check their dirtiness
-		// instead of just updating the effects - this way we avoid overfiring.
-		if ((effect.f & CLEAN) !== 0) {
-			set_signal_status(effect, MAYBE_DIRTY);
-		}
+	try {
+		for (const effect of inspects) {
+			// Mark clean inspect-effects as maybe dirty and then check their dirtiness
+			// instead of just updating the effects - this way we avoid overfiring.
+			if ((effect.f & CLEAN) !== 0) {
+				set_signal_status(effect, MAYBE_DIRTY);
+			}
 
-		if (is_dirty(effect)) {
-			update_effect(effect);
+			if (is_dirty(effect)) {
+				update_effect(effect);
+			}
 		}
+	} finally {
+		set_is_updating_effect(prev_is_updating_effect);
 	}
 
 	eager_effects.clear();
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-derived-4/_config.js b/packages/svelte/tests/runtime-runes/samples/inspect-derived-4/_config.js
new file mode 100644
index 0000000000..3a3bca7221
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-derived-4/_config.js
@@ -0,0 +1,35 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+import { normalise_inspect_logs } from '../../../helpers';
+
+export default test({
+	compileOptions: {
+		dev: true
+	},
+
+	async test({ assert, target, logs }) {
+		const [b] = target.querySelectorAll('button');
+
+		b.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>first unseen: 1</button>`);
+
+		b.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>first unseen: 2</button>`);
+
+		b.click();
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<button>first unseen:</button>`);
+
+		assert.deepEqual(normalise_inspect_logs(logs), [
+			[0, 1, 2],
+			[1, 2],
+			'at SvelteSet.add',
+			[2],
+			'at SvelteSet.add',
+			[],
+			'at SvelteSet.add'
+		]);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/inspect-derived-4/main.svelte b/packages/svelte/tests/runtime-runes/samples/inspect-derived-4/main.svelte
new file mode 100644
index 0000000000..eb4ea891db
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/inspect-derived-4/main.svelte
@@ -0,0 +1,14 @@
+<script>
+	import {SvelteSet} from "svelte/reactivity";
+	const ids = [0,1,2];
+	const seenIds = new SvelteSet();
+
+	const unseenIds = $derived(ids.filter((id) => !seenIds.has(id)));
+	
+	const currentId = $derived(unseenIds.at(0));
+	$inspect(unseenIds)
+</script>
+
+<button onclick={() => seenIds.add(currentId)}>
+	first unseen: {currentId}
+</button>

From b94289d23b593aa0991811977d2ad4cc8891805d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Nov 2025 18:43:22 -0500
Subject: [PATCH 175/347] Version Packages (#17168)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/gentle-showers-speak.md |  5 -----
 .changeset/sad-forks-go.md         |  5 -----
 .changeset/silent-teeth-invent.md  |  5 -----
 .changeset/social-taxis-tell.md    |  5 -----
 .changeset/soft-radios-make.md     |  5 -----
 .changeset/stale-items-know.md     |  5 -----
 packages/svelte/CHANGELOG.md       | 16 ++++++++++++++++
 packages/svelte/package.json       |  2 +-
 packages/svelte/src/version.js     |  2 +-
 9 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 .changeset/gentle-showers-speak.md
 delete mode 100644 .changeset/sad-forks-go.md
 delete mode 100644 .changeset/silent-teeth-invent.md
 delete mode 100644 .changeset/social-taxis-tell.md
 delete mode 100644 .changeset/soft-radios-make.md
 delete mode 100644 .changeset/stale-items-know.md

diff --git a/.changeset/gentle-showers-speak.md b/.changeset/gentle-showers-speak.md
deleted file mode 100644
index 9cc1adee94..0000000000
--- a/.changeset/gentle-showers-speak.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: correctly handle functions when determining async blockers
diff --git a/.changeset/sad-forks-go.md b/.changeset/sad-forks-go.md
deleted file mode 100644
index da27e11642..0000000000
--- a/.changeset/sad-forks-go.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: keep deriveds reactive after their original parent effect was destroyed
diff --git a/.changeset/silent-teeth-invent.md b/.changeset/silent-teeth-invent.md
deleted file mode 100644
index 54603cc27e..0000000000
--- a/.changeset/silent-teeth-invent.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ensure eager effects don't break reactions chain
diff --git a/.changeset/social-taxis-tell.md b/.changeset/social-taxis-tell.md
deleted file mode 100644
index ea23a01def..0000000000
--- a/.changeset/social-taxis-tell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ensure async `@const` in boundary hydrates correctly
diff --git a/.changeset/soft-radios-make.md b/.changeset/soft-radios-make.md
deleted file mode 100644
index 15a9dbe35a..0000000000
--- a/.changeset/soft-radios-make.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: take blockers into account when creating `#await` blocks
diff --git a/.changeset/stale-items-know.md b/.changeset/stale-items-know.md
deleted file mode 100644
index 60fa85f595..0000000000
--- a/.changeset/stale-items-know.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: parallelize async `@const`s in the template
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 1fd67f455d..0c8b8b4d18 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,21 @@
 # svelte
 
+## 5.43.9
+
+### Patch Changes
+
+- fix: correctly handle functions when determining async blockers ([#17137](https://github.com/sveltejs/svelte/pull/17137))
+
+- fix: keep deriveds reactive after their original parent effect was destroyed ([#17171](https://github.com/sveltejs/svelte/pull/17171))
+
+- fix: ensure eager effects don't break reactions chain ([#17138](https://github.com/sveltejs/svelte/pull/17138))
+
+- fix: ensure async `@const` in boundary hydrates correctly ([#17165](https://github.com/sveltejs/svelte/pull/17165))
+
+- fix: take blockers into account when creating `#await` blocks ([#17137](https://github.com/sveltejs/svelte/pull/17137))
+
+- fix: parallelize async `@const`s in the template ([#17165](https://github.com/sveltejs/svelte/pull/17165))
+
 ## 5.43.8
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index dfecc8d62d..8b9d1a1eae 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.43.8",
+  "version": "5.43.9",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 191a36da84..8453735367 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.43.8';
+export const VERSION = '5.43.9';
 export const PUBLIC_VERSION = '5';

From fe50e58f34b7df263b1875e495536fe87905e75f Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 17 Nov 2025 18:57:00 -0500
Subject: [PATCH 176/347] chore: fix types of binding.blocker (#17177)

---
 packages/svelte/src/compiler/phases/2-analyze/index.js | 10 +++++++++-
 packages/svelte/src/compiler/phases/scope.js           |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 34490ff9c8..4206f3df9a 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -1184,7 +1184,15 @@ function calculate_blockers(instance, scopes, analysis) {
 		trace_references(body, reads_writes, reads_writes);
 
 		const max = [...reads_writes].reduce((max, binding) => {
-			return binding.blocker ? Math.max(binding.blocker.property.value, max) : max;
+			if (binding.blocker) {
+				let property = /** @type {ESTree.SimpleLiteral & { value: number }} */ (
+					binding.blocker.property
+				);
+
+				return Math.max(property.value, max);
+			}
+
+			return max;
 		}, -1);
 
 		if (max === -1) continue;
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index 94b4994bc5..2a0c76f756 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -141,7 +141,7 @@ export class Binding {
 	 * otherwise the initial value will not have been assigned.
 	 * It is a member expression of the form `$$blockers[n]`.
 	 * TODO the blocker is set during transform which feels a bit grubby
-	 * @type {MemberExpression & { object: Identifier, property: SimpleLiteral & { value: number } } | null}
+	 * @type {MemberExpression | null}
 	 */
 	blocker = null;
 

From 3604fdac6bedb09e26dca250e757543910c0ed22 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 18 Nov 2025 01:19:31 +0100
Subject: [PATCH 177/347] fix: avoid other batches running with queued root
 effects of main batch (#17145)

* fix: avoid other batches running with queued root effects of main batch

When `#traverse_effect_tree` runs, it can execute block effects, which in turn can create effects which are scheduled, which means `queued_root_effects` is now filled again. We didn't take that into account and assumed that in `#commit` we would have no queued root effects. As a result another batch could wrongfully run with the queued root effects of the main batch. That in turn can mean that `skipped_effects` is different on the other batch, leading to some branches not getting traversed into. As a result part of the tree is marked clean while further below batches are still not marked clean. That then breaks reactivity as soon as you schedule an effect in this still-not-clean sub tree, as it will not bubble all the way up to the root, since it comes across a not-clean branch, assuming something was already scheduled.

The fix is simple: Stash the queued root effects before rebasing branches.

Fixes #17118

* add note to self

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/sixty-glasses-try.md               |  5 ++
 .../src/internal/client/reactivity/batch.js   | 10 ++-
 .../async-block-effect-queueing/A.svelte      | 15 +++++
 .../async-block-effect-queueing/B.svelte      |  1 +
 .../async-block-effect-queueing/_config.js    | 63 +++++++++++++++++++
 .../async-block-effect-queueing/main.svelte   | 24 +++++++
 6 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/sixty-glasses-try.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/A.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/B.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/main.svelte

diff --git a/.changeset/sixty-glasses-try.md b/.changeset/sixty-glasses-try.md
new file mode 100644
index 0000000000..77db4a5cc5
--- /dev/null
+++ b/.changeset/sixty-glasses-try.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: avoid other batches running with queued root effects of main batch
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 03a0721057..c7e01fbcba 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -68,6 +68,7 @@ export let previous_batch = null;
  */
 export let batch_values = null;
 
+// TODO this should really be a property of `batch`
 /** @type {Effect[]} */
 let queued_root_effects = [];
 
@@ -171,6 +172,8 @@ export class Batch {
 
 		for (const root of root_effects) {
 			this.#traverse_effect_tree(root, target);
+			// Note: #traverse_effect_tree runs block effects eagerly, which can schedule effects,
+			// which means queued_root_effects now may be filled again.
 		}
 
 		if (!this.is_fork) {
@@ -418,6 +421,10 @@ export class Batch {
 				// Re-run async/block effects that depend on distinct values changed in both batches
 				const others = [...batch.current.keys()].filter((s) => !this.current.has(s));
 				if (others.length > 0) {
+					// Avoid running queued root effects on the wrong branch
+					var prev_queued_root_effects = queued_root_effects;
+					queued_root_effects = [];
+
 					/** @type {Set<Value>} */
 					const marked = new Set();
 					/** @type {Map<Reaction, boolean>} */
@@ -436,9 +443,10 @@ export class Batch {
 
 						// TODO do we need to do anything with `target`? defer block effects?
 
-						queued_root_effects = [];
 						batch.deactivate();
 					}
+
+					queued_root_effects = prev_queued_root_effects;
 				}
 			}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/A.svelte b/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/A.svelte
new file mode 100644
index 0000000000..7971deff5f
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/A.svelte
@@ -0,0 +1,15 @@
+<script>
+	let open = $state(false);
+	let menuOptionsEl = $state(null);
+</script>
+
+<button onclick={() => open = !open}>
+	toggle
+
+		{#if open}
+			<!-- bind:this uses effect, which is scheduled, causing queued_root_effects to be filled again -->
+			<span bind:this={menuOptionsEl}>
+				A
+			</span>
+		{/if}
+</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/B.svelte b/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/B.svelte
new file mode 100644
index 0000000000..7371f47a6f
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/B.svelte
@@ -0,0 +1 @@
+B
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/_config.js b/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/_config.js
new file mode 100644
index 0000000000..789cdfaa02
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/_config.js
@@ -0,0 +1,63 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [fork, commit, toggle] = target.querySelectorAll('button');
+
+		fork.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork</button>
+			<button>commit</button>
+			<button>toggle</button>
+		`
+		);
+
+		toggle.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork</button>
+			<button>commit</button>
+			<button>toggle <span>A</span></button>
+		`
+		);
+
+		toggle.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork</button>
+			<button>commit</button>
+			<button>toggle</button>
+		`
+		);
+
+		toggle.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork</button>
+			<button>commit</button>
+			<button>toggle <span>A</span></button>
+		`
+		);
+
+		commit.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork</button>
+			<button>commit</button>
+			B
+		`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/main.svelte
new file mode 100644
index 0000000000..7342a37f05
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-block-effect-queueing/main.svelte
@@ -0,0 +1,24 @@
+<script lang="ts">
+	import { fork } from 'svelte';
+	import A from './A.svelte';
+	import B from './B.svelte';
+
+	let open = $state(true);
+	let f;
+</script>
+
+
+<button onclick={() => {
+	f = fork(() => {
+		open = !open;
+	})
+}}>fork</button>
+<button onclick={() => {
+	f.commit()
+}}>commit</button>
+
+{#if open}
+	<A />
+{:else}
+	<B />
+{/if}

From 3b4b0adcd5b7d1c48f4f2eb45b30a8471484b2a8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Nov 2025 19:21:57 -0500
Subject: [PATCH 178/347] Version Packages (#17178)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/sixty-glasses-try.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/sixty-glasses-try.md

diff --git a/.changeset/sixty-glasses-try.md b/.changeset/sixty-glasses-try.md
deleted file mode 100644
index 77db4a5cc5..0000000000
--- a/.changeset/sixty-glasses-try.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: avoid other batches running with queued root effects of main batch
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 0c8b8b4d18..670940f2df 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.43.10
+
+### Patch Changes
+
+- fix: avoid other batches running with queued root effects of main batch ([#17145](https://github.com/sveltejs/svelte/pull/17145))
+
 ## 5.43.9
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 8b9d1a1eae..bec65bf787 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.43.9",
+  "version": "5.43.10",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 8453735367..44ac4393ed 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.43.9';
+export const VERSION = '5.43.10';
 export const PUBLIC_VERSION = '5';

From ebb97a618cb61af95323e874d515c36613c9dc69 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 18 Nov 2025 15:51:43 +0100
Subject: [PATCH 179/347] perf: don't use tracing overeager during dev (#17183)

* perf: don't use tracing overeager during dev

#17176 is a case where many sources are created and then written to (due to Svelte 4 prop mechanics), and our tracing kicked in eagerly. That combined with the excessive depth of the related stack traces slowed things down tremendously.

The fix is simple: Don't record stack traces until we've seen this source get updated for a couple of times. Additionally we now delete the `updates` map after a flush. Previously it was just an ever-growing stack trace map.

* fix

* fix
---
 .changeset/salty-hounds-worry.md              |  5 ++++
 .../svelte/src/compiler/phases/types.d.ts     |  1 +
 .../svelte/src/internal/client/dev/tracing.js |  6 +++--
 .../src/internal/client/reactivity/batch.js   | 20 ++++++++++++--
 .../src/internal/client/reactivity/sources.js | 26 ++++++++++++-------
 packages/svelte/src/internal/flags/index.js   |  3 +++
 6 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/salty-hounds-worry.md

diff --git a/.changeset/salty-hounds-worry.md b/.changeset/salty-hounds-worry.md
new file mode 100644
index 0000000000..82a887450c
--- /dev/null
+++ b/.changeset/salty-hounds-worry.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+perf: don't use tracing overeager during dev
diff --git a/packages/svelte/src/compiler/phases/types.d.ts b/packages/svelte/src/compiler/phases/types.d.ts
index 71f77b1a11..5397ea45f9 100644
--- a/packages/svelte/src/compiler/phases/types.d.ts
+++ b/packages/svelte/src/compiler/phases/types.d.ts
@@ -53,6 +53,7 @@ export interface Analysis {
 	/** @deprecated use `runes` from `state.js` instead */
 	runes: boolean;
 	immutable: boolean;
+	/** True if `$inspect.trace` is used */
 	tracing: boolean;
 	comments: AST.JSComment[];
 
diff --git a/packages/svelte/src/internal/client/dev/tracing.js b/packages/svelte/src/internal/client/dev/tracing.js
index 4688637f5d..183da73447 100644
--- a/packages/svelte/src/internal/client/dev/tracing.js
+++ b/packages/svelte/src/internal/client/dev/tracing.js
@@ -57,8 +57,10 @@ function log_entry(signal, entry) {
 
 	if (dirty && signal.updated) {
 		for (const updated of signal.updated.values()) {
-			// eslint-disable-next-line no-console
-			console.log(updated.error);
+			if (updated.error) {
+				// eslint-disable-next-line no-console
+				console.log(updated.error);
+			}
 		}
 	}
 
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index c7e01fbcba..22526df7c1 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -608,6 +608,8 @@ function flush_effects() {
 	var was_updating_effect = is_updating_effect;
 	is_flushing = true;
 
+	var source_stacks = DEV ? new Set() : null;
+
 	try {
 		var flush_count = 0;
 		set_is_updating_effect(true);
@@ -633,8 +635,10 @@ function flush_effects() {
 					}
 
 					for (const update of updates.values()) {
-						// eslint-disable-next-line no-console
-						console.error(update.error);
+						if (update.error) {
+							// eslint-disable-next-line no-console
+							console.error(update.error);
+						}
 					}
 				}
 
@@ -643,12 +647,24 @@ function flush_effects() {
 
 			batch.process(queued_root_effects);
 			old_values.clear();
+
+			if (DEV) {
+				for (const source of batch.current.keys()) {
+					/** @type {Set<Source>} */ (source_stacks).add(source);
+				}
+			}
 		}
 	} finally {
 		is_flushing = false;
 		set_is_updating_effect(was_updating_effect);
 
 		last_scheduled_effect = null;
+
+		if (DEV) {
+			for (const source of /** @type {Set<Source>} */ (source_stacks)) {
+				source.updated = null;
+			}
+		}
 	}
 }
 
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 052ca97dc0..822fb21822 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -188,18 +188,26 @@ export function internal_set(source, value) {
 
 		if (DEV) {
 			if (tracing_mode_flag || active_effect !== null) {
-				const error = get_stack('updated at');
+				source.updated ??= new Map();
 
-				if (error !== null) {
-					source.updated ??= new Map();
-					let entry = source.updated.get(error.stack);
+				// For performance reasons, when not using $inspect.trace, we only start collecting stack traces
+				// after the same source has been updated more than 5 times in the same flush cycle.
+				const count = (source.updated.get('')?.count ?? 0) + 1;
+				source.updated.set('', { error: /** @type {any} */ (null), count });
 
-					if (!entry) {
-						entry = { error, count: 0 };
-						source.updated.set(error.stack, entry);
-					}
+				if (tracing_mode_flag || count > 5) {
+					const error = get_stack('updated at');
+
+					if (error !== null) {
+						let entry = source.updated.get(error.stack);
 
-					entry.count++;
+						if (!entry) {
+							entry = { error, count: 0 };
+							source.updated.set(error.stack, entry);
+						}
+
+						entry.count++;
+					}
 				}
 			}
 
diff --git a/packages/svelte/src/internal/flags/index.js b/packages/svelte/src/internal/flags/index.js
index ce7bba604b..5d4054975f 100644
--- a/packages/svelte/src/internal/flags/index.js
+++ b/packages/svelte/src/internal/flags/index.js
@@ -1,5 +1,8 @@
+/** True if experimental.async=true */
 export let async_mode_flag = false;
+/** True if we're not certain that we only have Svelte 5 code in the compilation */
 export let legacy_mode_flag = false;
+/** True if $inspect.trace is used */
 export let tracing_mode_flag = false;
 
 export function enable_async_mode_flag() {

From 203c228174a144990ac45da3669c913a9a245482 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 18 Nov 2025 16:13:25 +0100
Subject: [PATCH 180/347] fix: don't cancel transition of already outroing
 elements (#17186)

* fix: don't cancel transition of already outroing elements

#16977 forgot one detail: While an element is outroing, the block of e.g. an if block can be triggered again, resolving to the same condition. In that case we have an in-between state where the element is still onscreen but already outroing. We have to detect this to not eagerly destroy the corresponding effect when we arrive at the outro/destroy logic.

Fixes #16982

* fix

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/shiny-otters-learn.md              |  5 +++
 .../internal/client/dom/blocks/branches.js    | 33 +++++++++++++++++--
 .../samples/transition-if/_config.js          | 28 ++++++++++++++++
 .../samples/transition-if/main.svelte         | 24 ++++++++++++++
 4 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/shiny-otters-learn.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/transition-if/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/transition-if/main.svelte

diff --git a/.changeset/shiny-otters-learn.md b/.changeset/shiny-otters-learn.md
new file mode 100644
index 0000000000..8bf4a13588
--- /dev/null
+++ b/.changeset/shiny-otters-learn.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't cancel transition of already outroing elements
diff --git a/packages/svelte/src/internal/client/dom/blocks/branches.js b/packages/svelte/src/internal/client/dom/blocks/branches.js
index f1b9baf6f6..527f0b0a8f 100644
--- a/packages/svelte/src/internal/client/dom/blocks/branches.js
+++ b/packages/svelte/src/internal/client/dom/blocks/branches.js
@@ -24,12 +24,35 @@ export class BranchManager {
 	/** @type {Map<Batch, Key>} */
 	#batches = new Map();
 
-	/** @type {Map<Key, Effect>} */
+	/**
+	 * Map of keys to effects that are currently rendered in the DOM.
+	 * These effects are visible and actively part of the document tree.
+	 * Example:
+	 * ```
+	 * {#if condition}
+	 * 	foo
+	 * {:else}
+	 * 	bar
+	 * {/if}
+	 * ```
+	 * Can result in the entries `true->Effect` and `false->Effect`
+	 * @type {Map<Key, Effect>}
+	 */
 	#onscreen = new Map();
 
-	/** @type {Map<Key, Branch>} */
+	/**
+	 * Similar to #onscreen with respect to the keys, but contains branches that are not yet
+	 * in the DOM, because their insertion is deferred.
+	 * @type {Map<Key, Branch>}
+	 */
 	#offscreen = new Map();
 
+	/**
+	 * Keys of effects that are currently outroing
+	 * @type {Set<Key>}
+	 */
+	#outroing = new Set();
+
 	/**
 	 * Whether to pause (i.e. outro) on change, or destroy immediately.
 	 * This is necessary for `<svelte:element>`
@@ -58,6 +81,7 @@ export class BranchManager {
 		if (onscreen) {
 			// effect is already in the DOM — abort any current outro
 			resume_effect(onscreen);
+			this.#outroing.delete(key);
 		} else {
 			// effect is currently offscreen. put it in the DOM
 			var offscreen = this.#offscreen.get(key);
@@ -96,7 +120,8 @@ export class BranchManager {
 		// outro/destroy all onscreen effects...
 		for (const [k, effect] of this.#onscreen) {
 			// ...except the one that was just committed
-			if (k === key) continue;
+			//    or those that are already outroing (else the transition is aborted and the effect destroyed right away)
+			if (k === key || this.#outroing.has(k)) continue;
 
 			const on_destroy = () => {
 				const keys = Array.from(this.#batches.values());
@@ -113,10 +138,12 @@ export class BranchManager {
 					destroy_effect(effect);
 				}
 
+				this.#outroing.delete(k);
 				this.#onscreen.delete(k);
 			};
 
 			if (this.#transition || !onscreen) {
+				this.#outroing.add(k);
 				pause_effect(effect, on_destroy, false);
 			} else {
 				on_destroy();
diff --git a/packages/svelte/tests/runtime-runes/samples/transition-if/_config.js b/packages/svelte/tests/runtime-runes/samples/transition-if/_config.js
new file mode 100644
index 0000000000..7cabc36163
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/transition-if/_config.js
@@ -0,0 +1,28 @@
+import { flushSync } from '../../../../src/index-client.js';
+import { test } from '../../test';
+
+export default test({
+	test({ assert, raf, target }) {
+		const [x, y] = target.querySelectorAll('button');
+
+		// Set second part of condition to false first...
+		y.click();
+		flushSync();
+		raf.tick(50);
+		assert.htmlEqual(
+			target.innerHTML,
+			'<button>toggle x</button> <button>toggle y</button> <p foo="0.5">hello</p>'
+		);
+
+		// ...so that when both are toggled the block condition runs again
+		x.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			'<button>toggle x</button> <button>toggle y</button> <p foo="0.5">hello</p>'
+		);
+
+		raf.tick(100);
+		assert.htmlEqual(target.innerHTML, '<button>toggle x</button> <button>toggle y</button>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/transition-if/main.svelte b/packages/svelte/tests/runtime-runes/samples/transition-if/main.svelte
new file mode 100644
index 0000000000..b60c6f22eb
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/transition-if/main.svelte
@@ -0,0 +1,24 @@
+<script>
+	function foo(node) {
+		return {
+			duration: 100,
+			tick: (t, u) => {
+				node.setAttribute('foo', t)
+			}
+		};
+	}
+
+	let x = $state(true);
+	let y = $state(true);
+</script>
+
+<button onclick={() => {
+	x = !x;
+}}>toggle x</button>
+<button onclick={() => {
+	y = !y;
+}}>toggle y</button>
+
+{#if x && y}
+	<p transition:foo>hello</p>
+{/if}

From 92c936d9b34813dc635d265da2ddb8fd2185582e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 18 Nov 2025 10:16:45 -0500
Subject: [PATCH 181/347] Version Packages (#17189)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/salty-hounds-worry.md | 5 -----
 .changeset/shiny-otters-learn.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/salty-hounds-worry.md
 delete mode 100644 .changeset/shiny-otters-learn.md

diff --git a/.changeset/salty-hounds-worry.md b/.changeset/salty-hounds-worry.md
deleted file mode 100644
index 82a887450c..0000000000
--- a/.changeset/salty-hounds-worry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-perf: don't use tracing overeager during dev
diff --git a/.changeset/shiny-otters-learn.md b/.changeset/shiny-otters-learn.md
deleted file mode 100644
index 8bf4a13588..0000000000
--- a/.changeset/shiny-otters-learn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't cancel transition of already outroing elements
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 670940f2df..027d351ab3 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.43.11
+
+### Patch Changes
+
+- perf: don't use tracing overeager during dev ([#17183](https://github.com/sveltejs/svelte/pull/17183))
+
+- fix: don't cancel transition of already outroing elements ([#17186](https://github.com/sveltejs/svelte/pull/17186))
+
 ## 5.43.10
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index bec65bf787..17e20f2634 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.43.10",
+  "version": "5.43.11",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 44ac4393ed..5ad7f75d21 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.43.10';
+export const VERSION = '5.43.11';
 export const PUBLIC_VERSION = '5';

From e365890ef9d9051985ea54808228aeb60ed51d3e Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 18 Nov 2025 17:34:02 -0500
Subject: [PATCH 182/347] fix: maintain correct linked list of effects when
 updating each blocks (#17191)

* fix: maintain correct linked list of effects when updating each blocks

* working

* tidy up

* changeset

* remove unnecessary assignment, add comment explaining unidirectionality
---
 .changeset/upset-eyes-relax.md                |  5 ++
 .../src/internal/client/dom/blocks/each.js    | 58 ++++++++++---------
 .../svelte/src/internal/client/types.d.ts     |  2 +
 .../samples/each-effect-linking/_config.js    | 32 ++++++++++
 .../samples/each-effect-linking/main.svelte   | 33 +++++++++++
 5 files changed, 104 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/upset-eyes-relax.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-effect-linking/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-effect-linking/main.svelte

diff --git a/.changeset/upset-eyes-relax.md b/.changeset/upset-eyes-relax.md
new file mode 100644
index 0000000000..b5c9b4e831
--- /dev/null
+++ b/.changeset/upset-eyes-relax.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: maintain correct linked list of effects when updating each blocks
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 0eb8f889c3..320c034690 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -129,8 +129,11 @@ function pause_effects(state, to_destroy, controlled_anchor) {
 export function each(node, flags, get_collection, get_key, render_fn, fallback_fn = null) {
 	var anchor = node;
 
-	/** @type {EachState} */
-	var state = { flags, items: new Map(), first: null };
+	/** @type {Map<any, EachItem>} */
+	var items = new Map();
+
+	/** @type {EachItem | null} */
+	var first = null;
 
 	var is_controlled = (flags & EACH_IS_CONTROLLED) !== 0;
 	var is_reactive_value = (flags & EACH_ITEM_REACTIVE) !== 0;
@@ -166,7 +169,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 	var first_run = true;
 
 	function commit() {
-		reconcile(each_effect, array, state, anchor, flags, get_key);
+		reconcile(state, array, anchor, flags, get_key);
 
 		if (fallback !== null) {
 			if (array.length === 0) {
@@ -177,7 +180,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 					resume_effect(fallback.effect);
 				}
 
-				each_effect.first = fallback.effect;
+				effect.first = fallback.effect;
 			} else {
 				pause_effect(fallback.effect, () => {
 					// TODO only null out if no pending batch needs it,
@@ -189,7 +192,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 		}
 	}
 
-	var each_effect = block(() => {
+	var effect = block(() => {
 		array = /** @type {V[]} */ (get(each_array));
 		var length = array.length;
 
@@ -230,7 +233,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 			var value = array[i];
 			var key = get_key(value, i);
 
-			var item = first_run ? null : state.items.get(key);
+			var item = first_run ? null : items.get(key);
 
 			if (item) {
 				// update before reconciliation, to trigger any async updates
@@ -263,7 +266,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 					item.o = true;
 
 					if (prev === null) {
-						state.first = item;
+						first = item;
 					} else {
 						prev.next = item;
 					}
@@ -271,7 +274,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 					prev = item;
 				}
 
-				state.items.set(key, item);
+				items.set(key, item);
 			}
 
 			keys.add(key);
@@ -302,7 +305,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 
 		if (!first_run) {
 			if (defer) {
-				for (const [key, item] of state.items) {
+				for (const [key, item] of items) {
 					if (!keys.has(key)) {
 						batch.skipped_effects.add(item.e);
 					}
@@ -331,6 +334,9 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 		get(each_array);
 	});
 
+	/** @type {EachState} */
+	var state = { effect, flags, items, first };
+
 	first_run = false;
 
 	if (hydrating) {
@@ -341,15 +347,14 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 /**
  * Add, remove, or reorder items output by an each block as its input changes
  * @template V
- * @param {Effect} each_effect
- * @param {Array<V>} array
  * @param {EachState} state
+ * @param {Array<V>} array
  * @param {Element | Comment | Text} anchor
  * @param {number} flags
  * @param {(value: V, index: number) => any} get_key
  * @returns {void}
  */
-function reconcile(each_effect, array, state, anchor, flags, get_key) {
+function reconcile(state, array, anchor, flags, get_key) {
 	var is_animated = (flags & EACH_IS_ANIMATED) !== 0;
 
 	var length = array.length;
@@ -536,16 +541,6 @@ function reconcile(each_effect, array, state, anchor, flags, get_key) {
 			}
 		});
 	}
-
-	// TODO i have an inkling that the rest of this function is wrong...
-	// the offscreen items need to be linked, so that they all update correctly.
-	// the last onscreen item should link to the first offscreen item, etc
-	each_effect.first = state.first && state.first.e;
-	each_effect.last = prev && prev.e;
-
-	if (prev) {
-		prev.e.next = null;
-	}
 }
 
 /**
@@ -601,11 +596,11 @@ function create_item(anchor, prev, value, key, index, render_fn, flags, get_coll
 
 		item.e = branch(() => render_fn(/** @type {Node} */ (anchor), v, i, get_collection));
 
-		item.e.prev = prev && prev.e;
-
 		if (prev !== null) {
+			// we only need to set `prev.next = item`, because
+			// `item.prev = prev` was set on initialization.
+			// the effects themselves are already linked
 			prev.next = item;
-			prev.e.next = item.e;
 		}
 
 		return item;
@@ -640,12 +635,23 @@ function move(item, next, anchor) {
 function link(state, prev, next) {
 	if (prev === null) {
 		state.first = next;
+		state.effect.first = next && next.e;
 	} else {
+		if (prev.e.next) {
+			prev.e.next.prev = null;
+		}
+
 		prev.next = next;
 		prev.e.next = next && next.e;
 	}
 
-	if (next !== null) {
+	if (next === null) {
+		state.effect.last = prev && prev.e;
+	} else {
+		if (next.e.prev) {
+			next.e.prev.next = null;
+		}
+
 		next.prev = prev;
 		next.e.prev = prev && prev.e;
 	}
diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts
index 19645fcc32..c1003ecc1a 100644
--- a/packages/svelte/src/internal/client/types.d.ts
+++ b/packages/svelte/src/internal/client/types.d.ts
@@ -64,6 +64,8 @@ export type TemplateNode = Text | Element | Comment;
 export type Dom = TemplateNode | TemplateNode[];
 
 export type EachState = {
+	/** the each block effect */
+	effect: Effect;
 	/** flags */
 	flags: number;
 	/** a key -> item lookup */
diff --git a/packages/svelte/tests/runtime-runes/samples/each-effect-linking/_config.js b/packages/svelte/tests/runtime-runes/samples/each-effect-linking/_config.js
new file mode 100644
index 0000000000..d1c23527a9
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-effect-linking/_config.js
@@ -0,0 +1,32 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [step_back, step_forward, jump_back, jump_forward] = target.querySelectorAll('button');
+		const [div] = target.querySelectorAll('div');
+
+		step_back.click();
+		await tick();
+
+		step_forward.click();
+		await tick();
+
+		step_forward.click();
+		await tick();
+
+		// if the effects get linked in a circle, we will never get here
+		assert.htmlEqual(div.innerHTML, '<p>5</p><p>6</p><p>7</p>');
+
+		jump_forward.click();
+		await tick();
+
+		step_forward.click();
+		await tick();
+
+		step_forward.click();
+		await tick();
+
+		assert.htmlEqual(div.innerHTML, '<p>12</p><p>13</p><p>14</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/each-effect-linking/main.svelte b/packages/svelte/tests/runtime-runes/samples/each-effect-linking/main.svelte
new file mode 100644
index 0000000000..ea33b11e22
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-effect-linking/main.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+	let items = $state([4, 5, 6]);
+</script>
+
+<button onclick={() => {
+	items = items.map((n) => n - 1);
+}}>
+	step back
+</button>
+
+<button onclick={() => {
+	items = items.map((n) => n + 1);
+}}>
+	step forward
+</button>
+
+<button onclick={() => {
+	items = items.map((n) => n - 5);
+}}>
+	jump back
+</button>
+
+<button onclick={() => {
+	items = items.map((n) => n + 5);
+}}>
+	jump forward
+</button>
+
+<div>
+	{#each items as item (item)}
+		<p>{item}</p>
+	{/each}
+</div>

From 9ccbd734f22539e75cccf56b4d8273b6c1620f9e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 18 Nov 2025 17:35:16 -0500
Subject: [PATCH 183/347] Version Packages (#17192)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/upset-eyes-relax.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/upset-eyes-relax.md

diff --git a/.changeset/upset-eyes-relax.md b/.changeset/upset-eyes-relax.md
deleted file mode 100644
index b5c9b4e831..0000000000
--- a/.changeset/upset-eyes-relax.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: maintain correct linked list of effects when updating each blocks
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 027d351ab3..4732aa722e 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.43.12
+
+### Patch Changes
+
+- fix: maintain correct linked list of effects when updating each blocks ([#17191](https://github.com/sveltejs/svelte/pull/17191))
+
 ## 5.43.11
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 17e20f2634..acfc1fc6e8 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.43.11",
+  "version": "5.43.12",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 5ad7f75d21..f12c8322f2 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.43.11';
+export const VERSION = '5.43.12';
 export const PUBLIC_VERSION = '5';

From 056b201d805c9e07a58813a2bbfcc3bea38ad2b2 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Thu, 20 Nov 2025 00:13:08 +0100
Subject: [PATCH 184/347] fix: don't set derived values during time traveling
 (#17163)

* chore: failing test for derived + fork + block

* fix: don't set derived values during time travel

* fix: skip no async

* fix: only set `derived.v` outside a fork

* chore: simplify

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

* tidy up test a bit (missing text makes things confusing in the sandbox)

* update comment

* tweak

---------

Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .../internal/client/reactivity/deriveds.js    | 13 ++++++++----
 .../svelte/src/internal/client/runtime.js     | 10 ++++------
 .../samples/fork-derived-value/_config.js     | 20 +++++++++++++++++++
 .../samples/fork-derived-value/main.svelte    | 20 +++++++++++++++++++
 4 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-value/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-value/main.svelte

diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 070230a461..39e02be764 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -356,9 +356,14 @@ export function update_derived(derived) {
 	var value = execute_derived(derived);
 
 	if (!derived.equals(value)) {
-		// TODO can we avoid setting `derived.v` when `batch_values !== null`,
-		// without causing the value to be stale later?
-		derived.v = value;
+		// in a fork, we don't update the underlying value, just `batch_values`.
+		// the underlying value will be updated when the fork is committed.
+		// otherwise, the next time we get here after a 'real world' state
+		// change, `derived.equals` may incorrectly return `true`
+		if (!current_batch?.is_fork) {
+			derived.v = value;
+		}
+
 		derived.wv = increment_write_version();
 	}
 
@@ -374,7 +379,7 @@ export function update_derived(derived) {
 		// only cache the value if we're in a tracking context, otherwise we won't
 		// clear the cache in `mark_reactions` when dependencies are updated
 		if (effect_tracking()) {
-			batch_values.set(derived, derived.v);
+			batch_values.set(derived, value);
 		}
 	} else {
 		var status = (derived.f & CONNECTED) === 0 ? MAYBE_DIRTY : CLEAN;
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 258f6962fa..5ece0d79b6 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -611,13 +611,9 @@ export function get(signal) {
 
 			return value;
 		}
-	} else if (is_derived) {
+	} else if (is_derived && !batch_values?.has(signal)) {
 		derived = /** @type {Derived} */ (signal);
 
-		if (batch_values?.has(derived)) {
-			return batch_values.get(derived);
-		}
-
 		if (is_dirty(derived)) {
 			update_derived(derived);
 		}
@@ -625,7 +621,9 @@ export function get(signal) {
 		if (is_updating_effect && effect_tracking() && (derived.f & CONNECTED) === 0) {
 			reconnect(derived);
 		}
-	} else if (batch_values?.has(signal)) {
+	}
+
+	if (batch_values?.has(signal)) {
 		return batch_values.get(signal);
 	}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-value/_config.js b/packages/svelte/tests/runtime-runes/samples/fork-derived-value/_config.js
new file mode 100644
index 0000000000..0635db7501
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-value/_config.js
@@ -0,0 +1,20 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const [fork, update] = target.querySelectorAll('button');
+
+		flushSync(() => {
+			fork.click();
+		});
+		flushSync(() => {
+			update.click();
+		});
+
+		const p = target.querySelector('p');
+
+		assert.equal(p?.textContent, 'one');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-value/main.svelte b/packages/svelte/tests/runtime-runes/samples/fork-derived-value/main.svelte
new file mode 100644
index 0000000000..06e0f1f264
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-value/main.svelte
@@ -0,0 +1,20 @@
+<script>
+	import { fork } from "svelte";
+
+	let state = $state(0);
+	let count = $derived(state);
+</script>
+
+<button onclick={() => {
+	fork(() => {
+		state++;
+	});
+}}>fork</button>
+
+<button onclick={() => {
+	state++;
+}}>update</button>
+
+{#if count === 1}
+	<p>one</p>
+{/if}

From 593eb048aacb0e9bc310b4ada120dc5d0d47159d Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Thu, 20 Nov 2025 06:43:08 +0100
Subject: [PATCH 185/347] chore changeset for #17163 (#17200)

---
 .changeset/spotty-dryers-return.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/spotty-dryers-return.md

diff --git a/.changeset/spotty-dryers-return.md b/.changeset/spotty-dryers-return.md
new file mode 100644
index 0000000000..6e3adfd807
--- /dev/null
+++ b/.changeset/spotty-dryers-return.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't set derived values during time traveling

From 110181068ffa88a237763d55958cd9919e36d5db Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Nov 2025 09:58:58 -0500
Subject: [PATCH 186/347] Version Packages (#17202)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/spotty-dryers-return.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/spotty-dryers-return.md

diff --git a/.changeset/spotty-dryers-return.md b/.changeset/spotty-dryers-return.md
deleted file mode 100644
index 6e3adfd807..0000000000
--- a/.changeset/spotty-dryers-return.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't set derived values during time traveling
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 4732aa722e..32cfaa4ddc 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.43.13
+
+### Patch Changes
+
+- fix: don't set derived values during time traveling ([#17200](https://github.com/sveltejs/svelte/pull/17200))
+
 ## 5.43.12
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index acfc1fc6e8..b0c2aa6eb4 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.43.12",
+  "version": "5.43.13",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index f12c8322f2..bc5ae5dc13 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.43.12';
+export const VERSION = '5.43.13';
 export const PUBLIC_VERSION = '5';

From a17dc3c3025266da0fa5b12628011197488235df Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Thu, 20 Nov 2025 17:13:57 +0100
Subject: [PATCH 187/347] fix: correctly migrate named self closing slots
 (#17199)

---
 .changeset/fuzzy-fans-hammer.md                           | 5 +++++
 packages/svelte/src/compiler/migrate/index.js             | 8 +++++---
 .../migrate/samples/self-closing-named-slot/input.svelte  | 3 +++
 .../migrate/samples/self-closing-named-slot/output.svelte | 5 +++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/fuzzy-fans-hammer.md
 create mode 100644 packages/svelte/tests/migrate/samples/self-closing-named-slot/input.svelte
 create mode 100644 packages/svelte/tests/migrate/samples/self-closing-named-slot/output.svelte

diff --git a/.changeset/fuzzy-fans-hammer.md b/.changeset/fuzzy-fans-hammer.md
new file mode 100644
index 0000000000..24af7fa8f5
--- /dev/null
+++ b/.changeset/fuzzy-fans-hammer.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly migrate named self closing slots
diff --git a/packages/svelte/src/compiler/migrate/index.js b/packages/svelte/src/compiler/migrate/index.js
index eb0e4eff8c..0d4691e9d6 100644
--- a/packages/svelte/src/compiler/migrate/index.js
+++ b/packages/svelte/src/compiler/migrate/index.js
@@ -1058,8 +1058,6 @@ const template = {
 		handle_identifier(node, state, path);
 	},
 	RegularElement(node, { state, path, next }) {
-		migrate_slot_usage(node, path, state);
-		handle_events(node, state);
 		// Strip off any namespace from the beginning of the node name.
 		const node_name = node.name.replace(/[a-zA-Z-]*:/g, '');
 
@@ -1067,8 +1065,12 @@ const template = {
 			let trimmed_position = node.end - 2;
 			while (state.str.original.charAt(trimmed_position - 1) === ' ') trimmed_position--;
 			state.str.remove(trimmed_position, node.end - 1);
-			state.str.appendRight(node.end, `</${node.name}>`);
+			state.str.appendLeft(node.end, `</${node.name}>`);
 		}
+
+		migrate_slot_usage(node, path, state);
+		handle_events(node, state);
+
 		next();
 	},
 	SvelteSelf(node, { state, next }) {
diff --git a/packages/svelte/tests/migrate/samples/self-closing-named-slot/input.svelte b/packages/svelte/tests/migrate/samples/self-closing-named-slot/input.svelte
new file mode 100644
index 0000000000..33ca4e3b9f
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/self-closing-named-slot/input.svelte
@@ -0,0 +1,3 @@
+<Component>
+	<div slot="test" />
+</Component>
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/self-closing-named-slot/output.svelte b/packages/svelte/tests/migrate/samples/self-closing-named-slot/output.svelte
new file mode 100644
index 0000000000..6655bc9dd2
--- /dev/null
+++ b/packages/svelte/tests/migrate/samples/self-closing-named-slot/output.svelte
@@ -0,0 +1,5 @@
+<Component>
+	{#snippet test()}
+		<div ></div>
+	{/snippet}
+</Component>
\ No newline at end of file

From 91486fa807c85193b5a52f7558acd9997d96892e Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 20 Nov 2025 17:23:02 +0100
Subject: [PATCH 188/347] fix: take async into account for
 bindings/transitions/animations/attachments (#17198)

* fix: take async into account for bindings/transitions/animations/attachments

- block on async work
- error at compile time on await expressions. Right now it gives confusing errors later at compile time or at runtime

Fixes #17194

* this was weird
---
 .changeset/itchy-forks-greet.md               |  5 ++++
 .changeset/plain-bikes-smile.md               |  5 ++++
 .../98-reference/.generated/compile-errors.md |  6 +++++
 .../messages/compile-errors/template.md       |  4 +++
 packages/svelte/src/compiler/errors.js        |  9 +++++++
 .../compiler/phases/1-parse/state/element.js  |  5 ++--
 .../src/compiler/phases/2-analyze/index.js    |  2 ++
 .../2-analyze/visitors/AnimateDirective.js    | 15 +++++++++++
 .../phases/2-analyze/visitors/AttachTag.js    |  6 ++++-
 .../2-analyze/visitors/BindDirective.js       | 10 +++++++
 .../2-analyze/visitors/TransitionDirective.js |  7 ++++-
 .../phases/2-analyze/visitors/UseDirective.js |  8 +++++-
 .../client/visitors/AnimateDirective.js       | 26 +++++++++++++------
 .../3-transform/client/visitors/AttachTag.js  | 14 +++++++++-
 .../client/visitors/TransitionDirective.js    | 14 +++++++++-
 .../client/visitors/UseDirective.js           | 14 +++++++++-
 .../client/visitors/shared/component.js       |  3 +++
 .../server/visitors/shared/component.js       |  4 +++
 .../svelte/src/compiler/types/template.d.ts   | 12 +++++++++
 .../client/dom/elements/transitions.js        |  8 +-----
 .../src/internal/client/reactivity/async.js   |  7 ++++-
 .../samples/async-action-blockers/_config.js  | 11 ++++++++
 .../samples/async-action-blockers/main.svelte | 13 ++++++++++
 .../async-attach-blockers/Child.svelte        |  5 ++++
 .../samples/async-attach-blockers/_config.js  | 11 ++++++++
 .../samples/async-attach-blockers/main.svelte | 17 ++++++++++++
 .../async-transition-blockers/_config.js      | 11 ++++++++
 .../async-transition-blockers/main.svelte     | 13 ++++++++++
 28 files changed, 240 insertions(+), 25 deletions(-)
 create mode 100644 .changeset/itchy-forks-greet.md
 create mode 100644 .changeset/plain-bikes-smile.md
 create mode 100644 packages/svelte/src/compiler/phases/2-analyze/visitors/AnimateDirective.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-action-blockers/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-action-blockers/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-attach-blockers/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-attach-blockers/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-attach-blockers/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-transition-blockers/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-transition-blockers/main.svelte

diff --git a/.changeset/itchy-forks-greet.md b/.changeset/itchy-forks-greet.md
new file mode 100644
index 0000000000..9eaf3b9852
--- /dev/null
+++ b/.changeset/itchy-forks-greet.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: error at compile time instead of at runtime on await expressions inside bindings/transitions/animations/attachments
diff --git a/.changeset/plain-bikes-smile.md b/.changeset/plain-bikes-smile.md
new file mode 100644
index 0000000000..19263dd616
--- /dev/null
+++ b/.changeset/plain-bikes-smile.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: take async blockers into account for bindings/transitions/animations/attachments
diff --git a/documentation/docs/98-reference/.generated/compile-errors.md b/documentation/docs/98-reference/.generated/compile-errors.md
index c5703c636b..94ea46b68a 100644
--- a/documentation/docs/98-reference/.generated/compile-errors.md
+++ b/documentation/docs/98-reference/.generated/compile-errors.md
@@ -561,6 +561,12 @@ Cannot use `await` in deriveds and template expressions, or at the top level of
 `$host()` can only be used inside custom element component instances
 ```
 
+### illegal_await_expression
+
+```
+`use:`, `transition:` and `animate:` directives, attachments and bindings do not support await expressions
+```
+
 ### illegal_element_attribute
 
 ```
diff --git a/packages/svelte/messages/compile-errors/template.md b/packages/svelte/messages/compile-errors/template.md
index ac95bfe4a7..dcec3867ef 100644
--- a/packages/svelte/messages/compile-errors/template.md
+++ b/packages/svelte/messages/compile-errors/template.md
@@ -231,6 +231,10 @@ The same applies to components:
 
 > Expected whitespace
 
+## illegal_await_expression
+
+> `use:`, `transition:` and `animate:` directives, attachments and bindings do not support await expressions
+
 ## illegal_element_attribute
 
 > `<%name%>` does not support non-event attributes or spread attributes
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index 5e3968215f..25304e48c8 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -1148,6 +1148,15 @@ export function expected_whitespace(node) {
 	e(node, 'expected_whitespace', `Expected whitespace\nhttps://svelte.dev/e/expected_whitespace`);
 }
 
+/**
+ * `use:`, `transition:` and `animate:` directives, attachments and bindings do not support await expressions
+ * @param {null | number | NodeLike} node
+ * @returns {never}
+ */
+export function illegal_await_expression(node) {
+	e(node, 'illegal_await_expression', `\`use:\`, \`transition:\` and \`animate:\` directives, attachments and bindings do not support await expressions\nhttps://svelte.dev/e/illegal_await_expression`);
+}
+
 /**
  * `<%name%>` does not support non-event attributes or spread attributes
  * @param {null | number | NodeLike} node
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 9167888e37..bd1bd33c41 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/element.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/element.js
@@ -654,8 +654,7 @@ function read_attribute(parser) {
 			}
 		}
 
-		/** @type {AST.Directive} */
-		const directive = {
+		const directive = /** @type {AST.Directive} */ ({
 			start,
 			end,
 			type,
@@ -664,7 +663,7 @@ function read_attribute(parser) {
 			metadata: {
 				expression: new ExpressionMetadata()
 			}
-		};
+		});
 
 		// @ts-expect-error we do this separately from the declaration to avoid upsetting typescript
 		directive.modifiers = modifiers;
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 4206f3df9a..fb026fa78f 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -24,6 +24,7 @@ import { extract_svelte_ignore } from '../../utils/extract_svelte_ignore.js';
 import { ignore_map, ignore_stack, pop_ignore, push_ignore } from '../../state.js';
 import { ArrowFunctionExpression } from './visitors/ArrowFunctionExpression.js';
 import { AssignmentExpression } from './visitors/AssignmentExpression.js';
+import { AnimateDirective } from './visitors/AnimateDirective.js';
 import { AttachTag } from './visitors/AttachTag.js';
 import { Attribute } from './visitors/Attribute.js';
 import { AwaitBlock } from './visitors/AwaitBlock.js';
@@ -142,6 +143,7 @@ const visitors = {
 			pop_ignore();
 		}
 	},
+	AnimateDirective,
 	ArrowFunctionExpression,
 	AssignmentExpression,
 	AttachTag,
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/AnimateDirective.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/AnimateDirective.js
new file mode 100644
index 0000000000..3b4f7007be
--- /dev/null
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/AnimateDirective.js
@@ -0,0 +1,15 @@
+/** @import { Context } from '../types' */
+/** @import { AST } from '#compiler'; */
+import * as e from '../../../errors.js';
+
+/**
+ * @param {AST.AnimateDirective} node
+ * @param {Context} context
+ */
+export function AnimateDirective(node, context) {
+	context.next({ ...context.state, expression: node.metadata.expression });
+
+	if (node.metadata.expression.has_await) {
+		e.illegal_await_expression(node);
+	}
+}
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/AttachTag.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/AttachTag.js
index 1e318f228d..f9a8c1b69d 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/AttachTag.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/AttachTag.js
@@ -1,7 +1,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { Context } from '../types' */
-
 import { mark_subtree_dynamic } from './shared/fragment.js';
+import * as e from '../../../errors.js';
 
 /**
  * @param {AST.AttachTag} node
@@ -10,4 +10,8 @@ import { mark_subtree_dynamic } from './shared/fragment.js';
 export function AttachTag(node, context) {
 	mark_subtree_dynamic(context.path);
 	context.next({ ...context.state, expression: node.metadata.expression });
+
+	if (node.metadata.expression.has_await) {
+		e.illegal_await_expression(node);
+	}
 }
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 aeae121278..ab541703a0 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js
@@ -161,6 +161,7 @@ export function BindDirective(node, context) {
 
 		const [get, set] = node.expression.expressions;
 		// We gotta jump across the getter/setter functions to avoid the expression metadata field being reset to null
+		// as we want to collect the functions' blocker/async info
 		context.visit(get.type === 'ArrowFunctionExpression' ? get.body : get, {
 			...context.state,
 			expression: node.metadata.expression
@@ -169,6 +170,11 @@ export function BindDirective(node, context) {
 			...context.state,
 			expression: node.metadata.expression
 		});
+
+		if (node.metadata.expression.has_await) {
+			e.illegal_await_expression(node);
+		}
+
 		return;
 	}
 
@@ -267,4 +273,8 @@ export function BindDirective(node, context) {
 	}
 
 	context.next({ ...context.state, expression: node.metadata.expression });
+
+	if (node.metadata.expression.has_await) {
+		e.illegal_await_expression(node);
+	}
 }
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/TransitionDirective.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/TransitionDirective.js
index c218f741c3..e50e28a04c 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/TransitionDirective.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/TransitionDirective.js
@@ -1,5 +1,6 @@
 /** @import { AST } from '#compiler' */
 /** @import { Context } from '../types' */
+import * as e from '../../../errors.js';
 
 import { mark_subtree_dynamic } from './shared/fragment.js';
 
@@ -10,5 +11,9 @@ import { mark_subtree_dynamic } from './shared/fragment.js';
 export function TransitionDirective(node, context) {
 	mark_subtree_dynamic(context.path);
 
-	context.next();
+	context.next({ ...context.state, expression: node.metadata.expression });
+
+	if (node.metadata.expression.has_await) {
+		e.illegal_await_expression(node);
+	}
 }
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/UseDirective.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/UseDirective.js
index 76706ad674..eb340382da 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/UseDirective.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/UseDirective.js
@@ -1,6 +1,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { Context } from '../types' */
 import { mark_subtree_dynamic } from './shared/fragment.js';
+import * as e from '../../../errors.js';
 
 /**
  * @param {AST.UseDirective} node
@@ -8,5 +9,10 @@ import { mark_subtree_dynamic } from './shared/fragment.js';
  */
 export function UseDirective(node, context) {
 	mark_subtree_dynamic(context.path);
-	context.next();
+
+	context.next({ ...context.state, expression: node.metadata.expression });
+
+	if (node.metadata.expression.has_await) {
+		e.illegal_await_expression(node);
+	}
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AnimateDirective.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AnimateDirective.js
index 16f9735370..c1f1991fa0 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AnimateDirective.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AnimateDirective.js
@@ -15,14 +15,24 @@ export function AnimateDirective(node, context) {
 			: b.thunk(/** @type {Expression} */ (context.visit(node.expression)));
 
 	// in after_update to ensure it always happens after bind:this
-	context.state.after_update.push(
-		b.stmt(
-			b.call(
-				'$.animation',
-				context.state.node,
-				b.thunk(/** @type {Expression} */ (context.visit(parse_directive_name(node.name)))),
-				expression
-			)
+	let statement = b.stmt(
+		b.call(
+			'$.animation',
+			context.state.node,
+			b.thunk(/** @type {Expression} */ (context.visit(parse_directive_name(node.name)))),
+			expression
 		)
 	);
+
+	if (node.metadata.expression.is_async()) {
+		statement = b.stmt(
+			b.call(
+				'$.run_after_blockers',
+				node.metadata.expression.blockers(),
+				b.thunk(b.block([statement]))
+			)
+		);
+	}
+
+	context.state.after_update.push(statement);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AttachTag.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AttachTag.js
index 8b1570c7dc..c594a1a1bd 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AttachTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AttachTag.js
@@ -9,6 +9,18 @@ import { build_expression } from './shared/utils.js';
  */
 export function AttachTag(node, context) {
 	const expression = build_expression(context, node.expression, node.metadata.expression);
-	context.state.init.push(b.stmt(b.call('$.attach', context.state.node, b.thunk(expression))));
+	let statement = b.stmt(b.call('$.attach', context.state.node, b.thunk(expression)));
+
+	if (node.metadata.expression.is_async()) {
+		statement = b.stmt(
+			b.call(
+				'$.run_after_blockers',
+				node.metadata.expression.blockers(),
+				b.thunk(b.block([statement]))
+			)
+		);
+	}
+
+	context.state.init.push(statement);
 	context.next();
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/TransitionDirective.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/TransitionDirective.js
index 41340c1290..bab843de02 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/TransitionDirective.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/TransitionDirective.js
@@ -25,5 +25,17 @@ export function TransitionDirective(node, context) {
 	}
 
 	// in after_update to ensure it always happens after bind:this
-	context.state.after_update.push(b.stmt(b.call('$.transition', ...args)));
+	let statement = b.stmt(b.call('$.transition', ...args));
+
+	if (node.metadata.expression.is_async()) {
+		statement = b.stmt(
+			b.call(
+				'$.run_after_blockers',
+				node.metadata.expression.blockers(),
+				b.thunk(b.block([statement]))
+			)
+		);
+	}
+
+	context.state.after_update.push(statement);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/UseDirective.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/UseDirective.js
index b95f2fc3ef..13d3057651 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/UseDirective.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/UseDirective.js
@@ -32,6 +32,18 @@ export function UseDirective(node, context) {
 	}
 
 	// actions need to run after attribute updates in order with bindings/events
-	context.state.init.push(b.stmt(b.call('$.action', ...args)));
+	let statement = b.stmt(b.call('$.action', ...args));
+
+	if (node.metadata.expression.is_async()) {
+		statement = b.stmt(
+			b.call(
+				'$.run_after_blockers',
+				node.metadata.expression.blockers(),
+				b.thunk(b.block([statement]))
+			)
+		);
+	}
+
+	context.state.init.push(statement);
 	context.next();
 }
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 b3139a29aa..d70048ad7e 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
@@ -296,6 +296,9 @@ export function build_component(node, component_name, context) {
 				);
 			}
 
+			// TODO also support await expressions here?
+			memoizer.check_blockers(attribute.metadata.expression);
+
 			push_prop(b.prop('init', b.call('$.attachment'), expression, true));
 		}
 	}
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 6f2ff38bc1..a90b5e41df 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
@@ -142,6 +142,10 @@ export function build_inline_component(node, expression, context) {
 					true
 				);
 			}
+		} else if (attribute.type === 'AttachTag') {
+			// While we don't run attachments on the server, on the client they might generate a surrounding blocker function which generates
+			// extra comments, and to prevent hydration mismatches we therefore have to account for them here to generate similar comments on the server.
+			optimiser.check_blockers(attribute.metadata.expression);
 		}
 	}
 
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index fd664f107c..1f62994807 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -194,6 +194,10 @@ export namespace AST {
 		name: string;
 		/** The y in `animate:x={y}` */
 		expression: null | Expression;
+		/** @internal */
+		metadata: {
+			expression: ExpressionMetadata;
+		};
 	}
 
 	/** A `bind:` directive */
@@ -285,6 +289,10 @@ export namespace AST {
 		intro: boolean;
 		/** True if this is a `transition:` or `out:` directive */
 		outro: boolean;
+		/** @internal */
+		metadata: {
+			expression: ExpressionMetadata;
+		};
 	}
 
 	/** A `use:` directive */
@@ -294,6 +302,10 @@ export namespace AST {
 		name: string;
 		/** The 'y' in `use:x={y}` */
 		expression: null | Expression;
+		/** @internal */
+		metadata: {
+			expression: ExpressionMetadata;
+		};
 	}
 
 	interface BaseElement extends BaseNode {
diff --git a/packages/svelte/src/internal/client/dom/elements/transitions.js b/packages/svelte/src/internal/client/dom/elements/transitions.js
index 00fad9ffdb..d1d034d402 100644
--- a/packages/svelte/src/internal/client/dom/elements/transitions.js
+++ b/packages/svelte/src/internal/client/dom/elements/transitions.js
@@ -1,13 +1,7 @@
 /** @import { AnimateFn, Animation, AnimationConfig, EachItem, Effect, TransitionFn, TransitionManager } from '#client' */
 import { noop, is_function } from '../../../shared/utils.js';
 import { effect } from '../../reactivity/effects.js';
-import {
-	active_effect,
-	active_reaction,
-	set_active_effect,
-	set_active_reaction,
-	untrack
-} from '../../runtime.js';
+import { active_effect, untrack } from '../../runtime.js';
 import { loop } from '../../loop.js';
 import { should_intro } from '../../render.js';
 import { current_each_item } from '../blocks/each.js';
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index e48aff3d7f..50c36ed021 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -26,6 +26,7 @@ import {
 } from './deriveds.js';
 import { aborted } from './effects.js';
 import { hydrate_next, hydrating, set_hydrate_node, skip_nodes } from '../dom/hydration.js';
+import { current_each_item, set_current_each_item } from '../dom/blocks/each.js';
 
 /**
  * @param {Array<Promise<void>>} blockers
@@ -89,7 +90,11 @@ export function flatten(blockers, sync, async, fn) {
  * @param {(values: Value[]) => any} fn
  */
 export function run_after_blockers(blockers, fn) {
-	flatten(blockers, [], [], fn);
+	var each_item = current_each_item; // TODO should this be part of capture?
+	flatten(blockers, [], [], (v) => {
+		set_current_each_item(each_item);
+		fn(v);
+	});
 }
 
 /**
diff --git a/packages/svelte/tests/runtime-runes/samples/async-action-blockers/_config.js b/packages/svelte/tests/runtime-runes/samples/async-action-blockers/_config.js
new file mode 100644
index 0000000000..9d8aea3c17
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-action-blockers/_config.js
@@ -0,0 +1,11 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client', 'hydrate'],
+	async test({ assert, logs }) {
+		await tick();
+
+		assert.deepEqual(logs, ['ready']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-action-blockers/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-action-blockers/main.svelte
new file mode 100644
index 0000000000..c9a1477a00
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-action-blockers/main.svelte
@@ -0,0 +1,13 @@
+<script>
+
+	// Wait a macrotask to make sure the effect doesn't run before the microtask-Promise.resolve() resolves, masking a bug
+	await new Promise(r => setTimeout(r));
+
+	function run(_, arg) {
+		console.log(arg);
+	}
+
+	let value = $state('ready');
+</script>
+
+<div use:run={value}></div>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-attach-blockers/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-attach-blockers/Child.svelte
new file mode 100644
index 0000000000..346f9c4a19
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-attach-blockers/Child.svelte
@@ -0,0 +1,5 @@
+<script>
+    let props = $props();
+</script>
+
+<div {...props}></div>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-attach-blockers/_config.js b/packages/svelte/tests/runtime-runes/samples/async-attach-blockers/_config.js
new file mode 100644
index 0000000000..4c83634e70
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-attach-blockers/_config.js
@@ -0,0 +1,11 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client', 'hydrate'],
+	async test({ assert, logs }) {
+		await tick();
+
+		assert.deepEqual(logs, ['ready', 'ready']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-attach-blockers/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-attach-blockers/main.svelte
new file mode 100644
index 0000000000..30ba602350
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-attach-blockers/main.svelte
@@ -0,0 +1,17 @@
+<script>
+	import Child from "./Child.svelte";
+
+	// Wait a macrotask to make sure the effect doesn't run before the microtask-Promise.resolve() resolves, masking a bug
+	await new Promise(r => setTimeout(r));
+
+	function createAttachment(value) {
+		return () => {
+			console.log(value);
+		};
+	}
+
+	let attachment = $state('ready');
+</script>
+
+<div {@attach createAttachment(attachment)}></div>
+<Child {@attach createAttachment(attachment)} />
diff --git a/packages/svelte/tests/runtime-runes/samples/async-transition-blockers/_config.js b/packages/svelte/tests/runtime-runes/samples/async-transition-blockers/_config.js
new file mode 100644
index 0000000000..9d8aea3c17
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-transition-blockers/_config.js
@@ -0,0 +1,11 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client', 'hydrate'],
+	async test({ assert, logs }) {
+		await tick();
+
+		assert.deepEqual(logs, ['ready']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-transition-blockers/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-transition-blockers/main.svelte
new file mode 100644
index 0000000000..ff5059e129
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-transition-blockers/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	// Wait a macrotask to make sure the effect doesn't run before the microtask-Promise.resolve() resolves, masking a bug
+	await new Promise(r => setTimeout(r));
+
+	function custom(_, value) {
+		console.log(value);
+		return { duration: 0 };
+	}
+
+	let params = $state('ready');
+</script>
+
+<div transition:custom={params}></div>

From 1aafbc47fff5766f272228d7346dda6816985318 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Nov 2025 14:58:07 -0500
Subject: [PATCH 189/347] Version Packages (#17204)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/fuzzy-fans-hammer.md |  5 -----
 .changeset/itchy-forks-greet.md |  5 -----
 .changeset/plain-bikes-smile.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/fuzzy-fans-hammer.md
 delete mode 100644 .changeset/itchy-forks-greet.md
 delete mode 100644 .changeset/plain-bikes-smile.md

diff --git a/.changeset/fuzzy-fans-hammer.md b/.changeset/fuzzy-fans-hammer.md
deleted file mode 100644
index 24af7fa8f5..0000000000
--- a/.changeset/fuzzy-fans-hammer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: correctly migrate named self closing slots
diff --git a/.changeset/itchy-forks-greet.md b/.changeset/itchy-forks-greet.md
deleted file mode 100644
index 9eaf3b9852..0000000000
--- a/.changeset/itchy-forks-greet.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: error at compile time instead of at runtime on await expressions inside bindings/transitions/animations/attachments
diff --git a/.changeset/plain-bikes-smile.md b/.changeset/plain-bikes-smile.md
deleted file mode 100644
index 19263dd616..0000000000
--- a/.changeset/plain-bikes-smile.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: take async blockers into account for bindings/transitions/animations/attachments
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 32cfaa4ddc..d89d611a10 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.43.14
+
+### Patch Changes
+
+- fix: correctly migrate named self closing slots ([#17199](https://github.com/sveltejs/svelte/pull/17199))
+
+- fix: error at compile time instead of at runtime on await expressions inside bindings/transitions/animations/attachments ([#17198](https://github.com/sveltejs/svelte/pull/17198))
+
+- fix: take async blockers into account for bindings/transitions/animations/attachments ([#17198](https://github.com/sveltejs/svelte/pull/17198))
+
 ## 5.43.13
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index b0c2aa6eb4..53f930fdac 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.43.13",
+  "version": "5.43.14",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index bc5ae5dc13..4d34f2c476 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.43.13';
+export const VERSION = '5.43.14';
 export const PUBLIC_VERSION = '5';

From 53bbe3462b3c50393eb916c23436bc497dfd82b9 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 24 Nov 2025 16:28:21 +0100
Subject: [PATCH 190/347] fix: don't execute attachments and attribute effects
 eagerly (#17208)

* fix: don't execute attachments and attribute effects eagerly

attributes_effect and attachments are blocks since they need the managed "don't just destroy children effects"-behavior, but they're not block effects in the sense of "run them eagerly while traversing the effect tree or while flushing effects". Since the latter was the case until now, it meant that forks could cause visible UI updates.

This PR introduces a new flag to fix that. `BLOCK_NON_EAGER` is basically a combination of block effects (with respects to the managed behavior) and render effects (with respects to the execution timing).

Fixes https://github.com/sveltejs/kit/issues/14931

* managed_effect
---
 .changeset/curvy-clouds-cut.md                |  5 ++
 .../svelte/src/internal/client/constants.js   |  9 +++
 .../client/dom/elements/attachments.js        |  4 +-
 .../client/dom/elements/attributes.js         |  4 +-
 .../src/internal/client/reactivity/batch.js   |  7 ++-
 .../src/internal/client/reactivity/effects.js | 15 ++++-
 .../src/internal/client/reactivity/sources.js |  6 +-
 .../svelte/src/internal/client/runtime.js     |  5 +-
 .../samples/async-fork-attributes/_config.js  | 60 +++++++++++++++++++
 .../samples/async-fork-attributes/main.svelte | 28 +++++++++
 10 files changed, 129 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/curvy-clouds-cut.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-attributes/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-attributes/main.svelte

diff --git a/.changeset/curvy-clouds-cut.md b/.changeset/curvy-clouds-cut.md
new file mode 100644
index 0000000000..f980e513c6
--- /dev/null
+++ b/.changeset/curvy-clouds-cut.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't execute attachments and attribute effects eagerly
diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js
index b39afef516..a121e6674a 100644
--- a/packages/svelte/src/internal/client/constants.js
+++ b/packages/svelte/src/internal/client/constants.js
@@ -2,6 +2,15 @@
 export const DERIVED = 1 << 1;
 export const EFFECT = 1 << 2;
 export const RENDER_EFFECT = 1 << 3;
+/**
+ * An effect that does not destroy its child effects when it reruns.
+ * Runs as part of render effects, i.e. not eagerly as part of tree traversal or effect flushing.
+ */
+export const MANAGED_EFFECT = 1 << 24;
+/**
+ * An effect that does not destroy its child effects when it reruns (like MANAGED_EFFECT).
+ * Runs eagerly as part of tree traversal or effect flushing.
+ */
 export const BLOCK_EFFECT = 1 << 4;
 export const BRANCH_EFFECT = 1 << 5;
 export const ROOT_EFFECT = 1 << 6;
diff --git a/packages/svelte/src/internal/client/dom/elements/attachments.js b/packages/svelte/src/internal/client/dom/elements/attachments.js
index 4fc1280138..8a3c313ae7 100644
--- a/packages/svelte/src/internal/client/dom/elements/attachments.js
+++ b/packages/svelte/src/internal/client/dom/elements/attachments.js
@@ -1,5 +1,5 @@
 /** @import { Effect } from '#client' */
-import { block, branch, effect, destroy_effect } from '../../reactivity/effects.js';
+import { branch, effect, destroy_effect, managed } from '../../reactivity/effects.js';
 
 // TODO in 6.0 or 7.0, when we remove legacy mode, we can simplify this by
 // getting rid of the block/branch stuff and just letting the effect rip.
@@ -16,7 +16,7 @@ export function attach(node, get_fn) {
 	/** @type {Effect | null} */
 	var e;
 
-	block(() => {
+	managed(() => {
 		if (fn !== (fn = get_fn())) {
 			if (e) {
 				destroy_effect(e);
diff --git a/packages/svelte/src/internal/client/dom/elements/attributes.js b/packages/svelte/src/internal/client/dom/elements/attributes.js
index d970e7c885..c1ab97dc61 100644
--- a/packages/svelte/src/internal/client/dom/elements/attributes.js
+++ b/packages/svelte/src/internal/client/dom/elements/attributes.js
@@ -20,7 +20,7 @@ import { clsx } from '../../../shared/attributes.js';
 import { set_class } from './class.js';
 import { set_style } from './style.js';
 import { ATTACHMENT_KEY, NAMESPACE_HTML, UNINITIALIZED } from '../../../../constants.js';
-import { block, branch, destroy_effect, effect } from '../../reactivity/effects.js';
+import { branch, destroy_effect, effect, managed } from '../../reactivity/effects.js';
 import { init_select, select_option } from './bindings/select.js';
 import { flatten } from '../../reactivity/async.js';
 
@@ -508,7 +508,7 @@ export function attribute_effect(
 		var is_select = element.nodeName === 'SELECT';
 		var inited = false;
 
-		block(() => {
+		managed(() => {
 			var next = fn(...values.map(get));
 			/** @type {Record<string | symbol, any>} */
 			var current = set_attributes(
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 22526df7c1..b99af84764 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -17,7 +17,8 @@ import {
 	EAGER_EFFECT,
 	HEAD_EFFECT,
 	ERROR_VALUE,
-	WAS_MARKED
+	WAS_MARKED,
+	MANAGED_EFFECT
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
@@ -234,7 +235,7 @@ export class Batch {
 					effect.f ^= CLEAN;
 				} else if ((flags & EFFECT) !== 0) {
 					target.effects.push(effect);
-				} else if (async_mode_flag && (flags & RENDER_EFFECT) !== 0) {
+				} else if (async_mode_flag && (flags & (RENDER_EFFECT | MANAGED_EFFECT)) !== 0) {
 					target.render_effects.push(effect);
 				} else if (is_dirty(effect)) {
 					if ((effect.f & BLOCK_EFFECT) !== 0) target.block_effects.push(effect);
@@ -779,7 +780,7 @@ function mark_effects(value, sources, marked, checked) {
 				mark_effects(/** @type {Derived} */ (reaction), sources, marked, checked);
 			} else if (
 				(flags & (ASYNC | BLOCK_EFFECT)) !== 0 &&
-				(flags & DIRTY) === 0 && // we may have scheduled this one already
+				(flags & DIRTY) === 0 &&
 				depends_on(reaction, sources, checked)
 			) {
 				set_signal_status(reaction, DIRTY);
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index abf7c43c29..4359378e01 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -33,7 +33,8 @@ import {
 	STALE_REACTION,
 	USER_EFFECT,
 	ASYNC,
-	CONNECTED
+	CONNECTED,
+	MANAGED_EFFECT
 } from '#client/constants';
 import * as e from '../errors.js';
 import { DEV } from 'esm-env';
@@ -401,6 +402,18 @@ export function block(fn, flags = 0) {
 	return effect;
 }
 
+/**
+ * @param {(() => void)} fn
+ * @param {number} flags
+ */
+export function managed(fn, flags = 0) {
+	var effect = create_effect(MANAGED_EFFECT | flags, fn, true);
+	if (DEV) {
+		effect.dev_stack = dev_stack;
+	}
+	return effect;
+}
+
 /**
  * @param {(() => void)} fn
  */
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 822fb21822..4f2adff9de 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -363,10 +363,8 @@ function mark_reactions(signal, status) {
 				mark_reactions(derived, MAYBE_DIRTY);
 			}
 		} else if (not_dirty) {
-			if ((flags & BLOCK_EFFECT) !== 0) {
-				if (eager_block_effects !== null) {
-					eager_block_effects.add(/** @type {Effect} */ (reaction));
-				}
+			if ((flags & BLOCK_EFFECT) !== 0 && eager_block_effects !== null) {
+				eager_block_effects.add(/** @type {Effect} */ (reaction));
 			}
 
 			schedule_effect(/** @type {Effect} */ (reaction));
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 5ece0d79b6..cb0fb74306 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -21,7 +21,8 @@ import {
 	REACTION_IS_UPDATING,
 	STALE_REACTION,
 	ERROR_VALUE,
-	WAS_MARKED
+	WAS_MARKED,
+	MANAGED_EFFECT
 } from './constants.js';
 import { old_values } from './reactivity/sources.js';
 import {
@@ -421,7 +422,7 @@ export function update_effect(effect) {
 	}
 
 	try {
-		if ((flags & BLOCK_EFFECT) !== 0) {
+		if ((flags & (BLOCK_EFFECT | MANAGED_EFFECT)) !== 0) {
 			destroy_block_effect_children(effect);
 		} else {
 			destroy_effect_children(effect);
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-attributes/_config.js b/packages/svelte/tests/runtime-runes/samples/async-fork-attributes/_config.js
new file mode 100644
index 0000000000..59bcdeb7f5
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-attributes/_config.js
@@ -0,0 +1,60 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [fork, commit] = target.querySelectorAll('button');
+
+		fork.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork</button>
+			<button>commit</button>
+			<p style="">foo</p>
+			<p style="">foo</p>
+			<p>foo</p>
+		`
+		);
+
+		commit.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork</button>
+			<button>commit</button>
+			<p style="color: red;">foo</p>
+			<p style="color: red;" data-attached=true>foo</p>
+			<p data-attached=true>foo</p>
+		`
+		);
+
+		fork.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork</button>
+			<button>commit</button>
+			<p style="color: red;">foo</p>
+			<p style="color: red;" data-attached=true>foo</p>
+			<p data-attached=true>foo</p>
+		`
+		);
+
+		commit.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+			<button>fork</button>
+			<button>commit</button>
+			<p style="">foo</p>
+			<p style="">foo</p>
+			<p>foo</p>
+		`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-attributes/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-fork-attributes/main.svelte
new file mode 100644
index 0000000000..956e5df6f3
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-attributes/main.svelte
@@ -0,0 +1,28 @@
+<script>
+	import { fork } from "svelte";
+	import { createAttachmentKey } from "svelte/attachments";
+
+	let style = $state('');
+	let attach = $state(undefined);
+
+	let forked;
+</script>
+
+<button onclick={()=>{
+	forked = fork(()=>{
+		style = style ? '' : 'color: red';
+		attach = attach ? undefined : (node) => {
+			node.setAttribute('data-attached', 'true');
+			return () => node.removeAttribute('data-attached');
+		};
+	})
+}}>fork</button>
+
+<button onclick={()=>{
+	forked.commit();
+}}>commit</button>
+
+<!-- force $.attribute_effect, which uses a block effect -->
+<p {...{style}}>foo</p>
+<p {...{style, [createAttachmentKey()]: attach}}>foo</p>
+<p {@attach attach}>foo</p>

From ea8838e96f063d274c989523e47f430bd9af9886 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Mon, 24 Nov 2025 22:41:09 +0100
Subject: [PATCH 191/347] fix: store forked derived values (#17212)

We have to take non-tracking contexts into account, especially while in the original `fork(() => ...)` context.

Closes #17206

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .changeset/strong-berries-fry.md                  |  5 +++++
 .../src/internal/client/reactivity/batch.js       |  3 +++
 .../src/internal/client/reactivity/deriveds.js    |  2 +-
 packages/svelte/src/internal/client/runtime.js    | 13 +++++++++++--
 .../fork-derived-value-immediate/_config.js       | 13 +++++++++++++
 .../fork-derived-value-immediate/main.svelte      | 15 +++++++++++++++
 6 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/strong-berries-fry.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-value-immediate/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-value-immediate/main.svelte

diff --git a/.changeset/strong-berries-fry.md b/.changeset/strong-berries-fry.md
new file mode 100644
index 0000000000..60dbb290a8
--- /dev/null
+++ b/.changeset/strong-berries-fry.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: store forked derived values
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index b99af84764..ee28556a27 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -959,12 +959,15 @@ export function fork(fn) {
 
 	var batch = Batch.ensure();
 	batch.is_fork = true;
+	batch_values = new Map();
 
 	var committed = false;
 	var settled = batch.settled();
 
 	flushSync(fn);
 
+	batch_values = null;
+
 	// revert state changes
 	for (var [source, value] of batch.previous) {
 		source.v = value;
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 39e02be764..3bf38bf0b2 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -378,7 +378,7 @@ export function update_derived(derived) {
 	if (batch_values !== null) {
 		// only cache the value if we're in a tracking context, otherwise we won't
 		// clear the cache in `mark_reactions` when dependencies are updated
-		if (effect_tracking()) {
+		if (effect_tracking() || current_batch?.is_fork) {
 			batch_values.set(derived, value);
 		}
 	} else {
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index cb0fb74306..4e82950782 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -44,7 +44,13 @@ import {
 	set_dev_stack
 } from './context.js';
 import * as w from './warnings.js';
-import { Batch, batch_values, flushSync, schedule_effect } from './reactivity/batch.js';
+import {
+	Batch,
+	batch_values,
+	current_batch,
+	flushSync,
+	schedule_effect
+} from './reactivity/batch.js';
 import { handle_error } from './error-handling.js';
 import { UNINITIALIZED } from '../../constants.js';
 import { captured_signals } from './legacy.js';
@@ -612,7 +618,10 @@ export function get(signal) {
 
 			return value;
 		}
-	} else if (is_derived && !batch_values?.has(signal)) {
+	} else if (
+		is_derived &&
+		(!batch_values?.has(signal) || (current_batch?.is_fork && !effect_tracking()))
+	) {
 		derived = /** @type {Derived} */ (signal);
 
 		if (is_dirty(derived)) {
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-value-immediate/_config.js b/packages/svelte/tests/runtime-runes/samples/fork-derived-value-immediate/_config.js
new file mode 100644
index 0000000000..4f7ff673d6
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-value-immediate/_config.js
@@ -0,0 +1,13 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target, logs }) {
+		const fork = target.querySelector('button');
+
+		fork?.click();
+		flushSync();
+		assert.deepEqual(logs, [1, 2]);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-value-immediate/main.svelte b/packages/svelte/tests/runtime-runes/samples/fork-derived-value-immediate/main.svelte
new file mode 100644
index 0000000000..2adb83b735
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-value-immediate/main.svelte
@@ -0,0 +1,15 @@
+<script>
+	import { fork } from "svelte";
+
+	let state = $state(0);
+	let count = $derived(state);
+</script>
+
+<button onclick={() => {
+	fork(() => {
+		state++;
+		console.log(count);
+		state++;
+		console.log(count);
+	});
+}}>fork</button>

From 84b261886b9747fc88df818eaf3ac70b802b6eae Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Mon, 24 Nov 2025 22:46:34 +0100
Subject: [PATCH 192/347] chore: lift "flushSync cannot be called in effects"
 restriction (#17139)

Since async-await was introduced into the code base a lot has changed. This lifts the restriction.

Closes #17131 (though I still wonder why Skeleton does that)
---
 .changeset/heavy-lions-tap.md                    |  5 +++++
 .../98-reference/.generated/client-errors.md     | 10 ----------
 packages/svelte/messages/client-errors/errors.md |  8 --------
 packages/svelte/src/internal/client/errors.js    | 16 ----------------
 .../src/internal/client/reactivity/batch.js      |  5 -----
 .../flush-sync-inside-attachment/_config.js      |  6 +-----
 6 files changed, 6 insertions(+), 44 deletions(-)
 create mode 100644 .changeset/heavy-lions-tap.md

diff --git a/.changeset/heavy-lions-tap.md b/.changeset/heavy-lions-tap.md
new file mode 100644
index 0000000000..5cf97fda77
--- /dev/null
+++ b/.changeset/heavy-lions-tap.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: lift "flushSync cannot be called in effects" restriction
diff --git a/documentation/docs/98-reference/.generated/client-errors.md b/documentation/docs/98-reference/.generated/client-errors.md
index 3f1cb8f76b..fa8533928a 100644
--- a/documentation/docs/98-reference/.generated/client-errors.md
+++ b/documentation/docs/98-reference/.generated/client-errors.md
@@ -136,16 +136,6 @@ Often when encountering this issue, the value in question shouldn't be state (fo
 Cannot use `fork(...)` unless the `experimental.async` compiler option is `true`
 ```
 
-### flush_sync_in_effect
-
-```
-Cannot use `flushSync` inside an effect
-```
-
-The `flushSync()` function can be used to flush any pending effects synchronously. It cannot be used if effects are currently being flushed — in other words, you can call it after a state change but _not_ inside an effect.
-
-This restriction only applies when using the `experimental.async` option, which will be active by default in Svelte 6.
-
 ### fork_discarded
 
 ```
diff --git a/packages/svelte/messages/client-errors/errors.md b/packages/svelte/messages/client-errors/errors.md
index ae7d811b2e..b75dc9cc6a 100644
--- a/packages/svelte/messages/client-errors/errors.md
+++ b/packages/svelte/messages/client-errors/errors.md
@@ -104,14 +104,6 @@ Often when encountering this issue, the value in question shouldn't be state (fo
 
 > Cannot use `fork(...)` unless the `experimental.async` compiler option is `true`
 
-## flush_sync_in_effect
-
-> Cannot use `flushSync` inside an effect
-
-The `flushSync()` function can be used to flush any pending effects synchronously. It cannot be used if effects are currently being flushed — in other words, you can call it after a state change but _not_ inside an effect.
-
-This restriction only applies when using the `experimental.async` option, which will be active by default in Svelte 6.
-
 ## fork_discarded
 
 > Cannot commit a fork that was already discarded
diff --git a/packages/svelte/src/internal/client/errors.js b/packages/svelte/src/internal/client/errors.js
index 8a5fde4f3b..c132382569 100644
--- a/packages/svelte/src/internal/client/errors.js
+++ b/packages/svelte/src/internal/client/errors.js
@@ -245,22 +245,6 @@ export function experimental_async_fork() {
 	}
 }
 
-/**
- * Cannot use `flushSync` inside an effect
- * @returns {never}
- */
-export function flush_sync_in_effect() {
-	if (DEV) {
-		const error = new Error(`flush_sync_in_effect\nCannot use \`flushSync\` inside an effect\nhttps://svelte.dev/e/flush_sync_in_effect`);
-
-		error.name = 'Svelte error';
-
-		throw error;
-	} else {
-		throw new Error(`https://svelte.dev/e/flush_sync_in_effect`);
-	}
-}
-
 /**
  * Cannot commit a fork that was already discarded
  * @returns {never}
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index ee28556a27..c6b182790e 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -563,11 +563,6 @@ export class Batch {
  * @returns {T}
  */
 export function flushSync(fn) {
-	if (async_mode_flag && active_effect !== null) {
-		// We disallow this because it creates super-hard to reason about stack trace and because it's generally a bad idea
-		e.flush_sync_in_effect();
-	}
-
 	var was_flushing_sync = is_flushing_sync;
 	is_flushing_sync = true;
 
diff --git a/packages/svelte/tests/runtime-runes/samples/flush-sync-inside-attachment/_config.js b/packages/svelte/tests/runtime-runes/samples/flush-sync-inside-attachment/_config.js
index ec8858b2c6..b34a90e901 100644
--- a/packages/svelte/tests/runtime-runes/samples/flush-sync-inside-attachment/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/flush-sync-inside-attachment/_config.js
@@ -1,12 +1,8 @@
-import { async_mode } from '../../../helpers';
 import { test } from '../../test';
 
 export default test({
-	// In legacy mode this succeeds and logs 'hello'
-	// In async mode this throws an error because flushSync is called inside an effect
 	async test({ assert, target, logs }) {
 		assert.htmlEqual(target.innerHTML, `<button>show</button> <div>hello</div>`);
 		assert.deepEqual(logs, ['hello']);
-	},
-	runtime_error: async_mode ? 'flush_sync_in_effect' : undefined
+	}
 });

From 129c4086f729ffe3c6d3fefc7cbc878825077506 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 22:47:40 +0100
Subject: [PATCH 193/347] Version Packages (#17228)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/curvy-clouds-cut.md   |  5 -----
 .changeset/heavy-lions-tap.md    |  5 -----
 .changeset/strong-berries-fry.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/curvy-clouds-cut.md
 delete mode 100644 .changeset/heavy-lions-tap.md
 delete mode 100644 .changeset/strong-berries-fry.md

diff --git a/.changeset/curvy-clouds-cut.md b/.changeset/curvy-clouds-cut.md
deleted file mode 100644
index f980e513c6..0000000000
--- a/.changeset/curvy-clouds-cut.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't execute attachments and attribute effects eagerly
diff --git a/.changeset/heavy-lions-tap.md b/.changeset/heavy-lions-tap.md
deleted file mode 100644
index 5cf97fda77..0000000000
--- a/.changeset/heavy-lions-tap.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: lift "flushSync cannot be called in effects" restriction
diff --git a/.changeset/strong-berries-fry.md b/.changeset/strong-berries-fry.md
deleted file mode 100644
index 60dbb290a8..0000000000
--- a/.changeset/strong-berries-fry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: store forked derived values
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index d89d611a10..36ff8010ab 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.43.15
+
+### Patch Changes
+
+- fix: don't execute attachments and attribute effects eagerly ([#17208](https://github.com/sveltejs/svelte/pull/17208))
+
+- chore: lift "flushSync cannot be called in effects" restriction ([#17139](https://github.com/sveltejs/svelte/pull/17139))
+
+- fix: store forked derived values ([#17212](https://github.com/sveltejs/svelte/pull/17212))
+
 ## 5.43.14
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 53f930fdac..fa636a5355 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.43.14",
+  "version": "5.43.15",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 4d34f2c476..f7ad2de61c 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.43.14';
+export const VERSION = '5.43.15';
 export const PUBLIC_VERSION = '5';

From c2a110cd81ba83407464e13b65126f97bbd42d26 Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Mon, 24 Nov 2025 19:20:31 -0700
Subject: [PATCH 194/347] feat: `hydratable` (#17154)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat:

* doc comments

* types

* types

* changeset

* tests

* docs

* hopefully

* lint

* finally figured out test issues

* get docs building

* the easy stuff

* prune errors

* feat: capture clobbering better, capture unused keys, don't block on unused keys

* progress on serializing nested promises

* fix

* idk man but the tests are passing so i'ma checkpoint this

* fix tests

* compare resolved serialized values

* robustify

* thunkify

* fixes

* ajsldkfjalsdfkjasd

* tests

* docs

* ugh

* ugh ugh ugh

* Update documentation/docs/06-runtime/05-hydratable.md

Co-authored-by: kaysef <25851116+kaysef@users.noreply.github.com>

* make errors better

* tweak

* remove context restoration

* fix

* trim

* simplify hydratable (#17230)

* simplify hydratable

* tidy up

* unused

---------

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

* improve errors

* include all non-internal frames, handle identical stacks

* tweak example

* tweak message — setTimeout is covered by ALS

* cut out the middleman

* unused

* tidy

* Apply suggestions from code review

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
Co-authored-by: kaysef <25851116+kaysef@users.noreply.github.com>
---
 .changeset/big-masks-shave.md                 |   5 +
 .../docs/06-runtime/05-hydratable.md          |  65 +++++++++
 .../98-reference/.generated/client-errors.md  |  27 +++-
 .../.generated/client-warnings.md             |  19 +++
 .../98-reference/.generated/server-errors.md  |  49 +++++++
 .../.generated/server-warnings.md             |  34 +++++
 .../98-reference/.generated/shared-errors.md  |   6 +
 .../svelte/messages/client-errors/errors.md   |  25 +++-
 .../messages/client-warnings/warnings.md      |  17 +++
 .../svelte/messages/server-errors/errors.md   |  41 ++++++
 .../messages/server-warnings/warnings.md      |  30 ++++
 .../svelte/messages/shared-errors/errors.md   |   4 +
 packages/svelte/package.json                  |   1 +
 packages/svelte/src/index-client.js           |   1 +
 packages/svelte/src/index-server.js           |   2 +
 .../svelte/src/internal/client/dev/inspect.js |   4 +-
 .../svelte/src/internal/client/dev/tracing.js |  57 --------
 packages/svelte/src/internal/client/errors.js |  25 +++-
 .../svelte/src/internal/client/hydratable.js  |  33 +++++
 packages/svelte/src/internal/client/proxy.js  |   5 +-
 .../src/internal/client/reactivity/batch.js   |   2 +-
 .../internal/client/reactivity/deriveds.js    |   4 +-
 .../src/internal/client/reactivity/sources.js |   7 +-
 .../svelte/src/internal/client/runtime.js     |   7 +-
 .../svelte/src/internal/client/types.d.ts     |   9 ++
 .../svelte/src/internal/client/warnings.js    |  12 ++
 packages/svelte/src/internal/server/dev.js    |  10 ++
 packages/svelte/src/internal/server/errors.js |  66 +++++++++
 .../svelte/src/internal/server/hydratable.js  | 136 ++++++++++++++++++
 .../src/internal/server/render-context.js     |  74 ++++++++++
 .../svelte/src/internal/server/renderer.js    |  86 +++++++++--
 .../svelte/src/internal/server/types.d.ts     |  19 +++
 .../svelte/src/internal/server/warnings.js    |  25 +++-
 packages/svelte/src/internal/shared/dev.js    |  65 +++++++++
 packages/svelte/src/internal/shared/errors.js |  17 +++
 .../svelte/src/internal/shared/types.d.ts     |   2 +
 packages/svelte/src/internal/shared/utils.js  |   2 +-
 .../svelte/tests/runtime-legacy/shared.ts     |  45 +++++-
 .../hydratable-complex-nesting/_config.js     |  24 ++++
 .../hydratable-complex-nesting/main.svelte    |  13 ++
 .../hydratable-error-on-missing/_config.js    |  13 ++
 .../hydratable-error-on-missing/main.svelte   |  14 ++
 .../_config.js                                |  27 ++++
 .../main.svelte                               |  27 ++++
 .../samples/hydratable-unused-keys/_config.js |  26 ++++
 .../hydratable-unused-keys/main.svelte        |  19 +++
 .../samples/hydratable/_config.js             |  21 +++
 .../samples/hydratable/main.svelte            |   9 ++
 .../_config.js                                |   1 +
 .../hydratable-clobbering-but-ok/_config.js   |   5 +
 .../_expected.html                            |   0
 .../hydratable-clobbering-but-ok/main.svelte  |   6 +
 .../_config.js                                |   6 +
 .../main.svelte                               |  16 +++
 .../samples/hydratable-clobbering/_config.js  |   6 +
 .../samples/hydratable-clobbering/main.svelte |   6 +
 .../invalid-nested-svelte-element/_config.js  |   2 +
 .../tests/server-side-rendering/test.ts       |   8 +-
 packages/svelte/types/index.d.ts              |   1 +
 pnpm-lock.yaml                                |   8 ++
 60 files changed, 1202 insertions(+), 94 deletions(-)
 create mode 100644 .changeset/big-masks-shave.md
 create mode 100644 documentation/docs/06-runtime/05-hydratable.md
 create mode 100644 documentation/docs/98-reference/.generated/server-warnings.md
 create mode 100644 packages/svelte/messages/server-warnings/warnings.md
 create mode 100644 packages/svelte/src/internal/client/hydratable.js
 create mode 100644 packages/svelte/src/internal/server/hydratable.js
 create mode 100644 packages/svelte/src/internal/server/render-context.js
 create mode 100644 packages/svelte/src/internal/shared/dev.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-complex-nesting/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-complex-nesting/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-error-on-missing/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-error-on-missing/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys-nesting-partial/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys-nesting-partial/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering/main.svelte

diff --git a/.changeset/big-masks-shave.md b/.changeset/big-masks-shave.md
new file mode 100644
index 0000000000..96c18fdb6c
--- /dev/null
+++ b/.changeset/big-masks-shave.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: `hydratable` API
diff --git a/documentation/docs/06-runtime/05-hydratable.md b/documentation/docs/06-runtime/05-hydratable.md
new file mode 100644
index 0000000000..298f653a7e
--- /dev/null
+++ b/documentation/docs/06-runtime/05-hydratable.md
@@ -0,0 +1,65 @@
+---
+title: Hydratable data
+---
+
+In Svelte, when you want to render asynchronous content data on the server, you can simply `await` it. This is great! However, it comes with a pitfall: when hydrating that content on the client, Svelte has to redo the asynchronous work, which blocks hydration for however long it takes:
+
+```svelte
+<script>
+  import { getUser } from 'my-database-library';
+
+  // This will get the user on the server, render the user's name into the h1,
+  // and then, during hydration on the client, it will get the user _again_,
+  // blocking hydration until it's done.
+  const user = await getUser();
+</script>
+
+<h1>{user.name}</h1>
+```
+
+That's silly, though. If we've already done the hard work of getting the data on the server, we don't want to get it again during hydration on the client. `hydratable` is a low-level API built to solve this problem. You probably won't need this very often -- it will be used behind the scenes by whatever datafetching library you use. For example, it powers [remote functions in SvelteKit](/docs/kit/remote-functions).
+
+To fix the example above:
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+  import { getUser } from 'my-database-library';
+
+  // During server rendering, this will serialize and stash the result of `getUser`, associating
+  // it with the provided key and baking it into the `head` content. During hydration, it will
+  // look for the serialized version, returning it instead of running `getUser`. After hydration
+  // is done, if it's called again, it'll simply invoke `getUser`.
+  const user = await hydratable('user', () => getUser());
+</script>
+
+<h1>{user.name}</h1>
+```
+
+This API can also be used to provide access to random or time-based values that are stable between server rendering and hydration. For example, to get a random number that doesn't update on hydration:
+
+```ts
+import { hydratable } from 'svelte';
+const rand = hydratable('random', () => Math.random());
+```
+
+If you're a library author, be sure to prefix the keys of your `hydratable` values with the name of your library so that your keys don't conflict with other libraries.
+
+## Serialization
+
+All data returned from a `hydratable` function must be serializable. But this doesn't mean you're limited to JSON — Svelte uses [`devalue`](https://npmjs.com/package/devalue), which can serialize all sorts of things including `Map`, `Set`, `URL`, and `BigInt`. Check the documentation page for a full list. In addition to these, thanks to some Svelte magic, you can also fearlessly use promises:
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+  const promises = hydratable('random', () => {
+    return {
+      one: Promise.resolve(1),
+      two: Promise.resolve(2)
+    }
+  });
+</script>
+
+{await promises.one}
+{await promises.two}
+```
diff --git a/documentation/docs/98-reference/.generated/client-errors.md b/documentation/docs/98-reference/.generated/client-errors.md
index fa8533928a..8601a728a7 100644
--- a/documentation/docs/98-reference/.generated/client-errors.md
+++ b/documentation/docs/98-reference/.generated/client-errors.md
@@ -130,12 +130,16 @@ $effect(() => {
 
 Often when encountering this issue, the value in question shouldn't be state (for example, if you are pushing to a `logs` array in an effect, make `logs` a normal array rather than `$state([])`). In the rare cases where you really _do_ need to write to state in an effect — [which you should avoid]($effect#When-not-to-use-$effect) — you can read the state with [untrack](svelte#untrack) to avoid adding it as a dependency.
 
-### experimental_async_fork
+### flush_sync_in_effect
 
 ```
-Cannot use `fork(...)` unless the `experimental.async` compiler option is `true`
+Cannot use `flushSync` inside an effect
 ```
 
+The `flushSync()` function can be used to flush any pending effects synchronously. It cannot be used if effects are currently being flushed — in other words, you can call it after a state change but _not_ inside an effect.
+
+This restriction only applies when using the `experimental.async` option, which will be active by default in Svelte 6.
+
 ### fork_discarded
 
 ```
@@ -154,6 +158,25 @@ Cannot create a fork inside an effect or when state changes are pending
 `getAbortSignal()` can only be called inside an effect or derived
 ```
 
+### hydratable_missing_but_required
+
+```
+Expected to find a hydratable with key `%key%` during hydration, but did not.
+```
+
+This can happen if you render a hydratable on the client that was not rendered on the server, and means that it was forced to fall back to running its function blockingly during hydration. This is bad for performance, as it blocks hydration until the asynchronous work completes.
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+
+	if (BROWSER) {
+		// bad! nothing can become interactive until this asynchronous work is done
+		await hydratable('foo', get_slow_random_number);
+	}
+</script>
+```
+
 ### hydration_failed
 
 ```
diff --git a/documentation/docs/98-reference/.generated/client-warnings.md b/documentation/docs/98-reference/.generated/client-warnings.md
index c95ace2229..4deb338521 100644
--- a/documentation/docs/98-reference/.generated/client-warnings.md
+++ b/documentation/docs/98-reference/.generated/client-warnings.md
@@ -140,6 +140,25 @@ The easiest way to log a value as it changes over time is to use the [`$inspect`
 %handler% should be a function. Did you mean to %suggestion%?
 ```
 
+### hydratable_missing_but_expected
+
+```
+Expected to find a hydratable with key `%key%` during hydration, but did not.
+```
+
+This can happen if you render a hydratable on the client that was not rendered on the server, and means that it was forced to fall back to running its function blockingly during hydration. This is bad for performance, as it blocks hydration until the asynchronous work completes.
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+
+	if (BROWSER) {
+		// bad! nothing can become interactive until this asynchronous work is done
+		await hydratable('foo', get_slow_random_number);
+	}
+</script>
+```
+
 ### hydration_attribute_changed
 
 ```
diff --git a/documentation/docs/98-reference/.generated/server-errors.md b/documentation/docs/98-reference/.generated/server-errors.md
index 6263032212..4d05e04207 100644
--- a/documentation/docs/98-reference/.generated/server-errors.md
+++ b/documentation/docs/98-reference/.generated/server-errors.md
@@ -1,5 +1,13 @@
 <!-- This file is generated by scripts/process-messages/index.js. Do not edit! -->
 
+### async_local_storage_unavailable
+
+```
+The node API `AsyncLocalStorage` is not available, but is required to use async server rendering.
+```
+
+Some platforms require configuration flags to enable this API. Consult your platform's documentation.
+
 ### await_invalid
 
 ```
@@ -14,6 +22,39 @@ You (or the framework you're using) called [`render(...)`](svelte-server#render)
 The `html` property of server render results has been deprecated. Use `body` instead.
 ```
 
+### hydratable_clobbering
+
+```
+Attempted to set `hydratable` with key `%key%` twice with different values.
+
+%stack%
+```
+
+This error occurs when using `hydratable` multiple times with the same key. To avoid this, you can:
+- Ensure all invocations with the same key result in the same value
+- Update the keys to make both instances unique
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+
+  // which one should "win" and be serialized in the rendered response?
+  const one = hydratable('not-unique', () => 1);
+  const two = hydratable('not-unique', () => 2);
+</script>
+```
+
+### hydratable_serialization_failed
+
+```
+Failed to serialize `hydratable` data for key `%key%`.
+
+`hydratable` can serialize anything [`uneval` from `devalue`](https://npmjs.com/package/uneval) can, plus Promises.
+
+Cause:
+%stack%
+```
+
 ### lifecycle_function_unavailable
 
 ```
@@ -21,3 +62,11 @@ The `html` property of server render results has been deprecated. Use `body` ins
 ```
 
 Certain methods such as `mount` cannot be invoked while running in a server context. Avoid calling them eagerly, i.e. not during render.
+
+### server_context_required
+
+```
+Could not resolve `render` context.
+```
+
+Certain functions such as `hydratable` cannot be invoked outside of a `render(...)` call, such as at the top level of a module.
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..c4a7fbefef
--- /dev/null
+++ b/documentation/docs/98-reference/.generated/server-warnings.md
@@ -0,0 +1,34 @@
+<!-- This file is generated by scripts/process-messages/index.js. Do not edit! -->
+
+### unresolved_hydratable
+
+```
+A `hydratable` value with key `%key%` was created, but at least part of it was not used during the render.
+
+The `hydratable` was initialized in:
+%stack%
+```
+
+The most likely cause of this is creating a `hydratable` in the `script` block of your component and then `await`ing
+the result inside a `svelte:boundary` with a `pending` snippet:
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+	import { getUser } from '$lib/get-user.js';
+
+	const user = hydratable('user', getUser);
+</script>
+
+<svelte:boundary>
+	<h1>{(await user).name}</h1>
+
+	{#snippet pending()}
+		<div>Loading...</div>
+	{/snippet}
+</svelte:boundary>
+```
+
+Consider inlining the `hydratable` call inside the boundary so that it's not called on the server.
+
+Note that this can also happen when a `hydratable` contains multiple promises and some but not all of them have been used.
diff --git a/documentation/docs/98-reference/.generated/shared-errors.md b/documentation/docs/98-reference/.generated/shared-errors.md
index 07e13dea45..136b3f4957 100644
--- a/documentation/docs/98-reference/.generated/shared-errors.md
+++ b/documentation/docs/98-reference/.generated/shared-errors.md
@@ -1,5 +1,11 @@
 <!-- This file is generated by scripts/process-messages/index.js. Do not edit! -->
 
+### experimental_async_required
+
+```
+Cannot use `%name%(...)` unless the `experimental.async` compiler option is `true`
+```
+
 ### invalid_default_snippet
 
 ```
diff --git a/packages/svelte/messages/client-errors/errors.md b/packages/svelte/messages/client-errors/errors.md
index b75dc9cc6a..bedf6db0a5 100644
--- a/packages/svelte/messages/client-errors/errors.md
+++ b/packages/svelte/messages/client-errors/errors.md
@@ -100,9 +100,13 @@ $effect(() => {
 
 Often when encountering this issue, the value in question shouldn't be state (for example, if you are pushing to a `logs` array in an effect, make `logs` a normal array rather than `$state([])`). In the rare cases where you really _do_ need to write to state in an effect — [which you should avoid]($effect#When-not-to-use-$effect) — you can read the state with [untrack](svelte#untrack) to avoid adding it as a dependency.
 
-## experimental_async_fork
+## flush_sync_in_effect
 
-> Cannot use `fork(...)` unless the `experimental.async` compiler option is `true`
+> Cannot use `flushSync` inside an effect
+
+The `flushSync()` function can be used to flush any pending effects synchronously. It cannot be used if effects are currently being flushed — in other words, you can call it after a state change but _not_ inside an effect.
+
+This restriction only applies when using the `experimental.async` option, which will be active by default in Svelte 6.
 
 ## fork_discarded
 
@@ -116,6 +120,23 @@ Often when encountering this issue, the value in question shouldn't be state (fo
 
 > `getAbortSignal()` can only be called inside an effect or derived
 
+## hydratable_missing_but_required
+
+> Expected to find a hydratable with key `%key%` during hydration, but did not.
+
+This can happen if you render a hydratable on the client that was not rendered on the server, and means that it was forced to fall back to running its function blockingly during hydration. This is bad for performance, as it blocks hydration until the asynchronous work completes.
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+
+	if (BROWSER) {
+		// bad! nothing can become interactive until this asynchronous work is done
+		await hydratable('foo', get_slow_random_number);
+	}
+</script>
+```
+
 ## hydration_failed
 
 > Failed to hydrate the application
diff --git a/packages/svelte/messages/client-warnings/warnings.md b/packages/svelte/messages/client-warnings/warnings.md
index 9763c8df1a..b51fc6b53c 100644
--- a/packages/svelte/messages/client-warnings/warnings.md
+++ b/packages/svelte/messages/client-warnings/warnings.md
@@ -124,6 +124,23 @@ The easiest way to log a value as it changes over time is to use the [`$inspect`
 
 > %handler% should be a function. Did you mean to %suggestion%?
 
+## hydratable_missing_but_expected
+
+> Expected to find a hydratable with key `%key%` during hydration, but did not.
+
+This can happen if you render a hydratable on the client that was not rendered on the server, and means that it was forced to fall back to running its function blockingly during hydration. This is bad for performance, as it blocks hydration until the asynchronous work completes.
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+
+	if (BROWSER) {
+		// bad! nothing can become interactive until this asynchronous work is done
+		await hydratable('foo', get_slow_random_number);
+	}
+</script>
+```
+
 ## hydration_attribute_changed
 
 > The `%attribute%` attribute on `%html%` changed its value between server and client renders. The client value, `%value%`, will be ignored in favour of the server value
diff --git a/packages/svelte/messages/server-errors/errors.md b/packages/svelte/messages/server-errors/errors.md
index 49d2a310f6..ac2ecc0a40 100644
--- a/packages/svelte/messages/server-errors/errors.md
+++ b/packages/svelte/messages/server-errors/errors.md
@@ -1,3 +1,9 @@
+## async_local_storage_unavailable
+
+> The node API `AsyncLocalStorage` is not available, but is required to use async server rendering.
+
+Some platforms require configuration flags to enable this API. Consult your platform's documentation.
+
 ## await_invalid
 
 > Encountered asynchronous work while rendering synchronously.
@@ -8,8 +14,43 @@ You (or the framework you're using) called [`render(...)`](svelte-server#render)
 
 > The `html` property of server render results has been deprecated. Use `body` instead.
 
+## hydratable_clobbering
+
+> Attempted to set `hydratable` with key `%key%` twice with different values.
+>
+> %stack%
+
+This error occurs when using `hydratable` multiple times with the same key. To avoid this, you can:
+- Ensure all invocations with the same key result in the same value
+- Update the keys to make both instances unique
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+
+  // which one should "win" and be serialized in the rendered response?
+  const one = hydratable('not-unique', () => 1);
+  const two = hydratable('not-unique', () => 2);
+</script>
+```
+
+## hydratable_serialization_failed
+
+> Failed to serialize `hydratable` data for key `%key%`.
+>
+> `hydratable` can serialize anything [`uneval` from `devalue`](https://npmjs.com/package/uneval) can, plus Promises.
+>
+> Cause:
+> %stack%
+
 ## 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.
+
+## server_context_required
+
+> Could not resolve `render` context.
+
+Certain functions such as `hydratable` cannot be invoked outside of a `render(...)` call, such as at the top level of a module.
diff --git a/packages/svelte/messages/server-warnings/warnings.md b/packages/svelte/messages/server-warnings/warnings.md
new file mode 100644
index 0000000000..89e1c9d718
--- /dev/null
+++ b/packages/svelte/messages/server-warnings/warnings.md
@@ -0,0 +1,30 @@
+## unresolved_hydratable
+
+> A `hydratable` value with key `%key%` was created, but at least part of it was not used during the render.
+>
+> The `hydratable` was initialized in:
+> %stack%
+
+The most likely cause of this is creating a `hydratable` in the `script` block of your component and then `await`ing
+the result inside a `svelte:boundary` with a `pending` snippet:
+
+```svelte
+<script>
+  import { hydratable } from 'svelte';
+	import { getUser } from '$lib/get-user.js';
+
+	const user = hydratable('user', getUser);
+</script>
+
+<svelte:boundary>
+	<h1>{(await user).name}</h1>
+
+	{#snippet pending()}
+		<div>Loading...</div>
+	{/snippet}
+</svelte:boundary>
+```
+
+Consider inlining the `hydratable` call inside the boundary so that it's not called on the server.
+
+Note that this can also happen when a `hydratable` contains multiple promises and some but not all of them have been used.
diff --git a/packages/svelte/messages/shared-errors/errors.md b/packages/svelte/messages/shared-errors/errors.md
index e3959034a3..bf053283e4 100644
--- a/packages/svelte/messages/shared-errors/errors.md
+++ b/packages/svelte/messages/shared-errors/errors.md
@@ -1,3 +1,7 @@
+## experimental_async_required
+
+> Cannot use `%name%(...)` unless the `experimental.async` compiler option is `true`
+
 ## 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/package.json b/packages/svelte/package.json
index fa636a5355..264c672828 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -174,6 +174,7 @@
     "aria-query": "^5.3.1",
     "axobject-query": "^4.1.0",
     "clsx": "^2.1.1",
+    "devalue": "^5.5.0",
     "esm-env": "^1.2.1",
     "esrap": "^2.1.0",
     "is-reference": "^3.0.3",
diff --git a/packages/svelte/src/index-client.js b/packages/svelte/src/index-client.js
index 4fcfff980d..0eb1b80315 100644
--- a/packages/svelte/src/index-client.js
+++ b/packages/svelte/src/index-client.js
@@ -249,6 +249,7 @@ export {
 	hasContext,
 	setContext
 } from './internal/client/context.js';
+export { hydratable } from './internal/client/hydratable.js';
 export { hydrate, mount, unmount } from './internal/client/render.js';
 export { tick, untrack, settled } from './internal/client/runtime.js';
 export { createRawSnippet } from './internal/client/dom/blocks/snippet.js';
diff --git a/packages/svelte/src/index-server.js b/packages/svelte/src/index-server.js
index 61b0d98c06..9fb810fd9e 100644
--- a/packages/svelte/src/index-server.js
+++ b/packages/svelte/src/index-server.js
@@ -51,4 +51,6 @@ export {
 	setContext
 } from './internal/server/context.js';
 
+export { hydratable } from './internal/server/hydratable.js';
+
 export { createRawSnippet } from './internal/server/blocks/snippet.js';
diff --git a/packages/svelte/src/internal/client/dev/inspect.js b/packages/svelte/src/internal/client/dev/inspect.js
index 34ba508984..1ed255b4dd 100644
--- a/packages/svelte/src/internal/client/dev/inspect.js
+++ b/packages/svelte/src/internal/client/dev/inspect.js
@@ -2,7 +2,7 @@ import { UNINITIALIZED } from '../../../constants.js';
 import { snapshot } from '../../shared/clone.js';
 import { eager_effect, render_effect, validate_effect } from '../reactivity/effects.js';
 import { untrack } from '../runtime.js';
-import { get_stack } from './tracing.js';
+import { get_error } from '../../shared/dev.js';
 
 /**
  * @param {() => any[]} get_value
@@ -33,7 +33,7 @@ export function inspect(get_value, inspector, show_stack = false) {
 				inspector(...snap);
 
 				if (!initial) {
-					const stack = get_stack('$inspect(...)');
+					const stack = get_error('$inspect(...)');
 					// eslint-disable-next-line no-console
 
 					if (stack) {
diff --git a/packages/svelte/src/internal/client/dev/tracing.js b/packages/svelte/src/internal/client/dev/tracing.js
index 183da73447..c6edfde933 100644
--- a/packages/svelte/src/internal/client/dev/tracing.js
+++ b/packages/svelte/src/internal/client/dev/tracing.js
@@ -1,7 +1,6 @@
 /** @import { Derived, Reaction, Value } from '#client' */
 import { UNINITIALIZED } from '../../../constants.js';
 import { snapshot } from '../../shared/clone.js';
-import { define_property } from '../../shared/utils.js';
 import { DERIVED, ASYNC, PROXY_PATH_SYMBOL, STATE_SYMBOL } from '#client/constants';
 import { effect_tracking } from '../reactivity/effects.js';
 import { active_reaction, untrack } from '../runtime.js';
@@ -131,62 +130,6 @@ export function trace(label, fn) {
 	}
 }
 
-/**
- * @param {string} label
- * @returns {Error & { stack: string } | null}
- */
-export function get_stack(label) {
-	// @ts-ignore stackTraceLimit doesn't exist everywhere
-	const limit = Error.stackTraceLimit;
-
-	// @ts-ignore
-	Error.stackTraceLimit = Infinity;
-	let error = Error();
-
-	// @ts-ignore
-	Error.stackTraceLimit = limit;
-
-	const stack = error.stack;
-
-	if (!stack) return null;
-
-	const lines = stack.split('\n');
-	const new_lines = ['\n'];
-
-	for (let i = 0; i < lines.length; i++) {
-		const line = lines[i];
-		const posixified = line.replaceAll('\\', '/');
-
-		if (line === 'Error') {
-			continue;
-		}
-
-		if (line.includes('validate_each_keys')) {
-			return null;
-		}
-
-		if (posixified.includes('svelte/src/internal') || posixified.includes('node_modules/.vite')) {
-			continue;
-		}
-
-		new_lines.push(line);
-	}
-
-	if (new_lines.length === 1) {
-		return null;
-	}
-
-	define_property(error, 'stack', {
-		value: new_lines.join('\n')
-	});
-
-	define_property(error, 'name', {
-		value: label
-	});
-
-	return /** @type {Error & { stack: string }} */ (error);
-}
-
 /**
  * @param {Value} source
  * @param {string} label
diff --git a/packages/svelte/src/internal/client/errors.js b/packages/svelte/src/internal/client/errors.js
index c132382569..34f1d85540 100644
--- a/packages/svelte/src/internal/client/errors.js
+++ b/packages/svelte/src/internal/client/errors.js
@@ -230,18 +230,18 @@ export function effect_update_depth_exceeded() {
 }
 
 /**
- * Cannot use `fork(...)` unless the `experimental.async` compiler option is `true`
+ * Cannot use `flushSync` inside an effect
  * @returns {never}
  */
-export function experimental_async_fork() {
+export function flush_sync_in_effect() {
 	if (DEV) {
-		const error = new Error(`experimental_async_fork\nCannot use \`fork(...)\` unless the \`experimental.async\` compiler option is \`true\`\nhttps://svelte.dev/e/experimental_async_fork`);
+		const error = new Error(`flush_sync_in_effect\nCannot use \`flushSync\` inside an effect\nhttps://svelte.dev/e/flush_sync_in_effect`);
 
 		error.name = 'Svelte error';
 
 		throw error;
 	} else {
-		throw new Error(`https://svelte.dev/e/experimental_async_fork`);
+		throw new Error(`https://svelte.dev/e/flush_sync_in_effect`);
 	}
 }
 
@@ -293,6 +293,23 @@ export function get_abort_signal_outside_reaction() {
 	}
 }
 
+/**
+ * Expected to find a hydratable with key `%key%` during hydration, but did not.
+ * @param {string} key
+ * @returns {never}
+ */
+export function hydratable_missing_but_required(key) {
+	if (DEV) {
+		const error = new Error(`hydratable_missing_but_required\nExpected to find a hydratable with key \`${key}\` during hydration, but did not.\nhttps://svelte.dev/e/hydratable_missing_but_required`);
+
+		error.name = 'Svelte error';
+
+		throw error;
+	} else {
+		throw new Error(`https://svelte.dev/e/hydratable_missing_but_required`);
+	}
+}
+
 /**
  * Failed to hydrate the application
  * @returns {never}
diff --git a/packages/svelte/src/internal/client/hydratable.js b/packages/svelte/src/internal/client/hydratable.js
new file mode 100644
index 0000000000..601b860a48
--- /dev/null
+++ b/packages/svelte/src/internal/client/hydratable.js
@@ -0,0 +1,33 @@
+import { async_mode_flag } from '../flags/index.js';
+import { hydrating } from './dom/hydration.js';
+import * as w from './warnings.js';
+import * as e from './errors.js';
+import { DEV } from 'esm-env';
+
+/**
+ * @template T
+ * @param {string} key
+ * @param {() => T} fn
+ * @returns {T}
+ */
+export function hydratable(key, fn) {
+	if (!async_mode_flag) {
+		e.experimental_async_required('hydratable');
+	}
+
+	if (hydrating) {
+		const store = window.__svelte?.h;
+
+		if (store?.has(key)) {
+			return /** @type {T} */ (store.get(key));
+		}
+
+		if (DEV) {
+			e.hydratable_missing_but_required(key);
+		} else {
+			w.hydratable_missing_but_expected(key);
+		}
+	}
+
+	return fn();
+}
diff --git a/packages/svelte/src/internal/client/proxy.js b/packages/svelte/src/internal/client/proxy.js
index 5b028d8d09..c8802e2672 100644
--- a/packages/svelte/src/internal/client/proxy.js
+++ b/packages/svelte/src/internal/client/proxy.js
@@ -25,7 +25,8 @@ import {
 import { PROXY_PATH_SYMBOL, STATE_SYMBOL } from '#client/constants';
 import { UNINITIALIZED } from '../../constants.js';
 import * as e from './errors.js';
-import { get_stack, tag } from './dev/tracing.js';
+import { tag } from './dev/tracing.js';
+import { get_error } from '../shared/dev.js';
 import { tracing_mode_flag } from '../flags/index.js';
 
 // TODO move all regexes into shared module?
@@ -53,7 +54,7 @@ export function proxy(value) {
 	var is_proxied_array = is_array(value);
 	var version = source(0);
 
-	var stack = DEV && tracing_mode_flag ? get_stack('created at') : null;
+	var stack = DEV && tracing_mode_flag ? get_error('created at') : null;
 	var parent_version = update_version;
 
 	/**
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index c6b182790e..3308711ed3 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -945,7 +945,7 @@ export function eager(fn) {
  */
 export function fork(fn) {
 	if (!async_mode_flag) {
-		e.experimental_async_fork();
+		e.experimental_async_required('fork');
 	}
 
 	if (current_batch !== null) {
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 3bf38bf0b2..b2d5d59ae1 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 e from '../errors.js';
 import * as w from '../warnings.js';
 import { async_effect, destroy_effect, effect_tracking, teardown } from './effects.js';
 import { eager_effects, internal_set, set_eager_effects, source } from './sources.js';
-import { get_stack } from '../dev/tracing.js';
+import { get_error } from '../../shared/dev.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';
@@ -84,7 +84,7 @@ export function derived(fn) {
 	};
 
 	if (DEV && tracing_mode_flag) {
-		signal.created = get_stack('created at');
+		signal.created = get_error('created at');
 	}
 
 	return signal;
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 4f2adff9de..853b255dd5 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -34,7 +34,8 @@ import {
 } from '#client/constants';
 import * as e from '../errors.js';
 import { legacy_mode_flag, tracing_mode_flag } from '../../flags/index.js';
-import { get_stack, tag_proxy } from '../dev/tracing.js';
+import { tag_proxy } from '../dev/tracing.js';
+import { get_error } from '../../shared/dev.js';
 import { component_context, is_runes } from '../context.js';
 import { Batch, batch_values, eager_block_effects, schedule_effect } from './batch.js';
 import { proxy } from '../proxy.js';
@@ -78,7 +79,7 @@ export function source(v, stack) {
 	};
 
 	if (DEV && tracing_mode_flag) {
-		signal.created = stack ?? get_stack('created at');
+		signal.created = stack ?? get_error('created at');
 		signal.updated = null;
 		signal.set_during_effect = false;
 		signal.trace = null;
@@ -196,7 +197,7 @@ export function internal_set(source, value) {
 				source.updated.set('', { error: /** @type {any} */ (null), count });
 
 				if (tracing_mode_flag || count > 5) {
-					const error = get_stack('updated at');
+					const error = get_error('updated at');
 
 					if (error !== null) {
 						let entry = source.updated.get(error.stack);
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 4e82950782..100804a974 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -33,7 +33,8 @@ import {
 	update_derived
 } from './reactivity/deriveds.js';
 import { async_mode_flag, tracing_mode_flag } from '../flags/index.js';
-import { tracing_expressions, get_stack } from './dev/tracing.js';
+import { tracing_expressions } from './dev/tracing.js';
+import { get_error } from '../shared/dev.js';
 import {
 	component_context,
 	dev_current_component_function,
@@ -554,7 +555,7 @@ export function get(signal) {
 		// 	if (!tracking && !untracking && !was_read) {
 		// 		w.await_reactivity_loss(/** @type {string} */ (signal.label));
 
-		// 		var trace = get_stack('traced at');
+		// 		var trace = get_error('traced at');
 		// 		// eslint-disable-next-line no-console
 		// 		if (trace) console.warn(trace);
 		// 	}
@@ -573,7 +574,7 @@ export function get(signal) {
 			if (signal.trace) {
 				signal.trace();
 			} else {
-				var trace = get_stack('traced at');
+				var trace = get_error('traced at');
 
 				if (trace) {
 					var entry = tracing_expressions.entries.get(signal);
diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts
index c1003ecc1a..5c682ed140 100644
--- a/packages/svelte/src/internal/client/types.d.ts
+++ b/packages/svelte/src/internal/client/types.d.ts
@@ -2,6 +2,15 @@ import type { Store } from '#shared';
 import { STATE_SYMBOL } from './constants.js';
 import type { Effect, Source, Value } from './reactivity/types.js';
 
+declare global {
+	interface Window {
+		__svelte?: {
+			/** hydratables */
+			h?: Map<string, unknown>;
+		};
+	}
+}
+
 type EventCallback = (event: Event) => boolean;
 export type EventCallbackMap = Record<string, EventCallback | EventCallback[]>;
 
diff --git a/packages/svelte/src/internal/client/warnings.js b/packages/svelte/src/internal/client/warnings.js
index 1081ef5861..a9a50c57d6 100644
--- a/packages/svelte/src/internal/client/warnings.js
+++ b/packages/svelte/src/internal/client/warnings.js
@@ -87,6 +87,18 @@ export function event_handler_invalid(handler, suggestion) {
 	}
 }
 
+/**
+ * Expected to find a hydratable with key `%key%` during hydration, but did not.
+ * @param {string} key
+ */
+export function hydratable_missing_but_expected(key) {
+	if (DEV) {
+		console.warn(`%c[svelte] hydratable_missing_but_expected\n%cExpected to find a hydratable with key \`${key}\` during hydration, but did not.\nhttps://svelte.dev/e/hydratable_missing_but_expected`, bold, normal);
+	} else {
+		console.warn(`https://svelte.dev/e/hydratable_missing_but_expected`);
+	}
+}
+
 /**
  * The `%attribute%` attribute on `%html%` changed its value between server and client renders. The client value, `%value%`, will be ignored in favour of the server value
  * @param {string} attribute
diff --git a/packages/svelte/src/internal/server/dev.js b/packages/svelte/src/internal/server/dev.js
index 1211670f94..4a6cdb8cf6 100644
--- a/packages/svelte/src/internal/server/dev.js
+++ b/packages/svelte/src/internal/server/dev.js
@@ -4,6 +4,7 @@ import {
 	is_tag_valid_with_ancestor,
 	is_tag_valid_with_parent
 } from '../../html-tree-validation.js';
+import { get_stack } from '../shared/dev.js';
 import { set_ssr_context, ssr_context } from './context.js';
 import * as e from './errors.js';
 import { Renderer } from './renderer.js';
@@ -98,3 +99,12 @@ export function validate_snippet_args(renderer) {
 		e.invalid_snippet_arguments();
 	}
 }
+
+export function get_user_code_location() {
+	const stack = get_stack();
+
+	return stack
+		.filter((line) => line.trim().startsWith('at '))
+		.map((line) => line.replace(/\((.*):\d+:\d+\)$/, (_, file) => `(${file})`))
+		.join('\n');
+}
diff --git a/packages/svelte/src/internal/server/errors.js b/packages/svelte/src/internal/server/errors.js
index bde49fe935..3d6c0ffbdd 100644
--- a/packages/svelte/src/internal/server/errors.js
+++ b/packages/svelte/src/internal/server/errors.js
@@ -2,6 +2,18 @@
 
 export *  from '../shared/errors.js';
 
+/**
+ * The node API `AsyncLocalStorage` is not available, but is required to use async server rendering.
+ * @returns {never}
+ */
+export function async_local_storage_unavailable() {
+	const error = new Error(`async_local_storage_unavailable\nThe node API \`AsyncLocalStorage\` is not available, but is required to use async server rendering.\nhttps://svelte.dev/e/async_local_storage_unavailable`);
+
+	error.name = 'Svelte error';
+
+	throw error;
+}
+
 /**
  * Encountered asynchronous work while rendering synchronously.
  * @returns {never}
@@ -26,6 +38,48 @@ export function html_deprecated() {
 	throw error;
 }
 
+/**
+ * Attempted to set `hydratable` with key `%key%` twice with different values.
+ * 
+ * %stack%
+ * @param {string} key
+ * @param {string} stack
+ * @returns {never}
+ */
+export function hydratable_clobbering(key, stack) {
+	const error = new Error(`hydratable_clobbering\nAttempted to set \`hydratable\` with key \`${key}\` twice with different values.
+
+${stack}\nhttps://svelte.dev/e/hydratable_clobbering`);
+
+	error.name = 'Svelte error';
+
+	throw error;
+}
+
+/**
+ * Failed to serialize `hydratable` data for key `%key%`.
+ * 
+ * `hydratable` can serialize anything [`uneval` from `devalue`](https://npmjs.com/package/uneval) can, plus Promises.
+ * 
+ * Cause:
+ * %stack%
+ * @param {string} key
+ * @param {string} stack
+ * @returns {never}
+ */
+export function hydratable_serialization_failed(key, stack) {
+	const error = new Error(`hydratable_serialization_failed\nFailed to serialize \`hydratable\` data for key \`${key}\`.
+
+\`hydratable\` can serialize anything [\`uneval\` from \`devalue\`](https://npmjs.com/package/uneval) can, plus Promises.
+
+Cause:
+${stack}\nhttps://svelte.dev/e/hydratable_serialization_failed`);
+
+	error.name = 'Svelte error';
+
+	throw error;
+}
+
 /**
  * `%name%(...)` is not available on the server
  * @param {string} name
@@ -36,5 +90,17 @@ export function lifecycle_function_unavailable(name) {
 
 	error.name = 'Svelte error';
 
+	throw error;
+}
+
+/**
+ * Could not resolve `render` context.
+ * @returns {never}
+ */
+export function server_context_required() {
+	const error = new Error(`server_context_required\nCould not resolve \`render\` context.\nhttps://svelte.dev/e/server_context_required`);
+
+	error.name = 'Svelte error';
+
 	throw error;
 }
\ No newline at end of file
diff --git a/packages/svelte/src/internal/server/hydratable.js b/packages/svelte/src/internal/server/hydratable.js
new file mode 100644
index 0000000000..59fa97da4c
--- /dev/null
+++ b/packages/svelte/src/internal/server/hydratable.js
@@ -0,0 +1,136 @@
+/** @import { HydratableLookupEntry } from '#server' */
+import { async_mode_flag } from '../flags/index.js';
+import { get_render_context } from './render-context.js';
+import * as e from './errors.js';
+import * as devalue from 'devalue';
+import { get_stack } from '../shared/dev.js';
+import { DEV } from 'esm-env';
+import { get_user_code_location } from './dev.js';
+
+/**
+ * @template T
+ * @param {string} key
+ * @param {() => T} fn
+ * @returns {T}
+ */
+export function hydratable(key, fn) {
+	if (!async_mode_flag) {
+		e.experimental_async_required('hydratable');
+	}
+
+	const { hydratable } = get_render_context();
+
+	let entry = hydratable.lookup.get(key);
+
+	if (entry !== undefined) {
+		if (DEV) {
+			const comparison = compare(key, entry, encode(key, fn()));
+			comparison.catch(() => {});
+			hydratable.comparisons.push(comparison);
+		}
+
+		return /** @type {T} */ (entry.value);
+	}
+
+	const value = fn();
+
+	entry = encode(key, value, hydratable.unresolved_promises);
+	hydratable.lookup.set(key, entry);
+
+	return value;
+}
+
+/**
+ * @param {string} key
+ * @param {any} value
+ * @param {Map<Promise<any>, string>} [unresolved]
+ */
+function encode(key, value, unresolved) {
+	/** @type {HydratableLookupEntry} */
+	const entry = { value, serialized: '' };
+
+	if (DEV) {
+		entry.stack = get_user_code_location();
+	}
+
+	let uid = 1;
+
+	entry.serialized = devalue.uneval(entry.value, (value, uneval) => {
+		if (value instanceof Promise) {
+			const p = value
+				.then((v) => `r(${uneval(v)})`)
+				.catch((devalue_error) =>
+					e.hydratable_serialization_failed(
+						key,
+						serialization_stack(entry.stack, devalue_error?.stack)
+					)
+				);
+
+			// prevent unhandled rejections from crashing the server
+			p.catch(() => {});
+
+			// track which promises are still resolving when render is complete
+			unresolved?.set(p, key);
+			p.finally(() => unresolved?.delete(p));
+
+			// we serialize promises as `"${i}"`, because it's impossible for that string
+			// to occur 'naturally' (since the quote marks would have to be escaped)
+			const placeholder = `"${uid++}"`;
+
+			(entry.promises ??= []).push(
+				p.then((s) => {
+					entry.serialized = entry.serialized.replace(placeholder, s);
+				})
+			);
+
+			return placeholder;
+		}
+	});
+
+	return entry;
+}
+
+/**
+ * @param {string} key
+ * @param {HydratableLookupEntry} a
+ * @param {HydratableLookupEntry} b
+ */
+async function compare(key, a, b) {
+	// note: these need to be loops (as opposed to Promise.all) because
+	// additional promises can get pushed to them while we're awaiting
+	// an earlier one
+	for (const p of a?.promises ?? []) {
+		await p;
+	}
+
+	for (const p of b?.promises ?? []) {
+		await p;
+	}
+
+	if (a.serialized !== b.serialized) {
+		const a_stack = /** @type {string} */ (a.stack);
+		const b_stack = /** @type {string} */ (b.stack);
+
+		const stack =
+			a_stack === b_stack
+				? `Occurred at:\n${a_stack}`
+				: `First occurrence at:\n${a_stack}\n\nSecond occurrence at:\n${b_stack}`;
+
+		e.hydratable_clobbering(key, stack);
+	}
+}
+
+/**
+ * @param {string | undefined} root_stack
+ * @param {string | undefined} uneval_stack
+ */
+function serialization_stack(root_stack, uneval_stack) {
+	let out = '';
+	if (root_stack) {
+		out += root_stack + '\n';
+	}
+	if (uneval_stack) {
+		out += 'Caused by:\n' + uneval_stack + '\n';
+	}
+	return out || '<missing stack trace>';
+}
diff --git a/packages/svelte/src/internal/server/render-context.js b/packages/svelte/src/internal/server/render-context.js
new file mode 100644
index 0000000000..a33fff69d3
--- /dev/null
+++ b/packages/svelte/src/internal/server/render-context.js
@@ -0,0 +1,74 @@
+// @ts-ignore -- we don't include node types in the production build
+/** @import { AsyncLocalStorage } from 'node:async_hooks' */
+/** @import { RenderContext } from '#server' */
+
+import { deferred } from '../shared/utils.js';
+import * as e from './errors.js';
+
+/** @type {Promise<void> | null} */
+let current_render = null;
+
+/** @type {RenderContext | null} */
+let context = null;
+
+/** @returns {RenderContext} */
+export function get_render_context() {
+	const store = context ?? als?.getStore();
+
+	if (!store) {
+		e.server_context_required();
+	}
+
+	return store;
+}
+
+/**
+ * @template T
+ * @param {() => Promise<T>} fn
+ * @returns {Promise<T>}
+ */
+export async function with_render_context(fn) {
+	context = {
+		hydratable: {
+			lookup: new Map(),
+			comparisons: [],
+			unresolved_promises: new Map()
+		}
+	};
+
+	if (in_webcontainer()) {
+		const { promise, resolve } = deferred();
+		const previous_render = current_render;
+		current_render = promise;
+		await previous_render;
+		return fn().finally(resolve);
+	}
+
+	try {
+		if (als === null) {
+			e.async_local_storage_unavailable();
+		}
+		return als.run(context, fn);
+	} finally {
+		context = null;
+	}
+}
+
+/** @type {AsyncLocalStorage<RenderContext | null> | null} */
+let als = null;
+
+export async function init_render_context() {
+	if (als !== null) return;
+	try {
+		// @ts-ignore -- we don't include node types in the production build
+		const { AsyncLocalStorage } = await import('node:async_hooks');
+		als = new AsyncLocalStorage();
+	} catch {}
+}
+
+// this has to be a function because rollup won't treeshake it if it's a constant
+function in_webcontainer() {
+	// @ts-ignore -- this will fail when we run typecheck because we exclude node types
+	// eslint-disable-next-line n/prefer-global/process
+	return !!globalThis.process?.versions?.webcontainer;
+}
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 479175c2eb..0cfb1a7a93 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -1,18 +1,19 @@
 /** @import { Component } from 'svelte' */
-/** @import { RenderOutput, SSRContext, SyncRenderOutput } from './types.js' */
+/** @import { HydratableContext, RenderOutput, SSRContext, SyncRenderOutput } from './types.js' */
+/** @import { MaybePromise } from '#shared' */
 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 { pop, push, set_ssr_context, ssr_context, save } 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';
+import { get_render_context, with_render_context, init_render_context } from './render-context.js';
+import { DEV } from 'esm-env';
 
 /** @typedef {'head' | 'body'} RendererType */
 /** @typedef {{ [key in RendererType]: string }} AccumulatedContent */
-/**
- * @template T
- * @typedef {T | Promise<T>} MaybePromise<T>
- */
+
 /**
  * @typedef {string | Renderer} RendererItem
  */
@@ -423,7 +424,9 @@ export class Renderer {
 							});
 							return Promise.resolve(user_result);
 						}
-						async ??= Renderer.#render_async(component, options);
+						async ??= init_render_context().then(() =>
+							with_render_context(() => Renderer.#render_async(component, options))
+						);
 						return async.then((result) => {
 							Object.defineProperty(result, 'html', {
 								// eslint-disable-next-line getter-return
@@ -515,15 +518,19 @@ export class Renderer {
 	 * @returns {Promise<AccumulatedContent>}
 	 */
 	static async #render_async(component, options) {
-		var previous_context = ssr_context;
+		const previous_context = ssr_context;
+
 		try {
 			const renderer = Renderer.#open_render('async', component, options);
-
 			const content = await renderer.#collect_content_async();
+			const hydratables = await renderer.#collect_hydratables();
+			if (hydratables !== null) {
+				content.head = hydratables + content.head;
+			}
 			return Renderer.#close_render(content, renderer);
 		} finally {
-			abort();
 			set_ssr_context(previous_context);
+			abort();
 		}
 	}
 
@@ -564,6 +571,23 @@ export class Renderer {
 		return content;
 	}
 
+	async #collect_hydratables() {
+		const ctx = get_render_context().hydratable;
+
+		for (const [_, key] of ctx.unresolved_promises) {
+			// this is a problem -- it means we've finished the render but we're still waiting on a promise to resolve so we can
+			// serialize it, so we're blocking the response on useless content.
+			w.unresolved_hydratable(key, ctx.lookup.get(key)?.stack ?? '<missing stack trace>');
+		}
+
+		for (const comparison of ctx.comparisons) {
+			// these reject if there's a mismatch
+			await comparison;
+		}
+
+		return await Renderer.#hydratable_block(ctx);
+	}
+
 	/**
 	 * @template {Record<string, any>} Props
 	 * @param {'sync' | 'async'} mode
@@ -617,6 +641,48 @@ export class Renderer {
 			body
 		};
 	}
+
+	/**
+	 * @param {HydratableContext} ctx
+	 */
+	static async #hydratable_block(ctx) {
+		if (ctx.lookup.size === 0) {
+			return null;
+		}
+
+		let entries = [];
+		let has_promises = false;
+
+		for (const [k, v] of ctx.lookup) {
+			if (v.promises) {
+				has_promises = true;
+				for (const p of v.promises) await p;
+			}
+
+			entries.push(`[${JSON.stringify(k)},${v.serialized}]`);
+		}
+
+		let prelude = `const h = (window.__svelte ??= {}).h ??= new Map();`;
+
+		if (has_promises) {
+			prelude = `const r = (v) => Promise.resolve(v);
+				${prelude}`;
+		}
+
+		// TODO csp -- have discussed but not implemented
+		return `
+		<script>
+			{
+				${prelude}
+
+				for (const [k, v] of [
+					${entries.join(',\n\t\t\t\t\t')}
+				]) {
+					h.set(k, v);
+				}
+			}
+		</script>`;
+	}
 }
 
 export class SSRState {
diff --git a/packages/svelte/src/internal/server/types.d.ts b/packages/svelte/src/internal/server/types.d.ts
index 53cefabc69..05ee34fb17 100644
--- a/packages/svelte/src/internal/server/types.d.ts
+++ b/packages/svelte/src/internal/server/types.d.ts
@@ -1,3 +1,4 @@
+import type { MaybePromise } from '#shared';
 import type { Element } from './dev';
 import type { Renderer } from './renderer';
 
@@ -14,6 +15,24 @@ export interface SSRContext {
 	element?: Element;
 }
 
+export interface HydratableLookupEntry {
+	value: unknown;
+	serialized: string;
+	promises?: Array<Promise<void>>;
+	/** dev-only */
+	stack?: string;
+}
+
+export interface HydratableContext {
+	lookup: Map<string, HydratableLookupEntry>;
+	comparisons: Promise<void>[];
+	unresolved_promises: Map<Promise<string>, string>;
+}
+
+export interface RenderContext {
+	hydratable: HydratableContext;
+}
+
 export interface SyncRenderOutput {
 	/** HTML that goes into the `<head>` */
 	head: string;
diff --git a/packages/svelte/src/internal/server/warnings.js b/packages/svelte/src/internal/server/warnings.js
index d4ee7a86c2..fc44a086af 100644
--- a/packages/svelte/src/internal/server/warnings.js
+++ b/packages/svelte/src/internal/server/warnings.js
@@ -3,4 +3,27 @@
 import { DEV } from 'esm-env';
 
 var bold = 'font-weight: bold';
-var normal = 'font-weight: normal';
\ No newline at end of file
+var normal = 'font-weight: normal';
+
+/**
+ * A `hydratable` value with key `%key%` was created, but at least part of it was not used during the render.
+ * 
+ * The `hydratable` was initialized in:
+ * %stack%
+ * @param {string} key
+ * @param {string} stack
+ */
+export function unresolved_hydratable(key, stack) {
+	if (DEV) {
+		console.warn(
+			`%c[svelte] unresolved_hydratable\n%cA \`hydratable\` value with key \`${key}\` was created, but at least part of it was not used during the render.
+
+The \`hydratable\` was initialized in:
+${stack}\nhttps://svelte.dev/e/unresolved_hydratable`,
+			bold,
+			normal
+		);
+	} else {
+		console.warn(`https://svelte.dev/e/unresolved_hydratable`);
+	}
+}
\ No newline at end of file
diff --git a/packages/svelte/src/internal/shared/dev.js b/packages/svelte/src/internal/shared/dev.js
new file mode 100644
index 0000000000..aadb3c7e6d
--- /dev/null
+++ b/packages/svelte/src/internal/shared/dev.js
@@ -0,0 +1,65 @@
+import { define_property } from './utils.js';
+
+/**
+ * @param {string} label
+ * @returns {Error & { stack: string } | null}
+ */
+export function get_error(label) {
+	const error = new Error();
+	const stack = get_stack();
+
+	if (stack.length === 0) {
+		return null;
+	}
+
+	stack.unshift('\n');
+
+	define_property(error, 'stack', {
+		value: stack.join('\n')
+	});
+
+	define_property(error, 'name', {
+		value: label
+	});
+
+	return /** @type {Error & { stack: string }} */ (error);
+}
+
+/**
+ * @returns {string[]}
+ */
+export function get_stack() {
+	// @ts-ignore - doesn't exist everywhere
+	const limit = Error.stackTraceLimit;
+	// @ts-ignore - doesn't exist everywhere
+	Error.stackTraceLimit = Infinity;
+	const stack = new Error().stack;
+	// @ts-ignore - doesn't exist everywhere
+	Error.stackTraceLimit = limit;
+
+	if (!stack) return [];
+
+	const lines = stack.split('\n');
+	const new_lines = [];
+
+	for (let i = 0; i < lines.length; i++) {
+		const line = lines[i];
+		const posixified = line.replaceAll('\\', '/');
+
+		if (line.trim() === 'Error') {
+			continue;
+		}
+
+		if (line.includes('validate_each_keys')) {
+			return [];
+		}
+
+		if (posixified.includes('svelte/src/internal') || posixified.includes('node_modules/.vite')) {
+			continue;
+		}
+
+		new_lines.push(line);
+	}
+
+	return new_lines;
+}
diff --git a/packages/svelte/src/internal/shared/errors.js b/packages/svelte/src/internal/shared/errors.js
index 669cdd96a7..b13a65b598 100644
--- a/packages/svelte/src/internal/shared/errors.js
+++ b/packages/svelte/src/internal/shared/errors.js
@@ -2,6 +2,23 @@
 
 import { DEV } from 'esm-env';
 
+/**
+ * Cannot use `%name%(...)` unless the `experimental.async` compiler option is `true`
+ * @param {string} name
+ * @returns {never}
+ */
+export function experimental_async_required(name) {
+	if (DEV) {
+		const error = new Error(`experimental_async_required\nCannot use \`${name}(...)\` unless the \`experimental.async\` compiler option is \`true\`\nhttps://svelte.dev/e/experimental_async_required`);
+
+		error.name = 'Svelte error';
+
+		throw error;
+	} else {
+		throw new Error(`https://svelte.dev/e/experimental_async_required`);
+	}
+}
+
 /**
  * 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/internal/shared/types.d.ts b/packages/svelte/src/internal/shared/types.d.ts
index 4deeb76b2f..3374d7bc16 100644
--- a/packages/svelte/src/internal/shared/types.d.ts
+++ b/packages/svelte/src/internal/shared/types.d.ts
@@ -8,3 +8,5 @@ export type Getters<T> = {
 };
 
 export type Snapshot<T> = ReturnType<typeof $state.snapshot<T>>;
+
+export type MaybePromise<T> = T | Promise<T>;
diff --git a/packages/svelte/src/internal/shared/utils.js b/packages/svelte/src/internal/shared/utils.js
index 10f8597520..659cd10040 100644
--- a/packages/svelte/src/internal/shared/utils.js
+++ b/packages/svelte/src/internal/shared/utils.js
@@ -48,7 +48,7 @@ export function run_all(arr) {
 
 /**
  * TODO replace with Promise.withResolvers once supported widely enough
- * @template T
+ * @template [T=void]
  */
 export function deferred() {
 	/** @type {(value: T) => void} */
diff --git a/packages/svelte/tests/runtime-legacy/shared.ts b/packages/svelte/tests/runtime-legacy/shared.ts
index e0f10ca2dd..13975c68ee 100644
--- a/packages/svelte/tests/runtime-legacy/shared.ts
+++ b/packages/svelte/tests/runtime-legacy/shared.ts
@@ -5,7 +5,7 @@ import { createClassComponent } from 'svelte/legacy';
 import { proxy } from 'svelte/internal/client';
 import { flushSync, hydrate, mount, unmount } from 'svelte';
 import { render } from 'svelte/server';
-import { afterAll, assert, beforeAll } from 'vitest';
+import { afterAll, assert, beforeAll, beforeEach } from 'vitest';
 import { async_mode, compile_directory, fragments } from '../helpers.js';
 import { assert_html_equal, assert_html_equal_with_options } from '../html_equal.js';
 import { raf } from '../animation-helpers.js';
@@ -86,6 +86,7 @@ export interface RuntimeTest<Props extends Record<string, any> = Record<string,
 	}) => void | Promise<void>;
 	test_ssr?: (args: {
 		logs: any[];
+		warnings: any[];
 		assert: Assert;
 		variant: 'ssr' | 'async-ssr';
 	}) => void | Promise<void>;
@@ -102,6 +103,14 @@ export interface RuntimeTest<Props extends Record<string, any> = Record<string,
 	recover?: boolean;
 }
 
+declare global {
+	var __svelte:
+		| {
+				h?: Map<string, unknown>;
+		  }
+		| undefined;
+}
+
 let unhandled_rejection: Error | null = null;
 
 function unhandled_rejection_handler(err: Error) {
@@ -115,6 +124,10 @@ beforeAll(() => {
 	process.prependListener('unhandledRejection', unhandled_rejection_handler);
 });
 
+beforeEach(() => {
+	delete globalThis?.__svelte?.h;
+});
+
 afterAll(() => {
 	process.removeListener('unhandledRejection', unhandled_rejection_handler);
 });
@@ -252,7 +265,16 @@ async function run_test_variant(
 			i++;
 		}
 
-		if (str.slice(0, i).includes('logs')) {
+		let ssr_str = config.test_ssr?.toString() ?? '';
+		let sn = 0;
+		let si = 0;
+		while (si < ssr_str.length) {
+			if (ssr_str[si] === '(') sn++;
+			if (ssr_str[si] === ')' && --sn === 0) break;
+			si++;
+		}
+
+		if (str.slice(0, i).includes('logs') || ssr_str.slice(0, si).includes('logs')) {
 			// eslint-disable-next-line no-console
 			console.log = (...args) => {
 				logs.push(...args);
@@ -263,7 +285,11 @@ async function run_test_variant(
 			manual_hydrate = true;
 		}
 
-		if (str.slice(0, i).includes('warnings') || config.warnings) {
+		if (
+			str.slice(0, i).includes('warnings') ||
+			config.warnings ||
+			ssr_str.slice(0, si).includes('warnings')
+		) {
 			// eslint-disable-next-line no-console
 			console.warn = (...args) => {
 				if (typeof args[0] === 'string' && args[0].startsWith('%c[svelte]')) {
@@ -383,6 +409,7 @@ async function run_test_variant(
 			if (config.test_ssr) {
 				await config.test_ssr({
 					logs,
+					warnings,
 					// @ts-expect-error
 					assert: {
 						...assert,
@@ -403,6 +430,15 @@ async function run_test_variant(
 				throw new Error('Ensure dom mode is skipped');
 			};
 
+			const run_hydratables_init = () => {
+				if (variant !== 'hydrate') return;
+				const script = [...document.head.querySelectorAll('script').values()].find((script) =>
+					script.textContent?.includes('window.__svelte ??= {}')
+				)?.textContent;
+				if (!script) return;
+				(0, eval)(script);
+			};
+
 			if (runes) {
 				props = proxy({ ...(config.props || {}) });
 
@@ -411,6 +447,7 @@ async function run_test_variant(
 
 				if (manual_hydrate && variant === 'hydrate') {
 					hydrate_fn = () => {
+						run_hydratables_init();
 						instance = hydrate(mod.default, {
 							target,
 							props,
@@ -419,6 +456,7 @@ async function run_test_variant(
 						});
 					};
 				} else {
+					run_hydratables_init();
 					const render = variant === 'hydrate' ? hydrate : mount;
 					instance = render(mod.default, {
 						target,
@@ -428,6 +466,7 @@ async function run_test_variant(
 					});
 				}
 			} else {
+				run_hydratables_init();
 				instance = createClassComponent({
 					component: mod.default,
 					props: config.props,
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-complex-nesting/_config.js b/packages/svelte/tests/runtime-runes/samples/hydratable-complex-nesting/_config.js
new file mode 100644
index 0000000000..0ac5333c4a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-complex-nesting/_config.js
@@ -0,0 +1,24 @@
+import { tick } from 'svelte';
+import { ok, test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	skip_mode: ['server'],
+
+	server_props: { environment: 'server' },
+	ssrHtml: '<p>The current environment is: server</p>',
+
+	props: { environment: 'browser' },
+
+	async test({ assert, target, variant }) {
+		// make sure hydration has a chance to finish
+		await tick();
+		const p = target.querySelector('p');
+		ok(p);
+		if (variant === 'hydrate') {
+			assert.htmlEqual(p.outerHTML, '<p>The current environment is: server</p>');
+		} else {
+			assert.htmlEqual(p.outerHTML, '<p>The current environment is: browser</p>');
+		}
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-complex-nesting/main.svelte b/packages/svelte/tests/runtime-runes/samples/hydratable-complex-nesting/main.svelte
new file mode 100644
index 0000000000..cd603a6e6b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-complex-nesting/main.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import { hydratable } from "svelte";
+
+	let { environment } = $props();
+
+	const value = hydratable("environment", () => Promise.resolve({
+		nested: Promise.resolve({
+			environment
+		})
+	}))
+</script>
+
+<p>The current environment is: {await value.then(res => res.nested).then(res => res.environment)}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-error-on-missing/_config.js b/packages/svelte/tests/runtime-runes/samples/hydratable-error-on-missing/_config.js
new file mode 100644
index 0000000000..3349cbcb66
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-error-on-missing/_config.js
@@ -0,0 +1,13 @@
+import { ok, test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	mode: ['async-server', 'hydrate'],
+
+	server_props: { environment: 'server' },
+	ssrHtml: '<p>The current environment is: server</p>',
+
+	props: { environment: 'browser' },
+
+	runtime_error: 'hydratable_missing_but_required'
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-error-on-missing/main.svelte b/packages/svelte/tests/runtime-runes/samples/hydratable-error-on-missing/main.svelte
new file mode 100644
index 0000000000..b7dfc0e7e2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-error-on-missing/main.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+	import { hydratable } from "svelte";
+
+	let { environment }: { environment: 'server' | 'browser' } = $props();
+
+	let value;
+	if (environment === 'server') {
+		value = 'server';
+	} else {
+		value = hydratable('environment', () => environment);
+	}
+</script>
+
+<p>The current environment is: {value}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys-nesting-partial/_config.js b/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys-nesting-partial/_config.js
new file mode 100644
index 0000000000..b1973a23c2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys-nesting-partial/_config.js
@@ -0,0 +1,27 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	mode: ['async-server', 'hydrate'],
+
+	server_props: { environment: 'server' },
+	ssrHtml:
+		'<div>did you ever hear the tragedy of darth plagueis the wise?</div><div>Loading...</div>',
+
+	test_ssr({ assert, warnings }) {
+		assert.strictEqual(warnings.length, 1);
+		// for some strange reason we trim the error code off the beginning of warnings so I can't actually assert it
+		assert.include(warnings[0], 'A `hydratable` value with key `partially_used`');
+	},
+
+	async test({ assert, target }) {
+		// make sure the hydratable promise on the client has a chance to run and reject (it shouldn't, because the server data should be used)
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			'<div>did you ever hear the tragedy of darth plagueis the wise?</div><div>no, sith daddy, please tell me</div>'
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys-nesting-partial/main.svelte b/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys-nesting-partial/main.svelte
new file mode 100644
index 0000000000..75723848b1
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys-nesting-partial/main.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+	import { hydratable } from "svelte";
+
+	const { environment } = $props();
+
+	const partially_used_hydratable = hydratable(
+		"partially_used",
+		() => {
+			return {
+				used: new Promise(
+					(res, rej) => environment === 'server' ? setTimeout(() => res('did you ever hear the tragedy of darth plagueis the wise?'), 0) : rej('should not run')
+				),
+				unused: new Promise(
+					(res, rej) => environment === 'server' ? setTimeout(() => res('no, sith daddy, please tell me'), 0) : rej('should not run')
+				),
+			}
+		}
+	);
+</script>
+
+<div>{await partially_used_hydratable.used}</div>
+<svelte:boundary>
+	<div>{await partially_used_hydratable.unused}</div>
+	{#snippet pending()}
+		<div>Loading...</div>
+	{/snippet}
+</svelte:boundary>
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys/_config.js b/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys/_config.js
new file mode 100644
index 0000000000..44978c8d58
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys/_config.js
@@ -0,0 +1,26 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	mode: ['async-server', 'hydrate'],
+
+	server_props: { environment: 'server' },
+	ssrHtml: '<div>Loading...</div>',
+
+	test_ssr({ assert, warnings }) {
+		assert.strictEqual(warnings.length, 1);
+		// for some strange reason we trim the error code off the beginning of warnings so I can't actually assert it
+		assert.include(warnings[0], 'A `hydratable` value with key `unused_key`');
+	},
+
+	async test({ assert, target }) {
+		// make sure the hydratable promise on the client has a chance to run and reject (it shouldn't, because the server data should be used)
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			'<div>did you ever hear the tragedy of darth plagueis the wise?</div>'
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys/main.svelte b/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys/main.svelte
new file mode 100644
index 0000000000..67848e7f6f
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-unused-keys/main.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import { hydratable } from "svelte";
+
+	const { environment } = $props();
+
+	const unresolved_hydratable = hydratable(
+		"unused_key",
+		() => new Promise(
+			(res, rej) => environment === 'server' ? setTimeout(() => res('did you ever hear the tragedy of darth plagueis the wise?'), 0) : rej('should not run')
+		)
+	);
+</script>
+
+<svelte:boundary>
+	<div>{await unresolved_hydratable}</div>
+	{#snippet pending()}
+		<div>Loading...</div>
+	{/snippet}
+</svelte:boundary>
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable/_config.js b/packages/svelte/tests/runtime-runes/samples/hydratable/_config.js
new file mode 100644
index 0000000000..57904ef576
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable/_config.js
@@ -0,0 +1,21 @@
+import { ok, test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	skip_mode: ['server'],
+
+	server_props: { environment: 'server' },
+	ssrHtml: '<p>The current environment is: server</p>',
+
+	props: { environment: 'browser' },
+
+	async test({ assert, target, variant }) {
+		const p = target.querySelector('p');
+		ok(p);
+		if (variant === 'hydrate') {
+			assert.htmlEqual(p.outerHTML, '<p>The current environment is: server</p>');
+		} else {
+			assert.htmlEqual(p.outerHTML, '<p>The current environment is: browser</p>');
+		}
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable/main.svelte b/packages/svelte/tests/runtime-runes/samples/hydratable/main.svelte
new file mode 100644
index 0000000000..53b9c24f91
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable/main.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+	import { hydratable } from "svelte";
+
+	let { environment } = $props();
+
+	const value = hydratable("environment", () => environment)
+</script>
+
+<p>The current environment is: {value}</p>
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
index a1b52a2df9..2d1b6be570 100644
--- 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
@@ -1,6 +1,7 @@
 import { test } from '../../test';
 
 export default test({
+	skip: true, // TODO it appears there might be an actual bug here; the promise isn't ever actually awaited in spite of being awaited in the component
 	mode: ['async'],
 	error: 'lifecycle_outside_component'
 });
diff --git a/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/_config.js b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/_config.js
new file mode 100644
index 0000000000..05de37a8bd
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/_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/hydratable-clobbering-but-ok/_expected.html b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/_expected.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/main.svelte b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/main.svelte
new file mode 100644
index 0000000000..87a31a8359
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-but-ok/main.svelte
@@ -0,0 +1,6 @@
+<script lang="ts">
+    import { hydratable } from 'svelte';
+
+    await hydratable('key', () => 'first');
+    await hydratable('key', () => 'first');
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/_config.js b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/_config.js
new file mode 100644
index 0000000000..404260cc66
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/_config.js
@@ -0,0 +1,6 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['async'],
+	error: 'hydratable_clobbering'
+});
diff --git a/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/main.svelte b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/main.svelte
new file mode 100644
index 0000000000..358488c3ac
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/main.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+    import { hydratable } from 'svelte';
+
+    hydratable('key', () => Promise.resolve({
+        nested: Promise.resolve({
+            one: Promise.resolve(1),
+        }),
+        two: Promise.resolve(2),
+    }));
+    hydratable('key', () => Promise.resolve({
+        nested: Promise.resolve({
+            one: Promise.resolve(2),
+        }),
+        two: Promise.resolve(2),
+    }));
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering/_config.js b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering/_config.js
new file mode 100644
index 0000000000..404260cc66
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering/_config.js
@@ -0,0 +1,6 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['async'],
+	error: 'hydratable_clobbering'
+});
diff --git a/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering/main.svelte b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering/main.svelte
new file mode 100644
index 0000000000..764c2c2415
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering/main.svelte
@@ -0,0 +1,6 @@
+<script lang="ts">
+    import { hydratable } from 'svelte';
+
+    hydratable('key', () => 'first');
+    hydratable('key', () => 'second');
+</script>
\ No newline at end of file
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 6325ea7d0e..12deae1e3e 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
@@ -1,9 +1,11 @@
 import { test } from '../../test';
 
 export default test({
+	skip: true, // TODO: This test actually works, but the error message is printed, not thrown, so we need to have a way to test for that
 	compileOptions: {
 		dev: true
 	},
+
 	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 7eede332a7..4b33685608 100644
--- a/packages/svelte/tests/server-side-rendering/test.ts
+++ b/packages/svelte/tests/server-side-rendering/test.ts
@@ -73,6 +73,7 @@ const { test, run } = suite_with_variants<SSRTest, 'sync' | 'async', CompileOpti
 		seen?.clear();
 
 		let rendered;
+		let errored = false;
 		try {
 			const render_result = render(Component, {
 				props: config.props || {},
@@ -80,14 +81,19 @@ const { test, run } = suite_with_variants<SSRTest, 'sync' | 'async', CompileOpti
 			});
 			rendered = is_async ? await render_result : render_result;
 		} catch (error) {
+			errored = true;
 			if (config.error) {
-				assert.deepEqual((error as Error).message, config.error);
+				assert.include((error as Error).message, config.error);
 				return;
 			} else {
 				throw error;
 			}
 		}
 
+		if (config.error && !errored) {
+			assert.fail('Expected an error to be thrown, but rendering succeeded.');
+		}
+
 		const { body, head } = rendered;
 
 		fs.writeFileSync(
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 5e3ca77eb5..f0200d09fe 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -450,6 +450,7 @@ declare module 'svelte' {
 	 * @deprecated Use [`$effect`](https://svelte.dev/docs/svelte/$effect) instead
 	 * */
 	export function afterUpdate(fn: () => void): void;
+	export function hydratable<T>(key: string, fn: () => T): T;
 	/**
 	 * Create a snippet programmatically
 	 * */
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0afaef0ceb..0b1f57213d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -89,6 +89,9 @@ importers:
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
+      devalue:
+        specifier: ^5.5.0
+        version: 5.5.0
       esm-env:
         specifier: ^1.2.1
         version: 1.2.1
@@ -1515,6 +1518,9 @@ packages:
     engines: {node: '>=0.10'}
     hasBin: true
 
+  devalue@5.5.0:
+    resolution: {integrity: sha512-69sM5yrHfFLJt0AZ9QqZXGCPfJ7fQjvpln3Rq5+PS03LD32Ost1Q9N+eEnaQwGRIriKkMImXD56ocjQmfjbV3w==}
+
   dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
@@ -3990,6 +3996,8 @@ snapshots:
   detect-libc@1.0.3:
     optional: true
 
+  devalue@5.5.0: {}
+
   dir-glob@3.0.1:
     dependencies:
       path-type: 4.0.0

From c6f99e6399fc5ebe66b0a4ddb4b68abbee92ea28 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 21:22:58 -0500
Subject: [PATCH 195/347] Version Packages (#17234)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/big-masks-shave.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/big-masks-shave.md

diff --git a/.changeset/big-masks-shave.md b/.changeset/big-masks-shave.md
deleted file mode 100644
index 96c18fdb6c..0000000000
--- a/.changeset/big-masks-shave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': minor
----
-
-feat: `hydratable` API
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 36ff8010ab..f1f33f6c00 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.44.0
+
+### Minor Changes
+
+- feat: `hydratable` API ([#17154](https://github.com/sveltejs/svelte/pull/17154))
+
 ## 5.43.15
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 264c672828..416493faf6 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.43.15",
+  "version": "5.44.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index f7ad2de61c..b95eb1f2b2 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.43.15';
+export const VERSION = '5.44.0';
 export const PUBLIC_VERSION = '5';

From 99362b029bdaae0abba8f0f223615bf62cac7858 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 25 Nov 2025 09:46:54 -0500
Subject: [PATCH 196/347] =?UTF-8?q?=E2=80=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 documentation/docs/06-runtime/05-hydratable.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/06-runtime/05-hydratable.md b/documentation/docs/06-runtime/05-hydratable.md
index 298f653a7e..a5302f264d 100644
--- a/documentation/docs/06-runtime/05-hydratable.md
+++ b/documentation/docs/06-runtime/05-hydratable.md
@@ -17,7 +17,7 @@ In Svelte, when you want to render asynchronous content data on the server, you
 <h1>{user.name}</h1>
 ```
 
-That's silly, though. If we've already done the hard work of getting the data on the server, we don't want to get it again during hydration on the client. `hydratable` is a low-level API built to solve this problem. You probably won't need this very often -- it will be used behind the scenes by whatever datafetching library you use. For example, it powers [remote functions in SvelteKit](/docs/kit/remote-functions).
+That's silly, though. If we've already done the hard work of getting the data on the server, we don't want to get it again during hydration on the client. `hydratable` is a low-level API built to solve this problem. You probably won't need this very often — it will be used behind the scenes by whatever datafetching library you use. For example, it powers [remote functions in SvelteKit](/docs/kit/remote-functions).
 
 To fix the example above:
 

From 707b6b8c20d2f8f969d688c8c23d9f799b1b101f Mon Sep 17 00:00:00 2001
From: t11r <1674104+t11r@users.noreply.github.com>
Date: Tue, 25 Nov 2025 21:42:20 +0100
Subject: [PATCH 197/347] docs: improve typography (#17222)

Some characters, like quotes and ellipses, are automatically replaced with their typographic counterparts on the website, but dashes remain as-is, and we want the pretty ones.
---
 documentation/docs/06-runtime/03-lifecycle-hooks.md |  2 +-
 documentation/docs/07-misc/02-testing.md            |  2 +-
 documentation/docs/07-misc/06-v4-migration-guide.md |  6 +++---
 documentation/docs/07-misc/07-v5-migration-guide.md | 10 +++++-----
 documentation/docs/07-misc/99-faq.md                |  2 +-
 documentation/docs/99-legacy/10-legacy-on.md        |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/documentation/docs/06-runtime/03-lifecycle-hooks.md b/documentation/docs/06-runtime/03-lifecycle-hooks.md
index f7a78beec9..95e1c260c1 100644
--- a/documentation/docs/06-runtime/03-lifecycle-hooks.md
+++ b/documentation/docs/06-runtime/03-lifecycle-hooks.md
@@ -94,7 +94,7 @@ Svelte 4 contained hooks that ran before and after the component as a whole was
 </script>
 ```
 
-Instead of `beforeUpdate` use `$effect.pre` and instead of `afterUpdate` use `$effect` instead - these runes offer more granular control and only react to the changes you're actually interested in.
+Instead of `beforeUpdate` use `$effect.pre` and instead of `afterUpdate` use `$effect` instead — these runes offer more granular control and only react to the changes you're actually interested in.
 
 ### Chat window example
 
diff --git a/documentation/docs/07-misc/02-testing.md b/documentation/docs/07-misc/02-testing.md
index 4807fc8f0c..85db7fc01f 100644
--- a/documentation/docs/07-misc/02-testing.md
+++ b/documentation/docs/07-misc/02-testing.md
@@ -294,7 +294,7 @@ E2E (short for 'end to end') tests allow you to test your full application throu
 
 You can use the Svelte CLI to [setup Playwright](/docs/cli/playwright) either during project creation or later on. You can also [set it up with `npm init playwright`](https://playwright.dev/docs/intro). Additionally, you may also want to install an IDE plugin such as [the VS Code extension](https://playwright.dev/docs/getting-started-vscode) to be able to execute tests from inside your IDE.
 
-If you've run `npm init playwright` or are not using Vite, you may need to adjust the Playwright config to tell Playwright what to do before running the tests - mainly starting your application at a certain port. For example:
+If you've run `npm init playwright` or are not using Vite, you may need to adjust the Playwright config to tell Playwright what to do before running the tests — mainly starting your application at a certain port. For example:
 
 ```js
 /// file: playwright.config.js
diff --git a/documentation/docs/07-misc/06-v4-migration-guide.md b/documentation/docs/07-misc/06-v4-migration-guide.md
index 484931f20a..dbb1cac215 100644
--- a/documentation/docs/07-misc/06-v4-migration-guide.md
+++ b/documentation/docs/07-misc/06-v4-migration-guide.md
@@ -137,7 +137,7 @@ Transitions are now local by default to prevent confusion around page navigation
 {/if}
 ```
 
-To make transitions global, add the `|global` modifier - then they will play when _any_ control flow block above is created/destroyed. The migration script will do this automatically for you. ([#6686](https://github.com/sveltejs/svelte/issues/6686))
+To make transitions global, add the `|global` modifier — then they will play when _any_ control flow block above is created/destroyed. The migration script will do this automatically for you. ([#6686](https://github.com/sveltejs/svelte/issues/6686))
 
 ## Default slot bindings
 
@@ -150,10 +150,10 @@ Default slot bindings are no longer exposed to named slots and vice versa:
 
 <Nested let:count>
 	<p>
-		count in default slot - is available: {count}
+		count in default slot — is available: {count}
 	</p>
 	<p slot="bar">
-		count in bar slot - is not available: {count}
+		count in bar slot — is not available: {count}
 	</p>
 </Nested>
 ```
diff --git a/documentation/docs/07-misc/07-v5-migration-guide.md b/documentation/docs/07-misc/07-v5-migration-guide.md
index 37da3b7b23..40cbc3bd9e 100644
--- a/documentation/docs/07-misc/07-v5-migration-guide.md
+++ b/documentation/docs/07-misc/07-v5-migration-guide.md
@@ -4,7 +4,7 @@ title: Svelte 5 migration guide
 
 Version 5 comes with an overhauled syntax and reactivity system. While it may look different at first, you'll soon notice many similarities. This guide goes over the changes in detail and shows you how to upgrade. Along with it, we also provide information on _why_ we did these changes.
 
-You don't have to migrate to the new syntax right away - Svelte 5 still supports the old Svelte 4 syntax, and you can mix and match components using the new syntax with components using the old and vice versa. We expect many people to be able to upgrade with only a few lines of code changed initially. There's also a [migration script](#Migration-script) that helps you with many of these steps automatically.
+You don't have to migrate to the new syntax right away — Svelte 5 still supports the old Svelte 4 syntax, and you can mix and match components using the new syntax with components using the old and vice versa. We expect many people to be able to upgrade with only a few lines of code changed initially. There's also a [migration script](#Migration-script) that helps you with many of these steps automatically.
 
 ## Reactivity syntax changes
 
@@ -23,7 +23,7 @@ In Svelte 4, a `let` declaration at the top level of a component was implicitly
 Nothing else changes. `count` is still the number itself, and you read and write directly to it, without a wrapper like `.value` or `getCount()`.
 
 > [!DETAILS] Why we did this
-> `let` being implicitly reactive at the top level worked great, but it meant that reactivity was constrained - a `let` declaration anywhere else was not reactive. This forced you to resort to using stores when refactoring code out of the top level of components for reuse. This meant you had to learn an entirely separate reactivity model, and the result often wasn't as nice to work with. Because reactivity is more explicit in Svelte 5, you can keep using the same API outside the top level of components. Head to [the tutorial](/tutorial) to learn more.
+> `let` being implicitly reactive at the top level worked great, but it meant that reactivity was constrained — a `let` declaration anywhere else was not reactive. This forced you to resort to using stores when refactoring code out of the top level of components for reuse. This meant you had to learn an entirely separate reactivity model, and the result often wasn't as nice to work with. Because reactivity is more explicit in Svelte 5, you can keep using the same API outside the top level of components. Head to [the tutorial](/tutorial) to learn more.
 
 ### $: → $derived/$effect
 
@@ -120,7 +120,7 @@ In Svelte 5, the `$props` rune makes this straightforward without any additional
 
 ## Event changes
 
-Event handlers have been given a facelift in Svelte 5. Whereas in Svelte 4 we use the `on:` directive to attach an event listener to an element, in Svelte 5 they are properties like any other (in other words - remove the colon):
+Event handlers have been given a facelift in Svelte 5. Whereas in Svelte 4 we use the `on:` directive to attach an event listener to an element, in Svelte 5 they are properties like any other (in other words — remove the colon):
 
 ```svelte
 <script>
@@ -154,7 +154,7 @@ Since they're just properties, you can use the normal shorthand syntax...
 
 In Svelte 4, components could emit events by creating a dispatcher with `createEventDispatcher`.
 
-This function is deprecated in Svelte 5. Instead, components should accept _callback props_ - which means you then pass functions as properties to these components:
+This function is deprecated in Svelte 5. Instead, components should accept _callback props_ — which means you then pass functions as properties to these components:
 
 ```svelte
 <!--- file: App.svelte --->
@@ -462,7 +462,7 @@ In Svelte 4, you would pass data to a `<slot />` and then retrieve it with `let:
 
 ## Migration script
 
-By now you should have a pretty good understanding of the before/after and how the old syntax relates to the new syntax. It probably also became clear that a lot of these migrations are rather technical and repetitive - something you don't want to do by hand.
+By now you should have a pretty good understanding of the before/after and how the old syntax relates to the new syntax. It probably also became clear that a lot of these migrations are rather technical and repetitive — something you don't want to do by hand.
 
 We thought the same, which is why we provide a migration script to do most of the migration automatically. You can upgrade your project by using `npx sv migrate svelte-5`. This will do the following things:
 
diff --git a/documentation/docs/07-misc/99-faq.md b/documentation/docs/07-misc/99-faq.md
index 86489e87e4..f9101b4792 100644
--- a/documentation/docs/07-misc/99-faq.md
+++ b/documentation/docs/07-misc/99-faq.md
@@ -69,7 +69,7 @@ There are several [UI component libraries](/packages#component-libraries) as wel
 
 ## How do I test Svelte apps?
 
-How your application is structured and where logic is defined will determine the best way to ensure it is properly tested. It is important to note that not all logic belongs within a component - this includes concerns such as data transformation, cross-component state management, and logging, among others. Remember that the Svelte library has its own test suite, so you do not need to write tests to validate implementation details provided by Svelte.
+How your application is structured and where logic is defined will determine the best way to ensure it is properly tested. It is important to note that not all logic belongs within a component — this includes concerns such as data transformation, cross-component state management, and logging, among others. Remember that the Svelte library has its own test suite, so you do not need to write tests to validate implementation details provided by Svelte.
 
 A Svelte application will typically have three different types of tests: Unit, Component, and End-to-End (E2E).
 
diff --git a/documentation/docs/99-legacy/10-legacy-on.md b/documentation/docs/99-legacy/10-legacy-on.md
index f2ee694cc1..ba084a228b 100644
--- a/documentation/docs/99-legacy/10-legacy-on.md
+++ b/documentation/docs/99-legacy/10-legacy-on.md
@@ -43,7 +43,7 @@ The following modifiers are available:
 
 - `preventDefault` — calls `event.preventDefault()` before running the handler
 - `stopPropagation` — calls `event.stopPropagation()`, preventing the event reaching the next element
-- `stopImmediatePropagation` - calls `event.stopImmediatePropagation()`, preventing other listeners of the same event from being fired.
+- `stopImmediatePropagation` — calls `event.stopImmediatePropagation()`, preventing other listeners of the same event from being fired.
 - `passive` — improves scrolling performance on touch/wheel events (Svelte will add it automatically where it's safe to do so)
 - `nonpassive` — explicitly set `passive: false`
 - `capture` — fires the handler during the _capture_ phase instead of the _bubbling_ phase

From f2dd4770312e98eef523952fbaa14c14555ab86f Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 25 Nov 2025 21:45:04 +0100
Subject: [PATCH 198/347] fix: await blockers before initialising const
 (#17226)

* fix: await blockers before initialising const

Fixes #17224

* ssr + test
---
 .changeset/famous-terms-shake.md                 |  5 +++++
 .../3-transform/client/visitors/ConstTag.js      | 16 +++++++++++-----
 .../3-transform/server/visitors/ConstTag.js      |  9 ++++++++-
 .../runtime-runes/samples/async-const/_config.js |  4 ++--
 .../samples/async-const/main.svelte              |  5 +++++
 5 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/famous-terms-shake.md

diff --git a/.changeset/famous-terms-shake.md b/.changeset/famous-terms-shake.md
new file mode 100644
index 0000000000..d7d9c26400
--- /dev/null
+++ b/.changeset/famous-terms-shake.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: await blockers before initialising const
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 f3d7a3549c..a9f922623e 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
@@ -1,6 +1,7 @@
 /** @import { Pattern } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
+/** @import { ExpressionMetadata } from '../../../nodes.js' */
 import { dev } from '../../../../state.js';
 import { extract_identifiers } from '../../../../utils/ast.js';
 import * as b from '#compiler/builders';
@@ -30,7 +31,7 @@ export function ConstTag(node, context) {
 			context.state,
 			declaration.id,
 			expression,
-			node.metadata.expression.has_await,
+			node.metadata.expression,
 			context.state.scope.get_bindings(declaration)
 		);
 	} else {
@@ -73,7 +74,7 @@ export function ConstTag(node, context) {
 			context.state,
 			tmp,
 			expression,
-			node.metadata.expression.has_await,
+			node.metadata.expression,
 			context.state.scope.get_bindings(declaration)
 		);
 
@@ -89,15 +90,18 @@ export function ConstTag(node, context) {
  * @param {ComponentContext['state']} state
  * @param {import('estree').Identifier} id
  * @param {import('estree').Expression} expression
- * @param {boolean} has_await
+ * @param {ExpressionMetadata} metadata
  * @param {import('#compiler').Binding[]} bindings
  */
-function add_const_declaration(state, id, expression, has_await, bindings) {
+function add_const_declaration(state, id, expression, metadata, bindings) {
 	// we need to eagerly evaluate the expression in order to hit any
 	// 'Cannot access x before initialization' errors
 	const after = dev ? [b.stmt(b.call('$.get', id))] : [];
 
-	if (has_await || state.async_consts) {
+	const has_await = metadata.has_await;
+	const blockers = [...metadata.dependencies].map((dep) => dep.blocker).filter((b) => b !== null);
+
+	if (has_await || state.async_consts || blockers.length > 0) {
 		const run = (state.async_consts ??= {
 			id: b.id(state.scope.generate('promises')),
 			thunks: []
@@ -108,6 +112,8 @@ function add_const_declaration(state, id, expression, has_await, bindings) {
 		const assignment = b.assignment('=', id, expression);
 		const body = after.length === 0 ? assignment : b.block([b.stmt(assignment), ...after]);
 
+		if (blockers.length > 0) run.thunks.push(b.thunk(b.call('Promise.all', b.array(blockers))));
+
 		run.thunks.push(b.thunk(body, has_await));
 
 		const blocker = b.member(run.id, b.literal(run.thunks.length - 1), true);
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js
index c549d1d009..fdc31e5238 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js
@@ -13,8 +13,11 @@ export function ConstTag(node, context) {
 	const id = /** @type {Pattern} */ (context.visit(declaration.id));
 	const init = /** @type {Expression} */ (context.visit(declaration.init));
 	const has_await = node.metadata.expression.has_await;
+	const blockers = [...node.metadata.expression.dependencies]
+		.map((dep) => dep.blocker)
+		.filter((b) => b !== null);
 
-	if (has_await || context.state.async_consts) {
+	if (has_await || context.state.async_consts || blockers.length > 0) {
 		const run = (context.state.async_consts ??= {
 			id: b.id(context.state.scope.generate('promises')),
 			thunks: []
@@ -27,6 +30,10 @@ export function ConstTag(node, context) {
 			context.state.init.push(b.let(identifier.name));
 		}
 
+		if (blockers.length > 0) {
+			run.thunks.push(b.thunk(b.call('Promise.all', b.array(blockers))));
+		}
+
 		const assignment = b.assignment('=', id, init);
 		run.thunks.push(b.thunk(b.block([b.stmt(assignment)]), has_await));
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-const/_config.js b/packages/svelte/tests/runtime-runes/samples/async-const/_config.js
index c3e74e886a..0dd4b870d5 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-const/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-const/_config.js
@@ -3,11 +3,11 @@ import { test } from '../../test';
 
 export default test({
 	mode: ['async-server', 'client', 'hydrate'],
-	ssrHtml: `<h1>Hello, world!</h1> 5 01234 5 sync 6 5 0`,
+	ssrHtml: `<h1>Hello, world!</h1> 5 01234 5 sync 6 5 0 10`,
 
 	async test({ assert, target }) {
 		await tick();
 
-		assert.htmlEqual(target.innerHTML, `<h1>Hello, world!</h1> 5 01234 5 sync 6 5 0`);
+		assert.htmlEqual(target.innerHTML, `<h1>Hello, world!</h1> 5 01234 5 sync 6 5 0 10`);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/async-const/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-const/main.svelte
index b7e00803c5..4212c59fdc 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-const/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-const/main.svelte
@@ -23,4 +23,9 @@
 
 	{@render greet()}
 	{number} {sync} {after_async} {length} {first}
+
+	{#if sync}
+		{@const double = number * 2}
+		{double}
+	{/if}
 </svelte:boundary>

From 52a36bdb350a5ed135de951259bf71a7bbb4da47 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 25 Nov 2025 16:42:15 -0500
Subject: [PATCH 199/347] fix: link offscreen items and last effect in each
 block correctly (alternative) (#17244)

It's possible that due to how new elements are inserted into the array that `effect.last` is wrong. We need to ensure it is really the last item to keep items properly connected to the graph.

Fixes #17201

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .changeset/great-ghosts-unite.md              |  5 ++
 .../src/internal/client/dom/blocks/each.js    |  8 +++
 .../samples/each-updates-10/_config.js        | 51 +++++++++++++++++++
 .../samples/each-updates-10/main.svelte       | 16 ++++++
 4 files changed, 80 insertions(+)
 create mode 100644 .changeset/great-ghosts-unite.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-updates-10/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-updates-10/main.svelte

diff --git a/.changeset/great-ghosts-unite.md b/.changeset/great-ghosts-unite.md
new file mode 100644
index 0000000000..2973737cfd
--- /dev/null
+++ b/.changeset/great-ghosts-unite.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: link offscreen items and last effect in each block correctly
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 320c034690..77e669aa22 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -637,6 +637,10 @@ function link(state, prev, next) {
 		state.first = next;
 		state.effect.first = next && next.e;
 	} else {
+		if (prev.e === state.effect.last && next !== null) {
+			state.effect.last = next.e;
+		}
+
 		if (prev.e.next) {
 			prev.e.next.prev = null;
 		}
@@ -648,6 +652,10 @@ function link(state, prev, next) {
 	if (next === null) {
 		state.effect.last = prev && prev.e;
 	} else {
+		if (next.e === state.effect.last && prev === null) {
+			state.effect.last = next.e.prev;
+		}
+
 		if (next.e.prev) {
 			next.e.prev.next = null;
 		}
diff --git a/packages/svelte/tests/runtime-runes/samples/each-updates-10/_config.js b/packages/svelte/tests/runtime-runes/samples/each-updates-10/_config.js
new file mode 100644
index 0000000000..d5c9e36f1d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-updates-10/_config.js
@@ -0,0 +1,51 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [add, adjust] = target.querySelectorAll('button');
+
+		add.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`<button>add</button> <button>adjust</button>
+			<h2>Keyed</h2>
+			<div>Item: 1. Index: 0</div>
+			<div>Item: 0. Index: 1</div>
+			<h2>Unkeyed</h2>
+			<div>Item: 1. Index: 0</div>
+			<div>Item: 0. Index: 1</div>`
+		);
+
+		add.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`<button>add</button> <button>adjust</button>
+			<h2>Keyed</h2>
+			<div>Item: 2. Index: 0</div>
+			<div>Item: 1. Index: 1</div>
+			<div>Item: 0. Index: 2</div>
+			<h2>Unkeyed</h2>
+			<div>Item: 2. Index: 0</div>
+			<div>Item: 1. Index: 1</div>
+			<div>Item: 0. Index: 2</div>`
+		);
+
+		adjust.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`<button>add</button> <button>adjust</button>
+			<h2>Keyed</h2>
+			<div>Item: 2. Index: 0</div>
+			<div>Item: 1. Index: 1</div>
+			<div>Item: 10. Index: 2</div>
+			<h2>Unkeyed</h2>
+			<div>Item: 2. Index: 0</div>
+			<div>Item: 1. Index: 1</div>
+			<div>Item: 10. Index: 2</div>`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/each-updates-10/main.svelte b/packages/svelte/tests/runtime-runes/samples/each-updates-10/main.svelte
new file mode 100644
index 0000000000..20ce8279de
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-updates-10/main.svelte
@@ -0,0 +1,16 @@
+<script>
+	const items = $state([{ t: 0 }]);
+</script>
+
+<button onclick={() => items.unshift({t:items.length})}>add</button>
+<button onclick={() => items.at(-1).t = 10}>adjust</button>
+ 
+<h2>Keyed</h2>
+{#each items as item, index (item)}
+	<div>Item: {item.t}. Index: {index}</div>
+{/each}
+
+<h2>Unkeyed</h2>
+{#each items as item, index}
+	<div>Item: {item.t}. Index: {index}</div>
+{/each}

From 5546272988930b47bf173946012f3fd53054dab7 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 25 Nov 2025 22:42:43 +0100
Subject: [PATCH 200/347] chore: test component exports + async (#17241)

Regression-test, this works already. Closes #16657
---
 .../samples/async-component-exports/Child.svelte     |  9 +++++++++
 .../samples/async-component-exports/_config.js       | 12 ++++++++++++
 .../samples/async-component-exports/main.svelte      | 11 +++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-component-exports/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-component-exports/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-component-exports/main.svelte

diff --git a/packages/svelte/tests/runtime-runes/samples/async-component-exports/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-component-exports/Child.svelte
new file mode 100644
index 0000000000..d5ad4754fb
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-component-exports/Child.svelte
@@ -0,0 +1,9 @@
+<script>
+	export function foo() {
+		console.log('foo');
+	}
+
+	const value = await Promise.resolve('bar');
+
+	export const bar = () => console.log(value);
+</script>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-component-exports/_config.js b/packages/svelte/tests/runtime-runes/samples/async-component-exports/_config.js
new file mode 100644
index 0000000000..a4e4f24360
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-component-exports/_config.js
@@ -0,0 +1,12 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		await tick();
+		const [log] = target.querySelectorAll('button');
+
+		log.click();
+		assert.deepEqual(logs, ['foo', 'bar']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-component-exports/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-component-exports/main.svelte
new file mode 100644
index 0000000000..9e4d07ddfe
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-component-exports/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	import Child from './Child.svelte';
+
+	let child;
+</script>
+
+<Child bind:this={child} />
+<button onclick={() => {
+	child.foo();
+	child.bar();
+}}>log</button>

From e3acf5deeae6cb8f872f3cb418de23f29429dc08 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 25 Nov 2025 16:50:39 -0500
Subject: [PATCH 201/347] chore: better log_effect_tree (#17243)

* chore: better log_effect_tree

* untrack

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .../svelte/src/internal/client/dev/debug.js   | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/svelte/src/internal/client/dev/debug.js b/packages/svelte/src/internal/client/dev/debug.js
index 2714a3af1f..ebb612cb61 100644
--- a/packages/svelte/src/internal/client/dev/debug.js
+++ b/packages/svelte/src/internal/client/dev/debug.js
@@ -12,6 +12,8 @@ import {
 	RENDER_EFFECT,
 	ROOT_EFFECT
 } from '#client/constants';
+import { snapshot } from '../../shared/clone.js';
+import { untrack } from '../runtime.js';
 
 /**
  *
@@ -84,6 +86,16 @@ export function log_effect_tree(effect, depth = 0) {
 		console.groupEnd();
 	}
 
+	if (effect.nodes_start && effect.nodes_end) {
+		// eslint-disable-next-line no-console
+		console.log(effect.nodes_start);
+
+		if (effect.nodes_start !== effect.nodes_end) {
+			// eslint-disable-next-line no-console
+			console.log(effect.nodes_end);
+		}
+	}
+
 	let child = effect.first;
 	while (child !== null) {
 		log_effect_tree(child, depth + 1);
@@ -103,7 +115,13 @@ function log_dep(dep) {
 		const derived = /** @type {Derived} */ (dep);
 
 		// eslint-disable-next-line no-console
-		console.groupCollapsed('%cderived', 'font-weight: normal', derived.v);
+		console.groupCollapsed(
+			`%c$derived %c${dep.label ?? '<unknown>'}`,
+			'font-weight: bold; color: CornflowerBlue',
+			'font-weight: normal',
+			untrack(() => snapshot(derived.v))
+		);
+
 		if (derived.deps) {
 			for (const d of derived.deps) {
 				log_dep(d);
@@ -114,6 +132,11 @@ function log_dep(dep) {
 		console.groupEnd();
 	} else {
 		// eslint-disable-next-line no-console
-		console.log('state', dep.v);
+		console.log(
+			`%c$state %c${dep.label ?? '<unknown>'}`,
+			'font-weight: bold; color: CornflowerBlue',
+			'font-weight: normal',
+			untrack(() => snapshot(dep.v))
+		);
 	}
 }

From d0e61bc2529db2f83998f6a9ca6b02f841ecfcde Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 25 Nov 2025 22:52:02 +0100
Subject: [PATCH 202/347] fix: ensure each block animations don't mess with
 transitions (#17238)

This ensures that an animation does not run when the element is first transitioning in. Else the animation would mess with the transition (overriding its animation basically). Due to our test setup it's not testable but I veryfied it fixes #17181 (tested all reproductions in there)
---
 .changeset/tiny-loops-wonder.md                        | 5 +++++
 packages/svelte/src/internal/client/dom/blocks/each.js | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/tiny-loops-wonder.md

diff --git a/.changeset/tiny-loops-wonder.md b/.changeset/tiny-loops-wonder.md
new file mode 100644
index 0000000000..49ac92947c
--- /dev/null
+++ b/.changeset/tiny-loops-wonder.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: ensure each block animations don't mess with transitions
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 77e669aa22..0147de3c3d 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -394,8 +394,12 @@ function reconcile(state, array, anchor, flags, get_key) {
 			key = get_key(value, i);
 			item = /** @type {EachItem} */ (items.get(key));
 
-			item.a?.measure();
-			(to_animate ??= new Set()).add(item);
+			// offscreen == coming in now, no animation in that case,
+			// else this would happen https://github.com/sveltejs/svelte/issues/17181
+			if (item.o) {
+				item.a?.measure();
+				(to_animate ??= new Set()).add(item);
+			}
 		}
 	}
 

From a7848c021a987d0efec1cda8d4f2a6066a39ceae Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 25 Nov 2025 22:52:26 +0100
Subject: [PATCH 203/347] fix: generate correct code for simple destructurings
 (#17237)

Fixes #17236

* fix: generate correct code for simple destructurings

* add a test (existing one doesn't fail on main)

* adjust existing test so it fails on main

* slightly neater approach (with identical outcome)

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/lovely-windows-shout.md            |  5 ++++
 .../3-transform/shared/transform-async.js     | 29 +++++++++----------
 .../async-derived-destructured/Child.svelte   |  4 +++
 .../async-derived-destructured/_config.js     |  2 ++
 4 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/lovely-windows-shout.md

diff --git a/.changeset/lovely-windows-shout.md b/.changeset/lovely-windows-shout.md
new file mode 100644
index 0000000000..d0b748a876
--- /dev/null
+++ b/.changeset/lovely-windows-shout.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: generate correct code for simple destructurings
diff --git a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
index 6ec7893452..22c4beb08a 100644
--- a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
+++ b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
@@ -53,23 +53,22 @@ export function transform_body(instance_body, runner, transform) {
 					transform(b.var(s.node.id, s.node.init))
 				);
 
-				if (visited.declarations.length === 1) {
-					return b.thunk(
-						b.assignment('=', visited.declarations[0].id, visited.declarations[0].init ?? b.void0),
-						s.has_await
-					);
+				const statements = visited.declarations.map((node) => {
+					if (node.id.type === 'Identifier' && node.id.name.startsWith('$$d')) {
+						// this is an intermediate declaration created in VariableDeclaration.js;
+						// subsequent statements depend on it
+						return b.var(node.id, node.init);
+					}
+
+					return b.stmt(b.assignment('=', node.id, node.init ?? b.void0));
+				});
+
+				if (statements.length === 1) {
+					const statement = /** @type {ESTree.ExpressionStatement} */ (statements[0]);
+					return b.thunk(statement.expression, s.has_await);
 				}
 
-				// if we have multiple declarations, it indicates destructuring
-				return b.thunk(
-					b.block([
-						b.var(visited.declarations[0].id, visited.declarations[0].init),
-						...visited.declarations
-							.slice(1)
-							.map((d) => b.stmt(b.assignment('=', d.id, d.init ?? b.void0)))
-					]),
-					s.has_await
-				);
+				return b.thunk(b.block(statements), s.has_await);
 			}
 
 			if (s.node.type === 'ClassDeclaration') {
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/Child.svelte
index 39112b12a7..fdf7184e3c 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/Child.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/Child.svelte
@@ -1,13 +1,17 @@
 <script>
 	let count = $state(1);
 
+	// More complex init
 	let { squared, cubed } = $derived(await {
 		squared: count ** 2,
 		cubed: count ** 3
 	});
+	// Simple init with multiple destructurings after await
+	let { toFixed, toString } = $derived(count);
 </script>
 
 <button onclick={() => count++}>increment</button>
 
 <p>{count} ** 2 = {squared}</p>
 <p>{count} ** 3 = {cubed}</p>
+<p>{typeof toFixed} {typeof toString}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/_config.js b/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/_config.js
index d444e8e1d9..bfd582ea97 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/_config.js
@@ -13,6 +13,7 @@ export default test({
 				<button>increment</button>
 				<p>1 ** 2 = 1</p>
 				<p>1 ** 3 = 1</p>
+				<p>function function</p>
 			`
 		);
 
@@ -25,6 +26,7 @@ export default test({
 				<button>increment</button>
 				<p>2 ** 2 = 4</p>
 				<p>2 ** 3 = 8</p>
+				<p>function function</p>
 			`
 		);
 	}

From 3c63b12ccd4a694b6de5d7c9fd51a375b389793e Mon Sep 17 00:00:00 2001
From: Alejandro Torres <Alejandrotorresndro@gmail.com>
Date: Tue, 25 Nov 2025 17:52:51 -0400
Subject: [PATCH 204/347] chore: fix typos in code comments and documentation
 (#17187)

* chore: fix typos in code comments and documentation

* regenerate

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 documentation/docs/98-reference/.generated/client-warnings.md | 2 +-
 packages/svelte/messages/client-warnings/warnings.md          | 2 +-
 packages/svelte/src/compiler/migrate/index.js                 | 4 ++--
 .../phases/3-transform/client/visitors/VariableDeclaration.js | 2 +-
 .../phases/3-transform/server/visitors/VariableDeclaration.js | 2 +-
 .../src/compiler/phases/3-transform/shared/transform-async.js | 2 +-
 .../svelte/src/internal/client/dom/elements/bindings/this.js  | 2 +-
 packages/svelte/src/internal/client/dom/elements/misc.js      | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/documentation/docs/98-reference/.generated/client-warnings.md b/documentation/docs/98-reference/.generated/client-warnings.md
index 4deb338521..7daf808d61 100644
--- a/documentation/docs/98-reference/.generated/client-warnings.md
+++ b/documentation/docs/98-reference/.generated/client-warnings.md
@@ -237,7 +237,7 @@ Hydration failed because the initial UI does not match what was rendered on the
 
 This warning is thrown when Svelte encounters an error while hydrating the HTML from the server. During hydration, Svelte walks the DOM, expecting a certain structure. If that structure is different (for example because the HTML was repaired by the DOM because of invalid HTML), then Svelte will run into issues, resulting in this warning.
 
-During development, this error is often preceeded by a `console.error` detailing the offending HTML, which needs fixing.
+During development, this error is often preceded by a `console.error` detailing the offending HTML, which needs fixing.
 
 ### invalid_raw_snippet_render
 
diff --git a/packages/svelte/messages/client-warnings/warnings.md b/packages/svelte/messages/client-warnings/warnings.md
index b51fc6b53c..6998173a99 100644
--- a/packages/svelte/messages/client-warnings/warnings.md
+++ b/packages/svelte/messages/client-warnings/warnings.md
@@ -209,7 +209,7 @@ To fix this, either silence the warning with a [`svelte-ignore`](basic-markup#Co
 
 This warning is thrown when Svelte encounters an error while hydrating the HTML from the server. During hydration, Svelte walks the DOM, expecting a certain structure. If that structure is different (for example because the HTML was repaired by the DOM because of invalid HTML), then Svelte will run into issues, resulting in this warning.
 
-During development, this error is often preceeded by a `console.error` detailing the offending HTML, which needs fixing.
+During development, this error is often preceded by a `console.error` detailing the offending HTML, which needs fixing.
 
 ## invalid_raw_snippet_render
 
diff --git a/packages/svelte/src/compiler/migrate/index.js b/packages/svelte/src/compiler/migrate/index.js
index 0d4691e9d6..ce5387f4dd 100644
--- a/packages/svelte/src/compiler/migrate/index.js
+++ b/packages/svelte/src/compiler/migrate/index.js
@@ -604,7 +604,7 @@ const instance_script = {
 						'Encountered an export declaration pattern that is not supported for automigration.'
 					);
 					// Turn export let into props. It's really really weird because export let { x: foo, z: [bar]} = ..
-					// means that foo and bar are the props (i.e. the leafs are the prop names), not x and z.
+					// means that foo and bar are the props (i.e. the leaves are the prop names), not x and z.
 					// const tmp = b.id(state.scope.generate('tmp'));
 					// const paths = extract_paths(declarator.id, tmp);
 					// state.props_pre.push(
@@ -1812,7 +1812,7 @@ function handle_events(element, state) {
 }
 
 /**
- * Returns start and end of the node. If the start is preceeded with white-space-only before a line break,
+ * Returns start and end of the node. If the start is preceded with white-space-only before a line break,
  * the start will be the start of the line.
  * @param {string} source
  * @param {LabeledStatement} node
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 63f942943f..f830e8c57d 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
@@ -305,7 +305,7 @@ export function VariableDeclaration(node, context) {
 			if (has_props) {
 				if (declarator.id.type !== 'Identifier') {
 					// Turn export let into props. It's really really weird because export let { x: foo, z: [bar]} = ..
-					// means that foo and bar are the props (i.e. the leafs are the prop names), not x and z.
+					// means that foo and bar are the props (i.e. the leaves are the prop names), not x and z.
 					const tmp = b.id(context.state.scope.generate('tmp'));
 					const { inserts, paths } = extract_paths(declarator.id, tmp);
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/VariableDeclaration.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/VariableDeclaration.js
index 7c94595147..58fde5964f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/VariableDeclaration.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/VariableDeclaration.js
@@ -119,7 +119,7 @@ export function VariableDeclaration(node, context) {
 			if (has_props) {
 				if (declarator.id.type !== 'Identifier') {
 					// Turn export let into props. It's really really weird because export let { x: foo, z: [bar]} = ..
-					// means that foo and bar are the props (i.e. the leafs are the prop names), not x and z.
+					// means that foo and bar are the props (i.e. the leaves are the prop names), not x and z.
 					const tmp = b.id(context.state.scope.generate('tmp'));
 					const { inserts, paths } = extract_paths(declarator.id, tmp);
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
index 22c4beb08a..b55356a38c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
+++ b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
@@ -35,7 +35,7 @@ export function transform_body(instance_body, runner, transform) {
 		(node) => /** @type {ESTree.Statement | ESTree.VariableDeclaration} */ (transform(node))
 	);
 
-	// Declarations for the await expressions (they will asign to them; need to be hoisted to be available in whole instance scope)
+	// Declarations for the await expressions (they will assign to them; need to be hoisted to be available in whole instance scope)
 	if (instance_body.declarations.length > 0) {
 		statements.push(
 			b.declaration(
diff --git a/packages/svelte/src/internal/client/dom/elements/bindings/this.js b/packages/svelte/src/internal/client/dom/elements/bindings/this.js
index e9bbcedc6f..f2e715113f 100644
--- a/packages/svelte/src/internal/client/dom/elements/bindings/this.js
+++ b/packages/svelte/src/internal/client/dom/elements/bindings/this.js
@@ -38,7 +38,7 @@ export function bind_this(element_or_component = {}, update, get_value, get_part
 			untrack(() => {
 				if (element_or_component !== get_value(...parts)) {
 					update(element_or_component, ...parts);
-					// If this is an effect rerun (cause: each block context changes), then nullfiy the binding at
+					// If this is an effect rerun (cause: each block context changes), then nullify the binding at
 					// the previous position if it isn't already taken over by a different effect.
 					if (old_parts && is_bound_this(get_value(...old_parts), element_or_component)) {
 						update(null, ...old_parts);
diff --git a/packages/svelte/src/internal/client/dom/elements/misc.js b/packages/svelte/src/internal/client/dom/elements/misc.js
index 61e513903f..f350d1df8c 100644
--- a/packages/svelte/src/internal/client/dom/elements/misc.js
+++ b/packages/svelte/src/internal/client/dom/elements/misc.js
@@ -51,7 +51,7 @@ export function add_form_reset_listener() {
 					}
 				});
 			},
-			// In the capture phase to guarantee we get noticed of it (no possiblity of stopPropagation)
+			// In the capture phase to guarantee we get noticed of it (no possibility of stopPropagation)
 			{ capture: true }
 		);
 	}

From cc1b3f234a07ca9cb135f9c6c9e47df7a51ebfe0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Nov 2025 20:56:39 -0500
Subject: [PATCH 205/347] Version Packages (#17245)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/famous-terms-shake.md   |  5 -----
 .changeset/great-ghosts-unite.md   |  5 -----
 .changeset/lovely-windows-shout.md |  5 -----
 .changeset/tiny-loops-wonder.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/famous-terms-shake.md
 delete mode 100644 .changeset/great-ghosts-unite.md
 delete mode 100644 .changeset/lovely-windows-shout.md
 delete mode 100644 .changeset/tiny-loops-wonder.md

diff --git a/.changeset/famous-terms-shake.md b/.changeset/famous-terms-shake.md
deleted file mode 100644
index d7d9c26400..0000000000
--- a/.changeset/famous-terms-shake.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: await blockers before initialising const
diff --git a/.changeset/great-ghosts-unite.md b/.changeset/great-ghosts-unite.md
deleted file mode 100644
index 2973737cfd..0000000000
--- a/.changeset/great-ghosts-unite.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: link offscreen items and last effect in each block correctly
diff --git a/.changeset/lovely-windows-shout.md b/.changeset/lovely-windows-shout.md
deleted file mode 100644
index d0b748a876..0000000000
--- a/.changeset/lovely-windows-shout.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: generate correct code for simple destructurings
diff --git a/.changeset/tiny-loops-wonder.md b/.changeset/tiny-loops-wonder.md
deleted file mode 100644
index 49ac92947c..0000000000
--- a/.changeset/tiny-loops-wonder.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: ensure each block animations don't mess with transitions
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index f1f33f6c00..fe2d5ae212 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.44.1
+
+### Patch Changes
+
+- fix: await blockers before initialising const ([#17226](https://github.com/sveltejs/svelte/pull/17226))
+
+- fix: link offscreen items and last effect in each block correctly ([#17244](https://github.com/sveltejs/svelte/pull/17244))
+
+- fix: generate correct code for simple destructurings ([#17237](https://github.com/sveltejs/svelte/pull/17237))
+
+- fix: ensure each block animations don't mess with transitions ([#17238](https://github.com/sveltejs/svelte/pull/17238))
+
 ## 5.44.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 416493faf6..c42a062b0e 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.44.0",
+  "version": "5.44.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index b95eb1f2b2..681a3d3487 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.44.0';
+export const VERSION = '5.44.1';
 export const PUBLIC_VERSION = '5';

From 8addf203c42698c485a4379d188b33fb24a7c684 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 25 Nov 2025 20:57:00 -0500
Subject: [PATCH 206/347] feat: add `print(...)` function (#16188)

* use local version of esrap, for now

* WIP

* WIP

* fixes

* more

* add `Declaration` visitor

* add `TransitionDirective`

* `UseDirective`, `OnDirective`

* more directives

* `SpreadAttribute`, directive shorthands

* `{#if ...} {:else ...}`

* fix

* more

* add tags, `AnimateDirective`

* `KeyBlock`

* `SelectorList`, `<svelte:whatever />`

* quote text in `Attribute` visitor

* tweak test logic to reduce false negatives

* fix

* fix

* add separate test suite

* fix

* more

* slightly nicer printing

* install from pkg.pr.new

* merge main

* bump

* fix

* remove any

* fix indentation

* replace TODO with a type error

* bump

* fix

* esrap@2

* lockfile

* try this

* regenerate

* add small comment

* fix test file

* ensure new lines at end of file

* common tests

* tests for A-nodes

* fix interface

* tests for B-nodes

* delete basic test

* tests for C-nodes

* combine css tests

* tests for E-nodes

* tests for H-nodes

* tests for I-nodes

* tests for K-nodes

* tests for L-nodes

* tests for N-nodes

* add todo

* remove other todo

* tests for O-nodes

* tests for P-nodes

* tests for R-nodes

* tests for S-nodes

* tests for T-nodes

* tests for U-nodes

* seperate css and svelte visitors for clarity

* fix failing test

* rename early tests

* fix const test

* fix svelte-element

* move block to css visitors

* fix css output

* fix #if indentation

* fix self closing tag problems

* use common method for attributes

* put attributes into multiple lines if too long

* fix new lines for #each:else

* fix svelte element new lines

* rmeove usless comments & fix playground

* improved formatting

* support formatting for a lot more nodes

* style

* fixes for formatting

* cleanup

* make typescript happy

* add formatting related test

* add docs

* changeset

* regenerate types

* fix self-closing tags

* fix bracket placement

* break length 50

* add support for additional comments

* remove abstract keyword

* strip out more typescript gubbins

---------

Co-authored-by: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Co-authored-by: Manuel Serret <mserret99@gmail.com>
---
 .changeset/little-humans-occur.md             |   5 +
 packages/svelte/package.json                  |   2 +-
 packages/svelte/src/compiler/index.js         |   1 +
 .../phases/1-parse/remove_typescript_nodes.js |  10 +
 packages/svelte/src/compiler/print/index.js   | 865 ++++++++++++++++++
 packages/svelte/src/compiler/print/types.d.ts |   6 +
 .../svelte/src/compiler/types/template.d.ts   |   2 +-
 packages/svelte/tests/parser-modern/test.ts   |  83 +-
 .../samples/animate-directive/input.svelte    |   1 +
 .../samples/animate-directive/output.svelte   |   1 +
 .../print/samples/attach-tag/input.svelte     |  13 +
 .../print/samples/attach-tag/output.svelte    |  13 +
 .../print/samples/attribute/input.svelte      |   1 +
 .../print/samples/attribute/output.svelte     |   1 +
 .../print/samples/await-block/input.svelte    |  10 +
 .../print/samples/await-block/output.svelte   |  10 +
 .../print/samples/bind-directive/input.svelte |   1 +
 .../samples/bind-directive/output.svelte      |   1 +
 .../tests/print/samples/block/input.svelte    |   9 +
 .../tests/print/samples/block/output.svelte   |  19 +
 .../samples/class-directive/input.svelte      |   8 +
 .../samples/class-directive/output.svelte     |   6 +
 .../tests/print/samples/comment/input.svelte  |   5 +
 .../tests/print/samples/comment/output.svelte |   3 +
 .../print/samples/component/input.svelte      |   8 +
 .../print/samples/component/output.svelte     |   6 +
 .../print/samples/const-tag/input.svelte      |   8 +
 .../print/samples/const-tag/output.svelte     |   8 +
 .../print/samples/each-block/input.svelte     |  15 +
 .../print/samples/each-block/output.svelte    |  17 +
 .../print/samples/expression-tag/input.svelte |   2 +
 .../samples/expression-tag/output.svelte      |   1 +
 .../print/samples/formatting/input.svelte     |   1 +
 .../print/samples/formatting/output.svelte    |  21 +
 .../tests/print/samples/html-tag/input.svelte |   3 +
 .../print/samples/html-tag/output.svelte      |   1 +
 .../tests/print/samples/if-block/input.svelte |   7 +
 .../print/samples/if-block/output.svelte      |   7 +
 .../print/samples/key-block/input.svelte      |   3 +
 .../print/samples/key-block/output.svelte     |   3 +
 .../print/samples/let-directive/input.svelte  |   3 +
 .../print/samples/let-directive/output.svelte |   1 +
 .../print/samples/on-directive/input.svelte   |  11 +
 .../print/samples/on-directive/output.svelte  |   9 +
 .../samples/regular-element/input.svelte      |   2 +
 .../samples/regular-element/output.svelte     |   1 +
 .../print/samples/render-tag/input.svelte     |   7 +
 .../print/samples/render-tag/output.svelte    |   7 +
 .../tests/print/samples/script/input.svelte   |   3 +
 .../tests/print/samples/script/output.svelte  |   3 +
 .../print/samples/slot-element/input.svelte   |   3 +
 .../print/samples/slot-element/output.svelte  |   1 +
 .../print/samples/snippet-block/input.svelte  |   3 +
 .../print/samples/snippet-block/output.svelte |   3 +
 .../samples/spread-attribute/input.svelte     |   1 +
 .../samples/spread-attribute/output.svelte    |   1 +
 .../samples/style-directive/input.svelte      |   2 +
 .../samples/style-directive/output.svelte     |   8 +
 .../tests/print/samples/style/input.svelte    |  43 +
 .../tests/print/samples/style/output.svelte   |  69 ++
 .../samples/svelte-boundary/input.svelte      |   7 +
 .../samples/svelte-boundary/output.svelte     |   7 +
 .../samples/svelte-component/input.svelte     |   1 +
 .../samples/svelte-component/output.svelte    |   1 +
 .../samples/svelte-document/input.svelte      |   1 +
 .../samples/svelte-document/output.svelte     |   4 +
 .../print/samples/svelte-element/input.svelte |   7 +
 .../samples/svelte-element/output.svelte      |   7 +
 .../samples/svelte-fragment/input.svelte      |  11 +
 .../samples/svelte-fragment/output.svelte     |  11 +
 .../print/samples/svelte-head/input.svelte    |   4 +
 .../print/samples/svelte-head/output.svelte   |   7 +
 .../print/samples/svelte-options/input.svelte |   1 +
 .../samples/svelte-options/output.svelte      |   1 +
 .../print/samples/svelte-self/input.svelte    |  10 +
 .../print/samples/svelte-self/output.svelte   |  10 +
 .../print/samples/svelte-window/input.svelte  |   7 +
 .../print/samples/svelte-window/output.svelte |   7 +
 .../tests/print/samples/text/input.svelte     |   1 +
 .../tests/print/samples/text/output.svelte    |   1 +
 .../samples/transition-directive/input.svelte |  11 +
 .../transition-directive/output.svelte        |  11 +
 .../print/samples/use-directive/input.svelte  |   9 +
 .../print/samples/use-directive/output.svelte |   9 +
 packages/svelte/tests/print/test.ts           |  30 +
 packages/svelte/types/index.d.ts              |  19 +-
 playgrounds/sandbox/run.js                    |   8 +-
 pnpm-lock.yaml                                |  81 +-
 88 files changed, 1606 insertions(+), 46 deletions(-)
 create mode 100644 .changeset/little-humans-occur.md
 create mode 100644 packages/svelte/src/compiler/print/index.js
 create mode 100644 packages/svelte/src/compiler/print/types.d.ts
 create mode 100644 packages/svelte/tests/print/samples/animate-directive/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/animate-directive/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/attach-tag/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/attach-tag/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/attribute/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/attribute/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/await-block/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/await-block/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/bind-directive/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/bind-directive/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/block/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/block/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/class-directive/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/class-directive/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/comment/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/comment/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/component/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/component/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/const-tag/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/const-tag/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/each-block/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/each-block/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/expression-tag/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/expression-tag/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/formatting/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/formatting/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/html-tag/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/html-tag/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/if-block/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/if-block/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/key-block/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/key-block/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/let-directive/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/let-directive/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/on-directive/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/on-directive/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/regular-element/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/regular-element/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/render-tag/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/render-tag/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/script/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/script/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/slot-element/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/slot-element/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/snippet-block/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/snippet-block/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/spread-attribute/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/spread-attribute/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/style-directive/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/style-directive/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/style/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/style/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-boundary/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-boundary/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-component/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-component/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-document/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-document/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-element/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-element/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-fragment/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-fragment/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-head/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-head/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-options/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-options/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-self/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-self/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-window/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/svelte-window/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/text/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/text/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/transition-directive/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/transition-directive/output.svelte
 create mode 100644 packages/svelte/tests/print/samples/use-directive/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/use-directive/output.svelte
 create mode 100644 packages/svelte/tests/print/test.ts

diff --git a/.changeset/little-humans-occur.md b/.changeset/little-humans-occur.md
new file mode 100644
index 0000000000..78b94ee26e
--- /dev/null
+++ b/.changeset/little-humans-occur.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: add `print(...)` function
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index c42a062b0e..3f81fb924c 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -176,7 +176,7 @@
     "clsx": "^2.1.1",
     "devalue": "^5.5.0",
     "esm-env": "^1.2.1",
-    "esrap": "^2.1.0",
+    "esrap": "^2.2.0",
     "is-reference": "^3.0.3",
     "locate-character": "^3.0.0",
     "magic-string": "^0.30.11",
diff --git a/packages/svelte/src/compiler/index.js b/packages/svelte/src/compiler/index.js
index a378af34ee..9095a2a2f2 100644
--- a/packages/svelte/src/compiler/index.js
+++ b/packages/svelte/src/compiler/index.js
@@ -10,6 +10,7 @@ import { transform_component, transform_module } from './phases/3-transform/inde
 import { validate_component_options, validate_module_options } from './validate-options.js';
 import * as state from './state.js';
 export { default as preprocess } from './preprocess/index.js';
+export { print } from './print/index.js';
 
 /**
  * `compile` converts your `.svelte` source code into a JavaScript module that exports a component
diff --git a/packages/svelte/src/compiler/phases/1-parse/remove_typescript_nodes.js b/packages/svelte/src/compiler/phases/1-parse/remove_typescript_nodes.js
index cb498c3c13..0835c5fc79 100644
--- a/packages/svelte/src/compiler/phases/1-parse/remove_typescript_nodes.js
+++ b/packages/svelte/src/compiler/phases/1-parse/remove_typescript_nodes.js
@@ -27,6 +27,9 @@ const visitors = {
 		delete n.typeArguments;
 		delete n.returnType;
 		delete n.accessibility;
+		delete n.readonly;
+		delete n.definite;
+		delete n.override;
 	},
 	Decorator(node) {
 		e.typescript_invalid_feature(node, 'decorators (related TSC proposal is not stage 4 yet)');
@@ -132,7 +135,14 @@ const visitors = {
 		if (node.declare) {
 			return b.empty;
 		}
+		delete node.abstract;
 		delete node.implements;
+		delete node.superTypeArguments;
+		return context.next();
+	},
+	ClassExpression(node, context) {
+		delete node.implements;
+		delete node.superTypeArguments;
 		return context.next();
 	},
 	MethodDefinition(node, context) {
diff --git a/packages/svelte/src/compiler/print/index.js b/packages/svelte/src/compiler/print/index.js
new file mode 100644
index 0000000000..abd8b56297
--- /dev/null
+++ b/packages/svelte/src/compiler/print/index.js
@@ -0,0 +1,865 @@
+/** @import { AST } from '#compiler'; */
+/** @import { Context, Visitors } from 'esrap' */
+import * as esrap from 'esrap';
+import ts from 'esrap/languages/ts';
+import { is_void } from '../../utils.js';
+
+/** Threshold for when content should be formatted on separate lines */
+const LINE_BREAK_THRESHOLD = 50;
+
+/**
+ * `print` converts a Svelte AST node back into Svelte source code.
+ * It is primarily intended for tools that parse and transform components using the compiler’s modern AST representation.
+ *
+ * `print(ast)` requires an AST node produced by parse with modern: true, or any sub-node within that modern AST.
+ * The result contains the generated source and a corresponding source map.
+ * The output is valid Svelte, but formatting details such as whitespace or quoting may differ from the original.
+ * @param {AST.SvelteNode} ast
+ * @param {import('./types.js').Options | undefined} options
+ */
+export function print(ast, options = undefined) {
+	return esrap.print(
+		ast,
+		/** @type {Visitors<AST.SvelteNode>} */ ({
+			...ts({
+				comments: ast.type === 'Root' ? ast.comments : [],
+				getLeadingComments: options?.getLeadingComments,
+				getTrailingComments: options?.getTrailingComments
+			}),
+			...svelte_visitors,
+			...css_visitors
+		})
+	);
+}
+
+/**
+ * @param {Context} context
+ * @param {AST.SvelteNode} node
+ * @param {boolean} allow_inline
+ */
+function block(context, node, allow_inline = false) {
+	const child_context = context.new();
+	child_context.visit(node);
+
+	if (child_context.empty()) {
+		return;
+	}
+
+	if (allow_inline && !child_context.multiline) {
+		context.append(child_context);
+	} else {
+		context.indent();
+		context.newline();
+		context.append(child_context);
+		context.dedent();
+		context.newline();
+	}
+}
+
+/**
+ * @param {AST.BaseElement['attributes']} attributes
+ * @param {Context} context
+ * @returns {boolean} true if attributes were formatted on multiple lines
+ */
+function attributes(attributes, context) {
+	if (attributes.length === 0) {
+		return false;
+	}
+
+	// Measure total width of all attributes when rendered inline
+	const child_context = context.new();
+
+	for (const attribute of attributes) {
+		child_context.write(' ');
+		child_context.visit(attribute);
+	}
+
+	const multiline = child_context.measure() > LINE_BREAK_THRESHOLD;
+
+	if (multiline) {
+		context.indent();
+		for (const attribute of attributes) {
+			context.newline();
+			context.visit(attribute);
+		}
+		context.dedent();
+		context.newline();
+	} else {
+		context.append(child_context);
+	}
+
+	return multiline;
+}
+
+/**
+ * @param {AST.BaseElement} node
+ * @param {Context} context
+ */
+function base_element(node, context) {
+	const child_context = context.new();
+
+	child_context.write('<' + node.name);
+
+	// Handle special Svelte components/elements that need 'this' attribute
+	if (node.type === 'SvelteComponent') {
+		child_context.write(' this={');
+		child_context.visit(/** @type {AST.SvelteComponent} */ (node).expression);
+		child_context.write('}');
+	} else if (node.type === 'SvelteElement') {
+		child_context.write(' this={');
+		child_context.visit(/** @type {AST.SvelteElement} */ (node).tag);
+		child_context.write('}');
+	}
+
+	const multiline_attributes = attributes(node.attributes, child_context);
+
+	const is_self_closing =
+		is_void(node.name) || (node.type === 'Component' && node.fragment.nodes.length === 0);
+	let multiline_content = false;
+
+	if (is_self_closing) {
+		child_context.write(`${multiline_attributes ? '' : ' '}/>`);
+	} else {
+		child_context.write('>');
+
+		// Process the element's content in a separate context for measurement
+		const content_context = child_context.new();
+		const allow_inline_content = child_context.measure() < LINE_BREAK_THRESHOLD;
+		block(content_context, node.fragment, allow_inline_content);
+
+		// Determine if content should be formatted on multiple lines
+		multiline_content = content_context.measure() > LINE_BREAK_THRESHOLD;
+
+		if (multiline_content) {
+			child_context.newline();
+
+			// Only indent if attributes are inline and content itself isn't already multiline
+			const should_indent = !multiline_attributes && !content_context.multiline;
+			if (should_indent) {
+				child_context.indent();
+			}
+
+			child_context.append(content_context);
+
+			if (should_indent) {
+				child_context.dedent();
+			}
+
+			child_context.newline();
+		} else {
+			child_context.append(content_context);
+		}
+
+		child_context.write(`</${node.name}>`);
+	}
+
+	const break_line_after = child_context.measure() > LINE_BREAK_THRESHOLD;
+
+	if ((multiline_content || multiline_attributes) && !context.empty()) {
+		context.newline();
+	}
+
+	context.append(child_context);
+
+	if (is_self_closing) return;
+	if (multiline_content || multiline_attributes || break_line_after) {
+		context.newline();
+	}
+}
+
+/** @type {Visitors<AST.SvelteNode>} */
+const css_visitors = {
+	Atrule(node, context) {
+		context.write(`@${node.name}`);
+		if (node.prelude) context.write(` ${node.prelude}`);
+
+		if (node.block) {
+			context.write(' ');
+			context.visit(node.block);
+		} else {
+			context.write(';');
+		}
+	},
+
+	Block(node, context) {
+		context.write('{');
+
+		if (node.children.length > 0) {
+			context.indent();
+			context.newline();
+
+			let started = false;
+
+			for (const child of node.children) {
+				if (started) {
+					context.newline();
+				}
+
+				context.visit(child);
+
+				started = true;
+			}
+
+			context.dedent();
+			context.newline();
+		}
+
+		context.write('}');
+	},
+
+	ClassSelector(node, context) {
+		context.write(`.${node.name}`);
+	},
+
+	ComplexSelector(node, context) {
+		for (const selector of node.children) {
+			context.visit(selector);
+		}
+	},
+
+	Declaration(node, context) {
+		context.write(`${node.property}: ${node.value};`);
+	},
+
+	Nth(node, context) {
+		context.write(node.value);
+	},
+
+	PseudoClassSelector(node, context) {
+		context.write(`:${node.name}`);
+
+		if (node.args) {
+			context.write('(');
+
+			let started = false;
+
+			for (const arg of node.args.children) {
+				if (started) {
+					context.write(', ');
+				}
+
+				context.visit(arg);
+
+				started = true;
+			}
+
+			context.write(')');
+		}
+	},
+
+	PseudoElementSelector(node, context) {
+		context.write(`::${node.name}`);
+	},
+
+	RelativeSelector(node, context) {
+		if (node.combinator) {
+			if (node.combinator.name === ' ') {
+				context.write(' ');
+			} else {
+				context.write(` ${node.combinator.name} `);
+			}
+		}
+
+		for (const selector of node.selectors) {
+			context.visit(selector);
+		}
+	},
+
+	Rule(node, context) {
+		let started = false;
+
+		for (const selector of node.prelude.children) {
+			if (started) {
+				context.write(',');
+				context.newline();
+			}
+
+			context.visit(selector);
+			started = true;
+		}
+
+		context.write(' ');
+		context.visit(node.block);
+	},
+
+	SelectorList(node, context) {
+		let started = false;
+		for (const selector of node.children) {
+			if (started) {
+				context.write(', ');
+			}
+
+			context.visit(selector);
+			started = true;
+		}
+	},
+
+	TypeSelector(node, context) {
+		context.write(node.name);
+	}
+};
+
+/** @type {Visitors<AST.SvelteNode>} */
+const svelte_visitors = {
+	Root(node, context) {
+		if (node.options) {
+			context.write('<svelte:options');
+
+			for (const attribute of node.options.attributes) {
+				context.write(' ');
+				context.visit(attribute);
+			}
+
+			context.write(' />');
+		}
+
+		let started = false;
+
+		for (const item of [node.module, node.instance, node.fragment, node.css]) {
+			if (!item) continue;
+
+			if (started) {
+				context.margin();
+				context.newline();
+			}
+
+			context.visit(item);
+			started = true;
+		}
+	},
+
+	Script(node, context) {
+		context.write('<script');
+		attributes(node.attributes, context);
+		context.write('>');
+		block(context, node.content);
+		context.write('</script>');
+	},
+
+	Fragment(node, context) {
+		/** @type {AST.SvelteNode[][]} */
+		const items = [];
+
+		/** @type {AST.SvelteNode[]} */
+		let sequence = [];
+
+		const flush = () => {
+			items.push(sequence);
+			sequence = [];
+		};
+
+		for (let i = 0; i < node.nodes.length; i += 1) {
+			let child_node = node.nodes[i];
+
+			const prev = node.nodes[i - 1];
+			const next = node.nodes[i + 1];
+
+			if (child_node.type === 'Text') {
+				child_node = { ...child_node }; // always clone, so we can safely mutate
+
+				child_node.data = child_node.data.replace(/[^\S]+/g, ' ');
+
+				// trim fragment
+				if (i === 0) {
+					child_node.data = child_node.data.trimStart();
+				}
+
+				if (i === node.nodes.length - 1) {
+					child_node.data = child_node.data.trimEnd();
+				}
+
+				if (child_node.data === '') {
+					continue;
+				}
+
+				if (child_node.data.startsWith(' ') && prev && prev.type !== 'ExpressionTag') {
+					flush();
+					child_node.data = child_node.data.trimStart();
+				}
+
+				if (child_node.data !== '') {
+					sequence.push({ ...child_node, data: child_node.data });
+
+					if (child_node.data.endsWith(' ') && next && next.type !== 'ExpressionTag') {
+						flush();
+						child_node.data = child_node.data.trimStart();
+					}
+				}
+			} else {
+				sequence.push(child_node);
+			}
+		}
+
+		flush();
+
+		let multiline = false;
+		let width = 0;
+
+		const child_contexts = items.map((sequence) => {
+			const child_context = context.new();
+
+			for (const node of sequence) {
+				child_context.visit(node);
+				multiline ||= child_context.multiline;
+			}
+
+			width += child_context.measure();
+
+			return child_context;
+		});
+
+		multiline ||= width > LINE_BREAK_THRESHOLD;
+
+		for (let i = 0; i < child_contexts.length; i += 1) {
+			const prev = child_contexts[i];
+			const next = child_contexts[i + 1];
+
+			context.append(prev);
+
+			if (next) {
+				if (prev.multiline || next.multiline) {
+					context.margin();
+					context.newline();
+				} else if (multiline) {
+					context.newline();
+				}
+			}
+		}
+	},
+
+	AnimateDirective(node, context) {
+		context.write(`animate:${node.name}`);
+		if (
+			node.expression !== null &&
+			!(node.expression.type === 'Identifier' && node.expression.name === node.name)
+		) {
+			context.write('={');
+			context.visit(node.expression);
+			context.write('}');
+		}
+	},
+
+	AttachTag(node, context) {
+		context.write('{@attach ');
+		context.visit(node.expression);
+		context.write('}');
+	},
+
+	Attribute(node, context) {
+		context.write(node.name);
+
+		if (node.value === true) return;
+
+		context.write('=');
+
+		if (Array.isArray(node.value)) {
+			if (node.value.length > 1 || node.value[0].type === 'Text') {
+				context.write('"');
+			}
+
+			for (const chunk of node.value) {
+				context.visit(chunk);
+			}
+
+			if (node.value.length > 1 || node.value[0].type === 'Text') {
+				context.write('"');
+			}
+		} else {
+			context.visit(node.value);
+		}
+	},
+
+	AwaitBlock(node, context) {
+		context.write(`{#await `);
+		context.visit(node.expression);
+
+		if (node.pending) {
+			context.write('}');
+			block(context, node.pending);
+			context.write('{:');
+		} else {
+			context.write(' ');
+		}
+
+		if (node.then) {
+			context.write(node.value ? 'then ' : 'then');
+			if (node.value) context.visit(node.value);
+			context.write('}');
+
+			block(context, node.then);
+
+			if (node.catch) {
+				context.write('{:');
+			}
+		}
+
+		if (node.catch) {
+			context.write(node.value ? 'catch ' : 'catch');
+			if (node.error) context.visit(node.error);
+			context.write('}');
+
+			block(context, node.catch);
+		}
+
+		context.write('{/await}');
+	},
+
+	BindDirective(node, context) {
+		context.write(`bind:${node.name}`);
+
+		if (node.expression.type === 'Identifier' && node.expression.name === node.name) {
+			// shorthand
+			return;
+		}
+
+		context.write('={');
+
+		if (node.expression.type === 'SequenceExpression') {
+			context.visit(node.expression.expressions[0]);
+			context.write(', ');
+			context.visit(node.expression.expressions[1]);
+		} else {
+			context.visit(node.expression);
+		}
+
+		context.write('}');
+	},
+
+	ClassDirective(node, context) {
+		context.write(`class:${node.name}`);
+		if (
+			node.expression !== null &&
+			!(node.expression.type === 'Identifier' && node.expression.name === node.name)
+		) {
+			context.write('={');
+			context.visit(node.expression);
+			context.write('}');
+		}
+	},
+
+	Comment(node, context) {
+		context.write('<!--' + node.data + '-->');
+	},
+
+	Component(node, context) {
+		base_element(node, context);
+	},
+
+	ConstTag(node, context) {
+		context.write('{@');
+		context.visit(node.declaration);
+		context.write('}');
+	},
+
+	DebugTag(node, context) {
+		context.write('{@debug ');
+		let started = false;
+		for (const identifier of node.identifiers) {
+			if (started) {
+				context.write(', ');
+			}
+			context.visit(identifier);
+			started = true;
+		}
+		context.write('}');
+	},
+
+	EachBlock(node, context) {
+		context.write('{#each ');
+		context.visit(node.expression);
+
+		if (node.context) {
+			context.write(' as ');
+			context.visit(node.context);
+		}
+
+		if (node.index) {
+			context.write(`, ${node.index}`);
+		}
+
+		if (node.key) {
+			context.write(' (');
+			context.visit(node.key);
+			context.write(')');
+		}
+
+		context.write('}');
+
+		block(context, node.body);
+
+		if (node.fallback) {
+			context.write('{:else}');
+			block(context, node.fallback);
+		}
+
+		context.write('{/each}');
+	},
+
+	ExpressionTag(node, context) {
+		context.write('{');
+		context.visit(node.expression);
+		context.write('}');
+	},
+
+	HtmlTag(node, context) {
+		context.write('{@html ');
+		context.visit(node.expression);
+		context.write('}');
+	},
+
+	IfBlock(node, context) {
+		if (node.elseif) {
+			context.write('{:else if ');
+			context.visit(node.test);
+			context.write('}');
+
+			block(context, node.consequent);
+		} else {
+			context.write('{#if ');
+			context.visit(node.test);
+			context.write('}');
+
+			block(context, node.consequent);
+		}
+
+		if (node.alternate !== null) {
+			if (
+				!(
+					node.alternate.nodes.length === 1 &&
+					node.alternate.nodes[0].type === 'IfBlock' &&
+					node.alternate.nodes[0].elseif
+				)
+			) {
+				context.write('{:else}');
+				block(context, node.alternate);
+			} else {
+				context.visit(node.alternate);
+			}
+		}
+
+		if (!node.elseif) {
+			context.write('{/if}');
+		}
+	},
+
+	KeyBlock(node, context) {
+		context.write('{#key ');
+		context.visit(node.expression);
+		context.write('}');
+		block(context, node.fragment);
+		context.write('{/key}');
+	},
+
+	LetDirective(node, context) {
+		context.write(`let:${node.name}`);
+		if (
+			node.expression !== null &&
+			!(node.expression.type === 'Identifier' && node.expression.name === node.name)
+		) {
+			context.write('={');
+			context.visit(node.expression);
+			context.write('}');
+		}
+	},
+
+	OnDirective(node, context) {
+		context.write(`on:${node.name}`);
+		for (const modifier of node.modifiers) {
+			context.write(`|${modifier}`);
+		}
+		if (
+			node.expression !== null &&
+			!(node.expression.type === 'Identifier' && node.expression.name === node.name)
+		) {
+			context.write('={');
+			context.visit(node.expression);
+			context.write('}');
+		}
+	},
+
+	RegularElement(node, context) {
+		base_element(node, context);
+	},
+
+	RenderTag(node, context) {
+		context.write('{@render ');
+		context.visit(node.expression);
+		context.write('}');
+	},
+
+	SlotElement(node, context) {
+		base_element(node, context);
+	},
+
+	SnippetBlock(node, context) {
+		context.write('{#snippet ');
+		context.visit(node.expression);
+
+		if (node.typeParams) {
+			context.write(`<${node.typeParams}>`);
+		}
+
+		context.write('(');
+
+		for (let i = 0; i < node.parameters.length; i += 1) {
+			if (i > 0) context.write(', ');
+			context.visit(node.parameters[i]);
+		}
+
+		context.write(')}');
+		block(context, node.body);
+		context.write('{/snippet}');
+	},
+
+	SpreadAttribute(node, context) {
+		context.write('{...');
+		context.visit(node.expression);
+		context.write('}');
+	},
+
+	StyleDirective(node, context) {
+		context.write(`style:${node.name}`);
+		for (const modifier of node.modifiers) {
+			context.write(`|${modifier}`);
+		}
+
+		if (node.value === true) {
+			return;
+		}
+
+		context.write('=');
+
+		if (Array.isArray(node.value)) {
+			context.write('"');
+
+			for (const tag of node.value) {
+				context.visit(tag);
+			}
+
+			context.write('"');
+		} else {
+			context.visit(node.value);
+		}
+	},
+
+	StyleSheet(node, context) {
+		context.write('<style');
+		attributes(node.attributes, context);
+		context.write('>');
+
+		if (node.children.length > 0) {
+			context.indent();
+			context.newline();
+
+			let started = false;
+
+			for (const child of node.children) {
+				if (started) {
+					context.margin();
+					context.newline();
+				}
+
+				context.visit(child);
+				started = true;
+			}
+
+			context.dedent();
+			context.newline();
+		}
+
+		context.write('</style>');
+	},
+
+	SvelteBoundary(node, context) {
+		base_element(node, context);
+	},
+
+	SvelteComponent(node, context) {
+		context.write('<svelte:component');
+
+		context.write(' this={');
+		context.visit(node.expression);
+		context.write('}');
+		attributes(node.attributes, context);
+		if (node.fragment && node.fragment.nodes.length > 0) {
+			context.write('>');
+			block(context, node.fragment, true);
+			context.write(`</svelte:component>`);
+		} else {
+			context.write(' />');
+		}
+	},
+
+	SvelteDocument(node, context) {
+		base_element(node, context);
+	},
+
+	SvelteElement(node, context) {
+		context.write('<svelte:element ');
+
+		context.write('this={');
+		context.visit(node.tag);
+		context.write('}');
+		attributes(node.attributes, context);
+
+		if (node.fragment && node.fragment.nodes.length > 0) {
+			context.write('>');
+			block(context, node.fragment);
+			context.write(`</svelte:element>`);
+		} else {
+			context.write(' />');
+		}
+	},
+
+	SvelteFragment(node, context) {
+		base_element(node, context);
+	},
+
+	SvelteHead(node, context) {
+		base_element(node, context);
+	},
+
+	SvelteSelf(node, context) {
+		base_element(node, context);
+	},
+
+	SvelteWindow(node, context) {
+		base_element(node, context);
+	},
+
+	Text(node, context) {
+		context.write(node.data);
+	},
+
+	TitleElement(node, context) {
+		base_element(node, context);
+	},
+
+	TransitionDirective(node, context) {
+		const directive = node.intro && node.outro ? 'transition' : node.intro ? 'in' : 'out';
+		context.write(`${directive}:${node.name}`);
+		for (const modifier of node.modifiers) {
+			context.write(`|${modifier}`);
+		}
+		if (
+			node.expression !== null &&
+			!(node.expression.type === 'Identifier' && node.expression.name === node.name)
+		) {
+			context.write('={');
+			context.visit(node.expression);
+			context.write('}');
+		}
+	},
+
+	UseDirective(node, context) {
+		context.write(`use:${node.name}`);
+		if (
+			node.expression !== null &&
+			!(node.expression.type === 'Identifier' && node.expression.name === node.name)
+		) {
+			context.write('={');
+			context.visit(node.expression);
+			context.write('}');
+		}
+	}
+};
diff --git a/packages/svelte/src/compiler/print/types.d.ts b/packages/svelte/src/compiler/print/types.d.ts
new file mode 100644
index 0000000000..cf9b749e0e
--- /dev/null
+++ b/packages/svelte/src/compiler/print/types.d.ts
@@ -0,0 +1,6 @@
+import ts from 'esrap/languages/ts';
+
+export type Options = {
+	getLeadingComments?: NonNullable<Parameters<typeof ts>[0]>['getLeadingComments'] | undefined;
+	getTrailingComments?: NonNullable<Parameters<typeof ts>[0]>['getTrailingComments'] | undefined;
+};
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index 1f62994807..c06b77c53c 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -308,7 +308,7 @@ export namespace AST {
 		};
 	}
 
-	interface BaseElement extends BaseNode {
+	export interface BaseElement extends BaseNode {
 		name: string;
 		attributes: Array<Attribute | SpreadAttribute | Directive | AttachTag>;
 		fragment: Fragment;
diff --git a/packages/svelte/tests/parser-modern/test.ts b/packages/svelte/tests/parser-modern/test.ts
index 279ba7bc08..e38bfc7525 100644
--- a/packages/svelte/tests/parser-modern/test.ts
+++ b/packages/svelte/tests/parser-modern/test.ts
@@ -1,12 +1,16 @@
 import * as fs from 'node:fs';
 import { assert, it } from 'vitest';
-import { parse } from 'svelte/compiler';
+import { parse, print } from 'svelte/compiler';
 import { try_load_json } from '../helpers.js';
 import { suite, type BaseTest } from '../suite.js';
+import { walk } from 'zimmerframe';
+import type { AST } from 'svelte/compiler';
 
 interface ParserTest extends BaseTest {}
 
 const { test, run } = suite<ParserTest>(async (config, cwd) => {
+	const loose = cwd.split('/').pop()!.startsWith('loose-');
+
 	const input = fs
 		.readFileSync(`${cwd}/input.svelte`, 'utf-8')
 		.replace(/\s+$/, '')
@@ -32,8 +36,85 @@ const { test, run } = suite<ParserTest>(async (config, cwd) => {
 		const expected = try_load_json(`${cwd}/output.json`);
 		assert.deepEqual(actual, expected);
 	}
+
+	if (!loose) {
+		const printed = print(actual);
+		const reparsed = JSON.parse(
+			JSON.stringify(
+				parse(printed.code, {
+					modern: true,
+					loose
+				})
+			)
+		);
+
+		fs.writeFileSync(`${cwd}/_actual.svelte`, printed.code);
+
+		delete reparsed.comments;
+
+		assert.deepEqual(clean(actual), clean(reparsed));
+	}
 });
 
+function clean(ast: AST.SvelteNode) {
+	return walk(ast, null, {
+		_(node, context) {
+			// @ts-ignore
+			delete node.start;
+			// @ts-ignore
+			delete node.end;
+			// @ts-ignore
+			delete node.loc;
+			// @ts-ignore
+			delete node.leadingComments;
+			// @ts-ignore
+			delete node.trailingComments;
+
+			context.next();
+		},
+		StyleSheet(node, context) {
+			return {
+				type: node.type,
+				attributes: node.attributes.map((attribute) => context.visit(attribute)),
+				children: node.children.map((child) => context.visit(child)),
+				content: {}
+			} as AST.SvelteNode;
+		},
+		Fragment(node, context) {
+			const nodes: AST.SvelteNode[] = [];
+
+			for (let i = 0; i < node.nodes.length; i += 1) {
+				let child = node.nodes[i];
+
+				if (child.type === 'Text') {
+					child = {
+						...child,
+						// trim multiple whitespace to single space
+						data: child.data.replace(/[^\S]+/g, ' '),
+						raw: child.raw.replace(/[^\S]+/g, ' ')
+					};
+
+					if (i === 0) {
+						child.data = child.data.trimStart();
+						child.raw = child.raw.trimStart();
+					}
+
+					if (i === node.nodes.length - 1) {
+						child.data = child.data.trimEnd();
+						child.raw = child.raw.trimEnd();
+					}
+
+					if (child.data === '') continue;
+				}
+
+				nodes.push(context.visit(child));
+			}
+
+			return { ...node, nodes } as AST.Fragment;
+		}
+	});
+}
+
 export { test };
 
 await run(__dirname);
diff --git a/packages/svelte/tests/print/samples/animate-directive/input.svelte b/packages/svelte/tests/print/samples/animate-directive/input.svelte
new file mode 100644
index 0000000000..7cd314f714
--- /dev/null
+++ b/packages/svelte/tests/print/samples/animate-directive/input.svelte
@@ -0,0 +1 @@
+<div animate:flip>{item}</div>
diff --git a/packages/svelte/tests/print/samples/animate-directive/output.svelte b/packages/svelte/tests/print/samples/animate-directive/output.svelte
new file mode 100644
index 0000000000..7cd314f714
--- /dev/null
+++ b/packages/svelte/tests/print/samples/animate-directive/output.svelte
@@ -0,0 +1 @@
+<div animate:flip>{item}</div>
diff --git a/packages/svelte/tests/print/samples/attach-tag/input.svelte b/packages/svelte/tests/print/samples/attach-tag/input.svelte
new file mode 100644
index 0000000000..e92604b92b
--- /dev/null
+++ b/packages/svelte/tests/print/samples/attach-tag/input.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import type { Attachment } from 'svelte/attachments';
+
+	const myAttachment: Attachment = (element) => {
+		console.log(element.nodeName);
+
+		return () => {
+			console.log('cleaning up');
+		};
+	};
+</script>
+
+<div {@attach myAttachment}>...</div>
diff --git a/packages/svelte/tests/print/samples/attach-tag/output.svelte b/packages/svelte/tests/print/samples/attach-tag/output.svelte
new file mode 100644
index 0000000000..e92604b92b
--- /dev/null
+++ b/packages/svelte/tests/print/samples/attach-tag/output.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import type { Attachment } from 'svelte/attachments';
+
+	const myAttachment: Attachment = (element) => {
+		console.log(element.nodeName);
+
+		return () => {
+			console.log('cleaning up');
+		};
+	};
+</script>
+
+<div {@attach myAttachment}>...</div>
diff --git a/packages/svelte/tests/print/samples/attribute/input.svelte b/packages/svelte/tests/print/samples/attribute/input.svelte
new file mode 100644
index 0000000000..4da846f8e6
--- /dev/null
+++ b/packages/svelte/tests/print/samples/attribute/input.svelte
@@ -0,0 +1 @@
+<div class="foo" data-foo="bar"></div>
diff --git a/packages/svelte/tests/print/samples/attribute/output.svelte b/packages/svelte/tests/print/samples/attribute/output.svelte
new file mode 100644
index 0000000000..4da846f8e6
--- /dev/null
+++ b/packages/svelte/tests/print/samples/attribute/output.svelte
@@ -0,0 +1 @@
+<div class="foo" data-foo="bar"></div>
diff --git a/packages/svelte/tests/print/samples/await-block/input.svelte b/packages/svelte/tests/print/samples/await-block/input.svelte
new file mode 100644
index 0000000000..10f0b3fb9e
--- /dev/null
+++ b/packages/svelte/tests/print/samples/await-block/input.svelte
@@ -0,0 +1,10 @@
+{#await promise}
+	<!-- promise is pending -->
+	<p>waiting for the promise to resolve...</p>
+{:then value}
+	<!-- promise was fulfilled or not a Promise -->
+	<p>The value is {value}</p>
+{:catch error}
+	<!-- promise was rejected -->
+	<p>Something went wrong: {error.message}</p>
+{/await}
diff --git a/packages/svelte/tests/print/samples/await-block/output.svelte b/packages/svelte/tests/print/samples/await-block/output.svelte
new file mode 100644
index 0000000000..10f0b3fb9e
--- /dev/null
+++ b/packages/svelte/tests/print/samples/await-block/output.svelte
@@ -0,0 +1,10 @@
+{#await promise}
+	<!-- promise is pending -->
+	<p>waiting for the promise to resolve...</p>
+{:then value}
+	<!-- promise was fulfilled or not a Promise -->
+	<p>The value is {value}</p>
+{:catch error}
+	<!-- promise was rejected -->
+	<p>Something went wrong: {error.message}</p>
+{/await}
diff --git a/packages/svelte/tests/print/samples/bind-directive/input.svelte b/packages/svelte/tests/print/samples/bind-directive/input.svelte
new file mode 100644
index 0000000000..3b7e08921e
--- /dev/null
+++ b/packages/svelte/tests/print/samples/bind-directive/input.svelte
@@ -0,0 +1 @@
+<input bind:value={name} />
diff --git a/packages/svelte/tests/print/samples/bind-directive/output.svelte b/packages/svelte/tests/print/samples/bind-directive/output.svelte
new file mode 100644
index 0000000000..3b7e08921e
--- /dev/null
+++ b/packages/svelte/tests/print/samples/bind-directive/output.svelte
@@ -0,0 +1 @@
+<input bind:value={name} />
diff --git a/packages/svelte/tests/print/samples/block/input.svelte b/packages/svelte/tests/print/samples/block/input.svelte
new file mode 100644
index 0000000000..84140c5c02
--- /dev/null
+++ b/packages/svelte/tests/print/samples/block/input.svelte
@@ -0,0 +1,9 @@
+{#if   condition} yes {:else} no {/if}
+
+{#each items as item, i}
+  <p>{i}: {item}</p>
+{/each}
+
+{#if condition}yes{:else}no{/if}
+
+{#each items as item, i}<p>{i}: {item}</p>{/each}
diff --git a/packages/svelte/tests/print/samples/block/output.svelte b/packages/svelte/tests/print/samples/block/output.svelte
new file mode 100644
index 0000000000..e5d8590875
--- /dev/null
+++ b/packages/svelte/tests/print/samples/block/output.svelte
@@ -0,0 +1,19 @@
+{#if condition}
+	yes
+{:else}
+	no
+{/if}
+
+{#each items as item, i}
+	<p>{i}: {item}</p>
+{/each}
+
+{#if condition}
+	yes
+{:else}
+	no
+{/if}
+
+{#each items as item, i}
+	<p>{i}: {item}</p>
+{/each}
diff --git a/packages/svelte/tests/print/samples/class-directive/input.svelte b/packages/svelte/tests/print/samples/class-directive/input.svelte
new file mode 100644
index 0000000000..5e63111930
--- /dev/null
+++ b/packages/svelte/tests/print/samples/class-directive/input.svelte
@@ -0,0 +1,8 @@
+<script>
+    let active = true;
+    let foo = false;
+</script>
+
+<div class:active class:bar={foo}>
+    Hello world!
+</div>
diff --git a/packages/svelte/tests/print/samples/class-directive/output.svelte b/packages/svelte/tests/print/samples/class-directive/output.svelte
new file mode 100644
index 0000000000..14e5611331
--- /dev/null
+++ b/packages/svelte/tests/print/samples/class-directive/output.svelte
@@ -0,0 +1,6 @@
+<script>
+	let active = true;
+	let foo = false;
+</script>
+
+<div class:active class:bar={foo}>Hello world!</div>
diff --git a/packages/svelte/tests/print/samples/comment/input.svelte b/packages/svelte/tests/print/samples/comment/input.svelte
new file mode 100644
index 0000000000..d144ced1b9
--- /dev/null
+++ b/packages/svelte/tests/print/samples/comment/input.svelte
@@ -0,0 +1,5 @@
+<!-- inline -->
+
+<!-- 
+    multiline
+-->
diff --git a/packages/svelte/tests/print/samples/comment/output.svelte b/packages/svelte/tests/print/samples/comment/output.svelte
new file mode 100644
index 0000000000..f2f97b65be
--- /dev/null
+++ b/packages/svelte/tests/print/samples/comment/output.svelte
@@ -0,0 +1,3 @@
+<!-- inline --><!-- 
+    multiline
+-->
diff --git a/packages/svelte/tests/print/samples/component/input.svelte b/packages/svelte/tests/print/samples/component/input.svelte
new file mode 100644
index 0000000000..c258d7d609
--- /dev/null
+++ b/packages/svelte/tests/print/samples/component/input.svelte
@@ -0,0 +1,8 @@
+<script>
+    import C from './C.svelte';
+</script>
+
+<C foo="bar" />
+<C foo="bar">
+    <span>Hello World</span>
+</C>
diff --git a/packages/svelte/tests/print/samples/component/output.svelte b/packages/svelte/tests/print/samples/component/output.svelte
new file mode 100644
index 0000000000..ec8b827883
--- /dev/null
+++ b/packages/svelte/tests/print/samples/component/output.svelte
@@ -0,0 +1,6 @@
+<script>
+	import C from './C.svelte';
+</script>
+
+<C foo="bar" />
+<C foo="bar"><span>Hello World</span></C>
diff --git a/packages/svelte/tests/print/samples/const-tag/input.svelte b/packages/svelte/tests/print/samples/const-tag/input.svelte
new file mode 100644
index 0000000000..50ada2dd66
--- /dev/null
+++ b/packages/svelte/tests/print/samples/const-tag/input.svelte
@@ -0,0 +1,8 @@
+<script>
+    const boxes = [];
+</script>
+
+{#each boxes as box}
+	{@const area = box.width * box.height}
+	{box.width} * {box.height} = {area}
+{/each}
diff --git a/packages/svelte/tests/print/samples/const-tag/output.svelte b/packages/svelte/tests/print/samples/const-tag/output.svelte
new file mode 100644
index 0000000000..d9d8addcbb
--- /dev/null
+++ b/packages/svelte/tests/print/samples/const-tag/output.svelte
@@ -0,0 +1,8 @@
+<script>
+	const boxes = [];
+</script>
+
+{#each boxes as box}
+	{@const area = box.width * box.height;}
+	{box.width} * {box.height} = {area}
+{/each}
diff --git a/packages/svelte/tests/print/samples/each-block/input.svelte b/packages/svelte/tests/print/samples/each-block/input.svelte
new file mode 100644
index 0000000000..a859705fec
--- /dev/null
+++ b/packages/svelte/tests/print/samples/each-block/input.svelte
@@ -0,0 +1,15 @@
+{#each items as { id, name, qty }, i (id)}
+	<li>{i + 1}: {name} x {qty}</li>
+{/each}
+
+{#each objects as { id, ...rest }}
+	<li><span>{id}</span><MyComponent {...rest} /></li>
+{/each}
+
+{#each expression}...{/each}
+
+{#each todos as todo}
+	<p>{todo.text}</p>
+{:else}
+	<p>No tasks today!</p>
+{/each}
diff --git a/packages/svelte/tests/print/samples/each-block/output.svelte b/packages/svelte/tests/print/samples/each-block/output.svelte
new file mode 100644
index 0000000000..b19925a694
--- /dev/null
+++ b/packages/svelte/tests/print/samples/each-block/output.svelte
@@ -0,0 +1,17 @@
+{#each items as { id, name, qty }, i (id)}
+	<li>{i + 1}: {name} x {qty}</li>
+{/each}
+
+{#each objects as { id, ...rest }}
+	<li><span>{id}</span><MyComponent {...rest} /></li>
+{/each}
+
+{#each expression}
+	...
+{/each}
+
+{#each todos as todo}
+	<p>{todo.text}</p>
+{:else}
+	<p>No tasks today!</p>
+{/each}
diff --git a/packages/svelte/tests/print/samples/expression-tag/input.svelte b/packages/svelte/tests/print/samples/expression-tag/input.svelte
new file mode 100644
index 0000000000..3920c3b40a
--- /dev/null
+++ b/packages/svelte/tests/print/samples/expression-tag/input.svelte
@@ -0,0 +1,2 @@
+<span>{name}</span>
+<span>{count + 1}</span>
diff --git a/packages/svelte/tests/print/samples/expression-tag/output.svelte b/packages/svelte/tests/print/samples/expression-tag/output.svelte
new file mode 100644
index 0000000000..9142a59631
--- /dev/null
+++ b/packages/svelte/tests/print/samples/expression-tag/output.svelte
@@ -0,0 +1 @@
+<span>{name}</span><span>{count + 1}</span>
diff --git a/packages/svelte/tests/print/samples/formatting/input.svelte b/packages/svelte/tests/print/samples/formatting/input.svelte
new file mode 100644
index 0000000000..9b1898e9c8
--- /dev/null
+++ b/packages/svelte/tests/print/samples/formatting/input.svelte
@@ -0,0 +1 @@
+<script>import { setLocale } from '$lib/paraglide/runtime';import { m } from '$lib/paraglide/messages.js';</script><h1>{m.hello_world({ name: 'SvelteKit User' })}</h1><div><button onclick={() => setLocale('en')}>en</button><button	onclick={() => setLocale('es')}>es</button></div><p>If you use VSCode, install the <a href="https://marketplace.visualstudio.com/items?itemName=inlang.vs-code-extension" target="_blank">Sherlock i18n extension</a>for a better i18n experience.</p>
diff --git a/packages/svelte/tests/print/samples/formatting/output.svelte b/packages/svelte/tests/print/samples/formatting/output.svelte
new file mode 100644
index 0000000000..7b40642580
--- /dev/null
+++ b/packages/svelte/tests/print/samples/formatting/output.svelte
@@ -0,0 +1,21 @@
+<script>
+	import { setLocale } from '$lib/paraglide/runtime';
+	import { m } from '$lib/paraglide/messages.js';
+</script>
+
+<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>
+<div>
+	<button onclick={() => setLocale('en')}>en</button>
+	<button onclick={() => setLocale('es')}>es</button>
+</div>
+<p>
+	If you use VSCode, install the 
+
+	<a
+		href="https://marketplace.visualstudio.com/items?itemName=inlang.vs-code-extension"
+		target="_blank"
+	>
+		Sherlock i18n extension
+	</a>
+	for a better i18n experience.
+</p>
diff --git a/packages/svelte/tests/print/samples/html-tag/input.svelte b/packages/svelte/tests/print/samples/html-tag/input.svelte
new file mode 100644
index 0000000000..d021ee8fa6
--- /dev/null
+++ b/packages/svelte/tests/print/samples/html-tag/input.svelte
@@ -0,0 +1,3 @@
+<article>
+	{@html content}
+</article>
diff --git a/packages/svelte/tests/print/samples/html-tag/output.svelte b/packages/svelte/tests/print/samples/html-tag/output.svelte
new file mode 100644
index 0000000000..84777d9b6a
--- /dev/null
+++ b/packages/svelte/tests/print/samples/html-tag/output.svelte
@@ -0,0 +1 @@
+<article>{@html content}</article>
diff --git a/packages/svelte/tests/print/samples/if-block/input.svelte b/packages/svelte/tests/print/samples/if-block/input.svelte
new file mode 100644
index 0000000000..0a444a1252
--- /dev/null
+++ b/packages/svelte/tests/print/samples/if-block/input.svelte
@@ -0,0 +1,7 @@
+{#if porridge.temperature > 100}
+	<p>too hot!</p>
+{:else if 80 > porridge.temperature}
+	<p>too cold!</p>
+{:else}
+	<p>just right!</p>
+{/if}
diff --git a/packages/svelte/tests/print/samples/if-block/output.svelte b/packages/svelte/tests/print/samples/if-block/output.svelte
new file mode 100644
index 0000000000..0a444a1252
--- /dev/null
+++ b/packages/svelte/tests/print/samples/if-block/output.svelte
@@ -0,0 +1,7 @@
+{#if porridge.temperature > 100}
+	<p>too hot!</p>
+{:else if 80 > porridge.temperature}
+	<p>too cold!</p>
+{:else}
+	<p>just right!</p>
+{/if}
diff --git a/packages/svelte/tests/print/samples/key-block/input.svelte b/packages/svelte/tests/print/samples/key-block/input.svelte
new file mode 100644
index 0000000000..9d09f8f00a
--- /dev/null
+++ b/packages/svelte/tests/print/samples/key-block/input.svelte
@@ -0,0 +1,3 @@
+{#key value}
+	<Component />
+{/key}
diff --git a/packages/svelte/tests/print/samples/key-block/output.svelte b/packages/svelte/tests/print/samples/key-block/output.svelte
new file mode 100644
index 0000000000..9d09f8f00a
--- /dev/null
+++ b/packages/svelte/tests/print/samples/key-block/output.svelte
@@ -0,0 +1,3 @@
+{#key value}
+	<Component />
+{/key}
diff --git a/packages/svelte/tests/print/samples/let-directive/input.svelte b/packages/svelte/tests/print/samples/let-directive/input.svelte
new file mode 100644
index 0000000000..c6b49c1561
--- /dev/null
+++ b/packages/svelte/tests/print/samples/let-directive/input.svelte
@@ -0,0 +1,3 @@
+<FancyList {items} let:item={processed}>
+	<div>{processed.text}</div>
+</FancyList>
diff --git a/packages/svelte/tests/print/samples/let-directive/output.svelte b/packages/svelte/tests/print/samples/let-directive/output.svelte
new file mode 100644
index 0000000000..c7254150e3
--- /dev/null
+++ b/packages/svelte/tests/print/samples/let-directive/output.svelte
@@ -0,0 +1 @@
+<FancyList items={items} let:item={processed}><div>{processed.text}</div></FancyList>
diff --git a/packages/svelte/tests/print/samples/on-directive/input.svelte b/packages/svelte/tests/print/samples/on-directive/input.svelte
new file mode 100644
index 0000000000..976749696a
--- /dev/null
+++ b/packages/svelte/tests/print/samples/on-directive/input.svelte
@@ -0,0 +1,11 @@
+<script lang="ts">
+	let count = 0;
+
+	function handleClick(event: MouseEvent) {
+		count += 1;
+	}
+</script>
+
+<button on:click|preventDefault={handleClick}>
+	count: {count}
+</button>
diff --git a/packages/svelte/tests/print/samples/on-directive/output.svelte b/packages/svelte/tests/print/samples/on-directive/output.svelte
new file mode 100644
index 0000000000..da0945678d
--- /dev/null
+++ b/packages/svelte/tests/print/samples/on-directive/output.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+	let count = 0;
+
+	function handleClick(event: MouseEvent) {
+		count += 1;
+	}
+</script>
+
+<button on:click|preventDefault={handleClick}>count: {count}</button>
diff --git a/packages/svelte/tests/print/samples/regular-element/input.svelte b/packages/svelte/tests/print/samples/regular-element/input.svelte
new file mode 100644
index 0000000000..c39f4f487f
--- /dev/null
+++ b/packages/svelte/tests/print/samples/regular-element/input.svelte
@@ -0,0 +1,2 @@
+<div><a href="/foo">bar</a></div>
+<br />
diff --git a/packages/svelte/tests/print/samples/regular-element/output.svelte b/packages/svelte/tests/print/samples/regular-element/output.svelte
new file mode 100644
index 0000000000..0cf7c2472f
--- /dev/null
+++ b/packages/svelte/tests/print/samples/regular-element/output.svelte
@@ -0,0 +1 @@
+<div><a href="/foo">bar</a></div><br />
diff --git a/packages/svelte/tests/print/samples/render-tag/input.svelte b/packages/svelte/tests/print/samples/render-tag/input.svelte
new file mode 100644
index 0000000000..b301e4b0d7
--- /dev/null
+++ b/packages/svelte/tests/print/samples/render-tag/input.svelte
@@ -0,0 +1,7 @@
+{#snippet sum(a, b)}
+	<p>{a} + {b} = {a + b}</p>
+{/snippet}
+
+{@render sum(1, 2)}
+{@render sum(3, 4)}
+{@render sum(5, 6)}
diff --git a/packages/svelte/tests/print/samples/render-tag/output.svelte b/packages/svelte/tests/print/samples/render-tag/output.svelte
new file mode 100644
index 0000000000..b301e4b0d7
--- /dev/null
+++ b/packages/svelte/tests/print/samples/render-tag/output.svelte
@@ -0,0 +1,7 @@
+{#snippet sum(a, b)}
+	<p>{a} + {b} = {a + b}</p>
+{/snippet}
+
+{@render sum(1, 2)}
+{@render sum(3, 4)}
+{@render sum(5, 6)}
diff --git a/packages/svelte/tests/print/samples/script/input.svelte b/packages/svelte/tests/print/samples/script/input.svelte
new file mode 100644
index 0000000000..f094ccf550
--- /dev/null
+++ b/packages/svelte/tests/print/samples/script/input.svelte
@@ -0,0 +1,3 @@
+<script lang="ts" module>
+    console.log('hello world');
+</script>
diff --git a/packages/svelte/tests/print/samples/script/output.svelte b/packages/svelte/tests/print/samples/script/output.svelte
new file mode 100644
index 0000000000..da5f5725bf
--- /dev/null
+++ b/packages/svelte/tests/print/samples/script/output.svelte
@@ -0,0 +1,3 @@
+<script lang="ts" module>
+	console.log('hello world');
+</script>
diff --git a/packages/svelte/tests/print/samples/slot-element/input.svelte b/packages/svelte/tests/print/samples/slot-element/input.svelte
new file mode 100644
index 0000000000..b92372f984
--- /dev/null
+++ b/packages/svelte/tests/print/samples/slot-element/input.svelte
@@ -0,0 +1,3 @@
+<div class="modal">
+	<slot></slot>
+</div>
diff --git a/packages/svelte/tests/print/samples/slot-element/output.svelte b/packages/svelte/tests/print/samples/slot-element/output.svelte
new file mode 100644
index 0000000000..4d59994078
--- /dev/null
+++ b/packages/svelte/tests/print/samples/slot-element/output.svelte
@@ -0,0 +1 @@
+<div class="modal"><slot></slot></div>
diff --git a/packages/svelte/tests/print/samples/snippet-block/input.svelte b/packages/svelte/tests/print/samples/snippet-block/input.svelte
new file mode 100644
index 0000000000..47f8efd9e9
--- /dev/null
+++ b/packages/svelte/tests/print/samples/snippet-block/input.svelte
@@ -0,0 +1,3 @@
+{#snippet name(param1, param2, paramN)}
+    Foo
+{/snippet}
diff --git a/packages/svelte/tests/print/samples/snippet-block/output.svelte b/packages/svelte/tests/print/samples/snippet-block/output.svelte
new file mode 100644
index 0000000000..bb172f1db6
--- /dev/null
+++ b/packages/svelte/tests/print/samples/snippet-block/output.svelte
@@ -0,0 +1,3 @@
+{#snippet name(param1, param2, paramN)}
+	Foo
+{/snippet}
diff --git a/packages/svelte/tests/print/samples/spread-attribute/input.svelte b/packages/svelte/tests/print/samples/spread-attribute/input.svelte
new file mode 100644
index 0000000000..836425cae3
--- /dev/null
+++ b/packages/svelte/tests/print/samples/spread-attribute/input.svelte
@@ -0,0 +1 @@
+<div {...props}></div>
diff --git a/packages/svelte/tests/print/samples/spread-attribute/output.svelte b/packages/svelte/tests/print/samples/spread-attribute/output.svelte
new file mode 100644
index 0000000000..836425cae3
--- /dev/null
+++ b/packages/svelte/tests/print/samples/spread-attribute/output.svelte
@@ -0,0 +1 @@
+<div {...props}></div>
diff --git a/packages/svelte/tests/print/samples/style-directive/input.svelte b/packages/svelte/tests/print/samples/style-directive/input.svelte
new file mode 100644
index 0000000000..2951fc9daa
--- /dev/null
+++ b/packages/svelte/tests/print/samples/style-directive/input.svelte
@@ -0,0 +1,2 @@
+<div style:color="red">...</div>
+<div style:color style:width="12rem" style:background-color={darkMode ? 'black' : 'white'}>...</div>
diff --git a/packages/svelte/tests/print/samples/style-directive/output.svelte b/packages/svelte/tests/print/samples/style-directive/output.svelte
new file mode 100644
index 0000000000..5aa3a6dcdb
--- /dev/null
+++ b/packages/svelte/tests/print/samples/style-directive/output.svelte
@@ -0,0 +1,8 @@
+<div style:color="red">...</div>
+<div
+	style:color
+	style:width="12rem"
+	style:background-color={darkMode ? 'black' : 'white'}
+>
+	...
+</div>
diff --git a/packages/svelte/tests/print/samples/style/input.svelte b/packages/svelte/tests/print/samples/style/input.svelte
new file mode 100644
index 0000000000..94312774ec
--- /dev/null
+++ b/packages/svelte/tests/print/samples/style/input.svelte
@@ -0,0 +1,43 @@
+<style>
+  .foo {
+    color: red;
+  }
+
+  .foo.bar {
+    color: blue;
+  }
+
+  @media (max-width: 600px) {
+    .box {
+      display: none;
+    }
+  }
+
+
+  @keyframes fade {
+    from { opacity: 0; }
+    to   { opacity: 1; }
+  }
+
+
+  @font-face {
+    font-family: "MyFont";
+    src: url("/fonts/MyFont.woff2") format("woff2");
+  }
+
+  .container .item { color: red; }
+  nav > ul.menu { display: flex; }
+  h2 + p.note { margin-top: 0; }
+  li:nth-child(2n + 1) { color: red; }
+  .button:hover { opacity: 0.5; }
+  .card::before {
+    content: "";
+    display: block;
+  }
+  .container > .item { color: red; }
+  h1 + p { margin-top: 0; }
+
+  .container .item, nav > ul.menu {
+    color: red;
+  }
+</style>
diff --git a/packages/svelte/tests/print/samples/style/output.svelte b/packages/svelte/tests/print/samples/style/output.svelte
new file mode 100644
index 0000000000..0f87f10941
--- /dev/null
+++ b/packages/svelte/tests/print/samples/style/output.svelte
@@ -0,0 +1,69 @@
+
+
+<style>
+	.foo {
+		color: red;
+	}
+
+	.foo.bar {
+		color: blue;
+	}
+
+	@media (max-width: 600px) {
+		.box {
+			display: none;
+		}
+	}
+
+	@keyframes fade {
+		from {
+			opacity: 0;
+		}
+		to {
+			opacity: 1;
+		}
+	}
+
+	@font-face {
+		font-family: "MyFont";
+		src: url("/fonts/MyFont.woff2") format("woff2");
+	}
+
+	.container .item {
+		color: red;
+	}
+
+	nav > ul.menu {
+		display: flex;
+	}
+
+	h2 + p.note {
+		margin-top: 0;
+	}
+
+	li:nth-child(2n + 1) {
+		color: red;
+	}
+
+	.button:hover {
+		opacity: 0.5;
+	}
+
+	.card::before {
+		content: "";
+		display: block;
+	}
+
+	.container > .item {
+		color: red;
+	}
+
+	h1 + p {
+		margin-top: 0;
+	}
+
+	.container .item,
+	nav > ul.menu {
+		color: red;
+	}
+</style>
diff --git a/packages/svelte/tests/print/samples/svelte-boundary/input.svelte b/packages/svelte/tests/print/samples/svelte-boundary/input.svelte
new file mode 100644
index 0000000000..2cbd32daf0
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-boundary/input.svelte
@@ -0,0 +1,7 @@
+<svelte:boundary>
+	<p>{await delayed('hello!')}</p>
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>
diff --git a/packages/svelte/tests/print/samples/svelte-boundary/output.svelte b/packages/svelte/tests/print/samples/svelte-boundary/output.svelte
new file mode 100644
index 0000000000..2cbd32daf0
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-boundary/output.svelte
@@ -0,0 +1,7 @@
+<svelte:boundary>
+	<p>{await delayed('hello!')}</p>
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>
diff --git a/packages/svelte/tests/print/samples/svelte-component/input.svelte b/packages/svelte/tests/print/samples/svelte-component/input.svelte
new file mode 100644
index 0000000000..046ee0f893
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-component/input.svelte
@@ -0,0 +1 @@
+<svelte:component this={MyComponent} />
diff --git a/packages/svelte/tests/print/samples/svelte-component/output.svelte b/packages/svelte/tests/print/samples/svelte-component/output.svelte
new file mode 100644
index 0000000000..046ee0f893
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-component/output.svelte
@@ -0,0 +1 @@
+<svelte:component this={MyComponent} />
diff --git a/packages/svelte/tests/print/samples/svelte-document/input.svelte b/packages/svelte/tests/print/samples/svelte-document/input.svelte
new file mode 100644
index 0000000000..b99b973e0d
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-document/input.svelte
@@ -0,0 +1 @@
+<svelte:document onvisibilitychange={handleVisibilityChange} use:someAction />
diff --git a/packages/svelte/tests/print/samples/svelte-document/output.svelte b/packages/svelte/tests/print/samples/svelte-document/output.svelte
new file mode 100644
index 0000000000..418ae4e008
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-document/output.svelte
@@ -0,0 +1,4 @@
+<svelte:document
+	onvisibilitychange={handleVisibilityChange}
+	use:someAction
+></svelte:document>
diff --git a/packages/svelte/tests/print/samples/svelte-element/input.svelte b/packages/svelte/tests/print/samples/svelte-element/input.svelte
new file mode 100644
index 0000000000..388c5a6090
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-element/input.svelte
@@ -0,0 +1,7 @@
+<script>
+	let tag = $state('hr');
+</script>
+
+<svelte:element this={tag}>
+	This text cannot appear inside an hr element
+</svelte:element>
diff --git a/packages/svelte/tests/print/samples/svelte-element/output.svelte b/packages/svelte/tests/print/samples/svelte-element/output.svelte
new file mode 100644
index 0000000000..388c5a6090
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-element/output.svelte
@@ -0,0 +1,7 @@
+<script>
+	let tag = $state('hr');
+</script>
+
+<svelte:element this={tag}>
+	This text cannot appear inside an hr element
+</svelte:element>
diff --git a/packages/svelte/tests/print/samples/svelte-fragment/input.svelte b/packages/svelte/tests/print/samples/svelte-fragment/input.svelte
new file mode 100644
index 0000000000..eb80023626
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-fragment/input.svelte
@@ -0,0 +1,11 @@
+<script lang="ts">
+	import Widget from './Widget.svelte';
+</script>
+
+<Widget>
+	<h1 slot="header">Hello</h1>
+	<svelte:fragment slot="footer">
+		<p>All rights reserved.</p>
+		<p>Copyright (c) 2019 Svelte Industries</p>
+	</svelte:fragment>
+</Widget>
diff --git a/packages/svelte/tests/print/samples/svelte-fragment/output.svelte b/packages/svelte/tests/print/samples/svelte-fragment/output.svelte
new file mode 100644
index 0000000000..eb80023626
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-fragment/output.svelte
@@ -0,0 +1,11 @@
+<script lang="ts">
+	import Widget from './Widget.svelte';
+</script>
+
+<Widget>
+	<h1 slot="header">Hello</h1>
+	<svelte:fragment slot="footer">
+		<p>All rights reserved.</p>
+		<p>Copyright (c) 2019 Svelte Industries</p>
+	</svelte:fragment>
+</Widget>
diff --git a/packages/svelte/tests/print/samples/svelte-head/input.svelte b/packages/svelte/tests/print/samples/svelte-head/input.svelte
new file mode 100644
index 0000000000..0a08871aba
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-head/input.svelte
@@ -0,0 +1,4 @@
+<svelte:head>
+	<title>Hello world!</title>
+	<meta name="description" content="This is where the description goes for SEO" />
+</svelte:head>
diff --git a/packages/svelte/tests/print/samples/svelte-head/output.svelte b/packages/svelte/tests/print/samples/svelte-head/output.svelte
new file mode 100644
index 0000000000..68d352260e
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-head/output.svelte
@@ -0,0 +1,7 @@
+<svelte:head>
+	<title>Hello world!</title>
+	<meta
+		name="description"
+		content="This is where the description goes for SEO"
+	/>
+</svelte:head>
diff --git a/packages/svelte/tests/print/samples/svelte-options/input.svelte b/packages/svelte/tests/print/samples/svelte-options/input.svelte
new file mode 100644
index 0000000000..70e2dda5c2
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-options/input.svelte
@@ -0,0 +1 @@
+<svelte:options runes={true} namespace="html" css="injected" customElement="my-custom-element" />
diff --git a/packages/svelte/tests/print/samples/svelte-options/output.svelte b/packages/svelte/tests/print/samples/svelte-options/output.svelte
new file mode 100644
index 0000000000..70e2dda5c2
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-options/output.svelte
@@ -0,0 +1 @@
+<svelte:options runes={true} namespace="html" css="injected" customElement="my-custom-element" />
diff --git a/packages/svelte/tests/print/samples/svelte-self/input.svelte b/packages/svelte/tests/print/samples/svelte-self/input.svelte
new file mode 100644
index 0000000000..7711defef1
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-self/input.svelte
@@ -0,0 +1,10 @@
+<script>
+	export let count;
+</script>
+
+{#if count > 0}
+	<p>counting down... {count}</p>
+	<svelte:self count={count - 1} />
+{:else}
+	<p>lift-off!</p>
+{/if}
diff --git a/packages/svelte/tests/print/samples/svelte-self/output.svelte b/packages/svelte/tests/print/samples/svelte-self/output.svelte
new file mode 100644
index 0000000000..15031a39fa
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-self/output.svelte
@@ -0,0 +1,10 @@
+<script>
+	export let count;
+</script>
+
+{#if count > 0}
+	<p>counting down... {count}</p>
+	<svelte:self count={count - 1}></svelte:self>
+{:else}
+	<p>lift-off!</p>
+{/if}
diff --git a/packages/svelte/tests/print/samples/svelte-window/input.svelte b/packages/svelte/tests/print/samples/svelte-window/input.svelte
new file mode 100644
index 0000000000..054e584e19
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-window/input.svelte
@@ -0,0 +1,7 @@
+<script>
+	function handleKeydown(event) {
+		alert(`pressed the ${event.key} key`);
+	}
+</script>
+
+<svelte:window onkeydown={handleKeydown} />
diff --git a/packages/svelte/tests/print/samples/svelte-window/output.svelte b/packages/svelte/tests/print/samples/svelte-window/output.svelte
new file mode 100644
index 0000000000..03997acab1
--- /dev/null
+++ b/packages/svelte/tests/print/samples/svelte-window/output.svelte
@@ -0,0 +1,7 @@
+<script>
+	function handleKeydown(event) {
+		alert(`pressed the ${event.key} key`);
+	}
+</script>
+
+<svelte:window onkeydown={handleKeydown}></svelte:window>
diff --git a/packages/svelte/tests/print/samples/text/input.svelte b/packages/svelte/tests/print/samples/text/input.svelte
new file mode 100644
index 0000000000..a04fa3c48c
--- /dev/null
+++ b/packages/svelte/tests/print/samples/text/input.svelte
@@ -0,0 +1 @@
+<p>Hello world</p>
diff --git a/packages/svelte/tests/print/samples/text/output.svelte b/packages/svelte/tests/print/samples/text/output.svelte
new file mode 100644
index 0000000000..a04fa3c48c
--- /dev/null
+++ b/packages/svelte/tests/print/samples/text/output.svelte
@@ -0,0 +1 @@
+<p>Hello world</p>
diff --git a/packages/svelte/tests/print/samples/transition-directive/input.svelte b/packages/svelte/tests/print/samples/transition-directive/input.svelte
new file mode 100644
index 0000000000..7fd08df6ef
--- /dev/null
+++ b/packages/svelte/tests/print/samples/transition-directive/input.svelte
@@ -0,0 +1,11 @@
+<script>
+	import { fade } from 'svelte/transition';
+
+	let visible = $state(false);
+</script>
+
+<button onclick={() => visible = !visible}>toggle</button>
+
+{#if visible}
+	<div transition:fade>fades in and out</div>
+{/if}
diff --git a/packages/svelte/tests/print/samples/transition-directive/output.svelte b/packages/svelte/tests/print/samples/transition-directive/output.svelte
new file mode 100644
index 0000000000..7fd08df6ef
--- /dev/null
+++ b/packages/svelte/tests/print/samples/transition-directive/output.svelte
@@ -0,0 +1,11 @@
+<script>
+	import { fade } from 'svelte/transition';
+
+	let visible = $state(false);
+</script>
+
+<button onclick={() => visible = !visible}>toggle</button>
+
+{#if visible}
+	<div transition:fade>fades in and out</div>
+{/if}
diff --git a/packages/svelte/tests/print/samples/use-directive/input.svelte b/packages/svelte/tests/print/samples/use-directive/input.svelte
new file mode 100644
index 0000000000..3b9f5562fb
--- /dev/null
+++ b/packages/svelte/tests/print/samples/use-directive/input.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+	import type { Action } from 'svelte/action';
+
+	const myaction: Action = (node, data) => {
+		// ...
+	};
+</script>
+
+<div use:myaction={data}>...</div>
diff --git a/packages/svelte/tests/print/samples/use-directive/output.svelte b/packages/svelte/tests/print/samples/use-directive/output.svelte
new file mode 100644
index 0000000000..3b9f5562fb
--- /dev/null
+++ b/packages/svelte/tests/print/samples/use-directive/output.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+	import type { Action } from 'svelte/action';
+
+	const myaction: Action = (node, data) => {
+		// ...
+	};
+</script>
+
+<div use:myaction={data}>...</div>
diff --git a/packages/svelte/tests/print/test.ts b/packages/svelte/tests/print/test.ts
new file mode 100644
index 0000000000..aa007a7a54
--- /dev/null
+++ b/packages/svelte/tests/print/test.ts
@@ -0,0 +1,30 @@
+import * as fs from 'node:fs';
+import { assert } from 'vitest';
+import { parse, print } from 'svelte/compiler';
+import { suite, type BaseTest } from '../suite.js';
+
+interface PrintTest extends BaseTest {}
+
+const { test, run } = suite<PrintTest>(async (config, cwd) => {
+	const input = fs.readFileSync(`${cwd}/input.svelte`, 'utf-8');
+
+	const ast = parse(input, { modern: true });
+	const output = print(ast);
+	const outputCode = output.code.endsWith('\n') ? output.code : output.code + '\n';
+
+	// run `UPDATE_SNAPSHOTS=true pnpm test print` to update print tests
+	if (process.env.UPDATE_SNAPSHOTS) {
+		fs.writeFileSync(`${cwd}/output.svelte`, outputCode);
+	} else {
+		fs.writeFileSync(`${cwd}/_actual.svelte`, outputCode);
+
+		const file = `${cwd}/output.svelte`;
+
+		const expected = fs.existsSync(file) ? fs.readFileSync(file, 'utf-8') : '';
+		assert.deepEqual(outputCode.trim().replaceAll('\r', ''), expected.trim().replaceAll('\r', ''));
+	}
+});
+
+export { test };
+
+await run(__dirname);
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index f0200d09fe..8561268689 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -844,6 +844,7 @@ declare module 'svelte/compiler' {
 	import type { SourceMap } from 'magic-string';
 	import type { ArrayExpression, ArrowFunctionExpression, VariableDeclaration, VariableDeclarator, Expression, Identifier, MemberExpression, Node, ObjectExpression, Pattern, Program, ChainExpression, SimpleCallExpression, SequenceExpression } from 'estree';
 	import type { Location } from 'locate-character';
+	import type { default as ts } from 'esrap/languages/ts';
 	/**
 	 * `compile` converts your `.svelte` source code into a JavaScript module that exports a component
 	 *
@@ -1390,7 +1391,7 @@ declare module 'svelte/compiler' {
 			expression: null | Expression;
 		}
 
-		interface BaseElement extends BaseNode {
+		export interface BaseElement extends BaseNode {
 			name: string;
 			attributes: Array<Attribute | SpreadAttribute | Directive | AttachTag>;
 			fragment: Fragment;
@@ -1616,6 +1617,18 @@ declare module 'svelte/compiler' {
 	export function preprocess(source: string, preprocessor: PreprocessorGroup | PreprocessorGroup[], options?: {
 		filename?: string;
 	} | undefined): Promise<Processed>;
+	/**
+	 * `print` converts a Svelte AST node back into Svelte source code.
+	 * It is primarily intended for tools that parse and transform components using the compiler’s modern AST representation.
+	 *
+	 * `print(ast)` requires an AST node produced by parse with modern: true, or any sub-node within that modern AST.
+	 * The result contains the generated source and a corresponding source map.
+	 * The output is valid Svelte, but formatting details such as whitespace or quoting may differ from the original.
+	 * */
+	export function print(ast: AST.SvelteNode, options?: Options | undefined): {
+		code: string;
+		map: any;
+	};
 	/**
 	 * The current version, as set in package.json.
 	 * */
@@ -1799,6 +1812,10 @@ declare module 'svelte/compiler' {
 			| SimpleSelector
 			| Declaration;
 	}
+	type Options = {
+		getLeadingComments?: NonNullable<Parameters<typeof ts>[0]>['getLeadingComments'] | undefined;
+		getTrailingComments?: NonNullable<Parameters<typeof ts>[0]>['getTrailingComments'] | undefined;
+	};
 
 	export {};
 }
diff --git a/playgrounds/sandbox/run.js b/playgrounds/sandbox/run.js
index 7ff9f7c4cd..35bffb67a2 100644
--- a/playgrounds/sandbox/run.js
+++ b/playgrounds/sandbox/run.js
@@ -3,7 +3,7 @@ import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { parseArgs } from 'node:util';
 import { globSync } from 'tinyglobby';
-import { compile, compileModule, parse, migrate } from 'svelte/compiler';
+import { compile, compileModule, parse, print, migrate } from 'svelte/compiler';
 
 // toggle these to change what gets written to sandbox/output
 const AST = false;
@@ -11,6 +11,7 @@ const MIGRATE = false;
 const FROM_HTML = true;
 const FROM_TREE = false;
 const DEV = false;
+const PRINT = false;
 
 const argv = parseArgs({ options: { runes: { type: 'boolean' } }, args: process.argv.slice(2) });
 
@@ -71,6 +72,11 @@ for (const generate of /** @type {const} */ (['client', 'server'])) {
 						'\t'
 					)
 				);
+
+				if (PRINT) {
+					const printed = print(ast);
+					write(`${cwd}/output/printed/${file}`, printed.code);
+				}
 			}
 
 			if (MIGRATE) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0b1f57213d..bdb120600b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -96,8 +96,8 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1
       esrap:
-        specifier: ^2.1.0
-        version: 2.1.0
+        specifier: ^2.2.0
+        version: 2.2.0
       is-reference:
         specifier: ^3.0.3
         version: 3.0.3
@@ -1178,8 +1178,8 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
-  '@typescript-eslint/project-service@8.46.2':
-    resolution: {integrity: sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg==}
+  '@typescript-eslint/project-service@8.48.0':
+    resolution: {integrity: sha512-Ne4CTZyRh1BecBf84siv42wv5vQvVmgtk8AuiEffKTUo3DrBaGYZueJSxxBZ8fjk/N3DrgChH4TOdIOwOwiqqw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -1188,12 +1188,12 @@ packages:
     resolution: {integrity: sha512-E0ntLvsfPqnPwng8b8y4OGuzh/iIOm2z8U3S9zic2TeMLW61u5IH2Q1wu0oSTkfrSzwbDJIB/Lm8O3//8BWMPA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/scope-manager@8.46.2':
-    resolution: {integrity: sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA==}
+  '@typescript-eslint/scope-manager@8.48.0':
+    resolution: {integrity: sha512-uGSSsbrtJrLduti0Q1Q9+BF1/iFKaxGoQwjWOIVNJv0o6omrdyR8ct37m4xIl5Zzpkp69Kkmvom7QFTtue89YQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/tsconfig-utils@8.46.2':
-    resolution: {integrity: sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag==}
+  '@typescript-eslint/tsconfig-utils@8.48.0':
+    resolution: {integrity: sha512-WNebjBdFdyu10sR1M4OXTt2OkMd5KWIL+LLfeH9KhgP+jzfDV/LI3eXzwJ1s9+Yc0Kzo2fQCdY/OpdusCMmh6w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -1209,8 +1209,8 @@ packages:
     resolution: {integrity: sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/types@8.46.2':
-    resolution: {integrity: sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==}
+  '@typescript-eslint/types@8.48.0':
+    resolution: {integrity: sha512-cQMcGQQH7kwKoVswD1xdOytxQR60MWKM1di26xSUtxehaDs/32Zpqsu5WJlXTtTTqyAVK8R7hvsUnIXRS+bjvA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/typescript-estree@8.26.0':
@@ -1219,8 +1219,8 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <5.9.0'
 
-  '@typescript-eslint/typescript-estree@8.46.2':
-    resolution: {integrity: sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ==}
+  '@typescript-eslint/typescript-estree@8.48.0':
+    resolution: {integrity: sha512-ljHab1CSO4rGrQIAyizUS6UGHHCiAYhbfcIZ1zVJr5nMryxlXMVWS3duFPSKvSUbFPwkXMFk1k0EMIjub4sRRQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -1232,8 +1232,8 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <5.9.0'
 
-  '@typescript-eslint/utils@8.46.2':
-    resolution: {integrity: sha512-sExxzucx0Tud5tE0XqR0lT0psBQvEpnpiul9XbGUB1QwpWJJAps1O/Z7hJxLGiZLBKMCutjTzDgmd1muEhBnVg==}
+  '@typescript-eslint/utils@8.48.0':
+    resolution: {integrity: sha512-yTJO1XuGxCsSfIVt1+1UrLHtue8xz16V8apzPYI06W0HbEbEWHxHXgZaAgavIkoh+GeV6hKKd5jm0sS6OYxWXQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -1243,8 +1243,8 @@ packages:
     resolution: {integrity: sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/visitor-keys@8.46.2':
-    resolution: {integrity: sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==}
+  '@typescript-eslint/visitor-keys@8.48.0':
+    resolution: {integrity: sha512-T0XJMaRPOH3+LBbAfzR2jalckP1MSG/L9eUtY0DEzUyVaXJ/t6zN0nR7co5kz0Jko/nkSYCBRkz1djvjajVTTg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@vitest/coverage-v8@2.1.9':
@@ -1660,8 +1660,8 @@ packages:
     resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
     engines: {node: '>=0.10'}
 
-  esrap@2.1.0:
-    resolution: {integrity: sha512-yzmPNpl7TBbMRC5Lj2JlJZNPml0tzqoqP5B1JXycNUwtqma9AKCO0M2wHrdgsHcy1WRW7S9rJknAMtByg3usgA==}
+  esrap@2.2.0:
+    resolution: {integrity: sha512-WBmtxe7R9C5mvL4n2le8nMUe4mD5V9oiK2vJpQ9I3y20ENPUomPcphBXE8D1x/Bm84oN1V+lOfgXxtqmxTp3Xg==}
 
   esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
@@ -3648,10 +3648,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.46.2(typescript@5.5.4)':
+  '@typescript-eslint/project-service@8.48.0(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.46.2(typescript@5.5.4)
-      '@typescript-eslint/types': 8.46.2
+      '@typescript-eslint/tsconfig-utils': 8.48.0(typescript@5.5.4)
+      '@typescript-eslint/types': 8.48.0
       debug: 4.4.3
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -3662,12 +3662,12 @@ snapshots:
       '@typescript-eslint/types': 8.26.0
       '@typescript-eslint/visitor-keys': 8.26.0
 
-  '@typescript-eslint/scope-manager@8.46.2':
+  '@typescript-eslint/scope-manager@8.48.0':
     dependencies:
-      '@typescript-eslint/types': 8.46.2
-      '@typescript-eslint/visitor-keys': 8.46.2
+      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/visitor-keys': 8.48.0
 
-  '@typescript-eslint/tsconfig-utils@8.46.2(typescript@5.5.4)':
+  '@typescript-eslint/tsconfig-utils@8.48.0(typescript@5.5.4)':
     dependencies:
       typescript: 5.5.4
 
@@ -3684,7 +3684,7 @@ snapshots:
 
   '@typescript-eslint/types@8.26.0': {}
 
-  '@typescript-eslint/types@8.46.2': {}
+  '@typescript-eslint/types@8.48.0': {}
 
   '@typescript-eslint/typescript-estree@8.26.0(typescript@5.5.4)':
     dependencies:
@@ -3700,17 +3700,16 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.46.2(typescript@5.5.4)':
+  '@typescript-eslint/typescript-estree@8.48.0(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/project-service': 8.46.2(typescript@5.5.4)
-      '@typescript-eslint/tsconfig-utils': 8.46.2(typescript@5.5.4)
-      '@typescript-eslint/types': 8.46.2
-      '@typescript-eslint/visitor-keys': 8.46.2
+      '@typescript-eslint/project-service': 8.48.0(typescript@5.5.4)
+      '@typescript-eslint/tsconfig-utils': 8.48.0(typescript@5.5.4)
+      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/visitor-keys': 8.48.0
       debug: 4.4.3
-      fast-glob: 3.3.3
-      is-glob: 4.0.3
       minimatch: 9.0.5
       semver: 7.7.3
+      tinyglobby: 0.2.15
       ts-api-utils: 2.1.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -3727,12 +3726,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.46.2(eslint@9.9.1)(typescript@5.5.4)':
+  '@typescript-eslint/utils@8.48.0(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
-      '@typescript-eslint/scope-manager': 8.46.2
-      '@typescript-eslint/types': 8.46.2
-      '@typescript-eslint/typescript-estree': 8.46.2(typescript@5.5.4)
+      '@typescript-eslint/scope-manager': 8.48.0
+      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.5.4)
       eslint: 9.9.1
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -3743,9 +3742,9 @@ snapshots:
       '@typescript-eslint/types': 8.26.0
       eslint-visitor-keys: 4.2.1
 
-  '@typescript-eslint/visitor-keys@8.46.2':
+  '@typescript-eslint/visitor-keys@8.48.0':
     dependencies:
-      '@typescript-eslint/types': 8.46.2
+      '@typescript-eslint/types': 8.48.0
       eslint-visitor-keys: 4.2.1
 
   '@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))':
@@ -4145,7 +4144,7 @@ snapshots:
   eslint-plugin-n@17.16.1(eslint@9.9.1)(typescript@5.5.4):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
-      '@typescript-eslint/utils': 8.46.2(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.48.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)
@@ -4245,7 +4244,7 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
-  esrap@2.1.0:
+  esrap@2.2.0:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 

From 1bc3ae7cbfaffa45c15511ea5a7ff4f1c433d78e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 14:05:39 -0500
Subject: [PATCH 207/347] Version Packages (#17247)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/little-humans-occur.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/little-humans-occur.md

diff --git a/.changeset/little-humans-occur.md b/.changeset/little-humans-occur.md
deleted file mode 100644
index 78b94ee26e..0000000000
--- a/.changeset/little-humans-occur.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': minor
----
-
-feat: add `print(...)` function
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index fe2d5ae212..11ffd0369b 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.45.0
+
+### Minor Changes
+
+- feat: add `print(...)` function ([#16188](https://github.com/sveltejs/svelte/pull/16188))
+
 ## 5.44.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 3f81fb924c..d734d75f35 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.44.1",
+  "version": "5.45.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 681a3d3487..27392e17a4 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.44.1';
+export const VERSION = '5.45.0';
 export const PUBLIC_VERSION = '5';

From da4cd0e35942ba9615ba6516ffaf185b511e7b59 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 26 Nov 2025 20:06:15 +0100
Subject: [PATCH 208/347] fix: link offscreen items and last effect in each
 block correctly (#17240)

* fix: link offscreen items and last effect in each block correctly

It's possible that due to how new elements are inserted into the array that `effect.last` is wrong. We need to ensure it is really the last item to keep items properly connected to the graph. In addition we link offscreen items after all onscreen items, to ensure they don't have wrong pointers.

Fixes #17201

* revert #17244

* add test
---
 .changeset/great-ghosts-unite.md              |  5 +++
 .../src/internal/client/dom/blocks/each.js    | 28 +++++++++-------
 .../samples/each-updates-11/_config.js        | 32 +++++++++++++++++++
 .../samples/each-updates-11/main.svelte       | 11 +++++++
 4 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/great-ghosts-unite.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-updates-11/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-updates-11/main.svelte

diff --git a/.changeset/great-ghosts-unite.md b/.changeset/great-ghosts-unite.md
new file mode 100644
index 0000000000..2973737cfd
--- /dev/null
+++ b/.changeset/great-ghosts-unite.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: link offscreen items and last effect in each block correctly
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 0147de3c3d..501577053d 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -507,6 +507,8 @@ function reconcile(state, array, anchor, flags, get_key) {
 		current = item.next;
 	}
 
+	let has_offscreen_items = items.size > length;
+
 	if (current !== null || seen !== undefined) {
 		var to_destroy = seen === undefined ? [] : array_from(seen);
 
@@ -520,6 +522,8 @@ function reconcile(state, array, anchor, flags, get_key) {
 
 		var destroy_length = to_destroy.length;
 
+		has_offscreen_items = items.size - destroy_length > length;
+
 		if (destroy_length > 0) {
 			var controlled_anchor = (flags & EACH_IS_CONTROLLED) !== 0 && length === 0 ? anchor : null;
 
@@ -537,6 +541,18 @@ function reconcile(state, array, anchor, flags, get_key) {
 		}
 	}
 
+	// Append offscreen items at the end
+	if (has_offscreen_items) {
+		for (const item of items.values()) {
+			if (!item.o) {
+				link(state, prev, item);
+				prev = item;
+			}
+		}
+	}
+
+	state.effect.last = prev && prev.e;
+
 	if (is_animated) {
 		queue_micro_task(() => {
 			if (to_animate === undefined) return;
@@ -641,10 +657,6 @@ function link(state, prev, next) {
 		state.first = next;
 		state.effect.first = next && next.e;
 	} else {
-		if (prev.e === state.effect.last && next !== null) {
-			state.effect.last = next.e;
-		}
-
 		if (prev.e.next) {
 			prev.e.next.prev = null;
 		}
@@ -653,13 +665,7 @@ function link(state, prev, next) {
 		prev.e.next = next && next.e;
 	}
 
-	if (next === null) {
-		state.effect.last = prev && prev.e;
-	} else {
-		if (next.e === state.effect.last && prev === null) {
-			state.effect.last = next.e.prev;
-		}
-
+	if (next !== null) {
 		if (next.e.prev) {
 			next.e.prev.next = null;
 		}
diff --git a/packages/svelte/tests/runtime-runes/samples/each-updates-11/_config.js b/packages/svelte/tests/runtime-runes/samples/each-updates-11/_config.js
new file mode 100644
index 0000000000..a8782d2da8
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-updates-11/_config.js
@@ -0,0 +1,32 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [add4, add5, modify3] = target.querySelectorAll('button');
+
+		add4.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`<button>add 4</button> <button>add 5</button> <button>modify 3</button>
+			1423`
+		);
+
+		add5.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`<button>add 4</button> <button>add 5</button> <button>modify 3</button>
+			14523`
+		);
+
+		modify3.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`<button>add 4</button> <button>add 5</button> <button>modify 3</button>
+			1452updated`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/each-updates-11/main.svelte b/packages/svelte/tests/runtime-runes/samples/each-updates-11/main.svelte
new file mode 100644
index 0000000000..1dcd265093
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-updates-11/main.svelte
@@ -0,0 +1,11 @@
+<script>
+	let list = $state([{ id: 1, text: '1' }, { id: 2, text: '2' }, { id: 3, text: '3' }]);
+</script>
+
+<button onclick={() => list = [list[0], { id: 4, text: '4' }, ...list.slice(1)]}>add 4</button>
+<button onclick={() => list = [list[0], list[1], { id: 5, text: '5' }, ...list.slice(2)]}>add 5</button>
+<button onclick={() => list.at(-1).text = 'updated'}>modify 3</button>
+
+{#each list as item (item.id)}
+	{item.text}
+{/each}

From 5c821c1a41886b094f9e7c66f8cecd7ce515e26e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 20:10:54 +0100
Subject: [PATCH 209/347] Version Packages (#17253)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/great-ghosts-unite.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/great-ghosts-unite.md

diff --git a/.changeset/great-ghosts-unite.md b/.changeset/great-ghosts-unite.md
deleted file mode 100644
index 2973737cfd..0000000000
--- a/.changeset/great-ghosts-unite.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: link offscreen items and last effect in each block correctly
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 11ffd0369b..d13e3c2113 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.45.1
+
+### Patch Changes
+
+- fix: link offscreen items and last effect in each block correctly ([#17240](https://github.com/sveltejs/svelte/pull/17240))
+
 ## 5.45.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index d734d75f35..9e261f36ec 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.45.0",
+  "version": "5.45.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 27392e17a4..1c3e3b7124 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.45.0';
+export const VERSION = '5.45.1';
 export const PUBLIC_VERSION = '5';

From ae6004657d4f56768176cba54813bcfddb83ecea Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Wed, 26 Nov 2025 21:55:38 +0100
Subject: [PATCH 210/347] fix: array destructuring after await (#17254)

---
 .changeset/green-cloths-happen.md                            | 5 +++++
 .../compiler/phases/3-transform/shared/transform-async.js    | 5 ++++-
 .../samples/async-derived-destructured/Child.svelte          | 5 +++++
 .../samples/async-derived-destructured/_config.js            | 2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/green-cloths-happen.md

diff --git a/.changeset/green-cloths-happen.md b/.changeset/green-cloths-happen.md
new file mode 100644
index 0000000000..a9677c8fc1
--- /dev/null
+++ b/.changeset/green-cloths-happen.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: array destructuring after await
diff --git a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
index b55356a38c..2b9c219d7d 100644
--- a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
+++ b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
@@ -54,7 +54,10 @@ export function transform_body(instance_body, runner, transform) {
 				);
 
 				const statements = visited.declarations.map((node) => {
-					if (node.id.type === 'Identifier' && node.id.name.startsWith('$$d')) {
+					if (
+						node.id.type === 'Identifier' &&
+						(node.id.name.startsWith('$$d') || node.id.name.startsWith('$$array'))
+					) {
 						// this is an intermediate declaration created in VariableDeclaration.js;
 						// subsequent statements depend on it
 						return b.var(node.id, node.init);
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/Child.svelte
index fdf7184e3c..04adc8e97f 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/Child.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/Child.svelte
@@ -1,5 +1,6 @@
 <script>
 	let count = $state(1);
+	let arr = $state([1,2]);
 
 	// More complex init
 	let { squared, cubed } = $derived(await {
@@ -8,6 +9,9 @@
 	});
 	// Simple init with multiple destructurings after await
 	let { toFixed, toString } = $derived(count);
+
+	// Simple init with array destructurings after await
+	let [a, b] = $derived(arr);
 </script>
 
 <button onclick={() => count++}>increment</button>
@@ -15,3 +19,4 @@
 <p>{count} ** 2 = {squared}</p>
 <p>{count} ** 3 = {cubed}</p>
 <p>{typeof toFixed} {typeof toString}</p>
+<p>{a} {b}</p>
\ No newline at end of file
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/_config.js b/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/_config.js
index bfd582ea97..26f1dfdeb3 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-destructured/_config.js
@@ -14,6 +14,7 @@ export default test({
 				<p>1 ** 2 = 1</p>
 				<p>1 ** 3 = 1</p>
 				<p>function function</p>
+				<p>1 2</p>
 			`
 		);
 
@@ -27,6 +28,7 @@ export default test({
 				<p>2 ** 2 = 4</p>
 				<p>2 ** 3 = 8</p>
 				<p>function function</p>
+				<p>1 2</p>
 			`
 		);
 	}

From bec7ca79186cbdbc40b6992b5a6188ad46a3a577 Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Wed, 26 Nov 2025 13:25:43 -0800
Subject: [PATCH 211/347] fix: throw on invalid `{@tag}`s (#17256)

* fix: throw on invalid `{@tag}`s

* fix
---
 .changeset/six-lemons-yell.md                            | 5 +++++
 .../docs/98-reference/.generated/compile-errors.md       | 6 ++++++
 packages/svelte/messages/compile-errors/template.md      | 4 ++++
 packages/svelte/src/compiler/errors.js                   | 9 +++++++++
 packages/svelte/src/compiler/phases/1-parse/state/tag.js | 3 +++
 5 files changed, 27 insertions(+)
 create mode 100644 .changeset/six-lemons-yell.md

diff --git a/.changeset/six-lemons-yell.md b/.changeset/six-lemons-yell.md
new file mode 100644
index 0000000000..3931644648
--- /dev/null
+++ b/.changeset/six-lemons-yell.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: throw on invalid `{@tag}`s
diff --git a/documentation/docs/98-reference/.generated/compile-errors.md b/documentation/docs/98-reference/.generated/compile-errors.md
index 94ea46b68a..8a8a10c80b 100644
--- a/documentation/docs/98-reference/.generated/compile-errors.md
+++ b/documentation/docs/98-reference/.generated/compile-errors.md
@@ -525,6 +525,12 @@ Expected an identifier
 Expected identifier or destructure pattern
 ```
 
+### expected_tag
+
+```
+Expected 'html', 'render', 'attach', 'const', or 'debug'
+```
+
 ### expected_token
 
 ```
diff --git a/packages/svelte/messages/compile-errors/template.md b/packages/svelte/messages/compile-errors/template.md
index dcec3867ef..db23a2eaa8 100644
--- a/packages/svelte/messages/compile-errors/template.md
+++ b/packages/svelte/messages/compile-errors/template.md
@@ -223,6 +223,10 @@ The same applies to components:
 
 > Expected identifier or destructure pattern
 
+## expected_tag
+
+> Expected 'html', 'render', 'attach', 'const', or 'debug'
+
 ## expected_token
 
 > Expected token %token%
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index 25304e48c8..d6c2efdfdc 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -1129,6 +1129,15 @@ export function expected_pattern(node) {
 	e(node, 'expected_pattern', `Expected identifier or destructure pattern\nhttps://svelte.dev/e/expected_pattern`);
 }
 
+/**
+ * Expected 'html', 'render', 'attach', 'const', or 'debug'
+ * @param {null | number | NodeLike} node
+ * @returns {never}
+ */
+export function expected_tag(node) {
+	e(node, 'expected_tag', `Expected 'html', 'render', 'attach', 'const', or 'debug'\nhttps://svelte.dev/e/expected_tag`);
+}
+
 /**
  * Expected token %token%
  * @param {null | number | NodeLike} node
diff --git a/packages/svelte/src/compiler/phases/1-parse/state/tag.js b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
index 4ff948e165..e6e083c09d 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/tag.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
@@ -724,6 +724,7 @@ function special(parser) {
 				expression: new ExpressionMetadata()
 			}
 		});
+		return;
 	}
 
 	if (parser.eat('render')) {
@@ -755,5 +756,7 @@ function special(parser) {
 				snippets: new Set()
 			}
 		});
+		return;
 	}
+	e.expected_tag(parser.index);
 }

From b4b580a13ac1003e22da39b7888881dbae9bb32f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 16:43:40 -0500
Subject: [PATCH 212/347] Version Packages (#17257)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/green-cloths-happen.md | 5 -----
 .changeset/six-lemons-yell.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/green-cloths-happen.md
 delete mode 100644 .changeset/six-lemons-yell.md

diff --git a/.changeset/green-cloths-happen.md b/.changeset/green-cloths-happen.md
deleted file mode 100644
index a9677c8fc1..0000000000
--- a/.changeset/green-cloths-happen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: array destructuring after await
diff --git a/.changeset/six-lemons-yell.md b/.changeset/six-lemons-yell.md
deleted file mode 100644
index 3931644648..0000000000
--- a/.changeset/six-lemons-yell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: throw on invalid `{@tag}`s
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index d13e3c2113..5add3b03ea 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.45.2
+
+### Patch Changes
+
+- fix: array destructuring after await ([#17254](https://github.com/sveltejs/svelte/pull/17254))
+
+- fix: throw on invalid `{@tag}`s ([#17256](https://github.com/sveltejs/svelte/pull/17256))
+
 ## 5.45.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 9e261f36ec..b0f4cbc648 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.45.1",
+  "version": "5.45.2",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 1c3e3b7124..71be80f593 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.45.1';
+export const VERSION = '5.45.2';
 export const PUBLIC_VERSION = '5';

From a72167bb3846237489be8ed5309148254d9b65ed Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Sat, 29 Nov 2025 02:11:39 +0100
Subject: [PATCH 213/347] chore: more effect debug helpers (#17259)

* chore: more effect helpers

This adds two new helpers that helped me tremendously with getting to the bottom of #17197:
- `log_reactions`: Logs the graph of reactions starting from the given signal, and also checks if the effect leafs are reachable and if they are able to schedule a root
- `log_inconsistent_branches`: Logs if there are paths in the graph where a branch is clean above a non-clean branch, which means that the part of the graph cannot schedule batches anymore

* shut up eslint
---
 .../svelte/src/internal/client/dev/debug.js   | 364 +++++++++++++++++-
 .../src/internal/client/reactivity/batch.js   |   3 +
 .../src/internal/client/reactivity/sources.js |   2 +
 3 files changed, 366 insertions(+), 3 deletions(-)

diff --git a/packages/svelte/src/internal/client/dev/debug.js b/packages/svelte/src/internal/client/dev/debug.js
index ebb612cb61..e1f8a688bb 100644
--- a/packages/svelte/src/internal/client/dev/debug.js
+++ b/packages/svelte/src/internal/client/dev/debug.js
@@ -5,12 +5,18 @@ import {
 	BOUNDARY_EFFECT,
 	BRANCH_EFFECT,
 	CLEAN,
+	CONNECTED,
 	DERIVED,
+	DIRTY,
 	EFFECT,
 	ASYNC,
+	DESTROYED,
+	INERT,
 	MAYBE_DIRTY,
 	RENDER_EFFECT,
-	ROOT_EFFECT
+	ROOT_EFFECT,
+	WAS_MARKED,
+	MANAGED_EFFECT
 } from '#client/constants';
 import { snapshot } from '../../shared/clone.js';
 import { untrack } from '../runtime.js';
@@ -30,11 +36,13 @@ export function root(effect) {
 /**
  *
  * @param {Effect} effect
+ * @param {boolean} append_effect
+ * @returns {string}
  */
-export function log_effect_tree(effect, depth = 0) {
+function effect_label(effect, append_effect = false) {
 	const flags = effect.f;
 
-	let label = '(unknown)';
+	let label = `(unknown ${append_effect ? 'effect' : ''})`;
 
 	if ((flags & ROOT_EFFECT) !== 0) {
 		label = 'root';
@@ -42,6 +50,8 @@ export function log_effect_tree(effect, depth = 0) {
 		label = 'boundary';
 	} else if ((flags & BLOCK_EFFECT) !== 0) {
 		label = 'block';
+	} else if ((flags & MANAGED_EFFECT) !== 0) {
+		label = 'managed';
 	} else if ((flags & ASYNC) !== 0) {
 		label = 'async';
 	} else if ((flags & BRANCH_EFFECT) !== 0) {
@@ -52,6 +62,20 @@ export function log_effect_tree(effect, depth = 0) {
 		label = 'effect';
 	}
 
+	if (append_effect && !label.endsWith('effect')) {
+		label += ' effect';
+	}
+
+	return label;
+}
+/**
+ *
+ * @param {Effect} effect
+ */
+export function log_effect_tree(effect, depth = 0) {
+	const flags = effect.f;
+	const label = effect_label(effect);
+
 	let status =
 		(flags & CLEAN) !== 0 ? 'clean' : (flags & MAYBE_DIRTY) !== 0 ? 'maybe dirty' : 'dirty';
 
@@ -140,3 +164,337 @@ function log_dep(dep) {
 		);
 	}
 }
+
+/**
+ * Logs all reactions of a source or derived transitively
+ * @param {Derived | Value} signal
+ */
+export function log_reactions(signal) {
+	/** @type {Set<Derived | Value>} */
+	const visited = new Set();
+
+	/**
+	 * Returns an array of flag names that are set on the given flags bitmask
+	 * @param {number} flags
+	 * @returns {string[]}
+	 */
+	function get_derived_flag_names(flags) {
+		/** @type {string[]} */
+		const names = [];
+
+		if ((flags & CLEAN) !== 0) names.push('CLEAN');
+		if ((flags & DIRTY) !== 0) names.push('DIRTY');
+		if ((flags & MAYBE_DIRTY) !== 0) names.push('MAYBE_DIRTY');
+		if ((flags & CONNECTED) !== 0) names.push('CONNECTED');
+		if ((flags & WAS_MARKED) !== 0) names.push('WAS_MARKED');
+		if ((flags & INERT) !== 0) names.push('INERT');
+		if ((flags & DESTROYED) !== 0) names.push('DESTROYED');
+
+		return names;
+	}
+
+	/**
+	 * @param {Derived | Value} d
+	 * @param {number} depth
+	 */
+	function log_derived(d, depth) {
+		const flags = d.f;
+		const flag_names = get_derived_flag_names(flags);
+		const flags_str = flag_names.length > 0 ? `(${flag_names.join(', ')})` : '(no flags)';
+
+		// eslint-disable-next-line no-console
+		console.group(
+			`%c${flags & DERIVED ? '$derived' : '$state'} %c${d.label ?? '<unknown>'} %c${flags_str}`,
+			'font-weight: bold; color: CornflowerBlue',
+			'font-weight: normal; color: inherit',
+			'font-weight: normal; color: gray'
+		);
+
+		// eslint-disable-next-line no-console
+		console.log(untrack(() => snapshot(d.v)));
+
+		if ('fn' in d) {
+			// eslint-disable-next-line no-console
+			console.log('%cfn:', 'font-weight: bold', d.fn);
+		}
+
+		if (d.reactions !== null && d.reactions.length > 0) {
+			// eslint-disable-next-line no-console
+			console.group('%creactions', 'font-weight: bold');
+
+			for (const reaction of d.reactions) {
+				if ((reaction.f & DERIVED) !== 0) {
+					const derived_reaction = /** @type {Derived} */ (reaction);
+
+					if (visited.has(derived_reaction)) {
+						// eslint-disable-next-line no-console
+						console.log(
+							`%c$derived %c${derived_reaction.label ?? '<unknown>'} %c(already seen)`,
+							'font-weight: bold; color: CornflowerBlue',
+							'font-weight: normal; color: inherit',
+							'font-weight: bold; color: orange'
+						);
+					} else {
+						visited.add(derived_reaction);
+						log_derived(derived_reaction, depth + 1);
+					}
+				} else {
+					// It's an effect
+					const label = effect_label(/** @type {Effect} */ (reaction), true);
+					const status = (flags & MAYBE_DIRTY) !== 0 ? 'maybe dirty' : 'dirty';
+
+					// Collect parent statuses
+					/** @type {string[]} */
+					const parent_statuses = [];
+					let show = false;
+					let current = /** @type {Effect} */ (reaction).parent;
+					while (current !== null) {
+						const parent_flags = current.f;
+						if ((parent_flags & (ROOT_EFFECT | BRANCH_EFFECT)) !== 0) {
+							const parent_status = (parent_flags & CLEAN) !== 0 ? 'clean' : 'not clean';
+							if (parent_status === 'clean' && parent_statuses.includes('not clean')) show = true;
+							parent_statuses.push(parent_status);
+						}
+						if (!current.parent) break;
+						current = current.parent;
+					}
+
+					// Check if reaction is reachable from root
+					const seen_effects = new Set();
+					let reachable = false;
+					/**
+					 * @param {Effect | null} effect
+					 */
+					function check_reachable(effect) {
+						if (effect === null || reachable) return;
+						if (effect === reaction) {
+							reachable = true;
+							return;
+						}
+						if (effect.f & DESTROYED) return;
+						if (seen_effects.has(effect)) {
+							throw new Error('');
+						}
+						seen_effects.add(effect);
+						let child = effect.first;
+						while (child !== null) {
+							check_reachable(child);
+							child = child.next;
+						}
+					}
+					try {
+						if (current) check_reachable(current);
+					} catch (e) {
+						// eslint-disable-next-line no-console
+						console.log(
+							`%c⚠️ Circular reference detected in effect tree`,
+							'font-weight: bold; color: red',
+							seen_effects
+						);
+					}
+
+					if (!reachable) {
+						// eslint-disable-next-line no-console
+						console.log(
+							`%c⚠️ Effect is NOT reachable from its parent chain`,
+							'font-weight: bold; color: red'
+						);
+					}
+
+					const parent_status_str = show ? ` (${parent_statuses.join(', ')})` : '';
+
+					// eslint-disable-next-line no-console
+					console.log(
+						`%c${label} (${status})${parent_status_str}`,
+						`font-weight: bold; color: ${parent_status_str ? 'red' : 'green'}`,
+						reaction
+					);
+				}
+			}
+
+			// eslint-disable-next-line no-console
+			console.groupEnd();
+		} else {
+			// eslint-disable-next-line no-console
+			console.log('%cno reactions', 'font-style: italic; color: gray');
+		}
+
+		// eslint-disable-next-line no-console
+		console.groupEnd();
+	}
+
+	// eslint-disable-next-line no-console
+	console.group(`%cDerived Reactions Graph`, 'font-weight: bold; color: purple');
+
+	visited.add(signal);
+	log_derived(signal, 0);
+
+	// eslint-disable-next-line no-console
+	console.groupEnd();
+}
+
+/**
+ * Traverses an effect tree and logs branches where a non-clean branch exists below a clean branch
+ * @param {Effect} effect
+ */
+export function log_inconsistent_branches(effect) {
+	const root_effect = root(effect);
+
+	/**
+	 * @typedef {{
+	 *   effect: Effect,
+	 *   status: 'clean' | 'maybe dirty' | 'dirty',
+	 *   parent_clean: boolean,
+	 *   children: BranchInfo[]
+	 * }} BranchInfo
+	 */
+
+	/**
+	 * Collects branch effects from the tree
+	 * @param {Effect} eff
+	 * @param {boolean} parent_clean - whether any ancestor branch is clean
+	 * @returns {BranchInfo[]}
+	 */
+	function collect_branches(eff, parent_clean) {
+		/** @type {BranchInfo[]} */
+		const branches = [];
+		const flags = eff.f;
+		const is_branch = (flags & BRANCH_EFFECT) !== 0;
+
+		if (is_branch) {
+			const status =
+				(flags & CLEAN) !== 0 ? 'clean' : (flags & MAYBE_DIRTY) !== 0 ? 'maybe dirty' : 'dirty';
+
+			/** @type {BranchInfo[]} */
+			const child_branches = [];
+
+			let child = eff.first;
+			while (child !== null) {
+				child_branches.push(...collect_branches(child, status === 'clean'));
+				child = child.next;
+			}
+
+			branches.push({
+				effect: eff,
+				status,
+				parent_clean,
+				children: child_branches
+			});
+		} else {
+			// Not a branch, continue traversing
+			let child = eff.first;
+			while (child !== null) {
+				branches.push(...collect_branches(child, parent_clean));
+				child = child.next;
+			}
+		}
+
+		return branches;
+	}
+
+	/**
+	 * Checks if a branch tree contains any inconsistencies (non-clean below clean)
+	 * @param {BranchInfo} branch
+	 * @param {boolean} ancestor_clean
+	 * @returns {boolean}
+	 */
+	function has_inconsistency(branch, ancestor_clean) {
+		const is_inconsistent = ancestor_clean && branch.status !== 'clean';
+		if (is_inconsistent) return true;
+
+		const new_ancestor_clean = ancestor_clean || branch.status === 'clean';
+		for (const child of branch.children) {
+			if (has_inconsistency(child, new_ancestor_clean)) return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Logs a branch and its children, but only if there are inconsistencies
+	 * @param {BranchInfo} branch
+	 * @param {boolean} ancestor_clean
+	 * @param {number} depth
+	 */
+	function log_branch(branch, ancestor_clean, depth) {
+		const is_inconsistent = ancestor_clean && branch.status !== 'clean';
+		const new_ancestor_clean = ancestor_clean || branch.status === 'clean';
+
+		// Only log if this branch or any descendant has an inconsistency
+		if (!has_inconsistency(branch, ancestor_clean) && !is_inconsistent) {
+			return;
+		}
+
+		const style = is_inconsistent
+			? 'font-weight: bold; color: red'
+			: branch.status === 'clean'
+				? 'font-weight: normal; color: green'
+				: 'font-weight: bold; color: orange';
+
+		const warning = is_inconsistent ? ' ⚠️ INCONSISTENT' : '';
+
+		// eslint-disable-next-line no-console
+		console.group(`%cbranch (${branch.status})${warning}`, style);
+
+		// eslint-disable-next-line no-console
+		console.log('%ceffect:', 'font-weight: bold', branch.effect);
+
+		if (branch.effect.fn) {
+			// eslint-disable-next-line no-console
+			console.log('%cfn:', 'font-weight: bold', branch.effect.fn);
+		}
+
+		if (branch.effect.deps !== null) {
+			// eslint-disable-next-line no-console
+			console.groupCollapsed('%cdeps', 'font-weight: normal');
+			for (const dep of branch.effect.deps) {
+				log_dep(dep);
+			}
+			// eslint-disable-next-line no-console
+			console.groupEnd();
+		}
+
+		if (is_inconsistent) {
+			log_effect_tree(branch.effect);
+		} else if (branch.children.length > 0) {
+			// eslint-disable-next-line no-console
+			console.group('%cchild branches', 'font-weight: bold');
+			for (const child of branch.children) {
+				log_branch(child, new_ancestor_clean, depth + 1);
+			}
+			// eslint-disable-next-line no-console
+			console.groupEnd();
+		}
+
+		// eslint-disable-next-line no-console
+		console.groupEnd();
+	}
+
+	const branches = collect_branches(root_effect, false);
+
+	// Check if there are any inconsistencies at all
+	let has_any_inconsistency = false;
+	for (const branch of branches) {
+		if (has_inconsistency(branch, false)) {
+			has_any_inconsistency = true;
+			break;
+		}
+	}
+
+	if (!has_any_inconsistency) {
+		// eslint-disable-next-line no-console
+		console.log('%cNo inconsistent branches found', 'font-weight: bold; color: green');
+		return;
+	}
+
+	// eslint-disable-next-line no-console
+	console.group(`%cInconsistent Branches (non-clean below clean)`, 'font-weight: bold; color: red');
+
+	for (const branch of branches) {
+		log_branch(branch, false, 0);
+	}
+
+	// eslint-disable-next-line no-console
+	console.groupEnd();
+
+	return true;
+}
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 3308711ed3..fc3e18562e 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -175,6 +175,9 @@ export class Batch {
 			this.#traverse_effect_tree(root, target);
 			// Note: #traverse_effect_tree runs block effects eagerly, which can schedule effects,
 			// which means queued_root_effects now may be filled again.
+
+			// Helpful for debugging reactivity loss that has to do with branches being skipped:
+			// log_inconsistent_branches(root);
 		}
 
 		if (!this.is_fork) {
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 853b255dd5..3f8d6cb09f 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -228,6 +228,8 @@ export function internal_set(source, value) {
 
 		source.wv = increment_write_version();
 
+		// For debugging, in case you want to know which reactions are being scheduled:
+		// log_reactions(source);
 		mark_reactions(source, DIRTY);
 
 		// It's possible that the current reaction might not have up-to-date dependencies

From 570f64963b6c740819b9d2d0464dfd36cb9318c1 Mon Sep 17 00:00:00 2001
From: adiGuba <frederic.martini@gmail.com>
Date: Sat, 29 Nov 2025 20:53:26 +0100
Subject: [PATCH 214/347] fix: add props to state_referenced_locally (#17266)

* add props to state_referenced_locally

* changeset
---
 .changeset/curly-phones-cross.md              |  5 +++
 .../phases/2-analyze/visitors/Identifier.js   |  3 +-
 .../static-state-reference/input.svelte       | 10 ++++++
 .../static-state-reference/warnings.json      | 36 +++++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/curly-phones-cross.md

diff --git a/.changeset/curly-phones-cross.md b/.changeset/curly-phones-cross.md
new file mode 100644
index 0000000000..4398ec1862
--- /dev/null
+++ b/.changeset/curly-phones-cross.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+add props to state_referenced_locally
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/Identifier.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/Identifier.js
index 1c98a95e63..9daae33dd7 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/Identifier.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/Identifier.js
@@ -114,7 +114,8 @@ export function Identifier(node, context) {
 						binding.initial.arguments[0].type !== 'SpreadElement' &&
 						!should_proxy(binding.initial.arguments[0], context.state.scope)))) ||
 				binding.kind === 'raw_state' ||
-				binding.kind === 'derived') &&
+				binding.kind === 'derived' ||
+				binding.kind === 'prop') &&
 			// We're only concerned with reads here
 			(parent.type !== 'AssignmentExpression' || parent.left !== node) &&
 			parent.type !== 'UpdateExpression'
diff --git a/packages/svelte/tests/validator/samples/static-state-reference/input.svelte b/packages/svelte/tests/validator/samples/static-state-reference/input.svelte
index 577527ee60..9037760321 100644
--- a/packages/svelte/tests/validator/samples/static-state-reference/input.svelte
+++ b/packages/svelte/tests/validator/samples/static-state-reference/input.svelte
@@ -8,11 +8,21 @@
 	console.log(count);
 	console.log(doubled);
 
+	let {
+		prop
+	} = $props();
+	let prop_state = $state(prop);
+	let prop_derived = $derived(prop);
+	console.log(prop);
+	console.log(prop_derived);
+
 	// writes are okay
 	count++;
 	count = 1;
 	obj.a++;
 	obj.a = 1;
+	prop_state = 1;
+	prop_derived = 1;
 
 	// `count` here is correctly identified as a non-reference
 	let typed: { count: number } | null = null;
diff --git a/packages/svelte/tests/validator/samples/static-state-reference/warnings.json b/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
index a118d5e4a0..a0ae24e37b 100644
--- a/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
+++ b/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
@@ -34,5 +34,41 @@
 			"column": 20,
 			"line": 9
 		}
+	},
+	{
+		"code": "state_referenced_locally",
+		"end": {
+			"column": 29,
+			"line": 14
+		},
+		"message": "This reference only captures the initial value of `prop`. Did you mean to reference it inside a closure instead?",
+		"start": {
+			"column": 25,
+			"line": 14
+		}
+	},
+	{
+		"code": "state_referenced_locally",
+		"end": {
+			"column": 17,
+			"line": 16
+		},
+		"message": "This reference only captures the initial value of `prop`. Did you mean to reference it inside a closure instead?",
+		"start": {
+			"column": 13,
+			"line": 16
+		}
+	},
+	{
+		"code": "state_referenced_locally",
+		"end": {
+			"column": 25,
+			"line": 17
+		},
+		"message": "This reference only captures the initial value of `prop_derived`. Did you mean to reference it inside a closure instead?",
+		"start": {
+			"column": 13,
+			"line": 17
+		}
 	}
 ]

From 6d696be17099cfabde7cfb10ecfa10f2f9c1e2b7 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sat, 29 Nov 2025 14:54:35 -0500
Subject: [PATCH 215/347] chore: update parser snapshots (#17267)

* chore: update snapshots

* update .prettierignore
---
 .prettierignore                               |  4 +++
 .../samples/action-duplicate/output.json      |  2 +-
 .../samples/action-with-call/output.json      |  2 +-
 .../action-with-identifier/output.json        |  2 +-
 .../samples/action-with-literal/output.json   |  2 +-
 .../parser-legacy/samples/action/output.json  |  2 +-
 .../samples/animation/output.json             |  2 +-
 .../attribute-class-directive/output.json     |  2 +-
 .../attribute-containing-solidus/output.json  |  2 +-
 .../attribute-curly-bracket/output.json       |  2 +-
 .../attribute-dynamic-boolean/output.json     |  2 +-
 .../samples/attribute-dynamic/output.json     |  2 +-
 .../samples/attribute-empty/output.json       |  2 +-
 .../samples/attribute-escaped/output.json     |  2 +-
 .../samples/attribute-multiple/output.json    |  2 +-
 .../samples/attribute-shorthand/output.json   |  2 +-
 .../attribute-static-boolean/output.json      |  2 +-
 .../samples/attribute-static/output.json      |  2 +-
 .../output.json                               |  6 +++--
 .../output.json                               |  2 +-
 .../output.json                               |  2 +-
 .../attribute-style-directive/output.json     |  2 +-
 .../samples/attribute-style/output.json       |  2 +-
 .../samples/attribute-unquoted/output.json    |  2 +-
 .../attribute-with-whitespace/output.json     |  2 +-
 .../samples/await-catch/output.json           |  2 +-
 .../samples/await-then-catch/output.json      |  2 +-
 .../samples/binding-shorthand/output.json     |  2 +-
 .../parser-legacy/samples/binding/output.json |  2 +-
 .../samples/comment-with-ignores/output.json  |  7 +++--
 .../parser-legacy/samples/comment/output.json |  2 +-
 .../samples/component-dynamic/output.json     |  2 +-
 .../convert-entities-in-element/output.json   |  2 +-
 .../samples/convert-entities/output.json      |  2 +-
 .../parser-legacy/samples/css/output.json     |  2 +-
 .../dynamic-element-string/output.json        |  2 +-
 .../dynamic-element-variable/output.json      |  2 +-
 .../samples/dynamic-import/output.json        |  2 +-
 .../each-block-destructured/output.json       |  2 +-
 .../samples/each-block-else/output.json       |  2 +-
 .../samples/each-block-indexed/output.json    |  2 +-
 .../samples/each-block-keyed/output.json      |  2 +-
 .../samples/each-block/output.json            |  2 +-
 .../output.json                               |  2 +-
 .../element-with-attribute/output.json        |  2 +-
 .../samples/element-with-mustache/output.json |  2 +-
 .../samples/element-with-text/output.json     |  2 +-
 .../samples/elements/output.json              |  2 +-
 .../samples/event-handler/output.json         |  2 +-
 .../samples/generic-snippets/output.json      |  2 +-
 .../samples/if-block-else/output.json         |  2 +-
 .../samples/if-block-elseif/output.json       |  2 +-
 .../samples/if-block/output.json              |  2 +-
 .../samples/implicitly-closed-li/output.json  |  2 +-
 .../samples/javascript-comments/output.json   |  2 +-
 .../samples/loose-invalid-block/output.json   |  2 +-
 .../loose-invalid-expression/output.json      |  2 +-
 .../samples/loose-unclosed-block/output.json  |  2 +-
 .../loose-unclosed-open-tag/output.json       |  2 +-
 .../samples/loose-unclosed-tag/output.json    |  2 +-
 .../parser-legacy/samples/nbsp/output.json    |  2 +-
 .../no-error-if-before-closing/output.json    |  2 +-
 .../samples/raw-mustaches/output.json         |  2 +-
 .../parser-legacy/samples/refs/output.json    |  2 +-
 .../output.json                               |  2 +-
 .../samples/script-comment-only/output.json   |  2 +-
 .../output.json                               |  2 +-
 .../parser-legacy/samples/script/output.json  |  2 +-
 .../samples/self-closing-element/output.json  |  2 +-
 .../samples/self-reference/output.json        |  2 +-
 .../samples/slotted-element/output.json       |  2 +-
 .../space-between-mustaches/output.json       |  2 +-
 .../parser-legacy/samples/spread/output.json  |  2 +-
 .../samples/style-inside-head/output.json     |  2 +-
 .../samples/textarea-children/output.json     |  2 +-
 .../samples/textarea-end-tag/output.json      |  2 +-
 .../transition-intro-no-params/output.json    |  2 +-
 .../samples/transition-intro/output.json      |  2 +-
 .../samples/unusual-identifier/output.json    |  2 +-
 .../whitespace-after-script-tag/output.json   |  2 +-
 .../whitespace-after-style-tag/output.json    |  2 +-
 .../whitespace-leading-trailing/output.json   |  2 +-
 .../samples/whitespace-normal/output.json     |  2 +-
 .../samples/attachments/output.json           |  2 +-
 .../output.json                               |  2 +-
 .../samples/comment-before-script/output.json |  2 +-
 .../samples/css-nth-syntax/output.json        |  2 +-
 .../samples/css-pseudo-classes/output.json    |  2 +-
 .../output.json                               | 22 ++++++++--------
 .../each-block-object-pattern/output.json     | 26 +++++++++----------
 .../samples/generic-snippets/output.json      |  2 +-
 .../samples/if-block-else/output.json         |  2 +-
 .../samples/if-block-elseif/output.json       |  2 +-
 .../samples/if-block/output.json              |  2 +-
 .../samples/loose-invalid-block/output.json   |  2 +-
 .../loose-invalid-expression/output.json      |  2 +-
 .../loose-unclosed-open-tag/output.json       |  2 +-
 .../samples/loose-unclosed-tag/output.json    |  2 +-
 .../samples/loose-valid-each-as/output.json   |  2 +-
 .../parser-modern/samples/options/output.json |  2 +-
 .../semicolon-inside-quotes/output.json       |  2 +-
 .../samples/snippets/output.json              |  2 +-
 .../samples/template-shadowroot/output.json   |  2 +-
 .../typescript-in-event-handler/output.json   |  2 +-
 104 files changed, 136 insertions(+), 127 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index 9cf9a4bfe1..ee5ef6d8c6 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -25,6 +25,10 @@ packages/svelte/tests/**/_output
 packages/svelte/tests/**/shards/*.test.js
 packages/svelte/tests/hydration/samples/*/_expected.html
 packages/svelte/tests/hydration/samples/*/_override.html
+packages/svelte/tests/parser-legacy/samples/*/_actual.json
+packages/svelte/tests/parser-legacy/samples/*/output.json
+packages/svelte/tests/parser-modern/samples/*/_actual.json
+packages/svelte/tests/parser-modern/samples/*/output.json
 packages/svelte/types
 packages/svelte/compiler/index.js
 playgrounds/sandbox/src/*
diff --git a/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json b/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json
index c6af77a47b..2318720f79 100644
--- a/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json
@@ -31,4 +31,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json b/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json
index a10d4eccf0..f2ef97f145 100644
--- a/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json
@@ -73,4 +73,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json b/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json
index e9a3e7e5da..d6f14ad053 100644
--- a/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json
@@ -38,4 +38,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json b/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json
index 94b60b9e5d..240f80df09 100644
--- a/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json
@@ -39,4 +39,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/action/output.json b/packages/svelte/tests/parser-legacy/samples/action/output.json
index f241c81a93..0e5d877584 100644
--- a/packages/svelte/tests/parser-legacy/samples/action/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action/output.json
@@ -23,4 +23,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/animation/output.json b/packages/svelte/tests/parser-legacy/samples/animation/output.json
index bf4b43b875..4b4700dd98 100644
--- a/packages/svelte/tests/parser-legacy/samples/animation/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/animation/output.json
@@ -88,4 +88,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json
index 3cd54b6647..2585fcfe94 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json
@@ -38,4 +38,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-containing-solidus/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-containing-solidus/output.json
index 2c63b3a43d..c67811fab9 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-containing-solidus/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-containing-solidus/output.json
@@ -38,4 +38,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-curly-bracket/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-curly-bracket/output.json
index 2453dc9e0a..a137dd795b 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-curly-bracket/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-curly-bracket/output.json
@@ -52,4 +52,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-dynamic-boolean/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-dynamic-boolean/output.json
index 5793afe896..5462eaf713 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-dynamic-boolean/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-dynamic-boolean/output.json
@@ -44,4 +44,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-dynamic/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-dynamic/output.json
index 9fd98c80ec..6acc5ebeb1 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-dynamic/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-dynamic/output.json
@@ -80,4 +80,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-empty/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-empty/output.json
index d2a3dcd93b..478ba2e525 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-empty/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-empty/output.json
@@ -105,4 +105,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-escaped/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-escaped/output.json
index e2eb99f327..74fa6f2aec 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-escaped/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-escaped/output.json
@@ -30,4 +30,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-multiple/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-multiple/output.json
index 66b780e536..80bbdf0e21 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-multiple/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-multiple/output.json
@@ -45,4 +45,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-shorthand/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-shorthand/output.json
index 2ae3acfdc7..87a01d4b09 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-shorthand/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-shorthand/output.json
@@ -34,4 +34,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-static-boolean/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-static-boolean/output.json
index 8cb93b75ec..a059934e40 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-static-boolean/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-static-boolean/output.json
@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-static/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-static/output.json
index 3e19a4727e..94608a0eba 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-static/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-static/output.json
@@ -30,4 +30,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-modifiers/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-modifiers/output.json
index b7de71ff5a..45bb6f0e2e 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-modifiers/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-modifiers/output.json
@@ -15,7 +15,9 @@
 						"end": 36,
 						"type": "StyleDirective",
 						"name": "color",
-						"modifiers": ["important"],
+						"modifiers": [
+							"important"
+						],
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -45,4 +47,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-shorthand/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-shorthand/output.json
index d7f53cb00c..4ad7aaf7f7 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-shorthand/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-shorthand/output.json
@@ -23,4 +23,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-string/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-string/output.json
index 5acf7d797e..9693f97782 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-string/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-string/output.json
@@ -359,4 +359,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive/output.json
index 2cce9fef95..08e2032db3 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive/output.json
@@ -45,4 +45,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style/output.json
index 1d9a528d6d..d029f9ef71 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style/output.json
@@ -38,4 +38,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-unquoted/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-unquoted/output.json
index ab2912a2c0..a8fb61f58c 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-unquoted/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-unquoted/output.json
@@ -108,4 +108,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json
index 2e45184be9..174e2b174f 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json
@@ -46,4 +46,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/await-catch/output.json b/packages/svelte/tests/parser-legacy/samples/await-catch/output.json
index 5572d573f8..5c2fa74e42 100644
--- a/packages/svelte/tests/parser-legacy/samples/await-catch/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/await-catch/output.json
@@ -183,4 +183,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/await-then-catch/output.json b/packages/svelte/tests/parser-legacy/samples/await-then-catch/output.json
index b71365f39d..5548cfc22e 100644
--- a/packages/svelte/tests/parser-legacy/samples/await-then-catch/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/await-then-catch/output.json
@@ -252,4 +252,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json b/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
index 4289245705..6106560949 100644
--- a/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
@@ -109,4 +109,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/binding/output.json b/packages/svelte/tests/parser-legacy/samples/binding/output.json
index 5256ede7bb..b6d24d6579 100644
--- a/packages/svelte/tests/parser-legacy/samples/binding/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/binding/output.json
@@ -119,4 +119,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/comment-with-ignores/output.json b/packages/svelte/tests/parser-legacy/samples/comment-with-ignores/output.json
index cf2dc9f752..74d0a52707 100644
--- a/packages/svelte/tests/parser-legacy/samples/comment-with-ignores/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/comment-with-ignores/output.json
@@ -9,8 +9,11 @@
 				"start": 0,
 				"end": 31,
 				"data": " svelte-ignore foo, bar ",
-				"ignores": ["foo", "bar"]
+				"ignores": [
+					"foo",
+					"bar"
+				]
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/comment/output.json b/packages/svelte/tests/parser-legacy/samples/comment/output.json
index 6017db404c..a721ddd8dc 100644
--- a/packages/svelte/tests/parser-legacy/samples/comment/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/comment/output.json
@@ -13,4 +13,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/component-dynamic/output.json b/packages/svelte/tests/parser-legacy/samples/component-dynamic/output.json
index f624a04c61..7e7267498f 100644
--- a/packages/svelte/tests/parser-legacy/samples/component-dynamic/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/component-dynamic/output.json
@@ -77,4 +77,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/convert-entities-in-element/output.json b/packages/svelte/tests/parser-legacy/samples/convert-entities-in-element/output.json
index f7a8a3c677..3025f2c800 100644
--- a/packages/svelte/tests/parser-legacy/samples/convert-entities-in-element/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/convert-entities-in-element/output.json
@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/convert-entities/output.json b/packages/svelte/tests/parser-legacy/samples/convert-entities/output.json
index c336a3978c..c43621cc6b 100644
--- a/packages/svelte/tests/parser-legacy/samples/convert-entities/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/convert-entities/output.json
@@ -13,4 +13,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/css/output.json b/packages/svelte/tests/parser-legacy/samples/css/output.json
index b3ecd7b671..443d6d2d50 100644
--- a/packages/svelte/tests/parser-legacy/samples/css/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/css/output.json
@@ -82,4 +82,4 @@
 			"comment": null
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/dynamic-element-string/output.json b/packages/svelte/tests/parser-legacy/samples/dynamic-element-string/output.json
index 9ba15d6044..5f73e70b5e 100644
--- a/packages/svelte/tests/parser-legacy/samples/dynamic-element-string/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/dynamic-element-string/output.json
@@ -171,4 +171,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/dynamic-element-variable/output.json b/packages/svelte/tests/parser-legacy/samples/dynamic-element-variable/output.json
index 291cdaa734..7c75c8bc2a 100644
--- a/packages/svelte/tests/parser-legacy/samples/dynamic-element-variable/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/dynamic-element-variable/output.json
@@ -77,4 +77,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json b/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json
index ee19d58742..943376010c 100644
--- a/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json
@@ -481,4 +481,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
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 637da24aea..21b059b7ae 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
@@ -266,4 +266,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/each-block-else/output.json b/packages/svelte/tests/parser-legacy/samples/each-block-else/output.json
index a6db309edb..f5145063e4 100644
--- a/packages/svelte/tests/parser-legacy/samples/each-block-else/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/each-block-else/output.json
@@ -100,4 +100,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/each-block-indexed/output.json b/packages/svelte/tests/parser-legacy/samples/each-block-indexed/output.json
index bce7fd81a2..ce2f921d86 100644
--- a/packages/svelte/tests/parser-legacy/samples/each-block-indexed/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/each-block-indexed/output.json
@@ -106,4 +106,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/each-block-keyed/output.json b/packages/svelte/tests/parser-legacy/samples/each-block-keyed/output.json
index 2f6206a6cb..637dab61b8 100644
--- a/packages/svelte/tests/parser-legacy/samples/each-block-keyed/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/each-block-keyed/output.json
@@ -126,4 +126,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/each-block/output.json b/packages/svelte/tests/parser-legacy/samples/each-block/output.json
index f26f557958..82390bb628 100644
--- a/packages/svelte/tests/parser-legacy/samples/each-block/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/each-block/output.json
@@ -77,4 +77,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/element-with-attribute-empty-string/output.json b/packages/svelte/tests/parser-legacy/samples/element-with-attribute-empty-string/output.json
index 7773256d44..afdcbf4297 100644
--- a/packages/svelte/tests/parser-legacy/samples/element-with-attribute-empty-string/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/element-with-attribute-empty-string/output.json
@@ -61,4 +61,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/element-with-attribute/output.json b/packages/svelte/tests/parser-legacy/samples/element-with-attribute/output.json
index 9477886bb2..b6740a6135 100644
--- a/packages/svelte/tests/parser-legacy/samples/element-with-attribute/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/element-with-attribute/output.json
@@ -61,4 +61,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/element-with-mustache/output.json b/packages/svelte/tests/parser-legacy/samples/element-with-mustache/output.json
index ce0dc25e85..9bb92244ce 100644
--- a/packages/svelte/tests/parser-legacy/samples/element-with-mustache/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/element-with-mustache/output.json
@@ -50,4 +50,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/element-with-text/output.json b/packages/svelte/tests/parser-legacy/samples/element-with-text/output.json
index fde57c470a..d8bb9e9c11 100644
--- a/packages/svelte/tests/parser-legacy/samples/element-with-text/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/element-with-text/output.json
@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/elements/output.json b/packages/svelte/tests/parser-legacy/samples/elements/output.json
index 6b51383d93..97513445d6 100644
--- a/packages/svelte/tests/parser-legacy/samples/elements/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/elements/output.json
@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/event-handler/output.json b/packages/svelte/tests/parser-legacy/samples/event-handler/output.json
index 11ee562297..218b349628 100644
--- a/packages/svelte/tests/parser-legacy/samples/event-handler/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/event-handler/output.json
@@ -161,4 +161,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json b/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json
index 37fb499e7b..72672cafbc 100644
--- a/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json
@@ -241,4 +241,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/if-block-else/output.json b/packages/svelte/tests/parser-legacy/samples/if-block-else/output.json
index 4ba9370d88..34efb9fd7b 100644
--- a/packages/svelte/tests/parser-legacy/samples/if-block-else/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/if-block-else/output.json
@@ -68,4 +68,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/if-block-elseif/output.json b/packages/svelte/tests/parser-legacy/samples/if-block-elseif/output.json
index f2af3d5a4b..d246cd1179 100644
--- a/packages/svelte/tests/parser-legacy/samples/if-block-elseif/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/if-block-elseif/output.json
@@ -221,4 +221,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/if-block/output.json b/packages/svelte/tests/parser-legacy/samples/if-block/output.json
index 61ecf6e3b2..1c60df0d31 100644
--- a/packages/svelte/tests/parser-legacy/samples/if-block/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/if-block/output.json
@@ -36,4 +36,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/implicitly-closed-li/output.json b/packages/svelte/tests/parser-legacy/samples/implicitly-closed-li/output.json
index a56701894e..be5fba538e 100644
--- a/packages/svelte/tests/parser-legacy/samples/implicitly-closed-li/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/implicitly-closed-li/output.json
@@ -70,4 +70,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json b/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
index 42229b741f..a5fe5749da 100644
--- a/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
@@ -869,4 +869,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-invalid-block/output.json b/packages/svelte/tests/parser-legacy/samples/loose-invalid-block/output.json
index 480fcf2edc..c8f248ee6c 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-invalid-block/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-invalid-block/output.json
@@ -104,4 +104,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-invalid-expression/output.json b/packages/svelte/tests/parser-legacy/samples/loose-invalid-expression/output.json
index 0564d6d295..b04a37e5e9 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-invalid-expression/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-invalid-expression/output.json
@@ -505,4 +505,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-block/output.json b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-block/output.json
index e6e909f0d5..ee4efc2a9c 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-block/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-block/output.json
@@ -273,4 +273,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-open-tag/output.json b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-open-tag/output.json
index 1792d6b8e6..1002df6b67 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-open-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-open-tag/output.json
@@ -346,4 +346,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-tag/output.json b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-tag/output.json
index 2205a00e20..4b6d31902f 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-tag/output.json
@@ -360,4 +360,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/nbsp/output.json b/packages/svelte/tests/parser-legacy/samples/nbsp/output.json
index 7d2158955a..a120b08f32 100644
--- a/packages/svelte/tests/parser-legacy/samples/nbsp/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/nbsp/output.json
@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/no-error-if-before-closing/output.json b/packages/svelte/tests/parser-legacy/samples/no-error-if-before-closing/output.json
index c60efd4fba..369cd4acc4 100644
--- a/packages/svelte/tests/parser-legacy/samples/no-error-if-before-closing/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/no-error-if-before-closing/output.json
@@ -289,4 +289,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/raw-mustaches/output.json b/packages/svelte/tests/parser-legacy/samples/raw-mustaches/output.json
index 7db0bb7ec1..b8e1da7499 100644
--- a/packages/svelte/tests/parser-legacy/samples/raw-mustaches/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/raw-mustaches/output.json
@@ -78,4 +78,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/refs/output.json b/packages/svelte/tests/parser-legacy/samples/refs/output.json
index 7829a2787f..108fa78697 100644
--- a/packages/svelte/tests/parser-legacy/samples/refs/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/refs/output.json
@@ -119,4 +119,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json b/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json
index e0b50e3b92..e9298ec50c 100644
--- a/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json
@@ -147,4 +147,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json b/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json
index b04a823e8d..502d5df576 100644
--- a/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json
@@ -52,4 +52,4 @@
 			]
 		}
 	}
-}
+}
\ No newline at end of file
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 64250cb302..5a380a3240 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
@@ -176,4 +176,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/script/output.json b/packages/svelte/tests/parser-legacy/samples/script/output.json
index d3d4abd6b2..e30414a2a8 100644
--- a/packages/svelte/tests/parser-legacy/samples/script/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script/output.json
@@ -147,4 +147,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/self-closing-element/output.json b/packages/svelte/tests/parser-legacy/samples/self-closing-element/output.json
index f0ba3a5c0d..fe59cac4b7 100644
--- a/packages/svelte/tests/parser-legacy/samples/self-closing-element/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/self-closing-element/output.json
@@ -14,4 +14,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/self-reference/output.json b/packages/svelte/tests/parser-legacy/samples/self-reference/output.json
index 34310fcce4..44547698fd 100644
--- a/packages/svelte/tests/parser-legacy/samples/self-reference/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/self-reference/output.json
@@ -133,4 +133,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/slotted-element/output.json b/packages/svelte/tests/parser-legacy/samples/slotted-element/output.json
index 90ded68103..c6717f3074 100644
--- a/packages/svelte/tests/parser-legacy/samples/slotted-element/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/slotted-element/output.json
@@ -39,4 +39,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/space-between-mustaches/output.json b/packages/svelte/tests/parser-legacy/samples/space-between-mustaches/output.json
index bb6de0bea9..7553651864 100644
--- a/packages/svelte/tests/parser-legacy/samples/space-between-mustaches/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/space-between-mustaches/output.json
@@ -106,4 +106,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/spread/output.json b/packages/svelte/tests/parser-legacy/samples/spread/output.json
index 3b79aa9670..b1d80bd5d4 100644
--- a/packages/svelte/tests/parser-legacy/samples/spread/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/spread/output.json
@@ -36,4 +36,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/style-inside-head/output.json b/packages/svelte/tests/parser-legacy/samples/style-inside-head/output.json
index 733f9e76ff..25588b950b 100644
--- a/packages/svelte/tests/parser-legacy/samples/style-inside-head/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/style-inside-head/output.json
@@ -30,4 +30,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/textarea-children/output.json b/packages/svelte/tests/parser-legacy/samples/textarea-children/output.json
index 60477807b7..62a295c135 100644
--- a/packages/svelte/tests/parser-legacy/samples/textarea-children/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/textarea-children/output.json
@@ -50,4 +50,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/textarea-end-tag/output.json b/packages/svelte/tests/parser-legacy/samples/textarea-end-tag/output.json
index ed3c85b09a..145de96560 100644
--- a/packages/svelte/tests/parser-legacy/samples/textarea-end-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/textarea-end-tag/output.json
@@ -50,4 +50,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json b/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json
index 18860d615b..85f45a93f5 100644
--- a/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json
@@ -33,4 +33,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json b/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json
index 973cfb7d33..be201143b4 100644
--- a/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json
@@ -101,4 +101,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/unusual-identifier/output.json b/packages/svelte/tests/parser-legacy/samples/unusual-identifier/output.json
index 9081b7cb92..b1595a6839 100644
--- a/packages/svelte/tests/parser-legacy/samples/unusual-identifier/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/unusual-identifier/output.json
@@ -77,4 +77,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json b/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json
index 69b2382442..dee3ba5f29 100644
--- a/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json
@@ -147,4 +147,4 @@
 			"sourceType": "module"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/whitespace-after-style-tag/output.json b/packages/svelte/tests/parser-legacy/samples/whitespace-after-style-tag/output.json
index 2cadbc672f..acd9798425 100644
--- a/packages/svelte/tests/parser-legacy/samples/whitespace-after-style-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/whitespace-after-style-tag/output.json
@@ -82,4 +82,4 @@
 			"comment": null
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/whitespace-leading-trailing/output.json b/packages/svelte/tests/parser-legacy/samples/whitespace-leading-trailing/output.json
index baffebfed7..67ffc03436 100644
--- a/packages/svelte/tests/parser-legacy/samples/whitespace-leading-trailing/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/whitespace-leading-trailing/output.json
@@ -29,4 +29,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-legacy/samples/whitespace-normal/output.json b/packages/svelte/tests/parser-legacy/samples/whitespace-normal/output.json
index 4fb88b818d..27f8e537a1 100644
--- a/packages/svelte/tests/parser-legacy/samples/whitespace-normal/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/whitespace-normal/output.json
@@ -75,4 +75,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/attachments/output.json b/packages/svelte/tests/parser-modern/samples/attachments/output.json
index 42e9880fcc..56dd077add 100644
--- a/packages/svelte/tests/parser-modern/samples/attachments/output.json
+++ b/packages/svelte/tests/parser-modern/samples/attachments/output.json
@@ -138,4 +138,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
index dba258a6b1..7189e27e96 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
@@ -323,4 +323,4 @@
 		},
 		"attributes": []
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
index 1aca0ce036..39bfd43237 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
@@ -150,4 +150,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json b/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
index a126acb4c3..a4abf172ac 100644
--- a/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
+++ b/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
@@ -1114,4 +1114,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json b/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
index e410cf2a80..a2e0195fab 100644
--- a/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
+++ b/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
@@ -406,4 +406,4 @@
 		"nodes": []
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/each-block-object-pattern-special-characters/output.json b/packages/svelte/tests/parser-modern/samples/each-block-object-pattern-special-characters/output.json
index b962db3226..37fdf92296 100644
--- a/packages/svelte/tests/parser-modern/samples/each-block-object-pattern-special-characters/output.json
+++ b/packages/svelte/tests/parser-modern/samples/each-block-object-pattern-special-characters/output.json
@@ -79,7 +79,6 @@
 								},
 								"name": "y"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 14,
@@ -127,7 +126,8 @@
 									"value": "z",
 									"raw": "'z'"
 								}
-							}
+							},
+							"kind": "init"
 						}
 					]
 				}
@@ -211,7 +211,6 @@
 								},
 								"name": "y"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 47,
@@ -259,7 +258,8 @@
 									"value": "{",
 									"raw": "'{'"
 								}
-							}
+							},
+							"kind": "init"
 						}
 					]
 				}
@@ -343,7 +343,6 @@
 								},
 								"name": "y"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 80,
@@ -391,7 +390,8 @@
 									"value": "]",
 									"raw": "']'"
 								}
-							}
+							},
+							"kind": "init"
 						}
 					]
 				}
@@ -475,7 +475,6 @@
 								},
 								"name": "y"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 113,
@@ -603,7 +602,8 @@
 										}
 									]
 								}
-							}
+							},
+							"kind": "init"
 						}
 					]
 				}
@@ -687,7 +687,6 @@
 								},
 								"name": "y"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 151,
@@ -815,7 +814,8 @@
 										}
 									]
 								}
-							}
+							},
+							"kind": "init"
 						}
 					]
 				}
@@ -823,4 +823,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/each-block-object-pattern/output.json b/packages/svelte/tests/parser-modern/samples/each-block-object-pattern/output.json
index 144016417b..b2a5f9e0d1 100644
--- a/packages/svelte/tests/parser-modern/samples/each-block-object-pattern/output.json
+++ b/packages/svelte/tests/parser-modern/samples/each-block-object-pattern/output.json
@@ -204,7 +204,6 @@
 								},
 								"name": "name"
 							},
-							"kind": "init",
 							"value": {
 								"type": "Identifier",
 								"start": 19,
@@ -220,7 +219,8 @@
 									}
 								},
 								"name": "name"
-							}
+							},
+							"kind": "init"
 						},
 						{
 							"type": "Property",
@@ -255,7 +255,6 @@
 								},
 								"name": "cool"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 25,
@@ -303,7 +302,8 @@
 									"value": true,
 									"raw": "true"
 								}
-							}
+							},
+							"kind": "init"
 						}
 					]
 				}
@@ -512,7 +512,6 @@
 								},
 								"name": "name"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 115,
@@ -619,7 +618,8 @@
 										}
 									]
 								}
-							}
+							},
+							"kind": "init"
 						},
 						{
 							"type": "Property",
@@ -654,7 +654,6 @@
 								},
 								"name": "cool"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 139,
@@ -702,7 +701,8 @@
 									"value": true,
 									"raw": "true"
 								}
-							}
+							},
+							"kind": "init"
 						}
 					]
 				}
@@ -911,7 +911,6 @@
 								},
 								"name": "name"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 229,
@@ -1087,7 +1086,8 @@
 									"arguments": [],
 									"optional": false
 								}
-							}
+							},
+							"kind": "init"
 						},
 						{
 							"type": "Property",
@@ -1122,7 +1122,6 @@
 								},
 								"name": "cool"
 							},
-							"kind": "init",
 							"value": {
 								"type": "AssignmentPattern",
 								"start": 275,
@@ -1170,7 +1169,8 @@
 									"value": true,
 									"raw": "true"
 								}
-							}
+							},
+							"kind": "init"
 						}
 					]
 				}
@@ -1178,4 +1178,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json b/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
index b66ee7288f..44d98b7a91 100644
--- a/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
+++ b/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
@@ -296,4 +296,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/if-block-else/output.json b/packages/svelte/tests/parser-modern/samples/if-block-else/output.json
index cf47e3e0bb..dcccde670c 100644
--- a/packages/svelte/tests/parser-modern/samples/if-block-else/output.json
+++ b/packages/svelte/tests/parser-modern/samples/if-block-else/output.json
@@ -108,4 +108,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/if-block-elseif/output.json b/packages/svelte/tests/parser-modern/samples/if-block-elseif/output.json
index b10d50c939..6759f678d8 100644
--- a/packages/svelte/tests/parser-modern/samples/if-block-elseif/output.json
+++ b/packages/svelte/tests/parser-modern/samples/if-block-elseif/output.json
@@ -202,4 +202,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/if-block/output.json b/packages/svelte/tests/parser-modern/samples/if-block/output.json
index f363ed8274..47ad4145a6 100644
--- a/packages/svelte/tests/parser-modern/samples/if-block/output.json
+++ b/packages/svelte/tests/parser-modern/samples/if-block/output.json
@@ -45,4 +45,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/loose-invalid-block/output.json b/packages/svelte/tests/parser-modern/samples/loose-invalid-block/output.json
index 46aad16b21..036b581d0c 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-invalid-block/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-invalid-block/output.json
@@ -168,4 +168,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/loose-invalid-expression/output.json b/packages/svelte/tests/parser-modern/samples/loose-invalid-expression/output.json
index 56fa4286dd..6231a19309 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-invalid-expression/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-invalid-expression/output.json
@@ -483,4 +483,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/loose-unclosed-open-tag/output.json b/packages/svelte/tests/parser-modern/samples/loose-unclosed-open-tag/output.json
index a0e13d4352..a7985ead8f 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-unclosed-open-tag/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-unclosed-open-tag/output.json
@@ -411,4 +411,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/loose-unclosed-tag/output.json b/packages/svelte/tests/parser-modern/samples/loose-unclosed-tag/output.json
index cf9138c026..df72219d43 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-unclosed-tag/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-unclosed-tag/output.json
@@ -429,4 +429,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json b/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
index 181f1ba250..c579e46d69 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
@@ -305,4 +305,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/options/output.json b/packages/svelte/tests/parser-modern/samples/options/output.json
index 6feee2d4f5..97e5351564 100644
--- a/packages/svelte/tests/parser-modern/samples/options/output.json
+++ b/packages/svelte/tests/parser-modern/samples/options/output.json
@@ -178,4 +178,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json b/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
index 33dd78879c..ff452b3563 100644
--- a/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
+++ b/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
@@ -111,4 +111,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/snippets/output.json b/packages/svelte/tests/parser-modern/samples/snippets/output.json
index acf484d8ae..1baa53f7cf 100644
--- a/packages/svelte/tests/parser-modern/samples/snippets/output.json
+++ b/packages/svelte/tests/parser-modern/samples/snippets/output.json
@@ -230,4 +230,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/template-shadowroot/output.json b/packages/svelte/tests/parser-modern/samples/template-shadowroot/output.json
index 65d716a82b..6039b6d52d 100644
--- a/packages/svelte/tests/parser-modern/samples/template-shadowroot/output.json
+++ b/packages/svelte/tests/parser-modern/samples/template-shadowroot/output.json
@@ -149,4 +149,4 @@
 		]
 	},
 	"options": null
-}
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json b/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
index 9c515ad905..a53e1eeebf 100644
--- a/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
+++ b/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
@@ -497,4 +497,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file

From 617e179e684363a03af6707a8d94f92e2510f523 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sun, 30 Nov 2025 16:14:43 -0500
Subject: [PATCH 216/347] fix: preserve node locations for better sourcemaps
 (#17269)

* preserve node locations

* preserve component IDs

* update tests

* use IDs for elements

* more

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* tweak

* tidy up

* changeset

* oops
---
 .changeset/gentle-views-matter.md             |   5 +
 .../src/compiler/phases/1-parse/index.js      |  48 ++--
 .../compiler/phases/1-parse/read/context.js   |  15 +-
 .../compiler/phases/1-parse/state/element.js  | 134 +++++++-----
 .../src/compiler/phases/1-parse/state/tag.js  |  21 +-
 .../src/compiler/phases/2-analyze/index.js    |   4 +-
 .../2-analyze/visitors/RegularElement.js      |   5 +-
 .../client/transform-template/index.js        |   3 +-
 .../client/visitors/BindDirective.js          |  38 +++-
 .../client/visitors/CallExpression.js         |   3 +-
 .../3-transform/client/visitors/Component.js  |   3 +-
 .../3-transform/client/visitors/Fragment.js   |   2 +-
 .../client/visitors/RegularElement.js         |   1 +
 .../client/visitors/SvelteComponent.js        |   3 +-
 .../3-transform/client/visitors/SvelteHead.js |   2 +-
 .../3-transform/client/visitors/SvelteSelf.js |   3 +-
 .../client/visitors/TitleElement.js           |   2 +-
 .../client/visitors/VariableDeclaration.js    |   3 +-
 .../client/visitors/shared/component.js       |  52 ++---
 .../client/visitors/shared/events.js          |  10 +-
 .../client/visitors/shared/fragment.js        |  14 +-
 .../client/visitors/shared/utils.js           |   4 +-
 .../server/visitors/RegularElement.js         |   2 +-
 .../server/visitors/SvelteElement.js          |   2 +-
 .../server/visitors/shared/element.js         |   4 +-
 packages/svelte/src/compiler/phases/nodes.js  |   6 +-
 packages/svelte/src/compiler/state.js         |  16 +-
 .../svelte/src/compiler/types/template.d.ts   |  28 ++-
 .../svelte/src/compiler/utils/builders.js     |   8 +-
 .../samples/action-duplicate/output.json      |  26 ++-
 .../samples/action-with-call/output.json      |  14 +-
 .../action-with-identifier/output.json        |  14 +-
 .../samples/action-with-literal/output.json   |  14 +-
 .../parser-legacy/samples/action/output.json  |  14 +-
 .../samples/animation/output.json             |  18 +-
 .../attribute-class-directive/output.json     |  14 +-
 .../attribute-containing-solidus/output.json  |  14 +-
 .../attribute-curly-bracket/output.json       |  14 +-
 .../attribute-dynamic-boolean/output.json     |  14 +-
 .../samples/attribute-dynamic/output.json     |  14 +-
 .../samples/attribute-empty/output.json       |  50 ++++-
 .../samples/attribute-escaped/output.json     |  14 +-
 .../samples/attribute-multiple/output.json    |  26 ++-
 .../samples/attribute-shorthand/output.json   |  30 ++-
 .../attribute-static-boolean/output.json      |  14 +-
 .../samples/attribute-static/output.json      |  14 +-
 .../output.json                               |  14 +-
 .../output.json                               |  14 +-
 .../output.json                               |  86 +++++++-
 .../attribute-style-directive/output.json     |  14 +-
 .../samples/attribute-style/output.json       |  14 +-
 .../samples/attribute-unquoted/output.json    |  38 +++-
 .../attribute-with-whitespace/output.json     |  14 +-
 .../samples/await-catch/output.json           |   6 +-
 .../samples/await-then-catch/output.json      |  10 +-
 .../samples/binding-shorthand/output.json     |  14 +-
 .../parser-legacy/samples/binding/output.json |  14 +-
 .../samples/comment-with-ignores/output.json  |   2 +-
 .../parser-legacy/samples/comment/output.json |   2 +-
 .../samples/component-dynamic/output.json     |   2 +-
 .../convert-entities-in-element/output.json   |   2 +-
 .../samples/convert-entities/output.json      |   2 +-
 .../parser-legacy/samples/css/output.json     |   2 +-
 .../dynamic-element-string/output.json        |  14 +-
 .../dynamic-element-variable/output.json      |  14 +-
 .../samples/dynamic-import/output.json        |   2 +-
 .../each-block-destructured/output.json       |   2 +-
 .../samples/each-block-else/output.json       |   6 +-
 .../samples/each-block-indexed/output.json    |   6 +-
 .../samples/each-block-keyed/output.json      |   6 +-
 .../samples/each-block/output.json            |   6 +-
 .../output.json                               |  26 ++-
 .../element-with-attribute/output.json        |  26 ++-
 .../samples/element-with-mustache/output.json |   2 +-
 .../samples/element-with-text/output.json     |   2 +-
 .../samples/elements/output.json              |  14 +-
 .../samples/event-handler/output.json         |  14 +-
 .../samples/generic-snippets/output.json      |  30 ++-
 .../samples/if-block-else/output.json         |   2 +-
 .../samples/if-block-elseif/output.json       |   2 +-
 .../samples/if-block/output.json              |   2 +-
 .../samples/implicitly-closed-li/output.json  |   2 +-
 .../samples/javascript-comments/output.json   |  14 +-
 .../samples/loose-invalid-block/output.json   |  30 ++-
 .../loose-invalid-expression/output.json      | 106 ++++++++-
 .../samples/loose-unclosed-block/output.json  |   6 +-
 .../loose-unclosed-open-tag/output.json       |  62 +++++-
 .../samples/loose-unclosed-tag/output.json    |  26 ++-
 .../parser-legacy/samples/nbsp/output.json    |   2 +-
 .../no-error-if-before-closing/output.json    |  10 +-
 .../samples/raw-mustaches/output.json         |   2 +-
 .../parser-legacy/samples/refs/output.json    |  14 +-
 .../output.json                               |   2 +-
 .../samples/script-comment-only/output.json   |   2 +-
 .../output.json                               |   2 +-
 .../parser-legacy/samples/script/output.json  |   2 +-
 .../samples/self-closing-element/output.json  |   2 +-
 .../samples/self-reference/output.json        |  14 +-
 .../samples/slotted-element/output.json       |  14 +-
 .../space-between-mustaches/output.json       |   2 +-
 .../parser-legacy/samples/spread/output.json  |   2 +-
 .../samples/style-inside-head/output.json     |   2 +-
 .../samples/textarea-children/output.json     |   2 +-
 .../samples/textarea-end-tag/output.json      |   2 +-
 .../transition-intro-no-params/output.json    |  14 +-
 .../samples/transition-intro/output.json      |  14 +-
 .../samples/unusual-identifier/output.json    |   6 +-
 .../whitespace-after-script-tag/output.json   |   2 +-
 .../whitespace-after-style-tag/output.json    |   2 +-
 .../whitespace-leading-trailing/output.json   |   2 +-
 .../samples/whitespace-normal/output.json     |   2 +-
 packages/svelte/tests/parser-legacy/test.ts   |   2 +-
 .../samples/attachments/output.json           |  14 +-
 .../output.json                               |  26 ++-
 .../samples/comment-before-script/output.json |  14 +-
 .../samples/css-nth-syntax/output.json        |  14 +-
 .../samples/css-pseudo-classes/output.json    |   2 +-
 .../output.json                               |   2 +-
 .../each-block-object-pattern/output.json     |  38 +++-
 .../samples/generic-snippets/output.json      |  42 +++-
 .../samples/if-block-else/output.json         |  26 ++-
 .../samples/if-block-elseif/output.json       |  26 ++-
 .../samples/if-block/output.json              |   2 +-
 .../samples/loose-invalid-block/output.json   |  30 ++-
 .../loose-invalid-expression/output.json      | 178 ++++++++++++++-
 .../loose-unclosed-open-tag/output.json       | 146 ++++++++++++-
 .../samples/loose-unclosed-tag/output.json    | 206 +++++++++++++++++-
 .../samples/loose-valid-each-as/output.json   |  26 ++-
 .../parser-modern/samples/options/output.json |  74 ++++++-
 .../semicolon-inside-quotes/output.json       |  14 +-
 .../samples/snippets/output.json              |  40 +++-
 .../samples/template-shadowroot/output.json   |  98 ++++++++-
 .../typescript-in-event-handler/output.json   |  38 +++-
 packages/svelte/tests/parser-modern/test.ts   |  16 +-
 packages/svelte/types/index.d.ts              |  27 ++-
 135 files changed, 2298 insertions(+), 352 deletions(-)
 create mode 100644 .changeset/gentle-views-matter.md

diff --git a/.changeset/gentle-views-matter.md b/.changeset/gentle-views-matter.md
new file mode 100644
index 0000000000..2b0b361317
--- /dev/null
+++ b/.changeset/gentle-views-matter.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: preserve node locations for better sourcemaps
diff --git a/packages/svelte/src/compiler/phases/1-parse/index.js b/packages/svelte/src/compiler/phases/1-parse/index.js
index 8f7ef76be5..7017d013da 100644
--- a/packages/svelte/src/compiler/phases/1-parse/index.js
+++ b/packages/svelte/src/compiler/phases/1-parse/index.js
@@ -1,4 +1,6 @@
 /** @import { AST } from '#compiler' */
+/** @import { Location } from 'locate-character' */
+/** @import * as ESTree from 'estree' */
 // @ts-expect-error acorn type definitions are borked in the release we use
 import { isIdentifierStart, isIdentifierChar } from 'acorn';
 import fragment from './state/fragment.js';
@@ -218,31 +220,45 @@ export class Parser {
 		return result;
 	}
 
-	/** @param {any} allow_reserved */
-	read_identifier(allow_reserved = false) {
+	/**
+	 * @returns {ESTree.Identifier & { start: number, end: number, loc: { start: Location, end: Location } }}
+	 */
+	read_identifier() {
 		const start = this.index;
+		let end = start;
+		let name = '';
 
-		let i = this.index;
+		const code = /** @type {number} */ (this.template.codePointAt(this.index));
 
-		const code = /** @type {number} */ (this.template.codePointAt(i));
-		if (!isIdentifierStart(code, true)) return null;
+		if (isIdentifierStart(code, true)) {
+			let i = this.index;
+			end += code <= 0xffff ? 1 : 2;
 
-		i += code <= 0xffff ? 1 : 2;
+			while (end < this.template.length) {
+				const code = /** @type {number} */ (this.template.codePointAt(end));
 
-		while (i < this.template.length) {
-			const code = /** @type {number} */ (this.template.codePointAt(i));
-
-			if (!isIdentifierChar(code, true)) break;
-			i += code <= 0xffff ? 1 : 2;
-		}
+				if (!isIdentifierChar(code, true)) break;
+				end += code <= 0xffff ? 1 : 2;
+			}
 
-		const identifier = this.template.slice(this.index, (this.index = i));
+			name = this.template.slice(start, end);
+			this.index = end;
 
-		if (!allow_reserved && is_reserved(identifier)) {
-			e.unexpected_reserved_word(start, identifier);
+			if (is_reserved(name)) {
+				e.unexpected_reserved_word(start, name);
+			}
 		}
 
-		return identifier;
+		return {
+			type: 'Identifier',
+			name,
+			start,
+			end,
+			loc: {
+				start: state.locator(start),
+				end: state.locator(end)
+			}
+		};
 	}
 
 	/** @param {RegExp} pattern */
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/context.js b/packages/svelte/src/compiler/phases/1-parse/read/context.js
index 282288e2a2..f90d59fa0b 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/context.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/context.js
@@ -1,11 +1,9 @@
-/** @import { Location } from 'locate-character' */
 /** @import { Pattern } from 'estree' */
 /** @import { Parser } from '../index.js' */
 import { match_bracket } from '../utils/bracket.js';
 import { parse_expression_at } from '../acorn.js';
 import { regex_not_newline_characters } from '../../patterns.js';
 import * as e from '../../../errors.js';
-import { locator } from '../../../state.js';
 
 /**
  * @param {Parser} parser
@@ -15,20 +13,13 @@ export default function read_pattern(parser) {
 	const start = parser.index;
 	let i = parser.index;
 
-	const name = parser.read_identifier();
+	const id = parser.read_identifier();
 
-	if (name !== null) {
+	if (id.name !== '') {
 		const annotation = read_type_annotation(parser);
 
 		return {
-			type: 'Identifier',
-			name,
-			start,
-			loc: {
-				start: /** @type {Location} */ (locator(start)),
-				end: /** @type {Location} */ (locator(parser.index))
-			},
-			end: parser.index,
+			...id,
 			typeAnnotation: annotation
 		};
 	}
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 bd1bd33c41..d9fe33bbac 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/element.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/element.js
@@ -1,4 +1,5 @@
-/** @import { Expression } from 'estree' */
+/** @import { Expression, Identifier, SourceLocation } from 'estree' */
+/** @import { Location } from 'locate-character' */
 /** @import { AST } from '#compiler' */
 /** @import { Parser } from '../index.js' */
 import { is_void } from '../../../../utils.js';
@@ -13,6 +14,8 @@ import { create_attribute, ExpressionMetadata, is_element_node } from '../../nod
 import { get_attribute_expression, is_expression_attribute } from '../../../utils/ast.js';
 import { closing_tag_omitted } from '../../../../html-tree-validation.js';
 import { list } from '../../../utils/string.js';
+import { locator } from '../../../state.js';
+import * as b from '#compiler/builders';
 
 const regex_invalid_unquoted_attribute_value = /^(\/>|[\s"'=<>`])/;
 const regex_closing_textarea_tag = /^<\/textarea(\s[^>]*)?>/i;
@@ -67,10 +70,9 @@ export default function element(parser) {
 		return;
 	}
 
-	const is_closing_tag = parser.eat('/');
-	const name = parser.read_until(regex_whitespace_or_slash_or_closing_tag);
+	if (parser.eat('/')) {
+		const name = parser.read_until(regex_whitespace_or_slash_or_closing_tag);
 
-	if (is_closing_tag) {
 		parser.allow_whitespace();
 		parser.eat('>', true);
 
@@ -125,39 +127,41 @@ export default function element(parser) {
 		return;
 	}
 
-	if (name.startsWith('svelte:') && !meta_tags.has(name)) {
-		const bounds = { start: start + 1, end: start + 1 + name.length };
+	const tag = read_tag(parser, regex_whitespace_or_slash_or_closing_tag);
+
+	if (tag.name.startsWith('svelte:') && !meta_tags.has(tag.name)) {
+		const bounds = { start: start + 1, end: start + 1 + tag.name.length };
 		e.svelte_meta_invalid_tag(bounds, list(Array.from(meta_tags.keys())));
 	}
 
-	if (!regex_valid_element_name.test(name) && !regex_valid_component_name.test(name)) {
+	if (!regex_valid_element_name.test(tag.name) && !regex_valid_component_name.test(tag.name)) {
 		// <div. -> in the middle of typing -> allow in loose mode
-		if (!parser.loose || !name.endsWith('.')) {
-			const bounds = { start: start + 1, end: start + 1 + name.length };
+		if (!parser.loose || !tag.name.endsWith('.')) {
+			const bounds = { start: start + 1, end: start + 1 + tag.name.length };
 			e.tag_invalid_name(bounds);
 		}
 	}
 
-	if (root_only_meta_tags.has(name)) {
-		if (name in parser.meta_tags) {
-			e.svelte_meta_duplicate(start, name);
+	if (root_only_meta_tags.has(tag.name)) {
+		if (tag.name in parser.meta_tags) {
+			e.svelte_meta_duplicate(start, tag.name);
 		}
 
 		if (parent.type !== 'Root') {
-			e.svelte_meta_invalid_placement(start, name);
+			e.svelte_meta_invalid_placement(start, tag.name);
 		}
 
-		parser.meta_tags[name] = true;
+		parser.meta_tags[tag.name] = true;
 	}
 
-	const type = meta_tags.has(name)
-		? meta_tags.get(name)
-		: regex_valid_component_name.test(name) || (parser.loose && name.endsWith('.'))
+	const type = meta_tags.has(tag.name)
+		? meta_tags.get(tag.name)
+		: regex_valid_component_name.test(tag.name) || (parser.loose && tag.name.endsWith('.'))
 			? 'Component'
-			: name === 'title' && parent_is_head(parser.stack)
+			: tag.name === 'title' && parent_is_head(parser.stack)
 				? 'TitleElement'
 				: // TODO Svelte 6/7: once slots are removed in favor of snippets, always keep slot as a regular element
-					name === 'slot' && !parent_is_shadowroot_template(parser.stack)
+					tag.name === 'slot' && !parent_is_shadowroot_template(parser.stack)
 					? 'SlotElement'
 					: 'RegularElement';
 
@@ -168,7 +172,8 @@ export default function element(parser) {
 					type,
 					start,
 					end: -1,
-					name,
+					name: tag.name,
+					name_loc: tag.loc,
 					attributes: [],
 					fragment: create_fragment(true),
 					metadata: {
@@ -184,7 +189,8 @@ export default function element(parser) {
 					type,
 					start,
 					end: -1,
-					name,
+					name: tag.name,
+					name_loc: tag.loc,
 					attributes: [],
 					fragment: create_fragment(true),
 					metadata: {
@@ -194,14 +200,14 @@ export default function element(parser) {
 
 	parser.allow_whitespace();
 
-	if (parent.type === 'RegularElement' && closing_tag_omitted(parent.name, name)) {
+	if (parent.type === 'RegularElement' && closing_tag_omitted(parent.name, tag.name)) {
 		const end = parent.fragment.nodes[0]?.start ?? start;
-		w.element_implicitly_closed({ start: parent.start, end }, `<${name}>`, `</${parent.name}>`);
+		w.element_implicitly_closed({ start: parent.start, end }, `<${tag.name}>`, `</${parent.name}>`);
 		parent.end = start;
 		parser.pop();
 		parser.last_auto_closed_tag = {
 			tag: parent.name,
-			reason: name,
+			reason: tag.name,
 			depth: parser.stack.length
 		};
 	}
@@ -211,7 +217,7 @@ export default function element(parser) {
 
 	const current = parser.current();
 	const is_top_level_script_or_style =
-		(name === 'script' || name === 'style') && current.type === 'Root';
+		(tag.name === 'script' || tag.name === 'style') && current.type === 'Root';
 
 	const read = is_top_level_script_or_style ? read_static_attribute : read_attribute;
 
@@ -324,7 +330,7 @@ export default function element(parser) {
 			}
 		}
 
-		if (name === 'script') {
+		if (tag.name === 'script') {
 			const content = read_script(parser, start, element.attributes);
 			if (prev_comment) {
 				// We take advantage of the fact that the root will never have leadingComments set,
@@ -352,7 +358,7 @@ export default function element(parser) {
 
 	parser.append(element);
 
-	const self_closing = parser.eat('/') || is_void(name);
+	const self_closing = parser.eat('/') || is_void(tag.name);
 	const closed = parser.eat('>', true, false);
 
 	// Loose parsing mode
@@ -382,7 +388,7 @@ export default function element(parser) {
 	if (self_closing || !closed) {
 		// don't push self-closing elements onto the stack
 		element.end = parser.index;
-	} else if (name === 'textarea') {
+	} else if (tag.name === 'textarea') {
 		// special case
 		element.fragment.nodes = read_sequence(
 			parser,
@@ -391,10 +397,10 @@ export default function element(parser) {
 		);
 		parser.read(regex_closing_textarea_tag);
 		element.end = parser.index;
-	} else if (name === 'script' || name === 'style') {
+	} else if (tag.name === 'script' || tag.name === 'style') {
 		// special case
 		const start = parser.index;
-		const data = parser.read_until(new RegExp(`</${name}>`));
+		const data = parser.read_until(new RegExp(`</${tag.name}>`));
 		const end = parser.index;
 
 		/** @type {AST.Text} */
@@ -407,7 +413,7 @@ export default function element(parser) {
 		};
 
 		element.fragment.nodes.push(node);
-		parser.eat(`</${name}>`, true);
+		parser.eat(`</${tag.name}>`, true);
 		element.end = parser.index;
 	} else {
 		parser.stack.push(element);
@@ -450,8 +456,8 @@ function parent_is_shadowroot_template(stack) {
 function read_static_attribute(parser) {
 	const start = parser.index;
 
-	const name = parser.read_until(regex_token_ending_character);
-	if (!name) return null;
+	const tag = read_tag(parser, regex_token_ending_character);
+	if (!tag.name) return null;
 
 	/** @type {true | Array<AST.Text | AST.ExpressionTag>} */
 	let value = true;
@@ -485,7 +491,7 @@ function read_static_attribute(parser) {
 		e.expected_token(parser.index, '=');
 	}
 
-	return create_attribute(name, start, parser.index, value);
+	return create_attribute(tag.name, tag.loc, start, parser.index, value);
 }
 
 /**
@@ -538,10 +544,9 @@ function read_attribute(parser) {
 
 			return spread;
 		} else {
-			const value_start = parser.index;
-			let name = parser.read_identifier();
+			const id = parser.read_identifier();
 
-			if (name === null) {
+			if (id.name === '') {
 				if (
 					parser.loose &&
 					(parser.match('#') || parser.match('/') || parser.match('@') || parser.match(':'))
@@ -551,7 +556,6 @@ function read_attribute(parser) {
 					return null;
 				} else if (parser.loose && parser.match('}')) {
 					// Likely in the middle of typing, just created the shorthand
-					name = '';
 				} else {
 					e.attribute_empty_shorthand(start);
 				}
@@ -563,32 +567,28 @@ function read_attribute(parser) {
 			/** @type {AST.ExpressionTag} */
 			const expression = {
 				type: 'ExpressionTag',
-				start: value_start,
-				end: value_start + name.length,
-				expression: {
-					start: value_start,
-					end: value_start + name.length,
-					type: 'Identifier',
-					name
-				},
+				start: id.start,
+				end: id.end,
+				expression: id,
 				metadata: {
 					expression: new ExpressionMetadata()
 				}
 			};
 
-			return create_attribute(name, start, parser.index, expression);
+			return create_attribute(id.name, id.loc, start, parser.index, expression);
 		}
 	}
 
-	const name = parser.read_until(regex_token_ending_character);
-	if (!name) return null;
+	const tag = read_tag(parser, regex_token_ending_character);
+
+	if (!tag.name) return null;
 
 	let end = parser.index;
 
 	parser.allow_whitespace();
 
-	const colon_index = name.indexOf(':');
-	const type = colon_index !== -1 && get_directive_type(name.slice(0, colon_index));
+	const colon_index = tag.name.indexOf(':');
+	const type = colon_index !== -1 && get_directive_type(tag.name.slice(0, colon_index));
 
 	/** @type {true | AST.ExpressionTag | Array<AST.Text | AST.ExpressionTag>} */
 	let value = true;
@@ -617,10 +617,10 @@ function read_attribute(parser) {
 	}
 
 	if (type) {
-		const [directive_name, ...modifiers] = name.slice(colon_index + 1).split('|');
+		const [directive_name, ...modifiers] = tag.name.slice(colon_index + 1).split('|');
 
 		if (directive_name === '') {
-			e.directive_missing_name({ start, end: start + colon_index + 1 }, name);
+			e.directive_missing_name({ start, end: start + colon_index + 1 }, tag.name);
 		}
 
 		if (type === 'StyleDirective') {
@@ -629,6 +629,7 @@ function read_attribute(parser) {
 				end,
 				type,
 				name: directive_name,
+				name_loc: tag.loc,
 				modifiers: /** @type {Array<'important'>} */ (modifiers),
 				value,
 				metadata: {
@@ -659,6 +660,7 @@ function read_attribute(parser) {
 			end,
 			type,
 			name: directive_name,
+			name_loc: tag.loc,
 			expression,
 			metadata: {
 				expression: new ExpressionMetadata()
@@ -669,7 +671,7 @@ function read_attribute(parser) {
 		directive.modifiers = modifiers;
 
 		if (directive.type === 'TransitionDirective') {
-			const direction = name.slice(0, colon_index);
+			const direction = tag.name.slice(0, colon_index);
 			directive.intro = direction === 'in' || direction === 'transition';
 			directive.outro = direction === 'out' || direction === 'transition';
 		}
@@ -690,7 +692,7 @@ function read_attribute(parser) {
 		return directive;
 	}
 
-	return create_attribute(name, start, end, value);
+	return create_attribute(tag.name, tag.loc, start, end, value);
 }
 
 /**
@@ -851,3 +853,25 @@ function read_sequence(parser, done, location) {
 		e.unexpected_eof(parser.template.length);
 	}
 }
+
+/**
+ * @param {Parser} parser
+ * @param {RegExp} regex
+ * @returns {Identifier & { start: number, end: number, loc: SourceLocation }}
+ */
+function read_tag(parser, regex) {
+	const start = parser.index;
+	const name = parser.read_until(regex);
+	const end = parser.index;
+
+	return {
+		type: 'Identifier',
+		name,
+		start,
+		end,
+		loc: {
+			start: locator(start),
+			end: locator(end)
+		}
+	};
+}
diff --git a/packages/svelte/src/compiler/phases/1-parse/state/tag.js b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
index e6e083c09d..138eda8033 100644
--- a/packages/svelte/src/compiler/phases/1-parse/state/tag.js
+++ b/packages/svelte/src/compiler/phases/1-parse/state/tag.js
@@ -177,7 +177,7 @@ function open(parser) {
 
 		if (parser.eat(',')) {
 			parser.allow_whitespace();
-			index = parser.read_identifier();
+			index = parser.read_identifier().name;
 			if (!index) {
 				e.expected_identifier(parser.index);
 			}
@@ -347,16 +347,10 @@ function open(parser) {
 	if (parser.eat('snippet')) {
 		parser.require_whitespace();
 
-		const name_start = parser.index;
-		let name = parser.read_identifier();
-		const name_end = parser.index;
+		const id = parser.read_identifier();
 
-		if (name === null) {
-			if (parser.loose) {
-				name = '';
-			} else {
-				e.expected_identifier(parser.index);
-			}
+		if (id.name === '' && !parser.loose) {
+			e.expected_identifier(parser.index);
 		}
 
 		parser.allow_whitespace();
@@ -415,12 +409,7 @@ function open(parser) {
 			type: 'SnippetBlock',
 			start,
 			end: -1,
-			expression: {
-				type: 'Identifier',
-				start: name_start,
-				end: name_end,
-				name
-			},
+			expression: id,
 			typeParams: type_params,
 			parameters: function_expression.params,
 			body: create_fragment(),
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index fb026fa78f..e44cf23ff5 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -900,7 +900,7 @@ export function analyze_component(root, source, options) {
 		// We need an empty class to generate the set_class() or class="" correctly
 		if (!has_spread && !has_class && (node.metadata.scoped || has_class_directive)) {
 			node.attributes.push(
-				create_attribute('class', -1, -1, [
+				create_attribute('class', null, -1, -1, [
 					{
 						type: 'Text',
 						data: '',
@@ -915,7 +915,7 @@ export function analyze_component(root, source, options) {
 		// We need an empty style to generate the set_style() correctly
 		if (!has_spread && !has_style && has_style_directive) {
 			node.attributes.push(
-				create_attribute('style', -1, -1, [
+				create_attribute('style', null, -1, -1, [
 					{
 						type: 'Text',
 						data: '',
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 4f41621db3..5fce138089 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
@@ -48,8 +48,9 @@ export function RegularElement(node, context) {
 			node.attributes.push(
 				create_attribute(
 					'value',
-					/** @type {AST.Text} */ (node.fragment.nodes.at(0)).start,
-					/** @type {AST.Text} */ (node.fragment.nodes.at(-1)).end,
+					null,
+					-1,
+					-1,
 					// @ts-ignore
 					node.fragment.nodes
 				)
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/index.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/index.js
index d0327e702a..40c0907e38 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/transform-template/index.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-template/index.js
@@ -1,4 +1,3 @@
-/** @import { Location } from 'locate-character' */
 /** @import { Namespace } from '#compiler' */
 /** @import { ComponentClientTransformState } from '../types.js' */
 /** @import { Node } from './types.js' */
@@ -15,7 +14,7 @@ function build_locations(nodes) {
 	for (const node of nodes) {
 		if (node.type !== 'element') continue;
 
-		const { line, column } = /** @type {Location} */ (locator(node.start));
+		const { line, column } = locator(node.start);
 
 		const expression = b.array([b.literal(line), b.literal(column)]);
 		const children = build_locations(node.children);
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js
index 12118d9f69..6838e5006d 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/BindDirective.js
@@ -40,22 +40,38 @@ export function BindDirective(node, context) {
 			validate_binding(context.state, node, expression);
 		}
 
-		get = b.thunk(expression);
+		const assignment = /** @type {Expression} */ (
+			context.visit(b.assignment('=', /** @type {Pattern} */ (node.expression), b.id('$$value')))
+		);
 
-		/** @type {Expression | undefined} */
-		set = b.unthunk(
-			b.arrow(
+		if (dev) {
+			// in dev, create named functions, so that `$inspect(...)` delivers
+			// useful stack traces
+			get = b.function(b.id('get', node.name_loc), [], b.block([b.return(expression)]));
+			set = b.function(
+				b.id('set', node.name_loc),
 				[b.id('$$value')],
-				/** @type {Expression} */ (
-					context.visit(
-						b.assignment('=', /** @type {Pattern} */ (node.expression), b.id('$$value'))
+				b.block([b.stmt(assignment)])
+			);
+		} else {
+			// in prod, optimise for brevity
+			get = b.thunk(expression);
+
+			/** @type {Expression | undefined} */
+			set = b.unthunk(
+				b.arrow(
+					[b.id('$$value')],
+					/** @type {Expression} */ (
+						context.visit(
+							b.assignment('=', /** @type {Pattern} */ (node.expression), b.id('$$value'))
+						)
 					)
 				)
-			)
-		);
+			);
 
-		if (get === set) {
-			set = undefined;
+			if (get === set) {
+				set = undefined;
+			}
 		}
 	}
 
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 e7468291a0..f69bc5fe6e 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
@@ -39,7 +39,8 @@ export function CallExpression(node, context) {
 				}
 			}
 
-			return b.call('$.state', value);
+			const callee = b.id('$.state', node.callee.loc);
+			return b.call(callee, value);
 		}
 
 		case '$derived':
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Component.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Component.js
index 9b86557536..12c7b2142b 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Component.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Component.js
@@ -1,6 +1,5 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
-import { regex_is_valid_identifier } from '../../../patterns.js';
 import { build_component } from './shared/component.js';
 
 /**
@@ -8,6 +7,6 @@ import { build_component } from './shared/component.js';
  * @param {ComponentContext} context
  */
 export function Component(node, context) {
-	const component = build_component(node, node.name, context);
+	const component = build_component(node, node.name, node.name_loc, context);
 	context.state.init.push(component);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
index ff2436779b..18017ea557 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
@@ -81,7 +81,7 @@ export function Fragment(node, context) {
 	if (is_single_element) {
 		const element = /** @type {AST.RegularElement} */ (trimmed[0]);
 
-		const id = b.id(context.state.scope.generate(element.name));
+		const id = b.id(context.state.scope.generate(element.name), element.name_loc);
 
 		context.visit(element, {
 			...state,
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 971f93e1d8..50cef67171 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
@@ -407,6 +407,7 @@ export function RegularElement(node, context) {
 			const synthetic_node = node.metadata.synthetic_value_node;
 			const synthetic_attribute = create_attribute(
 				'value',
+				null,
 				synthetic_node.start,
 				synthetic_node.end,
 				[synthetic_node]
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteComponent.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteComponent.js
index 85a4b611c0..d6a0418dd0 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteComponent.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteComponent.js
@@ -1,12 +1,13 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
 import { build_component } from './shared/component.js';
+import * as b from '#compiler/builders';
 
 /**
  * @param {AST.SvelteComponent} node
  * @param {ComponentContext} context
  */
 export function SvelteComponent(node, context) {
-	const component = build_component(node, '$$component', context);
+	const component = build_component(node, '$$component', null, context);
 	context.state.init.push(component);
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteHead.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteHead.js
index 3a45389dd7..f57e333a35 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteHead.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteHead.js
@@ -14,7 +14,7 @@ export function SvelteHead(node, context) {
 	context.state.init.push(
 		b.stmt(
 			b.call(
-				'$.head',
+				b.id('$.head', node.name_loc),
 				b.literal(hash(filename)),
 				b.arrow([b.id('$$anchor')], /** @type {BlockStatement} */ (context.visit(node.fragment)))
 			)
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteSelf.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteSelf.js
index 285951499c..3d076177ac 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteSelf.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteSelf.js
@@ -1,5 +1,6 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
+import { component_name } from '../../../../state.js';
 import { build_component } from './shared/component.js';
 
 /**
@@ -7,6 +8,6 @@ import { build_component } from './shared/component.js';
  * @param {ComponentContext} context
  */
 export function SvelteSelf(node, context) {
-	const component = build_component(node, context.state.analysis.name, context);
+	const component = build_component(node, component_name, node.name_loc, context);
 	context.state.init.push(component);
 }
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 f815f3ae05..d91c387496 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
@@ -20,7 +20,7 @@ export function TitleElement(node, context) {
 	const statement = b.stmt(
 		b.assignment(
 			'=',
-			b.id('$.document.title'),
+			b.member(b.id('$.document'), b.id('title', node.name_loc)),
 			evaluated.is_known
 				? b.literal(evaluated.value)
 				: evaluated.is_defined
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 f830e8c57d..57dba202ba 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
@@ -136,7 +136,8 @@ export function VariableDeclaration(node, context) {
 					}
 
 					if (is_state) {
-						value = b.call('$.state', value);
+						const callee = b.id('$.state', /** @type {CallExpression} */ (init).callee.loc);
+						value = b.call(callee, value);
 
 						if (dev) {
 							value = b.call('$.tag', value, b.literal(id.name));
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 d70048ad7e..4651f6f733 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
@@ -1,4 +1,4 @@
-/** @import { BlockStatement, Expression, ExpressionStatement, Identifier, MemberExpression, Pattern, Property, SequenceExpression, Statement } from 'estree' */
+/** @import { BlockStatement, Expression, ExpressionStatement, Identifier, MemberExpression, Pattern, Property, SequenceExpression, SourceLocation, Statement } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../../types.js' */
 import { dev, is_ignored } from '../../../../../state.js';
@@ -12,10 +12,11 @@ import { determine_slot } from '../../../../../utils/slot.js';
 /**
  * @param {AST.Component | AST.SvelteComponent | AST.SvelteSelf} node
  * @param {string} component_name
+ * @param {SourceLocation | null} loc
  * @param {ComponentContext} context
  * @returns {Statement}
  */
-export function build_component(node, component_name, context) {
+export function build_component(node, component_name, loc, context) {
 	/** @type {Expression} */
 	const anchor = context.state.node;
 
@@ -259,15 +260,9 @@ export function build_component(node, component_name, context) {
 						attribute.expression.type === 'Identifier' &&
 						context.state.scope.get(attribute.expression.name)?.kind === 'store_sub';
 
-					// Delay prop pushes so bindings come at the end, to avoid spreads overwriting them
-					if (is_store_sub) {
-						push_prop(
-							b.get(attribute.name, [b.stmt(b.call('$.mark_store_binding')), b.return(expression)]),
-							true
-						);
-					} else {
-						push_prop(b.get(attribute.name, [b.return(expression)]), true);
-					}
+					const get = is_store_sub
+						? b.get(attribute.name, [b.stmt(b.call('$.mark_store_binding')), b.return(expression)])
+						: b.get(attribute.name, [b.return(expression)]);
 
 					const assignment = b.assignment(
 						'=',
@@ -275,10 +270,16 @@ export function build_component(node, component_name, context) {
 						b.id('$$value')
 					);
 
-					push_prop(
-						b.set(attribute.name, [b.stmt(/** @type {Expression} */ (context.visit(assignment)))]),
-						true
-					);
+					const set = b.set(attribute.name, [
+						b.stmt(/** @type {Expression} */ (context.visit(assignment)))
+					]);
+
+					get.key.loc = attribute.name_loc;
+					set.key.loc = attribute.name_loc;
+
+					// Delay prop pushes so bindings come at the end, to avoid spreads overwriting them
+					push_prop(get, true);
+					push_prop(set, true);
 				}
 			}
 		} else if (attribute.type === 'AttachTag') {
@@ -434,16 +435,17 @@ export function build_component(node, component_name, context) {
 
 	/** @param {Expression} node_id */
 	let fn = (node_id) => {
-		return b.call(
-			// TODO We can remove this ternary once we remove legacy mode, since in runes mode dynamic components
-			// will be handled separately through the `$.component` function, and then the component name will
-			// always be referenced through just the identifier here.
-			is_component_dynamic
-				? intermediate_name
-				: /** @type {Expression} */ (context.visit(b.member_id(component_name))),
-			node_id,
-			props_expression
-		);
+		// TODO We can remove this ternary once we remove legacy mode, since in runes mode dynamic components
+		// will be handled separately through the `$.component` function, and then the component name will
+		// always be referenced through just the identifier here.
+		const callee = is_component_dynamic
+			? b.id(intermediate_name)
+			: /** @type {Expression} */ (context.visit(b.member_id(component_name)));
+
+		// line up the `Foo` in `Foo(...)` and `<Foo>` for usable stack traces
+		callee.loc = loc;
+
+		return b.call(callee, node_id, props_expression);
 	};
 
 	if (bind_this !== null) {
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js
index 3ab1506eb3..29edc316ca 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/events.js
@@ -32,7 +32,13 @@ export function visit_event_attribute(node, context) {
 		}
 
 		context.state.init.push(
-			b.stmt(b.assignment('=', b.member(context.state.node, '__' + event_name), handler))
+			b.stmt(
+				b.assignment(
+					'=',
+					b.member(context.state.node, b.id('__' + event_name, node.name_loc)),
+					handler
+				)
+			)
 		);
 	} else {
 		const statement = b.stmt(
@@ -140,7 +146,7 @@ export function build_event_handler(node, metadata, context) {
 			b.this,
 			b.id('$$args'),
 			b.id(context.state.analysis.name),
-			loc && b.array([b.literal(loc.line), b.literal(loc.column)]),
+			b.array([b.literal(loc.line), b.literal(loc.column)]),
 			has_side_effects(node) && b.true,
 			remove_parens && b.true
 		);
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
index 67982b6150..ff931842d8 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
@@ -1,4 +1,4 @@
-/** @import { Expression } from 'estree' */
+/** @import { Expression, Identifier, SourceLocation } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../../types' */
 import { cannot_be_set_statically } from '../../../../../../utils.js';
@@ -42,13 +42,14 @@ export function process_children(nodes, initial, is_element, context) {
 	/**
 	 * @param {boolean} is_text
 	 * @param {string} name
+	 * @param {SourceLocation | null} [loc]
 	 */
-	function flush_node(is_text, name) {
+	function flush_node(is_text, name, loc) {
 		const expression = get_node(is_text);
 		let id = expression;
 
 		if (id.type !== 'Identifier') {
-			id = b.id(context.state.scope.generate(name));
+			id = b.id(context.state.scope.generate(name), loc);
 			context.state.init.push(b.var(id, expression));
 		}
 
@@ -109,7 +110,12 @@ export function process_children(nodes, initial, is_element, context) {
 			) {
 				node.metadata.is_controlled = true;
 			} else {
-				const id = flush_node(false, node.type === 'RegularElement' ? node.name : 'node');
+				const id = flush_node(
+					false,
+					node.type === 'RegularElement' ? node.name : 'node',
+					node.type === 'RegularElement' ? node.name_loc : null
+				);
+
 				child_state = { ...context.state, node: id };
 			}
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
index e7a4f6059b..6145f66d87 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
@@ -366,8 +366,8 @@ export function validate_binding(state, binding, expression) {
 							: b.literal(/** @type {Identifier} */ (expression.property).name)
 					)
 				),
-				loc && b.literal(loc.line),
-				loc && b.literal(loc.column)
+				b.literal(loc.line),
+				b.literal(loc.column)
 			)
 		)
 	);
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 2ca16c4a24..f74b1185a0 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
@@ -99,7 +99,7 @@ export function RegularElement(node, context) {
 	}
 
 	if (dev) {
-		const location = /** @type {Location} */ (locator(node.start));
+		const location = locator(node.start);
 		state.template.push(
 			b.stmt(
 				b.call(
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 145167a690..6fc1ca5dfc 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
@@ -50,7 +50,7 @@ export function SvelteElement(node, context) {
 	build_element_attributes(node, { ...context, state }, optimiser.transform);
 
 	if (dev) {
-		const location = /** @type {Location} */ (locator(node.start));
+		const location = locator(node.start);
 		statements.push(
 			b.stmt(
 				b.call(
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 31ffe19139..979efef6b9 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
@@ -142,7 +142,7 @@ export function build_element_attributes(node, context, transform) {
 				);
 
 				attributes.push(
-					create_attribute('checked', -1, -1, [
+					create_attribute('checked', null, -1, -1, [
 						{
 							type: 'ExpressionTag',
 							start: -1,
@@ -165,7 +165,7 @@ export function build_element_attributes(node, context, transform) {
 				);
 			} else {
 				attributes.push(
-					create_attribute(attribute.name, -1, -1, [
+					create_attribute(attribute.name, null, -1, -1, [
 						{
 							type: 'ExpressionTag',
 							start: -1,
diff --git a/packages/svelte/src/compiler/phases/nodes.js b/packages/svelte/src/compiler/phases/nodes.js
index e9717eb404..313880cf5b 100644
--- a/packages/svelte/src/compiler/phases/nodes.js
+++ b/packages/svelte/src/compiler/phases/nodes.js
@@ -1,4 +1,4 @@
-/** @import { Expression, PrivateIdentifier } from 'estree' */
+/** @import { Expression, PrivateIdentifier, SourceLocation } from 'estree' */
 /** @import { AST, Binding } from '#compiler' */
 import * as b from '#compiler/builders';
 
@@ -47,17 +47,19 @@ export function is_custom_element_node(node) {
 
 /**
  * @param {string} name
+ * @param {SourceLocation | null} name_loc
  * @param {number} start
  * @param {number} end
  * @param {AST.Attribute['value']} value
  * @returns {AST.Attribute}
  */
-export function create_attribute(name, start, end, value) {
+export function create_attribute(name, name_loc, start, end, value) {
 	return {
 		type: 'Attribute',
 		start,
 		end,
 		name,
+		name_loc,
 		value,
 		metadata: {
 			delegated: false,
diff --git a/packages/svelte/src/compiler/state.js b/packages/svelte/src/compiler/state.js
index 6d9873eb30..37aeafe595 100644
--- a/packages/svelte/src/compiler/state.js
+++ b/packages/svelte/src/compiler/state.js
@@ -40,19 +40,28 @@ export let dev;
 
 export let runes = false;
 
-export let locator = getLocator('', { offsetLine: 1 });
+/** @type {(index: number) => Location} */
+export let locator;
 
 /** @param {string} value */
 export function set_source(value) {
 	source = value;
-	locator = getLocator(source, { offsetLine: 1 });
+
+	const l = getLocator(source, { offsetLine: 1 });
+
+	locator = (i) => {
+		const loc = l(i);
+		if (!loc) throw new Error('An impossible situation occurred');
+
+		return loc;
+	};
 }
 
 /**
  * @param {AST.SvelteNode & { start?: number | undefined }} node
  */
 export function locate_node(node) {
-	const loc = /** @type {Location} */ (locator(/** @type {number} */ (node.start)));
+	const loc = locator(/** @type {number} */ (node.start));
 	return `${sanitize_location(filename)}:${loc?.line}:${loc.column}`;
 }
 
@@ -103,7 +112,6 @@ export function reset(state) {
 	runes = false;
 	component_name = UNKNOWN_FILENAME;
 	source = '';
-	locator = () => undefined;
 	filename = (state.filename ?? UNKNOWN_FILENAME).replace(/\\/g, '/');
 	warning_filter = state.warning ?? (() => true);
 	warnings = [];
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index c06b77c53c..b529a2dda9 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -13,7 +13,8 @@ import type {
 	Program,
 	ChainExpression,
 	SimpleCallExpression,
-	SequenceExpression
+	SequenceExpression,
+	SourceLocation
 } from 'estree';
 import type { Scope } from '../phases/scope';
 import type { _CSS } from './css';
@@ -188,7 +189,7 @@ export namespace AST {
 	}
 
 	/** An `animate:` directive */
-	export interface AnimateDirective extends BaseNode {
+	export interface AnimateDirective extends BaseAttribute {
 		type: 'AnimateDirective';
 		/** The 'x' in `animate:x` */
 		name: string;
@@ -201,7 +202,7 @@ export namespace AST {
 	}
 
 	/** A `bind:` directive */
-	export interface BindDirective extends BaseNode {
+	export interface BindDirective extends BaseAttribute {
 		type: 'BindDirective';
 		/** The 'x' in `bind:x` */
 		name: string;
@@ -217,7 +218,7 @@ export namespace AST {
 	}
 
 	/** A `class:` directive */
-	export interface ClassDirective extends BaseNode {
+	export interface ClassDirective extends BaseAttribute {
 		type: 'ClassDirective';
 		/** The 'x' in `class:x` */
 		name: 'class';
@@ -230,7 +231,7 @@ export namespace AST {
 	}
 
 	/** A `let:` directive */
-	export interface LetDirective extends BaseNode {
+	export interface LetDirective extends BaseAttribute {
 		type: 'LetDirective';
 		/** The 'x' in `let:x` */
 		name: string;
@@ -239,7 +240,7 @@ export namespace AST {
 	}
 
 	/** An `on:` directive */
-	export interface OnDirective extends BaseNode {
+	export interface OnDirective extends BaseAttribute {
 		type: 'OnDirective';
 		/** The 'x' in `on:x` */
 		name: string;
@@ -263,7 +264,7 @@ export namespace AST {
 	}
 
 	/** A `style:` directive */
-	export interface StyleDirective extends BaseNode {
+	export interface StyleDirective extends BaseAttribute {
 		type: 'StyleDirective';
 		/** The 'x' in `style:x` */
 		name: string;
@@ -278,7 +279,7 @@ export namespace AST {
 
 	// TODO have separate in/out/transition directives
 	/** A `transition:`, `in:` or `out:` directive */
-	export interface TransitionDirective extends BaseNode {
+	export interface TransitionDirective extends BaseAttribute {
 		type: 'TransitionDirective';
 		/** The 'x' in `transition:x` */
 		name: string;
@@ -296,7 +297,7 @@ export namespace AST {
 	}
 
 	/** A `use:` directive */
-	export interface UseDirective extends BaseNode {
+	export interface UseDirective extends BaseAttribute {
 		type: 'UseDirective';
 		/** The 'x' in `use:x` */
 		name: string;
@@ -310,6 +311,7 @@ export namespace AST {
 
 	export interface BaseElement extends BaseNode {
 		name: string;
+		name_loc: SourceLocation;
 		attributes: Array<Attribute | SpreadAttribute | Directive | AttachTag>;
 		fragment: Fragment;
 	}
@@ -528,9 +530,13 @@ export namespace AST {
 		};
 	}
 
-	export interface Attribute extends BaseNode {
-		type: 'Attribute';
+	export interface BaseAttribute extends BaseNode {
 		name: string;
+		name_loc: SourceLocation | null;
+	}
+
+	export interface Attribute extends BaseAttribute {
+		type: 'Attribute';
 		/**
 		 * Quoted/string values are represented by an array, even if they contain a single expression like `"{x}"`
 		 */
diff --git a/packages/svelte/src/compiler/utils/builders.js b/packages/svelte/src/compiler/utils/builders.js
index 82fce262b9..223676d22f 100644
--- a/packages/svelte/src/compiler/utils/builders.js
+++ b/packages/svelte/src/compiler/utils/builders.js
@@ -262,10 +262,14 @@ export function get(name, body) {
 
 /**
  * @param {string} name
+ * @param {ESTree.SourceLocation | null} [loc]
  * @returns {ESTree.Identifier}
  */
-export function id(name) {
-	return { type: 'Identifier', name };
+export function id(name, loc) {
+	const node = /** @type {ESTree.Identifier} */ ({ type: 'Identifier', name });
+	if (loc) node.loc = loc;
+
+	return node;
 }
 
 /**
diff --git a/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json b/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json
index 2318720f79..9a171547fe 100644
--- a/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action-duplicate/output.json
@@ -15,6 +15,18 @@
 						"end": 20,
 						"type": "Action",
 						"name": "autofocus",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 7,
+								"character": 7
+							},
+							"end": {
+								"line": 1,
+								"column": 20,
+								"character": 20
+							}
+						},
 						"expression": null,
 						"modifiers": []
 					},
@@ -23,6 +35,18 @@
 						"end": 34,
 						"type": "Action",
 						"name": "autofocus",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 21,
+								"character": 21
+							},
+							"end": {
+								"line": 1,
+								"column": 34,
+								"character": 34
+							}
+						},
 						"expression": null,
 						"modifiers": []
 					}
@@ -31,4 +55,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json b/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json
index f2ef97f145..f3242eba5e 100644
--- a/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action-with-call/output.json
@@ -15,6 +15,18 @@
 						"end": 39,
 						"type": "Action",
 						"name": "tooltip",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 7,
+								"character": 7
+							},
+							"end": {
+								"line": 1,
+								"column": 18,
+								"character": 18
+							}
+						},
 						"expression": {
 							"type": "CallExpression",
 							"start": 21,
@@ -73,4 +85,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json b/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json
index d6f14ad053..8f76afc829 100644
--- a/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action-with-identifier/output.json
@@ -15,6 +15,18 @@
 						"end": 28,
 						"type": "Action",
 						"name": "tooltip",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 7,
+								"character": 7
+							},
+							"end": {
+								"line": 1,
+								"column": 18,
+								"character": 18
+							}
+						},
 						"expression": {
 							"type": "Identifier",
 							"start": 20,
@@ -38,4 +50,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json b/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json
index 240f80df09..b6c4f2690d 100644
--- a/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action-with-literal/output.json
@@ -15,6 +15,18 @@
 						"end": 36,
 						"type": "Action",
 						"name": "tooltip",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 7,
+								"character": 7
+							},
+							"end": {
+								"line": 1,
+								"column": 18,
+								"character": 18
+							}
+						},
 						"expression": {
 							"type": "Literal",
 							"start": 21,
@@ -39,4 +51,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/action/output.json b/packages/svelte/tests/parser-legacy/samples/action/output.json
index 0e5d877584..a271778985 100644
--- a/packages/svelte/tests/parser-legacy/samples/action/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/action/output.json
@@ -15,6 +15,18 @@
 						"end": 20,
 						"type": "Action",
 						"name": "autofocus",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 7,
+								"character": 7
+							},
+							"end": {
+								"line": 1,
+								"column": 20,
+								"character": 20
+							}
+						},
 						"expression": null,
 						"modifiers": []
 					}
@@ -23,4 +35,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/animation/output.json b/packages/svelte/tests/parser-legacy/samples/animation/output.json
index 4b4700dd98..262bb17d9a 100644
--- a/packages/svelte/tests/parser-legacy/samples/animation/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/animation/output.json
@@ -20,6 +20,18 @@
 								"end": 50,
 								"type": "Animation",
 								"name": "flip",
+								"name_loc": {
+									"start": {
+										"line": 2,
+										"column": 6,
+										"character": 38
+									},
+									"end": {
+										"line": 2,
+										"column": 18,
+										"character": 50
+									}
+								},
 								"expression": null,
 								"modifiers": []
 							}
@@ -39,6 +51,7 @@
 					"type": "Identifier",
 					"name": "thing",
 					"start": 17,
+					"end": 22,
 					"loc": {
 						"start": {
 							"line": 1,
@@ -50,8 +63,7 @@
 							"column": 22,
 							"character": 22
 						}
-					},
-					"end": 22
+					}
 				},
 				"expression": {
 					"type": "Identifier",
@@ -88,4 +100,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json
index 2585fcfe94..bbf9c12ceb 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-class-directive/output.json
@@ -15,6 +15,18 @@
 						"end": 22,
 						"type": "Class",
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 14,
+								"character": 14
+							}
+						},
 						"expression": {
 							"type": "Identifier",
 							"start": 16,
@@ -38,4 +50,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-containing-solidus/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-containing-solidus/output.json
index c67811fab9..c1bcbbaf5e 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-containing-solidus/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-containing-solidus/output.json
@@ -15,6 +15,18 @@
 						"start": 3,
 						"end": 30,
 						"name": "href",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 3,
+								"character": 3
+							},
+							"end": {
+								"line": 1,
+								"column": 7,
+								"character": 7
+							}
+						},
 						"value": [
 							{
 								"start": 8,
@@ -38,4 +50,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-curly-bracket/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-curly-bracket/output.json
index a137dd795b..d84b63745c 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-curly-bracket/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-curly-bracket/output.json
@@ -15,6 +15,18 @@
 						"start": 7,
 						"end": 15,
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 7,
+								"character": 7
+							},
+							"end": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							}
+						},
 						"value": [
 							{
 								"start": 11,
@@ -52,4 +64,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-dynamic-boolean/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-dynamic-boolean/output.json
index 5462eaf713..13488a20d3 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-dynamic-boolean/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-dynamic-boolean/output.json
@@ -15,6 +15,18 @@
 						"start": 10,
 						"end": 29,
 						"name": "readonly",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							},
+							"end": {
+								"line": 1,
+								"column": 18,
+								"character": 18
+							}
+						},
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -44,4 +56,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-dynamic/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-dynamic/output.json
index 6acc5ebeb1..088a9d01ab 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-dynamic/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-dynamic/output.json
@@ -15,6 +15,18 @@
 						"start": 5,
 						"end": 28,
 						"name": "style",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							}
+						},
 						"value": [
 							{
 								"start": 12,
@@ -80,4 +92,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-empty/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-empty/output.json
index 478ba2e525..028b11077d 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-empty/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-empty/output.json
@@ -15,6 +15,18 @@
 						"start": 5,
 						"end": 9,
 						"name": "a",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 6,
+								"character": 6
+							}
+						},
 						"value": [
 							{
 								"start": 8,
@@ -30,6 +42,18 @@
 						"start": 10,
 						"end": 16,
 						"name": "b",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							},
+							"end": {
+								"line": 1,
+								"column": 11,
+								"character": 11
+							}
+						},
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -60,6 +84,18 @@
 						"start": 17,
 						"end": 21,
 						"name": "c",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 17,
+								"character": 17
+							},
+							"end": {
+								"line": 1,
+								"column": 18,
+								"character": 18
+							}
+						},
 						"value": [
 							{
 								"start": 20,
@@ -75,6 +111,18 @@
 						"start": 22,
 						"end": 30,
 						"name": "d",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 22,
+								"character": 22
+							},
+							"end": {
+								"line": 1,
+								"column": 23,
+								"character": 23
+							}
+						},
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -105,4 +153,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-escaped/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-escaped/output.json
index 74fa6f2aec..a23fcd55cd 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-escaped/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-escaped/output.json
@@ -15,6 +15,18 @@
 						"start": 5,
 						"end": 76,
 						"name": "data-foo",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 13,
+								"character": 13
+							}
+						},
 						"value": [
 							{
 								"start": 15,
@@ -30,4 +42,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-multiple/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-multiple/output.json
index 80bbdf0e21..4e2bddf54e 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-multiple/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-multiple/output.json
@@ -15,6 +15,18 @@
 						"start": 5,
 						"end": 11,
 						"name": "id",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 7,
+								"character": 7
+							}
+						},
 						"value": [
 							{
 								"start": 9,
@@ -30,6 +42,18 @@
 						"start": 12,
 						"end": 21,
 						"name": "class",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 12,
+								"character": 12
+							},
+							"end": {
+								"line": 1,
+								"column": 17,
+								"character": 17
+							}
+						},
 						"value": [
 							{
 								"start": 19,
@@ -45,4 +69,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-shorthand/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-shorthand/output.json
index 87a01d4b09..61121e436e 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-shorthand/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-shorthand/output.json
@@ -15,16 +15,40 @@
 						"start": 5,
 						"end": 9,
 						"name": "id",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 6,
+								"character": 6
+							},
+							"end": {
+								"line": 1,
+								"column": 8,
+								"character": 8
+							}
+						},
 						"value": [
 							{
 								"type": "AttributeShorthand",
 								"start": 6,
 								"end": 8,
 								"expression": {
+									"type": "Identifier",
+									"name": "id",
 									"start": 6,
 									"end": 8,
-									"type": "Identifier",
-									"name": "id"
+									"loc": {
+										"start": {
+											"line": 1,
+											"column": 6,
+											"character": 6
+										},
+										"end": {
+											"line": 1,
+											"column": 8,
+											"character": 8
+										}
+									}
 								}
 							}
 						]
@@ -34,4 +58,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-static-boolean/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-static-boolean/output.json
index a059934e40..1442a445d0 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-static-boolean/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-static-boolean/output.json
@@ -15,6 +15,18 @@
 						"start": 10,
 						"end": 18,
 						"name": "readonly",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							},
+							"end": {
+								"line": 1,
+								"column": 18,
+								"character": 18
+							}
+						},
 						"value": true
 					}
 				],
@@ -22,4 +34,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-static/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-static/output.json
index 94608a0eba..dbc2a4b79f 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-static/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-static/output.json
@@ -15,6 +15,18 @@
 						"start": 5,
 						"end": 16,
 						"name": "class",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							}
+						},
 						"value": [
 							{
 								"start": 12,
@@ -30,4 +42,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-modifiers/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-modifiers/output.json
index 45bb6f0e2e..da8a11e48e 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-modifiers/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-modifiers/output.json
@@ -15,6 +15,18 @@
 						"end": 36,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 26,
+								"character": 26
+							}
+						},
 						"modifiers": [
 							"important"
 						],
@@ -47,4 +59,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-shorthand/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-shorthand/output.json
index 4ad7aaf7f7..b54a6e91d7 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-shorthand/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-shorthand/output.json
@@ -15,6 +15,18 @@
 						"end": 16,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 16,
+								"character": 16
+							}
+						},
 						"modifiers": [],
 						"value": true
 					}
@@ -23,4 +35,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-string/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-string/output.json
index 9693f97782..f349e61ef7 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-string/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive-string/output.json
@@ -15,6 +15,18 @@
 						"end": 22,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 16,
+								"character": 16
+							}
+						},
 						"modifiers": [],
 						"value": [
 							{
@@ -47,6 +59,18 @@
 						"end": 52,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 2,
+								"column": 5,
+								"character": 35
+							},
+							"end": {
+								"line": 2,
+								"column": 16,
+								"character": 46
+							}
+						},
 						"modifiers": [],
 						"value": [
 							{
@@ -79,6 +103,18 @@
 						"end": 80,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 3,
+								"column": 5,
+								"character": 65
+							},
+							"end": {
+								"line": 3,
+								"column": 16,
+								"character": 76
+							}
+						},
 						"modifiers": [],
 						"value": [
 							{
@@ -111,6 +147,18 @@
 						"end": 120,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 4,
+								"column": 5,
+								"character": 93
+							},
+							"end": {
+								"line": 4,
+								"column": 16,
+								"character": 104
+							}
+						},
 						"modifiers": [],
 						"value": [
 							{
@@ -164,6 +212,18 @@
 						"end": 160,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 5,
+								"column": 5,
+								"character": 133
+							},
+							"end": {
+								"line": 5,
+								"column": 16,
+								"character": 144
+							}
+						},
 						"modifiers": [],
 						"value": [
 							{
@@ -217,6 +277,18 @@
 						"end": 198,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 6,
+								"column": 5,
+								"character": 173
+							},
+							"end": {
+								"line": 6,
+								"column": 16,
+								"character": 184
+							}
+						},
 						"modifiers": [],
 						"value": [
 							{
@@ -270,6 +342,18 @@
 						"end": 245,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 7,
+								"column": 5,
+								"character": 211
+							},
+							"end": {
+								"line": 7,
+								"column": 16,
+								"character": 222
+							}
+						},
 						"modifiers": [],
 						"value": [
 							{
@@ -359,4 +443,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive/output.json
index 08e2032db3..34e899428c 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style-directive/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style-directive/output.json
@@ -15,6 +15,18 @@
 						"end": 26,
 						"type": "StyleDirective",
 						"name": "color",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 16,
+								"character": 16
+							}
+						},
 						"modifiers": [],
 						"value": [
 							{
@@ -45,4 +57,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-style/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-style/output.json
index d029f9ef71..272c48d6ed 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-style/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-style/output.json
@@ -15,6 +15,18 @@
 						"start": 5,
 						"end": 24,
 						"name": "style",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							}
+						},
 						"value": [
 							{
 								"start": 12,
@@ -38,4 +50,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-unquoted/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-unquoted/output.json
index a8fb61f58c..fecbd9f290 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-unquoted/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-unquoted/output.json
@@ -15,6 +15,18 @@
 						"start": 5,
 						"end": 14,
 						"name": "class",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							}
+						},
 						"value": [
 							{
 								"start": 11,
@@ -46,6 +58,18 @@
 						"start": 25,
 						"end": 31,
 						"name": "href",
+						"name_loc": {
+							"start": {
+								"line": 2,
+								"column": 3,
+								"character": 25
+							},
+							"end": {
+								"line": 2,
+								"column": 7,
+								"character": 29
+							}
+						},
 						"value": [
 							{
 								"start": 30,
@@ -85,6 +109,18 @@
 						"start": 44,
 						"end": 53,
 						"name": "href",
+						"name_loc": {
+							"start": {
+								"line": 3,
+								"column": 3,
+								"character": 44
+							},
+							"end": {
+								"line": 3,
+								"column": 7,
+								"character": 48
+							}
+						},
 						"value": [
 							{
 								"start": 49,
@@ -108,4 +144,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json b/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json
index 174e2b174f..16cfcec195 100644
--- a/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/attribute-with-whitespace/output.json
@@ -15,6 +15,18 @@
 						"end": 23,
 						"type": "EventHandler",
 						"name": "click",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 8,
+								"character": 8
+							},
+							"end": {
+								"line": 1,
+								"column": 16,
+								"character": 16
+							}
+						},
 						"expression": {
 							"type": "Identifier",
 							"start": 19,
@@ -46,4 +58,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/await-catch/output.json b/packages/svelte/tests/parser-legacy/samples/await-catch/output.json
index 5c2fa74e42..1ac7f1773d 100644
--- a/packages/svelte/tests/parser-legacy/samples/await-catch/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/await-catch/output.json
@@ -29,6 +29,7 @@
 					"type": "Identifier",
 					"name": "theError",
 					"start": 47,
+					"end": 55,
 					"loc": {
 						"start": {
 							"line": 3,
@@ -40,8 +41,7 @@
 							"column": 16,
 							"character": 55
 						}
-					},
-					"end": 55
+					}
 				},
 				"pending": {
 					"type": "PendingBlock",
@@ -183,4 +183,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/await-then-catch/output.json b/packages/svelte/tests/parser-legacy/samples/await-then-catch/output.json
index 5548cfc22e..df76eab8d3 100644
--- a/packages/svelte/tests/parser-legacy/samples/await-then-catch/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/await-then-catch/output.json
@@ -28,6 +28,7 @@
 					"type": "Identifier",
 					"name": "theValue",
 					"start": 46,
+					"end": 54,
 					"loc": {
 						"start": {
 							"line": 3,
@@ -39,13 +40,13 @@
 							"column": 15,
 							"character": 54
 						}
-					},
-					"end": 54
+					}
 				},
 				"error": {
 					"type": "Identifier",
 					"name": "theError",
 					"start": 96,
+					"end": 104,
 					"loc": {
 						"start": {
 							"line": 5,
@@ -57,8 +58,7 @@
 							"column": 16,
 							"character": 104
 						}
-					},
-					"end": 104
+					}
 				},
 				"pending": {
 					"type": "PendingBlock",
@@ -252,4 +252,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json b/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
index 6106560949..9c48025ff9 100644
--- a/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
@@ -22,6 +22,18 @@
 						"end": 46,
 						"type": "Binding",
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 5,
+								"column": 8,
+								"character": 38
+							},
+							"end": {
+								"line": 5,
+								"column": 16,
+								"character": 46
+							}
+						},
 						"expression": {
 							"start": 43,
 							"end": 46,
@@ -109,4 +121,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/binding/output.json b/packages/svelte/tests/parser-legacy/samples/binding/output.json
index b6d24d6579..17a78f051c 100644
--- a/packages/svelte/tests/parser-legacy/samples/binding/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/binding/output.json
@@ -22,6 +22,18 @@
 						"end": 55,
 						"type": "Binding",
 						"name": "value",
+						"name_loc": {
+							"start": {
+								"line": 5,
+								"column": 7,
+								"character": 38
+							},
+							"end": {
+								"line": 5,
+								"column": 17,
+								"character": 48
+							}
+						},
 						"expression": {
 							"type": "Identifier",
 							"start": 50,
@@ -119,4 +131,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/comment-with-ignores/output.json b/packages/svelte/tests/parser-legacy/samples/comment-with-ignores/output.json
index 74d0a52707..2caf252de8 100644
--- a/packages/svelte/tests/parser-legacy/samples/comment-with-ignores/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/comment-with-ignores/output.json
@@ -16,4 +16,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/comment/output.json b/packages/svelte/tests/parser-legacy/samples/comment/output.json
index a721ddd8dc..6017db404c 100644
--- a/packages/svelte/tests/parser-legacy/samples/comment/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/comment/output.json
@@ -13,4 +13,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/component-dynamic/output.json b/packages/svelte/tests/parser-legacy/samples/component-dynamic/output.json
index 7e7267498f..f624a04c61 100644
--- a/packages/svelte/tests/parser-legacy/samples/component-dynamic/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/component-dynamic/output.json
@@ -77,4 +77,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/convert-entities-in-element/output.json b/packages/svelte/tests/parser-legacy/samples/convert-entities-in-element/output.json
index 3025f2c800..f7a8a3c677 100644
--- a/packages/svelte/tests/parser-legacy/samples/convert-entities-in-element/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/convert-entities-in-element/output.json
@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/convert-entities/output.json b/packages/svelte/tests/parser-legacy/samples/convert-entities/output.json
index c43621cc6b..c336a3978c 100644
--- a/packages/svelte/tests/parser-legacy/samples/convert-entities/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/convert-entities/output.json
@@ -13,4 +13,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/css/output.json b/packages/svelte/tests/parser-legacy/samples/css/output.json
index 443d6d2d50..b3ecd7b671 100644
--- a/packages/svelte/tests/parser-legacy/samples/css/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/css/output.json
@@ -82,4 +82,4 @@
 			"comment": null
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/dynamic-element-string/output.json b/packages/svelte/tests/parser-legacy/samples/dynamic-element-string/output.json
index 5f73e70b5e..4768501c46 100644
--- a/packages/svelte/tests/parser-legacy/samples/dynamic-element-string/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/dynamic-element-string/output.json
@@ -156,6 +156,18 @@
 						"start": 263,
 						"end": 274,
 						"name": "class",
+						"name_loc": {
+							"start": {
+								"line": 7,
+								"column": 29,
+								"character": 263
+							},
+							"end": {
+								"line": 7,
+								"column": 34,
+								"character": 268
+							}
+						},
 						"value": [
 							{
 								"start": 270,
@@ -171,4 +183,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/dynamic-element-variable/output.json b/packages/svelte/tests/parser-legacy/samples/dynamic-element-variable/output.json
index 7c75c8bc2a..6d9a5c78ee 100644
--- a/packages/svelte/tests/parser-legacy/samples/dynamic-element-variable/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/dynamic-element-variable/output.json
@@ -62,6 +62,18 @@
 						"start": 72,
 						"end": 83,
 						"name": "class",
+						"name_loc": {
+							"start": {
+								"line": 2,
+								"column": 27,
+								"character": 72
+							},
+							"end": {
+								"line": 2,
+								"column": 32,
+								"character": 77
+							}
+						},
 						"value": [
 							{
 								"start": 79,
@@ -77,4 +89,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json b/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json
index 943376010c..ee19d58742 100644
--- a/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json
@@ -481,4 +481,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
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 21b059b7ae..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
@@ -266,4 +266,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/each-block-else/output.json b/packages/svelte/tests/parser-legacy/samples/each-block-else/output.json
index f5145063e4..c8458f96f0 100644
--- a/packages/svelte/tests/parser-legacy/samples/each-block-else/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/each-block-else/output.json
@@ -44,6 +44,7 @@
 					"type": "Identifier",
 					"name": "animal",
 					"start": 18,
+					"end": 24,
 					"loc": {
 						"start": {
 							"line": 1,
@@ -55,8 +56,7 @@
 							"column": 24,
 							"character": 24
 						}
-					},
-					"end": 24
+					}
 				},
 				"expression": {
 					"type": "Identifier",
@@ -100,4 +100,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/each-block-indexed/output.json b/packages/svelte/tests/parser-legacy/samples/each-block-indexed/output.json
index ce2f921d86..2ba41d56b8 100644
--- a/packages/svelte/tests/parser-legacy/samples/each-block-indexed/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/each-block-indexed/output.json
@@ -72,6 +72,7 @@
 					"type": "Identifier",
 					"name": "animal",
 					"start": 18,
+					"end": 24,
 					"loc": {
 						"start": {
 							"line": 1,
@@ -83,8 +84,7 @@
 							"column": 24,
 							"character": 24
 						}
-					},
-					"end": 24
+					}
 				},
 				"expression": {
 					"type": "Identifier",
@@ -106,4 +106,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/each-block-keyed/output.json b/packages/svelte/tests/parser-legacy/samples/each-block-keyed/output.json
index 637dab61b8..569681506b 100644
--- a/packages/svelte/tests/parser-legacy/samples/each-block-keyed/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/each-block-keyed/output.json
@@ -44,6 +44,7 @@
 					"type": "Identifier",
 					"name": "todo",
 					"start": 16,
+					"end": 20,
 					"loc": {
 						"start": {
 							"line": 1,
@@ -55,8 +56,7 @@
 							"column": 20,
 							"character": 20
 						}
-					},
-					"end": 20
+					}
 				},
 				"expression": {
 					"type": "Identifier",
@@ -126,4 +126,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/each-block/output.json b/packages/svelte/tests/parser-legacy/samples/each-block/output.json
index 82390bb628..c763dc6b85 100644
--- a/packages/svelte/tests/parser-legacy/samples/each-block/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/each-block/output.json
@@ -44,6 +44,7 @@
 					"type": "Identifier",
 					"name": "animal",
 					"start": 18,
+					"end": 24,
 					"loc": {
 						"start": {
 							"line": 1,
@@ -55,8 +56,7 @@
 							"column": 24,
 							"character": 24
 						}
-					},
-					"end": 24
+					}
 				},
 				"expression": {
 					"type": "Identifier",
@@ -77,4 +77,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/element-with-attribute-empty-string/output.json b/packages/svelte/tests/parser-legacy/samples/element-with-attribute-empty-string/output.json
index afdcbf4297..2d6a4b752c 100644
--- a/packages/svelte/tests/parser-legacy/samples/element-with-attribute-empty-string/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/element-with-attribute-empty-string/output.json
@@ -15,6 +15,18 @@
 						"start": 6,
 						"end": 13,
 						"name": "attr",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 6,
+								"character": 6
+							},
+							"end": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							}
+						},
 						"value": [
 							{
 								"start": 12,
@@ -46,6 +58,18 @@
 						"start": 28,
 						"end": 35,
 						"name": "attr",
+						"name_loc": {
+							"start": {
+								"line": 2,
+								"column": 6,
+								"character": 28
+							},
+							"end": {
+								"line": 2,
+								"column": 10,
+								"character": 32
+							}
+						},
 						"value": [
 							{
 								"start": 34,
@@ -61,4 +85,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/element-with-attribute/output.json b/packages/svelte/tests/parser-legacy/samples/element-with-attribute/output.json
index b6740a6135..9fdb601b67 100644
--- a/packages/svelte/tests/parser-legacy/samples/element-with-attribute/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/element-with-attribute/output.json
@@ -15,6 +15,18 @@
 						"start": 6,
 						"end": 16,
 						"name": "attr",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 6,
+								"character": 6
+							},
+							"end": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							}
+						},
 						"value": [
 							{
 								"start": 12,
@@ -46,6 +58,18 @@
 						"start": 31,
 						"end": 41,
 						"name": "attr",
+						"name_loc": {
+							"start": {
+								"line": 2,
+								"column": 6,
+								"character": 31
+							},
+							"end": {
+								"line": 2,
+								"column": 10,
+								"character": 35
+							}
+						},
 						"value": [
 							{
 								"start": 37,
@@ -61,4 +85,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/element-with-mustache/output.json b/packages/svelte/tests/parser-legacy/samples/element-with-mustache/output.json
index 9bb92244ce..ce0dc25e85 100644
--- a/packages/svelte/tests/parser-legacy/samples/element-with-mustache/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/element-with-mustache/output.json
@@ -50,4 +50,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/element-with-text/output.json b/packages/svelte/tests/parser-legacy/samples/element-with-text/output.json
index d8bb9e9c11..fde57c470a 100644
--- a/packages/svelte/tests/parser-legacy/samples/element-with-text/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/element-with-text/output.json
@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/elements/output.json b/packages/svelte/tests/parser-legacy/samples/elements/output.json
index 97513445d6..afc49c56c3 100644
--- a/packages/svelte/tests/parser-legacy/samples/elements/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/elements/output.json
@@ -15,6 +15,18 @@
 						"start": 10,
 						"end": 14,
 						"name": "html",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							},
+							"end": {
+								"line": 1,
+								"column": 14,
+								"character": 14
+							}
+						},
 						"value": true
 					}
 				],
@@ -22,4 +34,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/event-handler/output.json b/packages/svelte/tests/parser-legacy/samples/event-handler/output.json
index 218b349628..8b054a4289 100644
--- a/packages/svelte/tests/parser-legacy/samples/event-handler/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/event-handler/output.json
@@ -15,6 +15,18 @@
 						"end": 45,
 						"type": "EventHandler",
 						"name": "click",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 8,
+								"character": 8
+							},
+							"end": {
+								"line": 1,
+								"column": 16,
+								"character": 16
+							}
+						},
 						"expression": {
 							"type": "ArrowFunctionExpression",
 							"start": 19,
@@ -161,4 +173,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json b/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json
index 72672cafbc..9cb5d765e8 100644
--- a/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json
@@ -17,9 +17,21 @@
 				"end": 92,
 				"expression": {
 					"type": "Identifier",
+					"name": "generic",
 					"start": 40,
 					"end": 47,
-					"name": "generic"
+					"loc": {
+						"start": {
+							"line": 4,
+							"column": 10,
+							"character": 40
+						},
+						"end": {
+							"line": 4,
+							"column": 17,
+							"character": 47
+						}
+					}
 				},
 				"parameters": [
 					{
@@ -123,9 +135,21 @@
 				"end": 192,
 				"expression": {
 					"type": "Identifier",
+					"name": "complex_generic",
 					"start": 104,
 					"end": 119,
-					"name": "complex_generic"
+					"loc": {
+						"start": {
+							"line": 8,
+							"column": 10,
+							"character": 104
+						},
+						"end": {
+							"line": 8,
+							"column": 25,
+							"character": 119
+						}
+					}
 				},
 				"parameters": [
 					{
@@ -241,4 +265,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/if-block-else/output.json b/packages/svelte/tests/parser-legacy/samples/if-block-else/output.json
index 34efb9fd7b..4ba9370d88 100644
--- a/packages/svelte/tests/parser-legacy/samples/if-block-else/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/if-block-else/output.json
@@ -68,4 +68,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/if-block-elseif/output.json b/packages/svelte/tests/parser-legacy/samples/if-block-elseif/output.json
index d246cd1179..f2af3d5a4b 100644
--- a/packages/svelte/tests/parser-legacy/samples/if-block-elseif/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/if-block-elseif/output.json
@@ -221,4 +221,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/if-block/output.json b/packages/svelte/tests/parser-legacy/samples/if-block/output.json
index 1c60df0d31..61ecf6e3b2 100644
--- a/packages/svelte/tests/parser-legacy/samples/if-block/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/if-block/output.json
@@ -36,4 +36,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/implicitly-closed-li/output.json b/packages/svelte/tests/parser-legacy/samples/implicitly-closed-li/output.json
index be5fba538e..a56701894e 100644
--- a/packages/svelte/tests/parser-legacy/samples/implicitly-closed-li/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/implicitly-closed-li/output.json
@@ -70,4 +70,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json b/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
index a5fe5749da..4723564f17 100644
--- a/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
@@ -22,6 +22,18 @@
 						"end": 692,
 						"type": "EventHandler",
 						"name": "click",
+						"name_loc": {
+							"start": {
+								"line": 34,
+								"column": 1,
+								"character": 574
+							},
+							"end": {
+								"line": 34,
+								"column": 9,
+								"character": 582
+							}
+						},
 						"expression": {
 							"type": "ArrowFunctionExpression",
 							"start": 596,
@@ -869,4 +881,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-invalid-block/output.json b/packages/svelte/tests/parser-legacy/samples/loose-invalid-block/output.json
index c8f248ee6c..c4d0dd4aa4 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-invalid-block/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-invalid-block/output.json
@@ -75,9 +75,21 @@
 				"end": 75,
 				"expression": {
 					"type": "Identifier",
+					"name": "",
 					"start": 63,
 					"end": 63,
-					"name": ""
+					"loc": {
+						"start": {
+							"line": 9,
+							"column": 10,
+							"character": 63
+						},
+						"end": {
+							"line": 9,
+							"column": 10,
+							"character": 63
+						}
+					}
 				},
 				"parameters": [],
 				"children": []
@@ -95,13 +107,25 @@
 				"end": 102,
 				"expression": {
 					"type": "Identifier",
+					"name": "foo",
 					"start": 87,
 					"end": 90,
-					"name": "foo"
+					"loc": {
+						"start": {
+							"line": 12,
+							"column": 10,
+							"character": 87
+						},
+						"end": {
+							"line": 12,
+							"column": 13,
+							"character": 90
+						}
+					}
 				},
 				"parameters": [],
 				"children": []
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-invalid-expression/output.json b/packages/svelte/tests/parser-legacy/samples/loose-invalid-expression/output.json
index b04a37e5e9..136c45fc6e 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-invalid-expression/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-invalid-expression/output.json
@@ -15,16 +15,40 @@
 						"start": 5,
 						"end": 7,
 						"name": "",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 6,
+								"character": 6
+							},
+							"end": {
+								"line": 1,
+								"column": 6,
+								"character": 6
+							}
+						},
 						"value": [
 							{
 								"type": "AttributeShorthand",
 								"start": 6,
 								"end": 6,
 								"expression": {
+									"type": "Identifier",
+									"name": "",
 									"start": 6,
 									"end": 6,
-									"type": "Identifier",
-									"name": ""
+									"loc": {
+										"start": {
+											"line": 1,
+											"column": 6,
+											"character": 6
+										},
+										"end": {
+											"line": 1,
+											"column": 6,
+											"character": 6
+										}
+									}
 								}
 							}
 						]
@@ -50,6 +74,18 @@
 						"start": 20,
 						"end": 26,
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 2,
+								"column": 5,
+								"character": 20
+							},
+							"end": {
+								"line": 2,
+								"column": 8,
+								"character": 23
+							}
+						},
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -85,6 +121,18 @@
 						"start": 40,
 						"end": 48,
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 4,
+								"column": 5,
+								"character": 40
+							},
+							"end": {
+								"line": 4,
+								"column": 8,
+								"character": 43
+							}
+						},
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -120,6 +168,18 @@
 						"start": 61,
 						"end": 73,
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 5,
+								"column": 5,
+								"character": 61
+							},
+							"end": {
+								"line": 5,
+								"column": 8,
+								"character": 64
+							}
+						},
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -155,6 +215,18 @@
 						"start": 92,
 						"end": 110,
 						"name": "onclick",
+						"name_loc": {
+							"start": {
+								"line": 6,
+								"column": 11,
+								"character": 92
+							},
+							"end": {
+								"line": 6,
+								"column": 18,
+								"character": 99
+							}
+						},
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -190,6 +262,18 @@
 						"end": 137,
 						"type": "Binding",
 						"name": "value",
+						"name_loc": {
+							"start": {
+								"line": 8,
+								"column": 7,
+								"character": 122
+							},
+							"end": {
+								"line": 8,
+								"column": 17,
+								"character": 132
+							}
+						},
 						"expression": {
 							"type": "Identifier",
 							"start": 134,
@@ -272,6 +356,7 @@
 					"type": "Identifier",
 					"name": "item",
 					"start": 197,
+					"end": 201,
 					"loc": {
 						"start": {
 							"line": 15,
@@ -283,8 +368,7 @@
 							"column": 20,
 							"character": 201
 						}
-					},
-					"end": 201
+					}
 				},
 				"expression": {
 					"type": "Identifier",
@@ -325,6 +409,7 @@
 					"type": "Identifier",
 					"name": "item",
 					"start": 234,
+					"end": 238,
 					"loc": {
 						"start": {
 							"line": 17,
@@ -336,8 +421,7 @@
 							"column": 19,
 							"character": 238
 						}
-					},
-					"end": 238
+					}
 				},
 				"expression": {
 					"type": "Identifier",
@@ -408,6 +492,7 @@
 					"type": "Identifier",
 					"name": "y",
 					"start": 285,
+					"end": 286,
 					"loc": {
 						"start": {
 							"line": 21,
@@ -419,8 +504,7 @@
 							"column": 17,
 							"character": 286
 						}
-					},
-					"end": 286
+					}
 				},
 				"error": null,
 				"pending": {
@@ -467,6 +551,7 @@
 					"type": "Identifier",
 					"name": "y",
 					"start": 314,
+					"end": 315,
 					"loc": {
 						"start": {
 							"line": 23,
@@ -478,8 +563,7 @@
 							"column": 18,
 							"character": 315
 						}
-					},
-					"end": 315
+					}
 				},
 				"pending": {
 					"type": "PendingBlock",
@@ -505,4 +589,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-block/output.json b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-block/output.json
index ee4efc2a9c..37a46a48da 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-block/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-block/output.json
@@ -240,6 +240,7 @@
 					"type": "Identifier",
 					"name": "y",
 					"start": 138,
+					"end": 139,
 					"loc": {
 						"start": {
 							"line": 19,
@@ -251,8 +252,7 @@
 							"column": 13,
 							"character": 139
 						}
-					},
-					"end": 139
+					}
 				},
 				"expression": {
 					"type": "Identifier",
@@ -273,4 +273,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-open-tag/output.json b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-open-tag/output.json
index 1002df6b67..9d5d0e7658 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-open-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-open-tag/output.json
@@ -29,6 +29,18 @@
 								"start": 13,
 								"end": 22,
 								"name": "foo",
+								"name_loc": {
+									"start": {
+										"line": 2,
+										"column": 7,
+										"character": 13
+									},
+									"end": {
+										"line": 2,
+										"column": 10,
+										"character": 16
+									}
+								},
 								"value": [
 									{
 										"type": "MustacheTag",
@@ -90,6 +102,18 @@
 								"start": 44,
 								"end": 53,
 								"name": "foo",
+								"name_loc": {
+									"start": {
+										"line": 6,
+										"column": 7,
+										"character": 44
+									},
+									"end": {
+										"line": 6,
+										"column": 10,
+										"character": 47
+									}
+								},
 								"value": [
 									{
 										"type": "MustacheTag",
@@ -158,6 +182,18 @@
 								"start": 79,
 								"end": 88,
 								"name": "foo",
+								"name_loc": {
+									"start": {
+										"line": 10,
+										"column": 7,
+										"character": 79
+									},
+									"end": {
+										"line": 10,
+										"column": 10,
+										"character": 82
+									}
+								},
 								"value": [
 									{
 										"type": "MustacheTag",
@@ -226,6 +262,18 @@
 								"start": 113,
 								"end": 122,
 								"name": "foo",
+								"name_loc": {
+									"start": {
+										"line": 14,
+										"column": 7,
+										"character": 113
+									},
+									"end": {
+										"line": 14,
+										"column": 10,
+										"character": 116
+									}
+								},
 								"value": [
 									{
 										"type": "MustacheTag",
@@ -317,6 +365,18 @@
 						"start": 161,
 						"end": 170,
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 20,
+								"column": 5,
+								"character": 161
+							},
+							"end": {
+								"line": 20,
+								"column": 8,
+								"character": 164
+							}
+						},
 						"value": [
 							{
 								"type": "MustacheTag",
@@ -346,4 +406,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-tag/output.json b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-tag/output.json
index 4b6d31902f..1ff3342de0 100644
--- a/packages/svelte/tests/parser-legacy/samples/loose-unclosed-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/loose-unclosed-tag/output.json
@@ -68,6 +68,18 @@
 								"start": 35,
 								"end": 44,
 								"name": "foo",
+								"name_loc": {
+									"start": {
+										"line": 6,
+										"column": 7,
+										"character": 35
+									},
+									"end": {
+										"line": 6,
+										"column": 10,
+										"character": 38
+									}
+								},
 								"value": [
 									{
 										"type": "MustacheTag",
@@ -275,6 +287,18 @@
 								"start": 159,
 								"end": 168,
 								"name": "foo",
+								"name_loc": {
+									"start": {
+										"line": 26,
+										"column": 7,
+										"character": 159
+									},
+									"end": {
+										"line": 26,
+										"column": 10,
+										"character": 162
+									}
+								},
 								"value": [
 									{
 										"type": "MustacheTag",
@@ -360,4 +384,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/nbsp/output.json b/packages/svelte/tests/parser-legacy/samples/nbsp/output.json
index a120b08f32..7d2158955a 100644
--- a/packages/svelte/tests/parser-legacy/samples/nbsp/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/nbsp/output.json
@@ -22,4 +22,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/no-error-if-before-closing/output.json b/packages/svelte/tests/parser-legacy/samples/no-error-if-before-closing/output.json
index 369cd4acc4..de12cffd86 100644
--- a/packages/svelte/tests/parser-legacy/samples/no-error-if-before-closing/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/no-error-if-before-closing/output.json
@@ -119,6 +119,7 @@
 					"type": "Identifier",
 					"name": "f",
 					"start": 97,
+					"end": 98,
 					"loc": {
 						"start": {
 							"line": 13,
@@ -130,8 +131,7 @@
 							"column": 8,
 							"character": 98
 						}
-					},
-					"end": 98
+					}
 				},
 				"error": null,
 				"pending": {
@@ -219,6 +219,7 @@
 					"type": "Identifier",
 					"name": "f",
 					"start": 137,
+					"end": 138,
 					"loc": {
 						"start": {
 							"line": 18,
@@ -230,8 +231,7 @@
 							"column": 8,
 							"character": 138
 						}
-					},
-					"end": 138
+					}
 				},
 				"error": null,
 				"pending": {
@@ -289,4 +289,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/raw-mustaches/output.json b/packages/svelte/tests/parser-legacy/samples/raw-mustaches/output.json
index b8e1da7499..7db0bb7ec1 100644
--- a/packages/svelte/tests/parser-legacy/samples/raw-mustaches/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/raw-mustaches/output.json
@@ -78,4 +78,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/refs/output.json b/packages/svelte/tests/parser-legacy/samples/refs/output.json
index 108fa78697..7f30946fc5 100644
--- a/packages/svelte/tests/parser-legacy/samples/refs/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/refs/output.json
@@ -22,6 +22,18 @@
 						"end": 53,
 						"type": "Binding",
 						"name": "this",
+						"name_loc": {
+							"start": {
+								"line": 5,
+								"column": 8,
+								"character": 38
+							},
+							"end": {
+								"line": 5,
+								"column": 17,
+								"character": 47
+							}
+						},
 						"expression": {
 							"type": "Identifier",
 							"start": 49,
@@ -119,4 +131,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json b/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json
index e9298ec50c..e0b50e3b92 100644
--- a/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json
@@ -147,4 +147,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json b/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json
index 502d5df576..b04a823e8d 100644
--- a/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json
@@ -52,4 +52,4 @@
 			]
 		}
 	}
-}
\ No newline at end of file
+}
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 5a380a3240..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
@@ -176,4 +176,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/script/output.json b/packages/svelte/tests/parser-legacy/samples/script/output.json
index e30414a2a8..d3d4abd6b2 100644
--- a/packages/svelte/tests/parser-legacy/samples/script/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script/output.json
@@ -147,4 +147,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/self-closing-element/output.json b/packages/svelte/tests/parser-legacy/samples/self-closing-element/output.json
index fe59cac4b7..f0ba3a5c0d 100644
--- a/packages/svelte/tests/parser-legacy/samples/self-closing-element/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/self-closing-element/output.json
@@ -14,4 +14,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/self-reference/output.json b/packages/svelte/tests/parser-legacy/samples/self-reference/output.json
index 44547698fd..1ca684931b 100644
--- a/packages/svelte/tests/parser-legacy/samples/self-reference/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/self-reference/output.json
@@ -69,6 +69,18 @@
 								"start": 30,
 								"end": 49,
 								"name": "depth",
+								"name_loc": {
+									"start": {
+										"line": 2,
+										"column": 14,
+										"character": 30
+									},
+									"end": {
+										"line": 2,
+										"column": 19,
+										"character": 35
+									}
+								},
 								"value": [
 									{
 										"type": "MustacheTag",
@@ -133,4 +145,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/slotted-element/output.json b/packages/svelte/tests/parser-legacy/samples/slotted-element/output.json
index c6717f3074..caa0b86c45 100644
--- a/packages/svelte/tests/parser-legacy/samples/slotted-element/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/slotted-element/output.json
@@ -22,6 +22,18 @@
 								"start": 16,
 								"end": 26,
 								"name": "slot",
+								"name_loc": {
+									"start": {
+										"line": 1,
+										"column": 16,
+										"character": 16
+									},
+									"end": {
+										"line": 1,
+										"column": 20,
+										"character": 20
+									}
+								},
 								"value": [
 									{
 										"start": 22,
@@ -39,4 +51,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/space-between-mustaches/output.json b/packages/svelte/tests/parser-legacy/samples/space-between-mustaches/output.json
index 7553651864..bb6de0bea9 100644
--- a/packages/svelte/tests/parser-legacy/samples/space-between-mustaches/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/space-between-mustaches/output.json
@@ -106,4 +106,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/spread/output.json b/packages/svelte/tests/parser-legacy/samples/spread/output.json
index b1d80bd5d4..3b79aa9670 100644
--- a/packages/svelte/tests/parser-legacy/samples/spread/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/spread/output.json
@@ -36,4 +36,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/style-inside-head/output.json b/packages/svelte/tests/parser-legacy/samples/style-inside-head/output.json
index 25588b950b..733f9e76ff 100644
--- a/packages/svelte/tests/parser-legacy/samples/style-inside-head/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/style-inside-head/output.json
@@ -30,4 +30,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/textarea-children/output.json b/packages/svelte/tests/parser-legacy/samples/textarea-children/output.json
index 62a295c135..60477807b7 100644
--- a/packages/svelte/tests/parser-legacy/samples/textarea-children/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/textarea-children/output.json
@@ -50,4 +50,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/textarea-end-tag/output.json b/packages/svelte/tests/parser-legacy/samples/textarea-end-tag/output.json
index 145de96560..ed3c85b09a 100644
--- a/packages/svelte/tests/parser-legacy/samples/textarea-end-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/textarea-end-tag/output.json
@@ -50,4 +50,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json b/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json
index 85f45a93f5..9f0d007cc8 100644
--- a/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/transition-intro-no-params/output.json
@@ -15,6 +15,18 @@
 						"end": 12,
 						"type": "Transition",
 						"name": "fade",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 12,
+								"character": 12
+							}
+						},
 						"expression": null,
 						"modifiers": [],
 						"intro": true,
@@ -33,4 +45,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json b/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json
index be201143b4..61b4afbc13 100644
--- a/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/transition-intro/output.json
@@ -15,6 +15,18 @@
 						"end": 30,
 						"type": "Transition",
 						"name": "style",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 5,
+								"character": 5
+							},
+							"end": {
+								"line": 1,
+								"column": 13,
+								"character": 13
+							}
+						},
 						"expression": {
 							"type": "ObjectExpression",
 							"start": 16,
@@ -101,4 +113,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/unusual-identifier/output.json b/packages/svelte/tests/parser-legacy/samples/unusual-identifier/output.json
index b1595a6839..da5555a777 100644
--- a/packages/svelte/tests/parser-legacy/samples/unusual-identifier/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/unusual-identifier/output.json
@@ -44,6 +44,7 @@
 					"type": "Identifier",
 					"name": "𐊧",
 					"start": 17,
+					"end": 19,
 					"loc": {
 						"start": {
 							"line": 1,
@@ -55,8 +56,7 @@
 							"column": 19,
 							"character": 19
 						}
-					},
-					"end": 19
+					}
 				},
 				"expression": {
 					"type": "Identifier",
@@ -77,4 +77,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json b/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json
index dee3ba5f29..69b2382442 100644
--- a/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json
@@ -147,4 +147,4 @@
 			"sourceType": "module"
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/whitespace-after-style-tag/output.json b/packages/svelte/tests/parser-legacy/samples/whitespace-after-style-tag/output.json
index acd9798425..2cadbc672f 100644
--- a/packages/svelte/tests/parser-legacy/samples/whitespace-after-style-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/whitespace-after-style-tag/output.json
@@ -82,4 +82,4 @@
 			"comment": null
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/whitespace-leading-trailing/output.json b/packages/svelte/tests/parser-legacy/samples/whitespace-leading-trailing/output.json
index 67ffc03436..baffebfed7 100644
--- a/packages/svelte/tests/parser-legacy/samples/whitespace-leading-trailing/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/whitespace-leading-trailing/output.json
@@ -29,4 +29,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/samples/whitespace-normal/output.json b/packages/svelte/tests/parser-legacy/samples/whitespace-normal/output.json
index 27f8e537a1..4fb88b818d 100644
--- a/packages/svelte/tests/parser-legacy/samples/whitespace-normal/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/whitespace-normal/output.json
@@ -75,4 +75,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-legacy/test.ts b/packages/svelte/tests/parser-legacy/test.ts
index 987253d8d0..2e64389404 100644
--- a/packages/svelte/tests/parser-legacy/test.ts
+++ b/packages/svelte/tests/parser-legacy/test.ts
@@ -18,7 +18,7 @@ const { test, run } = suite<ParserTest>(async (config, cwd) => {
 
 	// run `UPDATE_SNAPSHOTS=true pnpm test parser` to update parser tests
 	if (process.env.UPDATE_SNAPSHOTS) {
-		fs.writeFileSync(`${cwd}/output.json`, JSON.stringify(actual, null, '\t'));
+		fs.writeFileSync(`${cwd}/output.json`, JSON.stringify(actual, null, '\t') + '\n');
 	} else {
 		fs.writeFileSync(`${cwd}/_actual.json`, JSON.stringify(actual, null, '\t'));
 
diff --git a/packages/svelte/tests/parser-modern/samples/attachments/output.json b/packages/svelte/tests/parser-modern/samples/attachments/output.json
index 56dd077add..d37fec7beb 100644
--- a/packages/svelte/tests/parser-modern/samples/attachments/output.json
+++ b/packages/svelte/tests/parser-modern/samples/attachments/output.json
@@ -12,6 +12,18 @@
 				"start": 0,
 				"end": 57,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 1,
+						"character": 1
+					},
+					"end": {
+						"line": 1,
+						"column": 4,
+						"character": 4
+					}
+				},
 				"attributes": [
 					{
 						"type": "AttachTag",
@@ -138,4 +150,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
index 7189e27e96..b26ee2866f 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
@@ -19,12 +19,36 @@
 				"start": 37,
 				"end": 117,
 				"name": "input",
+				"name_loc": {
+					"start": {
+						"line": 5,
+						"column": 1,
+						"character": 38
+					},
+					"end": {
+						"line": 5,
+						"column": 6,
+						"character": 43
+					}
+				},
 				"attributes": [
 					{
 						"start": 44,
 						"end": 114,
 						"type": "BindDirective",
 						"name": "value",
+						"name_loc": {
+							"start": {
+								"line": 5,
+								"column": 7,
+								"character": 44
+							},
+							"end": {
+								"line": 5,
+								"column": 17,
+								"character": 54
+							}
+						},
 						"expression": {
 							"type": "SequenceExpression",
 							"start": 68,
@@ -323,4 +347,4 @@
 		},
 		"attributes": []
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
index 39bfd43237..827ad85d92 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
@@ -138,6 +138,18 @@
 				"start": 36,
 				"end": 45,
 				"name": "lang",
+				"name_loc": {
+					"start": {
+						"line": 2,
+						"column": 8,
+						"character": 36
+					},
+					"end": {
+						"line": 2,
+						"column": 12,
+						"character": 40
+					}
+				},
 				"value": [
 					{
 						"start": 42,
@@ -150,4 +162,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json b/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
index a4abf172ac..26b4998587 100644
--- a/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
+++ b/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
@@ -1097,6 +1097,18 @@
 				"start": 808,
 				"end": 820,
 				"name": "h1",
+				"name_loc": {
+					"start": {
+						"line": 46,
+						"column": 1,
+						"character": 809
+					},
+					"end": {
+						"line": 46,
+						"column": 3,
+						"character": 811
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -1114,4 +1126,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json b/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
index a2e0195fab..e410cf2a80 100644
--- a/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
+++ b/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
@@ -406,4 +406,4 @@
 		"nodes": []
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/each-block-object-pattern-special-characters/output.json b/packages/svelte/tests/parser-modern/samples/each-block-object-pattern-special-characters/output.json
index 37fdf92296..7fd5deb3ea 100644
--- a/packages/svelte/tests/parser-modern/samples/each-block-object-pattern-special-characters/output.json
+++ b/packages/svelte/tests/parser-modern/samples/each-block-object-pattern-special-characters/output.json
@@ -823,4 +823,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/each-block-object-pattern/output.json b/packages/svelte/tests/parser-modern/samples/each-block-object-pattern/output.json
index b2a5f9e0d1..7e2fe09ea2 100644
--- a/packages/svelte/tests/parser-modern/samples/each-block-object-pattern/output.json
+++ b/packages/svelte/tests/parser-modern/samples/each-block-object-pattern/output.json
@@ -42,6 +42,18 @@
 							"start": 41,
 							"end": 86,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 2,
+									"column": 2,
+									"character": 42
+								},
+								"end": {
+									"line": 2,
+									"column": 3,
+									"character": 43
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -350,6 +362,18 @@
 							"start": 155,
 							"end": 200,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 6,
+									"column": 2,
+									"character": 156
+								},
+								"end": {
+									"line": 6,
+									"column": 3,
+									"character": 157
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -749,6 +773,18 @@
 							"start": 291,
 							"end": 336,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 10,
+									"column": 2,
+									"character": 292
+								},
+								"end": {
+									"line": 10,
+									"column": 3,
+									"character": 293
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -1178,4 +1214,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json b/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
index 44d98b7a91..5a0e64894d 100644
--- a/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
+++ b/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
@@ -20,9 +20,21 @@
 				"end": 92,
 				"expression": {
 					"type": "Identifier",
+					"name": "generic",
 					"start": 40,
 					"end": 47,
-					"name": "generic"
+					"loc": {
+						"start": {
+							"line": 4,
+							"column": 10,
+							"character": 40
+						},
+						"end": {
+							"line": 4,
+							"column": 17,
+							"character": 47
+						}
+					}
 				},
 				"typeParams": "T extends string",
 				"parameters": [
@@ -143,9 +155,21 @@
 				"end": 192,
 				"expression": {
 					"type": "Identifier",
+					"name": "complex_generic",
 					"start": 104,
 					"end": 119,
-					"name": "complex_generic"
+					"loc": {
+						"start": {
+							"line": 8,
+							"column": 10,
+							"character": 104
+						},
+						"end": {
+							"line": 8,
+							"column": 25,
+							"character": 119
+						}
+					}
 				},
 				"typeParams": "T extends { bracket: \"<\" } | \"<\" | Set<\"<>\">",
 				"parameters": [
@@ -284,6 +308,18 @@
 				"start": 8,
 				"end": 17,
 				"name": "lang",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 8,
+						"character": 8
+					},
+					"end": {
+						"line": 1,
+						"column": 12,
+						"character": 12
+					}
+				},
 				"value": [
 					{
 						"start": 14,
@@ -296,4 +332,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/if-block-else/output.json b/packages/svelte/tests/parser-modern/samples/if-block-else/output.json
index dcccde670c..13b56db9de 100644
--- a/packages/svelte/tests/parser-modern/samples/if-block-else/output.json
+++ b/packages/svelte/tests/parser-modern/samples/if-block-else/output.json
@@ -43,6 +43,18 @@
 							"start": 11,
 							"end": 21,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 2,
+									"column": 2,
+									"character": 12
+								},
+								"end": {
+									"line": 2,
+									"column": 3,
+									"character": 13
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -81,6 +93,18 @@
 							"start": 31,
 							"end": 45,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 4,
+									"column": 2,
+									"character": 32
+								},
+								"end": {
+									"line": 4,
+									"column": 3,
+									"character": 33
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -108,4 +132,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/if-block-elseif/output.json b/packages/svelte/tests/parser-modern/samples/if-block-elseif/output.json
index 6759f678d8..fb00488f31 100644
--- a/packages/svelte/tests/parser-modern/samples/if-block-elseif/output.json
+++ b/packages/svelte/tests/parser-modern/samples/if-block-elseif/output.json
@@ -76,6 +76,18 @@
 							"start": 14,
 							"end": 41,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 2,
+									"column": 2,
+									"character": 15
+								},
+								"end": {
+									"line": 2,
+									"column": 3,
+									"character": 16
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -171,6 +183,18 @@
 										"start": 60,
 										"end": 83,
 										"name": "p",
+										"name_loc": {
+											"start": {
+												"line": 4,
+												"column": 2,
+												"character": 61
+											},
+											"end": {
+												"line": 4,
+												"column": 3,
+												"character": 62
+											}
+										},
 										"attributes": [],
 										"fragment": {
 											"type": "Fragment",
@@ -202,4 +226,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/if-block/output.json b/packages/svelte/tests/parser-modern/samples/if-block/output.json
index 47ad4145a6..f363ed8274 100644
--- a/packages/svelte/tests/parser-modern/samples/if-block/output.json
+++ b/packages/svelte/tests/parser-modern/samples/if-block/output.json
@@ -45,4 +45,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/loose-invalid-block/output.json b/packages/svelte/tests/parser-modern/samples/loose-invalid-block/output.json
index 036b581d0c..69fc7a0c81 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-invalid-block/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-invalid-block/output.json
@@ -116,9 +116,21 @@
 				"end": 75,
 				"expression": {
 					"type": "Identifier",
+					"name": "",
 					"start": 63,
 					"end": 63,
-					"name": ""
+					"loc": {
+						"start": {
+							"line": 9,
+							"column": 10,
+							"character": 63
+						},
+						"end": {
+							"line": 9,
+							"column": 10,
+							"character": 63
+						}
+					}
 				},
 				"parameters": [],
 				"body": {
@@ -147,9 +159,21 @@
 				"end": 102,
 				"expression": {
 					"type": "Identifier",
+					"name": "foo",
 					"start": 87,
 					"end": 90,
-					"name": "foo"
+					"loc": {
+						"start": {
+							"line": 12,
+							"column": 10,
+							"character": 87
+						},
+						"end": {
+							"line": 12,
+							"column": 13,
+							"character": 90
+						}
+					}
 				},
 				"parameters": [],
 				"body": {
@@ -168,4 +192,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/loose-invalid-expression/output.json b/packages/svelte/tests/parser-modern/samples/loose-invalid-expression/output.json
index 6231a19309..593aebe279 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-invalid-expression/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-invalid-expression/output.json
@@ -12,21 +12,57 @@
 				"start": 0,
 				"end": 14,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 1,
+						"character": 1
+					},
+					"end": {
+						"line": 1,
+						"column": 4,
+						"character": 4
+					}
+				},
 				"attributes": [
 					{
 						"type": "Attribute",
 						"start": 5,
 						"end": 7,
 						"name": "",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 6,
+								"character": 6
+							},
+							"end": {
+								"line": 1,
+								"column": 6,
+								"character": 6
+							}
+						},
 						"value": {
 							"type": "ExpressionTag",
 							"start": 6,
 							"end": 6,
 							"expression": {
+								"type": "Identifier",
+								"name": "",
 								"start": 6,
 								"end": 6,
-								"type": "Identifier",
-								"name": ""
+								"loc": {
+									"start": {
+										"line": 1,
+										"column": 6,
+										"character": 6
+									},
+									"end": {
+										"line": 1,
+										"column": 6,
+										"character": 6
+									}
+								}
 							}
 						}
 					}
@@ -48,12 +84,36 @@
 				"start": 15,
 				"end": 33,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 2,
+						"column": 1,
+						"character": 16
+					},
+					"end": {
+						"line": 2,
+						"column": 4,
+						"character": 19
+					}
+				},
 				"attributes": [
 					{
 						"type": "Attribute",
 						"start": 20,
 						"end": 26,
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 2,
+								"column": 5,
+								"character": 20
+							},
+							"end": {
+								"line": 2,
+								"column": 8,
+								"character": 23
+							}
+						},
 						"value": {
 							"type": "ExpressionTag",
 							"start": 24,
@@ -84,12 +144,36 @@
 				"start": 35,
 				"end": 55,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 4,
+						"column": 1,
+						"character": 36
+					},
+					"end": {
+						"line": 4,
+						"column": 4,
+						"character": 39
+					}
+				},
 				"attributes": [
 					{
 						"type": "Attribute",
 						"start": 40,
 						"end": 48,
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 4,
+								"column": 5,
+								"character": 40
+							},
+							"end": {
+								"line": 4,
+								"column": 8,
+								"character": 43
+							}
+						},
 						"value": {
 							"type": "ExpressionTag",
 							"start": 44,
@@ -120,12 +204,36 @@
 				"start": 56,
 				"end": 80,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 5,
+						"column": 1,
+						"character": 57
+					},
+					"end": {
+						"line": 5,
+						"column": 4,
+						"character": 60
+					}
+				},
 				"attributes": [
 					{
 						"type": "Attribute",
 						"start": 61,
 						"end": 73,
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 5,
+								"column": 5,
+								"character": 61
+							},
+							"end": {
+								"line": 5,
+								"column": 8,
+								"character": 64
+							}
+						},
 						"value": {
 							"type": "ExpressionTag",
 							"start": 65,
@@ -156,12 +264,36 @@
 				"start": 81,
 				"end": 113,
 				"name": "Component",
+				"name_loc": {
+					"start": {
+						"line": 6,
+						"column": 1,
+						"character": 82
+					},
+					"end": {
+						"line": 6,
+						"column": 10,
+						"character": 91
+					}
+				},
 				"attributes": [
 					{
 						"type": "Attribute",
 						"start": 92,
 						"end": 110,
 						"name": "onclick",
+						"name_loc": {
+							"start": {
+								"line": 6,
+								"column": 11,
+								"character": 92
+							},
+							"end": {
+								"line": 6,
+								"column": 18,
+								"character": 99
+							}
+						},
 						"value": {
 							"type": "ExpressionTag",
 							"start": 100,
@@ -192,12 +324,36 @@
 				"start": 115,
 				"end": 140,
 				"name": "input",
+				"name_loc": {
+					"start": {
+						"line": 8,
+						"column": 1,
+						"character": 116
+					},
+					"end": {
+						"line": 8,
+						"column": 6,
+						"character": 121
+					}
+				},
 				"attributes": [
 					{
 						"start": 122,
 						"end": 137,
 						"type": "BindDirective",
 						"name": "value",
+						"name_loc": {
+							"start": {
+								"line": 8,
+								"column": 7,
+								"character": 122
+							},
+							"end": {
+								"line": 8,
+								"column": 17,
+								"character": 132
+							}
+						},
 						"expression": {
 							"type": "Identifier",
 							"start": 134,
@@ -307,6 +463,7 @@
 					"type": "Identifier",
 					"name": "item",
 					"start": 197,
+					"end": 201,
 					"loc": {
 						"start": {
 							"line": 15,
@@ -318,8 +475,7 @@
 							"column": 20,
 							"character": 201
 						}
-					},
-					"end": 201
+					}
 				},
 				"key": {
 					"type": "Identifier",
@@ -353,6 +509,7 @@
 					"type": "Identifier",
 					"name": "item",
 					"start": 234,
+					"end": 238,
 					"loc": {
 						"start": {
 							"line": 17,
@@ -364,8 +521,7 @@
 							"column": 19,
 							"character": 238
 						}
-					},
-					"end": 238
+					}
 				}
 			},
 			{
@@ -415,6 +571,7 @@
 					"type": "Identifier",
 					"name": "y",
 					"start": 285,
+					"end": 286,
 					"loc": {
 						"start": {
 							"line": 21,
@@ -426,8 +583,7 @@
 							"column": 17,
 							"character": 286
 						}
-					},
-					"end": 286
+					}
 				},
 				"error": null,
 				"pending": null,
@@ -459,6 +615,7 @@
 					"type": "Identifier",
 					"name": "y",
 					"start": 314,
+					"end": 315,
 					"loc": {
 						"start": {
 							"line": 23,
@@ -470,8 +627,7 @@
 							"column": 18,
 							"character": 315
 						}
-					},
-					"end": 315
+					}
 				},
 				"pending": null,
 				"then": null,
@@ -483,4 +639,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/loose-unclosed-open-tag/output.json b/packages/svelte/tests/parser-modern/samples/loose-unclosed-open-tag/output.json
index a7985ead8f..b614e0391d 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-unclosed-open-tag/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-unclosed-open-tag/output.json
@@ -12,6 +12,18 @@
 				"start": 0,
 				"end": 29,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 1,
+						"character": 1
+					},
+					"end": {
+						"line": 1,
+						"column": 4,
+						"character": 4
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -28,12 +40,36 @@
 							"start": 7,
 							"end": 23,
 							"name": "Comp",
+							"name_loc": {
+								"start": {
+									"line": 2,
+									"column": 2,
+									"character": 8
+								},
+								"end": {
+									"line": 2,
+									"column": 6,
+									"character": 12
+								}
+							},
 							"attributes": [
 								{
 									"type": "Attribute",
 									"start": 13,
 									"end": 22,
 									"name": "foo",
+									"name_loc": {
+										"start": {
+											"line": 2,
+											"column": 7,
+											"character": 13
+										},
+										"end": {
+											"line": 2,
+											"column": 10,
+											"character": 16
+										}
+									},
 									"value": {
 										"type": "ExpressionTag",
 										"start": 17,
@@ -77,6 +113,18 @@
 				"start": 31,
 				"end": 60,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 5,
+						"column": 1,
+						"character": 32
+					},
+					"end": {
+						"line": 5,
+						"column": 4,
+						"character": 35
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -93,12 +141,36 @@
 							"start": 38,
 							"end": 54,
 							"name": "span",
+							"name_loc": {
+								"start": {
+									"line": 6,
+									"column": 2,
+									"character": 39
+								},
+								"end": {
+									"line": 6,
+									"column": 6,
+									"character": 43
+								}
+							},
 							"attributes": [
 								{
 									"type": "Attribute",
 									"start": 44,
 									"end": 53,
 									"name": "foo",
+									"name_loc": {
+										"start": {
+											"line": 6,
+											"column": 7,
+											"character": 44
+										},
+										"end": {
+											"line": 6,
+											"column": 10,
+											"character": 47
+										}
+									},
 									"value": {
 										"type": "ExpressionTag",
 										"start": 48,
@@ -173,12 +245,36 @@
 							"start": 73,
 							"end": 89,
 							"name": "Comp",
+							"name_loc": {
+								"start": {
+									"line": 10,
+									"column": 2,
+									"character": 74
+								},
+								"end": {
+									"line": 10,
+									"column": 6,
+									"character": 78
+								}
+							},
 							"attributes": [
 								{
 									"type": "Attribute",
 									"start": 79,
 									"end": 88,
 									"name": "foo",
+									"name_loc": {
+										"start": {
+											"line": 10,
+											"column": 7,
+											"character": 79
+										},
+										"end": {
+											"line": 10,
+											"column": 10,
+											"character": 82
+										}
+									},
 									"value": {
 										"type": "ExpressionTag",
 										"start": 83,
@@ -254,12 +350,36 @@
 							"start": 107,
 							"end": 124,
 							"name": "Comp",
+							"name_loc": {
+								"start": {
+									"line": 14,
+									"column": 2,
+									"character": 108
+								},
+								"end": {
+									"line": 14,
+									"column": 6,
+									"character": 112
+								}
+							},
 							"attributes": [
 								{
 									"type": "Attribute",
 									"start": 113,
 									"end": 122,
 									"name": "foo",
+									"name_loc": {
+										"start": {
+											"line": 14,
+											"column": 7,
+											"character": 113
+										},
+										"end": {
+											"line": 14,
+											"column": 10,
+											"character": 116
+										}
+									},
 									"value": {
 										"type": "ExpressionTag",
 										"start": 117,
@@ -374,12 +494,36 @@
 				"start": 156,
 				"end": 170,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 20,
+						"column": 1,
+						"character": 157
+					},
+					"end": {
+						"line": 20,
+						"column": 4,
+						"character": 160
+					}
+				},
 				"attributes": [
 					{
 						"type": "Attribute",
 						"start": 161,
 						"end": 170,
 						"name": "foo",
+						"name_loc": {
+							"start": {
+								"line": 20,
+								"column": 5,
+								"character": 161
+							},
+							"end": {
+								"line": 20,
+								"column": 8,
+								"character": 164
+							}
+						},
 						"value": {
 							"type": "ExpressionTag",
 							"start": 165,
@@ -411,4 +555,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/loose-unclosed-tag/output.json b/packages/svelte/tests/parser-modern/samples/loose-unclosed-tag/output.json
index df72219d43..59bff2ff80 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-unclosed-tag/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-unclosed-tag/output.json
@@ -12,6 +12,18 @@
 				"start": 0,
 				"end": 20,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 1,
+						"character": 1
+					},
+					"end": {
+						"line": 1,
+						"column": 4,
+						"character": 4
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -28,6 +40,18 @@
 							"start": 7,
 							"end": 14,
 							"name": "Comp",
+							"name_loc": {
+								"start": {
+									"line": 2,
+									"column": 2,
+									"character": 8
+								},
+								"end": {
+									"line": 2,
+									"column": 6,
+									"character": 12
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -57,6 +81,18 @@
 				"start": 22,
 				"end": 51,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 5,
+						"column": 1,
+						"character": 23
+					},
+					"end": {
+						"line": 5,
+						"column": 4,
+						"character": 26
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -73,12 +109,36 @@
 							"start": 29,
 							"end": 45,
 							"name": "Comp",
+							"name_loc": {
+								"start": {
+									"line": 6,
+									"column": 2,
+									"character": 30
+								},
+								"end": {
+									"line": 6,
+									"column": 6,
+									"character": 34
+								}
+							},
 							"attributes": [
 								{
 									"type": "Attribute",
 									"start": 35,
 									"end": 44,
 									"name": "foo",
+									"name_loc": {
+										"start": {
+											"line": 6,
+											"column": 7,
+											"character": 35
+										},
+										"end": {
+											"line": 6,
+											"column": 10,
+											"character": 38
+										}
+									},
 									"value": {
 										"type": "ExpressionTag",
 										"start": 39,
@@ -122,6 +182,18 @@
 				"start": 53,
 				"end": 72,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 9,
+						"column": 1,
+						"character": 54
+					},
+					"end": {
+						"line": 9,
+						"column": 4,
+						"character": 57
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -138,6 +210,18 @@
 							"start": 60,
 							"end": 66,
 							"name": "span",
+							"name_loc": {
+								"start": {
+									"line": 10,
+									"column": 2,
+									"character": 61
+								},
+								"end": {
+									"line": 10,
+									"column": 6,
+									"character": 65
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -159,6 +243,18 @@
 				"start": 74,
 				"end": 94,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 13,
+						"column": 1,
+						"character": 75
+					},
+					"end": {
+						"line": 13,
+						"column": 4,
+						"character": 78
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -175,6 +271,18 @@
 							"start": 81,
 							"end": 88,
 							"name": "Comp.",
+							"name_loc": {
+								"start": {
+									"line": 14,
+									"column": 2,
+									"character": 82
+								},
+								"end": {
+									"line": 14,
+									"column": 7,
+									"character": 87
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -196,6 +304,18 @@
 				"start": 96,
 				"end": 116,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 17,
+						"column": 1,
+						"character": 97
+					},
+					"end": {
+						"line": 17,
+						"column": 4,
+						"character": 100
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -212,6 +332,18 @@
 							"start": 103,
 							"end": 110,
 							"name": "comp.",
+							"name_loc": {
+								"start": {
+									"line": 18,
+									"column": 2,
+									"character": 104
+								},
+								"end": {
+									"line": 18,
+									"column": 7,
+									"character": 109
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -264,6 +396,18 @@
 							"start": 129,
 							"end": 135,
 							"name": "div",
+							"name_loc": {
+								"start": {
+									"line": 22,
+									"column": 2,
+									"character": 130
+								},
+								"end": {
+									"line": 22,
+									"column": 5,
+									"character": 133
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -325,12 +469,36 @@
 							"start": 153,
 							"end": 169,
 							"name": "Comp",
+							"name_loc": {
+								"start": {
+									"line": 26,
+									"column": 2,
+									"character": 154
+								},
+								"end": {
+									"line": 26,
+									"column": 6,
+									"character": 158
+								}
+							},
 							"attributes": [
 								{
 									"type": "Attribute",
 									"start": 159,
 									"end": 168,
 									"name": "foo",
+									"name_loc": {
+										"start": {
+											"line": 26,
+											"column": 7,
+											"character": 159
+										},
+										"end": {
+											"line": 26,
+											"column": 10,
+											"character": 162
+										}
+									},
 									"value": {
 										"type": "ExpressionTag",
 										"start": 163,
@@ -375,6 +543,18 @@
 				"start": 176,
 				"end": 204,
 				"name": "div",
+				"name_loc": {
+					"start": {
+						"line": 29,
+						"column": 1,
+						"character": 177
+					},
+					"end": {
+						"line": 29,
+						"column": 4,
+						"character": 180
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -391,6 +571,18 @@
 							"start": 182,
 							"end": 191,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 30,
+									"column": 1,
+									"character": 183
+								},
+								"end": {
+									"line": 30,
+									"column": 2,
+									"character": 184
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -417,6 +609,18 @@
 							"start": 193,
 							"end": 204,
 							"name": "open-ended",
+							"name_loc": {
+								"start": {
+									"line": 32,
+									"column": 1,
+									"character": 194
+								},
+								"end": {
+									"line": 32,
+									"column": 11,
+									"character": 204
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -429,4 +633,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json b/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
index c579e46d69..6096907d5d 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
@@ -49,6 +49,18 @@
 							"start": 86,
 							"end": 111,
 							"name": "div",
+							"name_loc": {
+								"start": {
+									"line": 6,
+									"column": 2,
+									"character": 87
+								},
+								"end": {
+									"line": 6,
+									"column": 5,
+									"character": 90
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -293,6 +305,18 @@
 				"start": 8,
 				"end": 17,
 				"name": "lang",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 8,
+						"character": 8
+					},
+					"end": {
+						"line": 1,
+						"column": 12,
+						"character": 12
+					}
+				},
 				"value": [
 					{
 						"start": 14,
@@ -305,4 +329,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/options/output.json b/packages/svelte/tests/parser-modern/samples/options/output.json
index 97e5351564..62c9fc1b9d 100644
--- a/packages/svelte/tests/parser-modern/samples/options/output.json
+++ b/packages/svelte/tests/parser-modern/samples/options/output.json
@@ -32,6 +32,18 @@
 				"start": 16,
 				"end": 49,
 				"name": "customElement",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 16,
+						"character": 16
+					},
+					"end": {
+						"line": 1,
+						"column": 29,
+						"character": 29
+					}
+				},
 				"value": [
 					{
 						"start": 31,
@@ -47,6 +59,18 @@
 				"start": 50,
 				"end": 62,
 				"name": "runes",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 50,
+						"character": 50
+					},
+					"end": {
+						"line": 1,
+						"column": 55,
+						"character": 55
+					}
+				},
 				"value": {
 					"type": "ExpressionTag",
 					"start": 56,
@@ -104,6 +128,18 @@
 				"start": 75,
 				"end": 81,
 				"name": "module",
+				"name_loc": {
+					"start": {
+						"line": 3,
+						"column": 8,
+						"character": 75
+					},
+					"end": {
+						"line": 3,
+						"column": 14,
+						"character": 81
+					}
+				},
 				"value": true
 			},
 			{
@@ -111,6 +147,18 @@
 				"start": 82,
 				"end": 91,
 				"name": "lang",
+				"name_loc": {
+					"start": {
+						"line": 3,
+						"column": 15,
+						"character": 82
+					},
+					"end": {
+						"line": 3,
+						"column": 19,
+						"character": 86
+					}
+				},
 				"value": [
 					{
 						"start": 88,
@@ -151,6 +199,18 @@
 				"start": 112,
 				"end": 121,
 				"name": "lang",
+				"name_loc": {
+					"start": {
+						"line": 6,
+						"column": 8,
+						"character": 112
+					},
+					"end": {
+						"line": 6,
+						"column": 12,
+						"character": 116
+					}
+				},
 				"value": [
 					{
 						"start": 118,
@@ -166,6 +226,18 @@
 				"start": 122,
 				"end": 158,
 				"name": "generics",
+				"name_loc": {
+					"start": {
+						"line": 6,
+						"column": 18,
+						"character": 122
+					},
+					"end": {
+						"line": 6,
+						"column": 26,
+						"character": 130
+					}
+				},
 				"value": [
 					{
 						"start": 132,
@@ -178,4 +250,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json b/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
index ff452b3563..e95ccb4094 100644
--- a/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
+++ b/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
@@ -87,6 +87,18 @@
 				"start": 0,
 				"end": 35,
 				"name": "h1",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 1,
+						"character": 1
+					},
+					"end": {
+						"line": 1,
+						"column": 3,
+						"character": 3
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -111,4 +123,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/snippets/output.json b/packages/svelte/tests/parser-modern/samples/snippets/output.json
index 1baa53f7cf..d760fe2e2d 100644
--- a/packages/svelte/tests/parser-modern/samples/snippets/output.json
+++ b/packages/svelte/tests/parser-modern/samples/snippets/output.json
@@ -20,9 +20,21 @@
 				"end": 81,
 				"expression": {
 					"type": "Identifier",
+					"name": "foo",
 					"start": 39,
 					"end": 42,
-					"name": "foo"
+					"loc": {
+						"start": {
+							"line": 3,
+							"column": 10,
+							"character": 39
+						},
+						"end": {
+							"line": 3,
+							"column": 13,
+							"character": 42
+						}
+					}
 				},
 				"parameters": [
 					{
@@ -87,6 +99,18 @@
 							"start": 58,
 							"end": 70,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 4,
+									"column": 2,
+									"character": 59
+								},
+								"end": {
+									"line": 4,
+									"column": 3,
+									"character": 60
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -218,6 +242,18 @@
 				"start": 8,
 				"end": 17,
 				"name": "lang",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 8,
+						"character": 8
+					},
+					"end": {
+						"line": 1,
+						"column": 12,
+						"character": 12
+					}
+				},
 				"value": [
 					{
 						"start": 14,
@@ -230,4 +266,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/template-shadowroot/output.json b/packages/svelte/tests/parser-modern/samples/template-shadowroot/output.json
index 6039b6d52d..2cc1dc4988 100644
--- a/packages/svelte/tests/parser-modern/samples/template-shadowroot/output.json
+++ b/packages/svelte/tests/parser-modern/samples/template-shadowroot/output.json
@@ -12,12 +12,36 @@
 				"start": 0,
 				"end": 66,
 				"name": "template",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 1,
+						"character": 1
+					},
+					"end": {
+						"line": 1,
+						"column": 9,
+						"character": 9
+					}
+				},
 				"attributes": [
 					{
 						"type": "Attribute",
 						"start": 10,
 						"end": 31,
 						"name": "shadowrootmode",
+						"name_loc": {
+							"start": {
+								"line": 1,
+								"column": 10,
+								"character": 10
+							},
+							"end": {
+								"line": 1,
+								"column": 24,
+								"character": 24
+							}
+						},
 						"value": [
 							{
 								"start": 26,
@@ -44,6 +68,18 @@
 							"start": 34,
 							"end": 54,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 2,
+									"column": 2,
+									"character": 35
+								},
+								"end": {
+									"line": 2,
+									"column": 3,
+									"character": 36
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -53,6 +89,18 @@
 										"start": 37,
 										"end": 50,
 										"name": "slot",
+										"name_loc": {
+											"start": {
+												"line": 2,
+												"column": 5,
+												"character": 38
+											},
+											"end": {
+												"line": 2,
+												"column": 9,
+												"character": 42
+											}
+										},
 										"attributes": [],
 										"fragment": {
 											"type": "Fragment",
@@ -84,6 +132,18 @@
 				"start": 67,
 				"end": 111,
 				"name": "template",
+				"name_loc": {
+					"start": {
+						"line": 4,
+						"column": 1,
+						"character": 68
+					},
+					"end": {
+						"line": 4,
+						"column": 9,
+						"character": 76
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -100,6 +160,18 @@
 							"start": 79,
 							"end": 99,
 							"name": "p",
+							"name_loc": {
+								"start": {
+									"line": 5,
+									"column": 2,
+									"character": 80
+								},
+								"end": {
+									"line": 5,
+									"column": 3,
+									"character": 81
+								}
+							},
 							"attributes": [],
 							"fragment": {
 								"type": "Fragment",
@@ -109,6 +181,18 @@
 										"start": 82,
 										"end": 95,
 										"name": "slot",
+										"name_loc": {
+											"start": {
+												"line": 5,
+												"column": 5,
+												"character": 83
+											},
+											"end": {
+												"line": 5,
+												"column": 9,
+												"character": 87
+											}
+										},
 										"attributes": [],
 										"fragment": {
 											"type": "Fragment",
@@ -140,6 +224,18 @@
 				"start": 112,
 				"end": 125,
 				"name": "slot",
+				"name_loc": {
+					"start": {
+						"line": 7,
+						"column": 1,
+						"character": 113
+					},
+					"end": {
+						"line": 7,
+						"column": 5,
+						"character": 117
+					}
+				},
 				"attributes": [],
 				"fragment": {
 					"type": "Fragment",
@@ -149,4 +245,4 @@
 		]
 	},
 	"options": null
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json b/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
index a53e1eeebf..4281d6fa46 100644
--- a/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
+++ b/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
@@ -19,12 +19,36 @@
 				"start": 54,
 				"end": 173,
 				"name": "button",
+				"name_loc": {
+					"start": {
+						"line": 5,
+						"column": 1,
+						"character": 55
+					},
+					"end": {
+						"line": 5,
+						"column": 7,
+						"character": 61
+					}
+				},
 				"attributes": [
 					{
 						"start": 63,
 						"end": 147,
 						"type": "OnDirective",
 						"name": "click",
+						"name_loc": {
+							"start": {
+								"line": 6,
+								"column": 1,
+								"character": 63
+							},
+							"end": {
+								"line": 6,
+								"column": 9,
+								"character": 71
+							}
+						},
 						"expression": {
 							"type": "ArrowFunctionExpression",
 							"start": 73,
@@ -485,6 +509,18 @@
 				"start": 8,
 				"end": 17,
 				"name": "lang",
+				"name_loc": {
+					"start": {
+						"line": 1,
+						"column": 8,
+						"character": 8
+					},
+					"end": {
+						"line": 1,
+						"column": 12,
+						"character": 12
+					}
+				},
 				"value": [
 					{
 						"start": 14,
@@ -497,4 +533,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/svelte/tests/parser-modern/test.ts b/packages/svelte/tests/parser-modern/test.ts
index e38bfc7525..fb762e89e1 100644
--- a/packages/svelte/tests/parser-modern/test.ts
+++ b/packages/svelte/tests/parser-modern/test.ts
@@ -29,7 +29,7 @@ const { test, run } = suite<ParserTest>(async (config, cwd) => {
 
 	// run `UPDATE_SNAPSHOTS=true pnpm test parser` to update parser tests
 	if (process.env.UPDATE_SNAPSHOTS) {
-		fs.writeFileSync(`${cwd}/output.json`, JSON.stringify(actual, null, '\t'));
+		fs.writeFileSync(`${cwd}/output.json`, JSON.stringify(actual, null, '\t') + '\n');
 	} else {
 		fs.writeFileSync(`${cwd}/_actual.json`, JSON.stringify(actual, null, '\t'));
 
@@ -66,6 +66,8 @@ function clean(ast: AST.SvelteNode) {
 			// @ts-ignore
 			delete node.loc;
 			// @ts-ignore
+			delete node.name_loc;
+			// @ts-ignore
 			delete node.leadingComments;
 			// @ts-ignore
 			delete node.trailingComments;
@@ -132,6 +134,18 @@ it('Strips BOM from the input', () => {
 					nodes: [],
 					type: 'Fragment'
 				},
+				name_loc: {
+					end: {
+						character: 4,
+						column: 4,
+						line: 1
+					},
+					start: {
+						character: 1,
+						column: 1,
+						line: 1
+					}
+				},
 				name: 'div',
 				start: 0,
 				type: 'RegularElement'
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 8561268689..0e6b019b62 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -842,7 +842,7 @@ declare module 'svelte/attachments' {
 
 declare module 'svelte/compiler' {
 	import type { SourceMap } from 'magic-string';
-	import type { ArrayExpression, ArrowFunctionExpression, VariableDeclaration, VariableDeclarator, Expression, Identifier, MemberExpression, Node, ObjectExpression, Pattern, Program, ChainExpression, SimpleCallExpression, SequenceExpression } from 'estree';
+	import type { ArrayExpression, ArrowFunctionExpression, VariableDeclaration, VariableDeclarator, Expression, Identifier, MemberExpression, Node, ObjectExpression, Pattern, Program, ChainExpression, SimpleCallExpression, SequenceExpression, SourceLocation } from 'estree';
 	import type { Location } from 'locate-character';
 	import type { default as ts } from 'esrap/languages/ts';
 	/**
@@ -1302,7 +1302,7 @@ declare module 'svelte/compiler' {
 		}
 
 		/** An `animate:` directive */
-		export interface AnimateDirective extends BaseNode {
+		export interface AnimateDirective extends BaseAttribute {
 			type: 'AnimateDirective';
 			/** The 'x' in `animate:x` */
 			name: string;
@@ -1311,7 +1311,7 @@ declare module 'svelte/compiler' {
 		}
 
 		/** A `bind:` directive */
-		export interface BindDirective extends BaseNode {
+		export interface BindDirective extends BaseAttribute {
 			type: 'BindDirective';
 			/** The 'x' in `bind:x` */
 			name: string;
@@ -1320,7 +1320,7 @@ declare module 'svelte/compiler' {
 		}
 
 		/** A `class:` directive */
-		export interface ClassDirective extends BaseNode {
+		export interface ClassDirective extends BaseAttribute {
 			type: 'ClassDirective';
 			/** The 'x' in `class:x` */
 			name: 'class';
@@ -1329,7 +1329,7 @@ declare module 'svelte/compiler' {
 		}
 
 		/** A `let:` directive */
-		export interface LetDirective extends BaseNode {
+		export interface LetDirective extends BaseAttribute {
 			type: 'LetDirective';
 			/** The 'x' in `let:x` */
 			name: string;
@@ -1338,7 +1338,7 @@ declare module 'svelte/compiler' {
 		}
 
 		/** An `on:` directive */
-		export interface OnDirective extends BaseNode {
+		export interface OnDirective extends BaseAttribute {
 			type: 'OnDirective';
 			/** The 'x' in `on:x` */
 			name: string;
@@ -1358,7 +1358,7 @@ declare module 'svelte/compiler' {
 		}
 
 		/** A `style:` directive */
-		export interface StyleDirective extends BaseNode {
+		export interface StyleDirective extends BaseAttribute {
 			type: 'StyleDirective';
 			/** The 'x' in `style:x` */
 			name: string;
@@ -1369,7 +1369,7 @@ declare module 'svelte/compiler' {
 
 		// TODO have separate in/out/transition directives
 		/** A `transition:`, `in:` or `out:` directive */
-		export interface TransitionDirective extends BaseNode {
+		export interface TransitionDirective extends BaseAttribute {
 			type: 'TransitionDirective';
 			/** The 'x' in `transition:x` */
 			name: string;
@@ -1383,7 +1383,7 @@ declare module 'svelte/compiler' {
 		}
 
 		/** A `use:` directive */
-		export interface UseDirective extends BaseNode {
+		export interface UseDirective extends BaseAttribute {
 			type: 'UseDirective';
 			/** The 'x' in `use:x` */
 			name: string;
@@ -1393,6 +1393,7 @@ declare module 'svelte/compiler' {
 
 		export interface BaseElement extends BaseNode {
 			name: string;
+			name_loc: SourceLocation;
 			attributes: Array<Attribute | SpreadAttribute | Directive | AttachTag>;
 			fragment: Fragment;
 		}
@@ -1517,9 +1518,13 @@ declare module 'svelte/compiler' {
 			body: Fragment;
 		}
 
-		export interface Attribute extends BaseNode {
-			type: 'Attribute';
+		export interface BaseAttribute extends BaseNode {
 			name: string;
+			name_loc: SourceLocation | null;
+		}
+
+		export interface Attribute extends BaseAttribute {
+			type: 'Attribute';
 			/**
 			 * Quoted/string values are represented by an array, even if they contain a single expression like `"{x}"`
 			 */

From 649d8572a6e76fbfe3529b17b202360764b8cabd Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 1 Dec 2025 13:48:54 -0500
Subject: [PATCH 217/347] fix: handle cross-realm Promises in `hydratable`
 (#17284)

---
 .changeset/olive-mangos-march.md                  |  5 +++++
 packages/svelte/src/internal/server/hydratable.js | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/olive-mangos-march.md

diff --git a/.changeset/olive-mangos-march.md b/.changeset/olive-mangos-march.md
new file mode 100644
index 0000000000..28253eb49a
--- /dev/null
+++ b/.changeset/olive-mangos-march.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: handle cross-realm Promises in `hydratable`
diff --git a/packages/svelte/src/internal/server/hydratable.js b/packages/svelte/src/internal/server/hydratable.js
index 59fa97da4c..5711885ed4 100644
--- a/packages/svelte/src/internal/server/hydratable.js
+++ b/packages/svelte/src/internal/server/hydratable.js
@@ -56,7 +56,7 @@ function encode(key, value, unresolved) {
 	let uid = 1;
 
 	entry.serialized = devalue.uneval(entry.value, (value, uneval) => {
-		if (value instanceof Promise) {
+		if (is_promise(value)) {
 			const p = value
 				.then((v) => `r(${uneval(v)})`)
 				.catch((devalue_error) =>
@@ -90,6 +90,16 @@ function encode(key, value, unresolved) {
 	return entry;
 }
 
+/**
+ * @param {any} value
+ * @returns {value is Promise<any>}
+ */
+function is_promise(value) {
+	// we use this check rather than `instanceof Promise`
+	// because it works cross-realm
+	return Object.prototype.toString.call(value) === '[object Promise]';
+}
+
 /**
  * @param {string} key
  * @param {HydratableLookupEntry} a

From f8287b0d91b5be4b62b70f5fe0a64685b935f6d0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 1 Dec 2025 14:00:01 -0500
Subject: [PATCH 218/347] Version Packages (#17268)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/curly-phones-cross.md  |  5 -----
 .changeset/gentle-views-matter.md |  5 -----
 .changeset/olive-mangos-march.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/curly-phones-cross.md
 delete mode 100644 .changeset/gentle-views-matter.md
 delete mode 100644 .changeset/olive-mangos-march.md

diff --git a/.changeset/curly-phones-cross.md b/.changeset/curly-phones-cross.md
deleted file mode 100644
index 4398ec1862..0000000000
--- a/.changeset/curly-phones-cross.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-add props to state_referenced_locally
diff --git a/.changeset/gentle-views-matter.md b/.changeset/gentle-views-matter.md
deleted file mode 100644
index 2b0b361317..0000000000
--- a/.changeset/gentle-views-matter.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: preserve node locations for better sourcemaps
diff --git a/.changeset/olive-mangos-march.md b/.changeset/olive-mangos-march.md
deleted file mode 100644
index 28253eb49a..0000000000
--- a/.changeset/olive-mangos-march.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: handle cross-realm Promises in `hydratable`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 5add3b03ea..2e8b9e814f 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.45.3
+
+### Patch Changes
+
+- add props to state_referenced_locally ([#17266](https://github.com/sveltejs/svelte/pull/17266))
+
+- fix: preserve node locations for better sourcemaps ([#17269](https://github.com/sveltejs/svelte/pull/17269))
+
+- fix: handle cross-realm Promises in `hydratable` ([#17284](https://github.com/sveltejs/svelte/pull/17284))
+
 ## 5.45.2
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index b0f4cbc648..e0525eac8b 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.45.2",
+  "version": "5.45.3",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 71be80f593..69f6907a49 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.45.2';
+export const VERSION = '5.45.3';
 export const PUBLIC_VERSION = '5';

From 0e1c98ea11e677d488aa61329e4873b33a901029 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 1 Dec 2025 16:35:08 -0500
Subject: [PATCH 219/347] fix: allow `$props.id()` to occur after an `await`
 (#17285)

---
 .changeset/sad-paths-build.md                         |  5 +++++
 .../svelte/src/compiler/phases/2-analyze/index.js     |  5 +++++
 .../runtime-runes/samples/async-props-id/_config.js   | 11 +++++++++++
 .../runtime-runes/samples/async-props-id/main.svelte  |  6 ++++++
 4 files changed, 27 insertions(+)
 create mode 100644 .changeset/sad-paths-build.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-props-id/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-props-id/main.svelte

diff --git a/.changeset/sad-paths-build.md b/.changeset/sad-paths-build.md
new file mode 100644
index 0000000000..f64d6f766c
--- /dev/null
+++ b/.changeset/sad-paths-build.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: allow `$props.id()` to occur after an `await`
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index e44cf23ff5..6d23e4d265 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -1105,6 +1105,11 @@ function calculate_blockers(instance, scopes, analysis) {
 			functions.push(node);
 		} else if (node.type === 'VariableDeclaration') {
 			for (const declarator of node.declarations) {
+				if (get_rune(declarator.init, instance.scope) === '$props.id') {
+					// special case
+					continue;
+				}
+
 				if (
 					declarator.init?.type === 'ArrowFunctionExpression' ||
 					declarator.init?.type === 'FunctionExpression'
diff --git a/packages/svelte/tests/runtime-runes/samples/async-props-id/_config.js b/packages/svelte/tests/runtime-runes/samples/async-props-id/_config.js
new file mode 100644
index 0000000000..3c6a6ed247
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-props-id/_config.js
@@ -0,0 +1,11 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	ssrHtml: `<p>s1</p>`,
+
+	async test({ assert, target, variant }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, variant === 'hydrate' ? '<p>s1</p>' : '<p>c1</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-props-id/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-props-id/main.svelte
new file mode 100644
index 0000000000..973d6855a6
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-props-id/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	await 1
+	const id = $props.id();
+</script>
+
+<p>{id}</p>

From 5b5f688dddc8021dfaaf6a2e257f71c8b9fe180a Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Tue, 2 Dec 2025 18:52:11 +0100
Subject: [PATCH 220/347] fix: `print(ast)` types (#17255)

* fix types?

* fix types?

* fix types?

* fix types?

* revert stuff

* check fix?

* comment

* fix types

* update esrap

* esrap 2.2.1

---------

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/svelte/package.json                  |  2 +-
 packages/svelte/src/compiler/print/types.d.ts |  3 ++-
 packages/svelte/types/index.d.ts              |  2 ++
 pnpm-lock.yaml                                | 10 +++++-----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index e0525eac8b..b3af271800 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -176,7 +176,7 @@
     "clsx": "^2.1.1",
     "devalue": "^5.5.0",
     "esm-env": "^1.2.1",
-    "esrap": "^2.2.0",
+    "esrap": "^2.2.1",
     "is-reference": "^3.0.3",
     "locate-character": "^3.0.0",
     "magic-string": "^0.30.11",
diff --git a/packages/svelte/src/compiler/print/types.d.ts b/packages/svelte/src/compiler/print/types.d.ts
index cf9b749e0e..d0ff909525 100644
--- a/packages/svelte/src/compiler/print/types.d.ts
+++ b/packages/svelte/src/compiler/print/types.d.ts
@@ -1,4 +1,5 @@
-import ts from 'esrap/languages/ts';
+import 'esrap'; // This import is required to make typescript happy when `skipLibCheck` is enabled
+import type ts from 'esrap/languages/ts';
 
 export type Options = {
 	getLeadingComments?: NonNullable<Parameters<typeof ts>[0]>['getLeadingComments'] | undefined;
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 0e6b019b62..9ace341e16 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -1,3 +1,5 @@
+/// <reference types="esrap" />
+
 declare module 'svelte' {
 	/**
 	 * @deprecated In Svelte 4, components are classes. In Svelte 5, they are functions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bdb120600b..70b43ae2ab 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -96,8 +96,8 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1
       esrap:
-        specifier: ^2.2.0
-        version: 2.2.0
+        specifier: ^2.2.1
+        version: 2.2.1
       is-reference:
         specifier: ^3.0.3
         version: 3.0.3
@@ -1660,8 +1660,8 @@ packages:
     resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
     engines: {node: '>=0.10'}
 
-  esrap@2.2.0:
-    resolution: {integrity: sha512-WBmtxe7R9C5mvL4n2le8nMUe4mD5V9oiK2vJpQ9I3y20ENPUomPcphBXE8D1x/Bm84oN1V+lOfgXxtqmxTp3Xg==}
+  esrap@2.2.1:
+    resolution: {integrity: sha512-GiYWG34AN/4CUyaWAgunGt0Rxvr1PTMlGC0vvEov/uOQYWne2bpN03Um+k8jT+q3op33mKouP2zeJ6OlM+qeUg==}
 
   esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
@@ -4244,7 +4244,7 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
-  esrap@2.2.0:
+  esrap@2.2.1:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 

From 6dea3d0a286971cdd41d7d7f8e93c2d2a9834c70 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 2 Dec 2025 16:15:42 -0500
Subject: [PATCH 221/347] chore: skip static index update (#17249)

---
 packages/svelte/src/internal/client/dom/blocks/each.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 501577053d..afe4098163 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -243,8 +243,6 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 
 				if (is_reactive_index) {
 					internal_set(/** @type {Value<number>} */ (item.i), i);
-				} else {
-					item.i = i;
 				}
 
 				if (defer) {

From 8dd8e3ec0b0c8bc1d7744ef891182a87c39435ce Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 2 Dec 2025 16:52:48 -0500
Subject: [PATCH 222/347] chore: minor each tweak (#17294)

---
 packages/svelte/src/internal/client/dom/blocks/each.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index afe4098163..0a8972d8d7 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -483,7 +483,7 @@ function reconcile(state, array, anchor, flags, get_key) {
 			matched = [];
 			stashed = [];
 
-			while (current !== null && current.k !== key) {
+			while (current !== null && current !== item) {
 				// If the each block isn't inert and an item has an effect that is already inert,
 				// skip over adding it to our seen Set as the item is already being handled
 				if ((current.e.f & INERT) === 0) {

From 1f3f1826e8827ff084043198dd3cd07248e47f48 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 2 Dec 2025 16:53:50 -0500
Subject: [PATCH 223/347] chore: move DOM-related effect properties to
 `effect.nodes` (#17293)

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* changeset

* unused
---
 .changeset/petite-mammals-talk.md             |  5 ++
 .../svelte/src/internal/client/dev/debug.js   |  8 +--
 .../src/internal/client/dom/blocks/each.js    | 64 +++++++------------
 .../src/internal/client/dom/blocks/html.js    |  6 +-
 .../client/dom/blocks/svelte-element.js       | 19 +++---
 .../client/dom/elements/transitions.js        | 22 +++++--
 .../src/internal/client/dom/template.js       | 22 ++++---
 .../src/internal/client/reactivity/async.js   |  7 +-
 .../src/internal/client/reactivity/batch.js   |  2 +-
 .../src/internal/client/reactivity/effects.js | 36 ++++++-----
 .../src/internal/client/reactivity/types.d.ts | 15 +++--
 packages/svelte/src/internal/client/render.js |  4 +-
 .../svelte/src/internal/client/types.d.ts     |  2 -
 13 files changed, 105 insertions(+), 107 deletions(-)
 create mode 100644 .changeset/petite-mammals-talk.md

diff --git a/.changeset/petite-mammals-talk.md b/.changeset/petite-mammals-talk.md
new file mode 100644
index 0000000000..97edc1953a
--- /dev/null
+++ b/.changeset/petite-mammals-talk.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: move DOM-related effect properties to `effect.nodes`
diff --git a/packages/svelte/src/internal/client/dev/debug.js b/packages/svelte/src/internal/client/dev/debug.js
index e1f8a688bb..22c4de1179 100644
--- a/packages/svelte/src/internal/client/dev/debug.js
+++ b/packages/svelte/src/internal/client/dev/debug.js
@@ -110,13 +110,13 @@ export function log_effect_tree(effect, depth = 0) {
 		console.groupEnd();
 	}
 
-	if (effect.nodes_start && effect.nodes_end) {
+	if (effect.nodes) {
 		// eslint-disable-next-line no-console
-		console.log(effect.nodes_start);
+		console.log(effect.nodes.start);
 
-		if (effect.nodes_start !== effect.nodes_end) {
+		if (effect.nodes.start !== effect.nodes.end) {
 			// eslint-disable-next-line no-console
-			console.log(effect.nodes_end);
+			console.log(effect.nodes.end);
 		}
 	}
 
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 0a8972d8d7..9a54ab2f5b 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -1,4 +1,4 @@
-/** @import { EachItem, EachState, Effect, MaybeSource, Source, TemplateNode, TransitionManager, Value } from '#client' */
+/** @import { EachItem, EachState, Effect, EffectNodes, MaybeSource, Source, TemplateNode, TransitionManager, Value } from '#client' */
 /** @import { Batch } from '../../reactivity/batch.js'; */
 import {
 	EACH_INDEX_REACTIVE,
@@ -43,18 +43,6 @@ import { DEV } from 'esm-env';
 import { derived_safe_equal } from '../../reactivity/deriveds.js';
 import { current_batch } from '../../reactivity/batch.js';
 
-/**
- * The row of a keyed each block that is currently updating. We track this
- * so that `animate:` directives have something to attach themselves to
- * @type {EachItem | null}
- */
-export let current_each_item = null;
-
-/** @param {EachItem | null} item */
-export function set_current_each_item(item) {
-	current_each_item = item;
-}
-
 /**
  * @param {any} _
  * @param {number} i
@@ -395,7 +383,7 @@ function reconcile(state, array, anchor, flags, get_key) {
 			// offscreen == coming in now, no animation in that case,
 			// else this would happen https://github.com/sveltejs/svelte/issues/17181
 			if (item.o) {
-				item.a?.measure();
+				item.e.nodes?.a?.measure();
 				(to_animate ??= new Set()).add(item);
 			}
 		}
@@ -430,7 +418,7 @@ function reconcile(state, array, anchor, flags, get_key) {
 		if ((item.e.f & INERT) !== 0) {
 			resume_effect(item.e);
 			if (is_animated) {
-				item.a?.unfix();
+				item.e.nodes?.a?.unfix();
 				(to_animate ??= new Set()).delete(item);
 			}
 		}
@@ -527,11 +515,11 @@ function reconcile(state, array, anchor, flags, get_key) {
 
 			if (is_animated) {
 				for (i = 0; i < destroy_length; i += 1) {
-					to_destroy[i].a?.measure();
+					to_destroy[i].e.nodes?.a?.measure();
 				}
 
 				for (i = 0; i < destroy_length; i += 1) {
-					to_destroy[i].a?.fix();
+					to_destroy[i].e.nodes?.a?.fix();
 				}
 			}
 
@@ -555,7 +543,7 @@ function reconcile(state, array, anchor, flags, get_key) {
 		queue_micro_task(() => {
 			if (to_animate === undefined) return;
 			for (item of to_animate) {
-				item.a?.apply();
+				item.e.nodes?.a?.apply();
 			}
 		});
 	}
@@ -574,7 +562,6 @@ function reconcile(state, array, anchor, flags, get_key) {
  * @returns {EachItem}
  */
 function create_item(anchor, prev, value, key, index, render_fn, flags, get_collection) {
-	var previous_each_item = current_each_item;
 	var reactive = (flags & EACH_ITEM_REACTIVE) !== 0;
 	var mutable = (flags & EACH_ITEM_IMMUTABLE) === 0;
 
@@ -596,7 +583,6 @@ function create_item(anchor, prev, value, key, index, render_fn, flags, get_coll
 		i,
 		v,
 		k: key,
-		a: null,
 		// @ts-expect-error
 		e: null,
 		o: false,
@@ -604,27 +590,21 @@ function create_item(anchor, prev, value, key, index, render_fn, flags, get_coll
 		next: null
 	};
 
-	current_each_item = item;
-
-	try {
-		if (anchor === null) {
-			var fragment = document.createDocumentFragment();
-			fragment.append((anchor = create_text()));
-		}
-
-		item.e = branch(() => render_fn(/** @type {Node} */ (anchor), v, i, get_collection));
+	if (anchor === null) {
+		var fragment = document.createDocumentFragment();
+		fragment.append((anchor = create_text()));
+	}
 
-		if (prev !== null) {
-			// we only need to set `prev.next = item`, because
-			// `item.prev = prev` was set on initialization.
-			// the effects themselves are already linked
-			prev.next = item;
-		}
+	item.e = branch(() => render_fn(/** @type {Node} */ (anchor), v, i, get_collection));
 
-		return item;
-	} finally {
-		current_each_item = previous_each_item;
+	if (prev !== null) {
+		// we only need to set `prev.next = item`, because
+		// `item.prev = prev` was set on initialization.
+		// the effects themselves are already linked
+		prev.next = item;
 	}
+
+	return item;
 }
 
 /**
@@ -633,10 +613,12 @@ function create_item(anchor, prev, value, key, index, render_fn, flags, get_coll
  * @param {Text | Element | Comment} anchor
  */
 function move(item, next, anchor) {
-	var end = item.next ? /** @type {TemplateNode} */ (item.next.e.nodes_start) : anchor;
+	if (!item.e.nodes) return;
+
+	var end = item.next ? /** @type {EffectNodes} */ (item.next.e.nodes).start : anchor;
 
-	var dest = next ? /** @type {TemplateNode} */ (next.e.nodes_start) : anchor;
-	var node = /** @type {TemplateNode} */ (item.e.nodes_start);
+	var dest = next ? /** @type {EffectNodes} */ (next.e.nodes).start : anchor;
+	var node = /** @type {TemplateNode} */ (item.e.nodes.start);
 
 	while (node !== null && node !== end) {
 		var next_node = /** @type {TemplateNode} */ (get_next_sibling(node));
diff --git a/packages/svelte/src/internal/client/dom/blocks/html.js b/packages/svelte/src/internal/client/dom/blocks/html.js
index d7190abc66..f7c11f42ca 100644
--- a/packages/svelte/src/internal/client/dom/blocks/html.js
+++ b/packages/svelte/src/internal/client/dom/blocks/html.js
@@ -54,9 +54,9 @@ export function html(node, get_value, svg = false, mathml = false, skip_warning
 			return;
 		}
 
-		if (effect.nodes_start !== null) {
-			remove_effect_dom(effect.nodes_start, /** @type {TemplateNode} */ (effect.nodes_end));
-			effect.nodes_start = effect.nodes_end = null;
+		if (effect.nodes !== null) {
+			remove_effect_dom(effect.nodes.start, /** @type {TemplateNode} */ (effect.nodes.end));
+			effect.nodes = null;
 		}
 
 		if (value === '') return;
diff --git a/packages/svelte/src/internal/client/dom/blocks/svelte-element.js b/packages/svelte/src/internal/client/dom/blocks/svelte-element.js
index 6533ff8921..35d2aaa1d9 100644
--- a/packages/svelte/src/internal/client/dom/blocks/svelte-element.js
+++ b/packages/svelte/src/internal/client/dom/blocks/svelte-element.js
@@ -1,4 +1,4 @@
-/** @import { Effect, TemplateNode } from '#client' */
+/** @import { Effect, EffectNodes, TemplateNode } from '#client' */
 import { FILENAME, NAMESPACE_SVG } from '../../../../constants.js';
 import {
 	hydrate_next,
@@ -10,7 +10,6 @@ import {
 import { create_text, get_first_child } from '../operations.js';
 import { block, teardown } from '../../reactivity/effects.js';
 import { set_should_intro } from '../../render.js';
-import { current_each_item, set_current_each_item } from './each.js';
 import { active_effect } from '../../runtime.js';
 import { component_context, dev_stack } from '../../context.js';
 import { DEV } from 'esm-env';
@@ -18,6 +17,7 @@ import { EFFECT_TRANSPARENT, ELEMENT_NODE } from '#client/constants';
 import { assign_nodes } from '../template.js';
 import { is_raw_text_element } from '../../../../utils.js';
 import { BranchManager } from './branches.js';
+import { set_animation_effect_override } from '../elements/transitions.js';
 
 /**
  * @param {Comment | Element} node
@@ -48,11 +48,10 @@ export function element(node, get_tag, is_svg, render_fn, get_namespace, locatio
 	var anchor = /** @type {TemplateNode} */ (hydrating ? hydrate_node : node);
 
 	/**
-	 * The keyed `{#each ...}` item block, if any, that this element is inside.
 	 * We track this so we can set it when changing the element, allowing any
 	 * `animate:` directive to bind itself to the correct block
 	 */
-	var each_item_block = current_each_item;
+	var parent_effect = /** @type {Effect} */ (active_effect);
 
 	var branches = new BranchManager(anchor, false);
 
@@ -67,10 +66,6 @@ export function element(node, get_tag, is_svg, render_fn, get_namespace, locatio
 		}
 
 		branches.ensure(next_tag, (anchor) => {
-			// See explanation of `each_item_block` above
-			var previous_each_item = current_each_item;
-			set_current_each_item(each_item_block);
-
 			if (next_tag) {
 				element = hydrating
 					? /** @type {Element} */ (element)
@@ -112,21 +107,23 @@ export function element(node, get_tag, is_svg, render_fn, get_namespace, locatio
 						}
 					}
 
+					set_animation_effect_override(parent_effect);
+
 					// `child_anchor` is undefined if this is a void element, but we still
 					// need to call `render_fn` in order to run actions etc. If the element
 					// contains children, it's a user error (which is warned on elsewhere)
 					// and the DOM will be silently discarded
 					render_fn(element, child_anchor);
+
+					set_animation_effect_override(null);
 				}
 
 				// we do this after calling `render_fn` so that child effects don't override `nodes.end`
-				/** @type {Effect} */ (active_effect).nodes_end = element;
+				/** @type {Effect & { nodes: EffectNodes }} */ (active_effect).nodes.end = element;
 
 				anchor.before(element);
 			}
 
-			set_current_each_item(previous_each_item);
-
 			if (hydrating) {
 				set_hydrate_node(anchor);
 			}
diff --git a/packages/svelte/src/internal/client/dom/elements/transitions.js b/packages/svelte/src/internal/client/dom/elements/transitions.js
index d1d034d402..e9f0953df7 100644
--- a/packages/svelte/src/internal/client/dom/elements/transitions.js
+++ b/packages/svelte/src/internal/client/dom/elements/transitions.js
@@ -1,10 +1,9 @@
-/** @import { AnimateFn, Animation, AnimationConfig, EachItem, Effect, TransitionFn, TransitionManager } from '#client' */
+/** @import { AnimateFn, Animation, AnimationConfig, EachItem, Effect, EffectNodes, TransitionFn, TransitionManager } from '#client' */
 import { noop, is_function } from '../../../shared/utils.js';
 import { effect } from '../../reactivity/effects.js';
 import { active_effect, untrack } from '../../runtime.js';
 import { loop } from '../../loop.js';
 import { should_intro } from '../../render.js';
-import { current_each_item } from '../blocks/each.js';
 import { TRANSITION_GLOBAL, TRANSITION_IN, TRANSITION_OUT } from '../../../../constants.js';
 import { BLOCK_EFFECT, EFFECT_RAN, EFFECT_TRANSPARENT } from '#client/constants';
 import { queue_micro_task } from '../task.js';
@@ -66,6 +65,14 @@ function css_to_keyframe(css) {
 /** @param {number} t */
 const linear = (t) => t;
 
+/** @type {Effect | null} */
+let animation_effect_override = null;
+
+/** @param {Effect | null} v */
+export function set_animation_effect_override(v) {
+	animation_effect_override = v;
+}
+
 /**
  * Called inside keyed `{#each ...}` blocks (as `$.animation(...)`). This creates an animation manager
  * and attaches it to the block, so that moves can be animated following reconciliation.
@@ -75,7 +82,8 @@ const linear = (t) => t;
  * @param {(() => P) | null} get_params
  */
 export function animation(element, get_fn, get_params) {
-	var item = /** @type {EachItem} */ (current_each_item);
+	var effect = animation_effect_override ?? /** @type {Effect} */ (active_effect);
+	var nodes = /** @type {EffectNodes} */ (effect.nodes);
 
 	/** @type {DOMRect} */
 	var from;
@@ -89,7 +97,7 @@ export function animation(element, get_fn, get_params) {
 	/** @type {null | { position: string, width: string, height: string, transform: string }} */
 	var original_styles = null;
 
-	item.a ??= {
+	nodes.a ??= {
 		element,
 		measure() {
 			from = this.element.getBoundingClientRect();
@@ -161,7 +169,7 @@ export function animation(element, get_fn, get_params) {
 	// when an animation manager already exists, if the tag changes. in that case, we need to
 	// swap out the element rather than creating a new manager, in case it happened at the same
 	// moment as a reconciliation
-	item.a.element = element;
+	nodes.a.element = element;
 }
 
 /**
@@ -265,9 +273,9 @@ export function transition(flags, element, get_fn, get_params) {
 		}
 	};
 
-	var e = /** @type {Effect} */ (active_effect);
+	var e = /** @type {Effect & { nodes: EffectNodes }} */ (active_effect);
 
-	(e.transitions ??= []).push(transition);
+	(e.nodes.t ??= []).push(transition);
 
 	// if this is a local transition, we only want to run it if the parent (branch) effect's
 	// parent (block) effect is where the state change happened. we can determine that by
diff --git a/packages/svelte/src/internal/client/dom/template.js b/packages/svelte/src/internal/client/dom/template.js
index 2ad0538b43..7382da7fb5 100644
--- a/packages/svelte/src/internal/client/dom/template.js
+++ b/packages/svelte/src/internal/client/dom/template.js
@@ -1,4 +1,4 @@
-/** @import { Effect, TemplateNode } from '#client' */
+/** @import { Effect, EffectNodes, TemplateNode } from '#client' */
 /** @import { TemplateStructure } from './types' */
 import { hydrate_next, hydrate_node, hydrating, set_hydrate_node } from './hydration.js';
 import {
@@ -28,9 +28,8 @@ import { COMMENT_NODE, DOCUMENT_FRAGMENT_NODE, EFFECT_RAN, TEXT_NODE } from '#cl
  */
 export function assign_nodes(start, end) {
 	var effect = /** @type {Effect} */ (active_effect);
-	if (effect.nodes_start === null) {
-		effect.nodes_start = start;
-		effect.nodes_end = end;
+	if (effect.nodes === null) {
+		effect.nodes = { start, end, a: null, t: null };
 	}
 }
 
@@ -270,7 +269,8 @@ function run_scripts(node) {
 		/** @type {HTMLElement} */ (node).tagName === 'SCRIPT'
 			? [/** @type {HTMLScriptElement} */ (node)]
 			: node.querySelectorAll('script');
-	const effect = /** @type {Effect} */ (active_effect);
+
+	const effect = /** @type {Effect & { nodes: EffectNodes }} */ (active_effect);
 
 	for (const script of scripts) {
 		const clone = document.createElement('script');
@@ -282,10 +282,10 @@ function run_scripts(node) {
 
 		// The script has changed - if it's at the edges, the effect now points at dead nodes
 		if (is_fragment ? node.firstChild === script : node === script) {
-			effect.nodes_start = clone;
+			effect.nodes.start = clone;
 		}
 		if (is_fragment ? node.lastChild === script : node === script) {
-			effect.nodes_end = clone;
+			effect.nodes.end = clone;
 		}
 
 		script.replaceWith(clone);
@@ -344,13 +344,15 @@ export function comment() {
  */
 export function append(anchor, dom) {
 	if (hydrating) {
-		var effect = /** @type {Effect} */ (active_effect);
+		var effect = /** @type {Effect & { nodes: EffectNodes }} */ (active_effect);
+
 		// When hydrating and outer component and an inner component is async, i.e. blocked on a promise,
 		// then by the time the inner resolves we have already advanced to the end of the hydrated nodes
 		// of the parent component. Check for defined for that reason to avoid rewinding the parent's end marker.
-		if ((effect.f & EFFECT_RAN) === 0 || effect.nodes_end === null) {
-			effect.nodes_end = hydrate_node;
+		if ((effect.f & EFFECT_RAN) === 0 || effect.nodes.end === null) {
+			effect.nodes.end = hydrate_node;
 		}
+
 		hydrate_next();
 		return;
 	}
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 50c36ed021..e48aff3d7f 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -26,7 +26,6 @@ import {
 } from './deriveds.js';
 import { aborted } from './effects.js';
 import { hydrate_next, hydrating, set_hydrate_node, skip_nodes } from '../dom/hydration.js';
-import { current_each_item, set_current_each_item } from '../dom/blocks/each.js';
 
 /**
  * @param {Array<Promise<void>>} blockers
@@ -90,11 +89,7 @@ export function flatten(blockers, sync, async, fn) {
  * @param {(values: Value[]) => any} fn
  */
 export function run_after_blockers(blockers, fn) {
-	var each_item = current_each_item; // TODO should this be part of capture?
-	flatten(blockers, [], [], (v) => {
-		set_current_each_item(each_item);
-		fn(v);
-	});
+	flatten(blockers, [], [], fn);
 }
 
 /**
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index fc3e18562e..24dee51419 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -708,7 +708,7 @@ function flush_queued_effects(effects) {
 			// don't know if we need to keep them until they are executed. Doing the check
 			// here (rather than in `update_effect`) allows us to skip the work for
 			// immediate effects.
-			if (effect.deps === null && effect.first === null && effect.nodes_start === null) {
+			if (effect.deps === null && effect.first === null && effect.nodes === null) {
 				// if there's no teardown or abort controller we completely unlink
 				// the effect from the graph
 				if (effect.teardown === null && effect.ac === null) {
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 4359378e01..4e8565ab8f 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -101,8 +101,7 @@ function create_effect(type, fn, sync) {
 	var effect = {
 		ctx: component_context,
 		deps: null,
-		nodes_start: null,
-		nodes_end: null,
+		nodes: null,
 		f: type | DIRTY | CONNECTED,
 		first: null,
 		fn,
@@ -112,7 +111,6 @@ function create_effect(type, fn, sync) {
 		b: parent && parent.b,
 		prev: null,
 		teardown: null,
-		transitions: null,
 		wv: 0,
 		ac: null
 	};
@@ -143,7 +141,7 @@ function create_effect(type, fn, sync) {
 		sync &&
 		e.deps === null &&
 		e.teardown === null &&
-		e.nodes_start === null &&
+		e.nodes === null &&
 		e.first === e.last && // either `null`, or a singular child
 		(e.f & EFFECT_PRESERVED) === 0
 	) {
@@ -497,10 +495,10 @@ export function destroy_effect(effect, remove_dom = true) {
 
 	if (
 		(remove_dom || (effect.f & HEAD_EFFECT) !== 0) &&
-		effect.nodes_start !== null &&
-		effect.nodes_end !== null
+		effect.nodes !== null &&
+		effect.nodes.end !== null
 	) {
-		remove_effect_dom(effect.nodes_start, /** @type {TemplateNode} */ (effect.nodes_end));
+		remove_effect_dom(effect.nodes.start, /** @type {TemplateNode} */ (effect.nodes.end));
 		removed = true;
 	}
 
@@ -508,7 +506,7 @@ export function destroy_effect(effect, remove_dom = true) {
 	remove_reactions(effect, 0);
 	set_signal_status(effect, DESTROYED);
 
-	var transitions = effect.transitions;
+	var transitions = effect.nodes && effect.nodes.t;
 
 	if (transitions !== null) {
 		for (const transition of transitions) {
@@ -537,8 +535,7 @@ export function destroy_effect(effect, remove_dom = true) {
 		effect.ctx =
 		effect.deps =
 		effect.fn =
-		effect.nodes_start =
-		effect.nodes_end =
+		effect.nodes =
 		effect.ac =
 			null;
 }
@@ -624,8 +621,10 @@ export function pause_children(effect, transitions, local) {
 	if ((effect.f & INERT) !== 0) return;
 	effect.f ^= INERT;
 
-	if (effect.transitions !== null) {
-		for (const transition of effect.transitions) {
+	var t = effect.nodes && effect.nodes.t;
+
+	if (t !== null) {
+		for (const transition of t) {
 			if (transition.is_global || local) {
 				transitions.push(transition);
 			}
@@ -688,8 +687,10 @@ function resume_children(effect, local) {
 		child = sibling;
 	}
 
-	if (effect.transitions !== null) {
-		for (const transition of effect.transitions) {
+	var t = effect.nodes && effect.nodes.t;
+
+	if (t !== null) {
+		for (const transition of t) {
 			if (transition.is_global || local) {
 				transition.in();
 			}
@@ -706,8 +707,11 @@ export function aborted(effect = /** @type {Effect} */ (active_effect)) {
  * @param {DocumentFragment} fragment
  */
 export function move_effect(effect, fragment) {
-	var node = effect.nodes_start;
-	var end = effect.nodes_end;
+	if (!effect.nodes) return;
+
+	/** @type {TemplateNode | null} */
+	var node = effect.nodes.start;
+	var end = effect.nodes.end;
 
 	while (node !== null) {
 		/** @type {TemplateNode | null} */
diff --git a/packages/svelte/src/internal/client/reactivity/types.d.ts b/packages/svelte/src/internal/client/reactivity/types.d.ts
index 81f7197b80..908576922f 100644
--- a/packages/svelte/src/internal/client/reactivity/types.d.ts
+++ b/packages/svelte/src/internal/client/reactivity/types.d.ts
@@ -1,4 +1,5 @@
 import type {
+	AnimationManager,
 	ComponentContext,
 	DevStackEntry,
 	Equals,
@@ -60,6 +61,15 @@ export interface Derived<V = unknown> extends Value<V>, Reaction {
 	parent: Effect | Derived | null;
 }
 
+export interface EffectNodes {
+	start: TemplateNode;
+	end: TemplateNode | null;
+	/** $.animation */
+	a: AnimationManager | null;
+	/** $.transition */
+	t: TransitionManager[] | null;
+}
+
 export interface Effect extends Reaction {
 	/**
 	 * Branch effects store their start/end nodes so that they can be
@@ -67,14 +77,11 @@ export interface Effect extends Reaction {
 	 * block is reconciled. In the case of a single text/element node,
 	 * `start` and `end` will be the same.
 	 */
-	nodes_start: null | TemplateNode;
-	nodes_end: null | TemplateNode;
+	nodes: null | EffectNodes;
 	/** The effect function */
 	fn: null | (() => void | (() => void));
 	/** The teardown function returned from the effect function */
 	teardown: null | (() => void);
-	/** Transition managers created with `$.transition` */
-	transitions: null | TransitionManager[];
 	/** Next sibling child effect created inside the parent signal */
 	prev: null | Effect;
 	/** Next sibling child effect created inside the parent signal */
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index 416627a157..92b83dbd5a 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -1,4 +1,4 @@
-/** @import { ComponentContext, Effect, TemplateNode } from '#client' */
+/** @import { ComponentContext, Effect, EffectNodes, TemplateNode } from '#client' */
 /** @import { Component, ComponentType, SvelteComponent, MountOptions } from '../../index.js' */
 import { DEV } from 'esm-env';
 import {
@@ -228,7 +228,7 @@ function _mount(Component, { target, anchor, props = {}, events, context, intro
 				should_intro = true;
 
 				if (hydrating) {
-					/** @type {Effect} */ (active_effect).nodes_end = hydrate_node;
+					/** @type {Effect & { nodes: EffectNodes }} */ (active_effect).nodes.end = hydrate_node;
 
 					if (
 						hydrate_node === null ||
diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts
index 5c682ed140..895bfba571 100644
--- a/packages/svelte/src/internal/client/types.d.ts
+++ b/packages/svelte/src/internal/client/types.d.ts
@@ -84,8 +84,6 @@ export type EachState = {
 };
 
 export type EachItem = {
-	/** animation manager */
-	a: AnimationManager | null;
 	/** effect */
 	e: Effect;
 	/** item */

From 794b8f3dfd14fad5d2d67dea7607bae8185cf800 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Tue, 2 Dec 2025 23:27:04 +0100
Subject: [PATCH 224/347] fix: keep reactions up to date even when read outside
 of effect (#17295)

In #17105 one line in `update_reaction` was changed that can cause reactivity loss. It checks if the reaction is updated inside of an effect and only then will push to the reactions. The prior version had an additional check to still add to the reactions if there is already at least one reaction on the derived, indicating it is connected. Removing this check fixes #17263 while keeping correctness: a connected derived by definition at least has one reaction and therefore can properly cleanup.
---
 .changeset/small-llamas-drum.md               |  5 ++++
 .../svelte/src/internal/client/runtime.js     |  2 +-
 packages/svelte/tests/signals/test.ts         | 25 +++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/small-llamas-drum.md

diff --git a/.changeset/small-llamas-drum.md b/.changeset/small-llamas-drum.md
new file mode 100644
index 0000000000..3848f83920
--- /dev/null
+++ b/.changeset/small-llamas-drum.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: keep reactions up to date even when read outside of effect
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 100804a974..64c8409b8f 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -278,7 +278,7 @@ export function update_reaction(reaction) {
 				reaction.deps = deps = new_deps;
 			}
 
-			if (is_updating_effect && effect_tracking() && (reaction.f & CONNECTED) !== 0) {
+			if (effect_tracking() && (reaction.f & CONNECTED) !== 0) {
 				for (i = skipped_deps; i < deps.length; i++) {
 					(deps[i].reactions ??= []).push(reaction);
 				}
diff --git a/packages/svelte/tests/signals/test.ts b/packages/svelte/tests/signals/test.ts
index 13430609a8..23c4bb42f9 100644
--- a/packages/svelte/tests/signals/test.ts
+++ b/packages/svelte/tests/signals/test.ts
@@ -1418,6 +1418,31 @@ describe('signals', () => {
 		};
 	});
 
+	test('derived when connected should add new dependency to its reaction even when read outside effect', () => {
+		let count_a = state(0);
+		let count_b = state(0);
+		let which = state(true);
+		let double = derived(() => ($.get(which) ? $.get(count_a) * 2 : $.get(count_b) * 2));
+
+		render_effect(() => {
+			$.get(double);
+		});
+
+		return () => {
+			flushSync();
+			assert.equal($.get(double!), 0);
+
+			set(which, false);
+			$.get(double); // read before render effect has a chance to rerun
+			flushSync();
+			assert.equal($.get(double!), 0);
+
+			set(count_b, 1);
+			flushSync();
+			assert.equal($.get(double!), 2);
+		};
+	});
+
 	test('$effect.root inside deriveds stay alive independently', () => {
 		const log: any[] = [];
 		const c = state(0);

From f091b11eab0b0f274b6332ae2aa081679f74064b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 17:49:10 -0500
Subject: [PATCH 225/347] Version Packages (#17286)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/petite-mammals-talk.md |  5 -----
 .changeset/sad-paths-build.md     |  5 -----
 .changeset/small-llamas-drum.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/petite-mammals-talk.md
 delete mode 100644 .changeset/sad-paths-build.md
 delete mode 100644 .changeset/small-llamas-drum.md

diff --git a/.changeset/petite-mammals-talk.md b/.changeset/petite-mammals-talk.md
deleted file mode 100644
index 97edc1953a..0000000000
--- a/.changeset/petite-mammals-talk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-chore: move DOM-related effect properties to `effect.nodes`
diff --git a/.changeset/sad-paths-build.md b/.changeset/sad-paths-build.md
deleted file mode 100644
index f64d6f766c..0000000000
--- a/.changeset/sad-paths-build.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: allow `$props.id()` to occur after an `await`
diff --git a/.changeset/small-llamas-drum.md b/.changeset/small-llamas-drum.md
deleted file mode 100644
index 3848f83920..0000000000
--- a/.changeset/small-llamas-drum.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: keep reactions up to date even when read outside of effect
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 2e8b9e814f..dc3b63ffd6 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.45.4
+
+### Patch Changes
+
+- chore: move DOM-related effect properties to `effect.nodes` ([#17293](https://github.com/sveltejs/svelte/pull/17293))
+
+- fix: allow `$props.id()` to occur after an `await` ([#17285](https://github.com/sveltejs/svelte/pull/17285))
+
+- fix: keep reactions up to date even when read outside of effect ([#17295](https://github.com/sveltejs/svelte/pull/17295))
+
 ## 5.45.3
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index b3af271800..2bfc07031d 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.45.3",
+  "version": "5.45.4",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 69f6907a49..abfc05b688 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.45.3';
+export const VERSION = '5.45.4';
 export const PUBLIC_VERSION = '5';

From ba9de6a47bb911bb8364e9009b81380bbd778403 Mon Sep 17 00:00:00 2001
From: dev-singh12 <dev.singh@adypu.edu.in>
Date: Wed, 3 Dec 2025 22:53:32 +0530
Subject: [PATCH 226/347] docs: update outdated Svelte Society editor support
 link URL (#17292)

* docs: update Editor Support link in Getting Started page

Updated editor tooling section for clarity and added link to the Editor Support collection.

* Revert text to original format and update only the URL as requested

Fix: Update support link URL in Getting Started documentation

Updates the support URL in 'documentation/docs/01-introduction/02-getting-started.md' to the correct location.
All content surrounding the link has been verified and restored to its original state.

* Update documentation/docs/01-introduction/02-getting-started.md

* Update documentation/docs/01-introduction/02-getting-started.md

---------

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 documentation/docs/01-introduction/02-getting-started.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/documentation/docs/01-introduction/02-getting-started.md b/documentation/docs/01-introduction/02-getting-started.md
index 2ad22c8469..519959a0b1 100644
--- a/documentation/docs/01-introduction/02-getting-started.md
+++ b/documentation/docs/01-introduction/02-getting-started.md
@@ -23,9 +23,10 @@ There are also [plugins for other bundlers](/packages#bundler-plugins), but we r
 
 ## Editor tooling
 
-The Svelte team maintains a [VS Code extension](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode), and there are integrations with various other [editors](https://sveltesociety.dev/resources#editor-support) and tools as well.
+The Svelte team maintains a [VS Code extension](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode), and there are integrations with various other [editors](https://sveltesociety.dev/collection/editor-support-c85c080efc292a34) and tools as well.
+
+You can also check your code from the command line using [`sv check`](https://github.com/sveltejs/cli).
 
-You can also check your code from the command line using [sv check](https://github.com/sveltejs/cli).
 
 ## Getting help
 

From 3a3b7e8a3f35cb736046ea16cfca1e302bf210fc Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 3 Dec 2025 12:24:11 -0500
Subject: [PATCH 227/347] chore: tidy up types for DOM operations (#17298)

* chore: tidy up types for DOM operations

* more
---
 .../internal/client/dom/blocks/css-props.js   |  5 ++--
 .../src/internal/client/dom/blocks/each.js    |  2 +-
 .../src/internal/client/dom/blocks/html.js    |  6 +++--
 .../client/dom/blocks/svelte-element.js       |  6 ++---
 .../internal/client/dom/blocks/svelte-head.js |  4 ++--
 .../src/internal/client/dom/hydration.js      |  4 ++--
 .../src/internal/client/dom/operations.js     | 23 ++++++++-----------
 .../src/internal/client/dom/template.js       |  6 ++---
 .../src/internal/client/reactivity/effects.js |  4 ++--
 packages/svelte/src/internal/client/render.js |  5 ++--
 10 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/packages/svelte/src/internal/client/dom/blocks/css-props.js b/packages/svelte/src/internal/client/dom/blocks/css-props.js
index ef36198753..084a5561be 100644
--- a/packages/svelte/src/internal/client/dom/blocks/css-props.js
+++ b/packages/svelte/src/internal/client/dom/blocks/css-props.js
@@ -1,5 +1,4 @@
-/** @import { TemplateNode } from '#client' */
-import { render_effect, teardown } from '../../reactivity/effects.js';
+import { render_effect } from '../../reactivity/effects.js';
 import { hydrating, set_hydrate_node } from '../hydration.js';
 import { get_first_child } from '../operations.js';
 
@@ -10,7 +9,7 @@ import { get_first_child } from '../operations.js';
  */
 export function css_props(element, get_styles) {
 	if (hydrating) {
-		set_hydrate_node(/** @type {TemplateNode} */ (get_first_child(element)));
+		set_hydrate_node(get_first_child(element));
 	}
 
 	render_effect(() => {
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 9a54ab2f5b..191152b927 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -131,7 +131,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 		var parent_node = /** @type {Element} */ (node);
 
 		anchor = hydrating
-			? set_hydrate_node(/** @type {Comment | Text} */ (get_first_child(parent_node)))
+			? set_hydrate_node(get_first_child(parent_node))
 			: parent_node.appendChild(create_text());
 	}
 
diff --git a/packages/svelte/src/internal/client/dom/blocks/html.js b/packages/svelte/src/internal/client/dom/blocks/html.js
index f7c11f42ca..1d337c1f74 100644
--- a/packages/svelte/src/internal/client/dom/blocks/html.js
+++ b/packages/svelte/src/internal/client/dom/blocks/html.js
@@ -65,6 +65,8 @@ export function html(node, get_value, svg = false, mathml = false, skip_warning
 			// We're deliberately not trying to repair mismatches between server and client,
 			// as it's costly and error-prone (and it's an edge case to have a mismatch anyway)
 			var hash = /** @type {Comment} */ (hydrate_node).data;
+
+			/** @type {TemplateNode | null} */
 			var next = hydrate_next();
 			var last = next;
 
@@ -73,7 +75,7 @@ export function html(node, get_value, svg = false, mathml = false, skip_warning
 				(next.nodeType !== COMMENT_NODE || /** @type {Comment} */ (next).data !== '')
 			) {
 				last = next;
-				next = /** @type {TemplateNode} */ (get_next_sibling(next));
+				next = get_next_sibling(next);
 			}
 
 			if (next === null) {
@@ -110,7 +112,7 @@ export function html(node, get_value, svg = false, mathml = false, skip_warning
 
 		if (svg || mathml) {
 			while (get_first_child(node)) {
-				anchor.before(/** @type {Node} */ (get_first_child(node)));
+				anchor.before(/** @type {TemplateNode} */ (get_first_child(node)));
 			}
 		} else {
 			anchor.before(node);
diff --git a/packages/svelte/src/internal/client/dom/blocks/svelte-element.js b/packages/svelte/src/internal/client/dom/blocks/svelte-element.js
index 35d2aaa1d9..47dfe7707d 100644
--- a/packages/svelte/src/internal/client/dom/blocks/svelte-element.js
+++ b/packages/svelte/src/internal/client/dom/blocks/svelte-element.js
@@ -95,9 +95,9 @@ export function element(node, get_tag, is_svg, render_fn, get_namespace, locatio
 
 					// If hydrating, use the existing ssr comment as the anchor so that the
 					// inner open and close methods can pick up the existing nodes correctly
-					var child_anchor = /** @type {TemplateNode} */ (
-						hydrating ? get_first_child(element) : element.appendChild(create_text())
-					);
+					var child_anchor = hydrating
+						? get_first_child(element)
+						: element.appendChild(create_text());
 
 					if (hydrating) {
 						if (child_anchor === null) {
diff --git a/packages/svelte/src/internal/client/dom/blocks/svelte-head.js b/packages/svelte/src/internal/client/dom/blocks/svelte-head.js
index 13926ccc4b..7c7eed24f7 100644
--- a/packages/svelte/src/internal/client/dom/blocks/svelte-head.js
+++ b/packages/svelte/src/internal/client/dom/blocks/svelte-head.js
@@ -21,7 +21,7 @@ export function head(hash, render_fn) {
 	if (hydrating) {
 		previous_hydrate_node = hydrate_node;
 
-		var head_anchor = /** @type {TemplateNode} */ (get_first_child(document.head));
+		var head_anchor = get_first_child(document.head);
 
 		// There might be multiple head blocks in our app, and they could have been
 		// rendered in an arbitrary order — find one corresponding to this component
@@ -29,7 +29,7 @@ export function head(hash, render_fn) {
 			head_anchor !== null &&
 			(head_anchor.nodeType !== COMMENT_NODE || /** @type {Comment} */ (head_anchor).data !== hash)
 		) {
-			head_anchor = /** @type {TemplateNode} */ (get_next_sibling(head_anchor));
+			head_anchor = get_next_sibling(head_anchor);
 		}
 
 		// If we can't find an opening hydration marker, skip hydration (this can happen
diff --git a/packages/svelte/src/internal/client/dom/hydration.js b/packages/svelte/src/internal/client/dom/hydration.js
index 5df9536d4d..7a9ef33d1b 100644
--- a/packages/svelte/src/internal/client/dom/hydration.js
+++ b/packages/svelte/src/internal/client/dom/hydration.js
@@ -30,7 +30,7 @@ export function set_hydrating(value) {
  */
 export let hydrate_node;
 
-/** @param {TemplateNode} node */
+/** @param {TemplateNode | null} node */
 export function set_hydrate_node(node) {
 	if (node === null) {
 		w.hydration_mismatch();
@@ -41,7 +41,7 @@ export function set_hydrate_node(node) {
 }
 
 export function hydrate_next() {
-	return set_hydrate_node(/** @type {TemplateNode} */ (get_next_sibling(hydrate_node)));
+	return set_hydrate_node(get_next_sibling(hydrate_node));
 }
 
 /** @param {TemplateNode} node */
diff --git a/packages/svelte/src/internal/client/dom/operations.js b/packages/svelte/src/internal/client/dom/operations.js
index c527ca23e3..479c2ba0a5 100644
--- a/packages/svelte/src/internal/client/dom/operations.js
+++ b/packages/svelte/src/internal/client/dom/operations.js
@@ -83,21 +83,19 @@ export function create_text(value = '') {
 /**
  * @template {Node} N
  * @param {N} node
- * @returns {Node | null}
  */
 /*@__NO_SIDE_EFFECTS__*/
 export function get_first_child(node) {
-	return first_child_getter.call(node);
+	return /** @type {TemplateNode | null} */ (first_child_getter.call(node));
 }
 
 /**
  * @template {Node} N
  * @param {N} node
- * @returns {Node | null}
  */
 /*@__NO_SIDE_EFFECTS__*/
 export function get_next_sibling(node) {
-	return next_sibling_getter.call(node);
+	return /** @type {TemplateNode | null} */ (next_sibling_getter.call(node));
 }
 
 /**
@@ -105,14 +103,14 @@ export function get_next_sibling(node) {
  * @template {Node} N
  * @param {N} node
  * @param {boolean} is_text
- * @returns {Node | null}
+ * @returns {TemplateNode | null}
  */
 export function child(node, is_text) {
 	if (!hydrating) {
 		return get_first_child(node);
 	}
 
-	var child = /** @type {TemplateNode} */ (get_first_child(hydrate_node));
+	var child = get_first_child(hydrate_node);
 
 	// Child can be null if we have an element with a single child, like `<p>{text}</p>`, where `text` is empty
 	if (child === null) {
@@ -130,14 +128,13 @@ export function child(node, is_text) {
 
 /**
  * Don't mark this as side-effect-free, hydration needs to walk all nodes
- * @param {DocumentFragment | TemplateNode | TemplateNode[]} fragment
+ * @param {TemplateNode} node
  * @param {boolean} [is_text]
- * @returns {Node | null}
+ * @returns {TemplateNode | null}
  */
-export function first_child(fragment, is_text = false) {
+export function first_child(node, 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)));
+		var first = get_first_child(node);
 
 		// TODO prevent user comments with the empty string when preserveComments is true
 		if (first instanceof Comment && first.data === '') return get_next_sibling(first);
@@ -163,7 +160,7 @@ export function first_child(fragment, is_text = false) {
  * @param {TemplateNode} node
  * @param {number} count
  * @param {boolean} is_text
- * @returns {Node | null}
+ * @returns {TemplateNode | null}
  */
 export function sibling(node, count = 1, is_text = false) {
 	let next_sibling = hydrating ? hydrate_node : node;
@@ -195,7 +192,7 @@ export function sibling(node, count = 1, is_text = false) {
 	}
 
 	set_hydrate_node(next_sibling);
-	return /** @type {TemplateNode} */ (next_sibling);
+	return next_sibling;
 }
 
 /**
diff --git a/packages/svelte/src/internal/client/dom/template.js b/packages/svelte/src/internal/client/dom/template.js
index 7382da7fb5..0d827218bc 100644
--- a/packages/svelte/src/internal/client/dom/template.js
+++ b/packages/svelte/src/internal/client/dom/template.js
@@ -60,7 +60,7 @@ export function from_html(content, flags) {
 
 		if (node === undefined) {
 			node = create_fragment_from_html(has_start ? content : '<!>' + content);
-			if (!is_fragment) node = /** @type {Node} */ (get_first_child(node));
+			if (!is_fragment) node = /** @type {TemplateNode} */ (get_first_child(node));
 		}
 
 		var clone = /** @type {TemplateNode} */ (
@@ -113,7 +113,7 @@ function from_namespace(content, flags, ns = 'svg') {
 			if (is_fragment) {
 				node = document.createDocumentFragment();
 				while (get_first_child(root)) {
-					node.appendChild(/** @type {Node} */ (get_first_child(root)));
+					node.appendChild(/** @type {TemplateNode} */ (get_first_child(root)));
 				}
 			} else {
 				node = /** @type {Element} */ (get_first_child(root));
@@ -227,7 +227,7 @@ export function from_tree(structure, flags) {
 						: undefined;
 
 			node = fragment_from_tree(structure, ns);
-			if (!is_fragment) node = /** @type {Node} */ (get_first_child(node));
+			if (!is_fragment) node = /** @type {TemplateNode} */ (get_first_child(node));
 		}
 
 		var clone = /** @type {TemplateNode} */ (
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 4e8565ab8f..be5ad773e0 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -548,7 +548,7 @@ export function destroy_effect(effect, remove_dom = true) {
 export function remove_effect_dom(node, end) {
 	while (node !== null) {
 		/** @type {TemplateNode | null} */
-		var next = node === end ? null : /** @type {TemplateNode} */ (get_next_sibling(node));
+		var next = node === end ? null : get_next_sibling(node);
 
 		node.remove();
 		node = next;
@@ -715,7 +715,7 @@ export function move_effect(effect, fragment) {
 
 	while (node !== null) {
 		/** @type {TemplateNode | null} */
-		var next = node === end ? null : /** @type {TemplateNode} */ (get_next_sibling(node));
+		var next = node === end ? null : get_next_sibling(node);
 
 		fragment.append(node);
 		node = next;
diff --git a/packages/svelte/src/internal/client/render.js b/packages/svelte/src/internal/client/render.js
index 92b83dbd5a..c76f0b1ce7 100644
--- a/packages/svelte/src/internal/client/render.js
+++ b/packages/svelte/src/internal/client/render.js
@@ -99,12 +99,13 @@ export function hydrate(component, options) {
 	const previous_hydrate_node = hydrate_node;
 
 	try {
-		var anchor = /** @type {TemplateNode} */ (get_first_child(target));
+		var anchor = get_first_child(target);
+
 		while (
 			anchor &&
 			(anchor.nodeType !== COMMENT_NODE || /** @type {Comment} */ (anchor).data !== HYDRATION_START)
 		) {
-			anchor = /** @type {TemplateNode} */ (get_next_sibling(anchor));
+			anchor = get_next_sibling(anchor);
 		}
 
 		if (!anchor) {

From 190e64acd9fcd6d86de53f8d1e51242393716772 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 3 Dec 2025 12:29:25 -0500
Subject: [PATCH 228/347] fix: destroy each items after siblings are resumed
 (#17258)

* fix: destroy each items after siblings are resumed

* changeset

* remove unused exports

* tidy up

* fix: correctly reconcile each blocks after outroing branches are resumed

* WIP

* add some logging

* fix

* remove item on destroy

* remove

* remove

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* tests passing

* tidy up

* tidy up

* note to self

* tidy up

* fix

* add stress test to repo
---
 .changeset/flat-cars-say.md                   |   5 +
 .changeset/great-bikes-listen.md              |   5 +
 .../svelte/src/internal/client/constants.js   |   1 +
 .../src/internal/client/dom/blocks/each.js    | 412 +++++++++---------
 .../src/internal/client/reactivity/effects.js |  12 +-
 .../svelte/src/internal/client/types.d.ts     |  25 +-
 .../tests/manual/each-stress-test/main.svelte | 194 +++++++++
 .../samples/each-updates-12/_config.js        |  33 ++
 .../samples/each-updates-12/main.svelte       |  19 +
 .../samples/each-updates-13/_config.js        |  23 +
 .../samples/each-updates-13/main.svelte       |  19 +
 11 files changed, 526 insertions(+), 222 deletions(-)
 create mode 100644 .changeset/flat-cars-say.md
 create mode 100644 .changeset/great-bikes-listen.md
 create mode 100644 packages/svelte/tests/manual/each-stress-test/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-updates-12/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-updates-12/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-updates-13/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-updates-13/main.svelte

diff --git a/.changeset/flat-cars-say.md b/.changeset/flat-cars-say.md
new file mode 100644
index 0000000000..1caa75a110
--- /dev/null
+++ b/.changeset/flat-cars-say.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly reconcile each blocks after outroing branches are resumed
diff --git a/.changeset/great-bikes-listen.md b/.changeset/great-bikes-listen.md
new file mode 100644
index 0000000000..416e0fcceb
--- /dev/null
+++ b/.changeset/great-bikes-listen.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: destroy each items after siblings are resumed
diff --git a/packages/svelte/src/internal/client/constants.js b/packages/svelte/src/internal/client/constants.js
index a121e6674a..a1bdb8a985 100644
--- a/packages/svelte/src/internal/client/constants.js
+++ b/packages/svelte/src/internal/client/constants.js
@@ -40,6 +40,7 @@ export const EAGER_EFFECT = 1 << 17;
 export const HEAD_EFFECT = 1 << 18;
 export const EFFECT_PRESERVED = 1 << 19;
 export const USER_EFFECT = 1 << 20;
+export const EFFECT_OFFSCREEN = 1 << 25;
 
 // Flags exclusive to deriveds
 /**
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index 191152b927..f7c9faf2b1 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -1,4 +1,4 @@
-/** @import { EachItem, EachState, Effect, EffectNodes, MaybeSource, Source, TemplateNode, TransitionManager, Value } from '#client' */
+/** @import { EachItem, EachOutroGroup, EachState, Effect, EffectNodes, MaybeSource, Source, TemplateNode, TransitionManager, Value } from '#client' */
 /** @import { Batch } from '../../reactivity/batch.js'; */
 import {
 	EACH_INDEX_REACTIVE,
@@ -29,20 +29,22 @@ import {
 	block,
 	branch,
 	destroy_effect,
-	run_out_transitions,
-	pause_children,
 	pause_effect,
 	resume_effect
 } from '../../reactivity/effects.js';
 import { source, mutable_source, internal_set } from '../../reactivity/sources.js';
 import { array_from, is_array } from '../../../shared/utils.js';
-import { COMMENT_NODE, INERT } from '#client/constants';
+import { COMMENT_NODE, EFFECT_OFFSCREEN, INERT } from '#client/constants';
 import { queue_micro_task } from '../task.js';
 import { get } from '../../runtime.js';
 import { DEV } from 'esm-env';
 import { derived_safe_equal } from '../../reactivity/deriveds.js';
 import { current_batch } from '../../reactivity/batch.js';
 
+// When making substantive changes to this file, validate them with the each block stress test:
+// https://svelte.dev/playground/1972b2cf46564476ad8c8c6405b23b7b
+// This test also exists in this repo, as `packages/svelte/tests/manual/each-stress-test`
+
 /**
  * @param {any} _
  * @param {number} i
@@ -55,7 +57,7 @@ export function index(_, i) {
  * Pause multiple effects simultaneously, and coordinate their
  * subsequent destruction. Used in each blocks
  * @param {EachState} state
- * @param {EachItem[]} to_destroy
+ * @param {Effect[]} to_destroy
  * @param {null | Node} controlled_anchor
  */
 function pause_effects(state, to_destroy, controlled_anchor) {
@@ -63,19 +65,44 @@ function pause_effects(state, to_destroy, controlled_anchor) {
 	var transitions = [];
 	var length = to_destroy.length;
 
+	/** @type {EachOutroGroup} */
+	var group;
+	var remaining = to_destroy.length;
+
 	for (var i = 0; i < length; i++) {
-		pause_children(to_destroy[i].e, transitions, true);
+		let effect = to_destroy[i];
+
+		pause_effect(
+			effect,
+			() => {
+				if (group) {
+					group.pending.delete(effect);
+					group.done.add(effect);
+
+					if (group.pending.size === 0) {
+						var groups = /** @type {Set<EachOutroGroup>} */ (state.outrogroups);
+
+						destroy_effects(array_from(group.done));
+						groups.delete(group);
+
+						if (groups.size === 0) {
+							state.outrogroups = null;
+						}
+					}
+				} else {
+					remaining -= 1;
+				}
+			},
+			false
+		);
 	}
 
-	run_out_transitions(transitions, () => {
+	if (remaining === 0) {
 		// If we're in a controlled each block (i.e. the block is the only child of an
 		// element), and we are removing all items, _and_ there are no out transitions,
 		// we can use the fast path — emptying the element and replacing the anchor
 		var fast_path = transitions.length === 0 && controlled_anchor !== null;
 
-		// TODO only destroy effects if no pending batch needs them. otherwise,
-		// just set `item.o` back to `false`
-
 		if (fast_path) {
 			var anchor = /** @type {Element} */ (controlled_anchor);
 			var parent_node = /** @type {Element} */ (anchor.parentNode);
@@ -84,26 +111,34 @@ function pause_effects(state, to_destroy, controlled_anchor) {
 			parent_node.append(anchor);
 
 			state.items.clear();
-			link(state, to_destroy[0].prev, to_destroy[length - 1].next);
 		}
 
-		for (var i = 0; i < length; i++) {
-			var item = to_destroy[i];
-
-			if (!fast_path) {
-				state.items.delete(item.k);
-				link(state, item.prev, item.next);
-			}
+		destroy_effects(to_destroy, !fast_path);
+	} else {
+		group = {
+			pending: new Set(to_destroy),
+			done: new Set()
+		};
 
-			destroy_effect(item.e, !fast_path);
-		}
+		(state.outrogroups ??= new Set()).add(group);
+	}
+}
 
-		if (state.first === to_destroy[0]) {
-			state.first = to_destroy[0].prev;
-		}
-	});
+/**
+ * @param {Effect[]} to_destroy
+ * @param {boolean} remove_dom
+ */
+function destroy_effects(to_destroy, remove_dom = true) {
+	// TODO only destroy effects if no pending batch needs them. otherwise,
+	// just re-add the `EFFECT_OFFSCREEN` flag
+	for (var i = 0; i < to_destroy.length; i++) {
+		destroy_effect(to_destroy[i], remove_dom);
+	}
 }
 
+/** @type {TemplateNode} */
+var offscreen_anchor;
+
 /**
  * @template V
  * @param {Element | Comment} node The next sibling node, or the parent node if this is a 'controlled' block
@@ -120,12 +155,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 	/** @type {Map<any, EachItem>} */
 	var items = new Map();
 
-	/** @type {EachItem | null} */
-	var first = null;
-
 	var is_controlled = (flags & EACH_IS_CONTROLLED) !== 0;
-	var is_reactive_value = (flags & EACH_ITEM_REACTIVE) !== 0;
-	var is_reactive_index = (flags & EACH_INDEX_REACTIVE) !== 0;
 
 	if (is_controlled) {
 		var parent_node = /** @type {Element} */ (node);
@@ -139,7 +169,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 		hydrate_next();
 	}
 
-	/** @type {{ fragment: DocumentFragment | null, effect: Effect } | null} */
+	/** @type {Effect | null} */
 	var fallback = null;
 
 	// TODO: ideally we could use derived for runes mode but because of the ability
@@ -157,20 +187,19 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 	var first_run = true;
 
 	function commit() {
+		state.fallback = fallback;
 		reconcile(state, array, anchor, flags, get_key);
 
 		if (fallback !== null) {
 			if (array.length === 0) {
-				if (fallback.fragment) {
-					anchor.before(fallback.fragment);
-					fallback.fragment = null;
+				if ((fallback.f & EFFECT_OFFSCREEN) === 0) {
+					resume_effect(fallback);
 				} else {
-					resume_effect(fallback.effect);
+					fallback.f ^= EFFECT_OFFSCREEN;
+					move(fallback, null, anchor);
 				}
-
-				effect.first = fallback.effect;
 			} else {
-				pause_effect(fallback.effect, () => {
+				pause_effect(fallback, () => {
 					// TODO only null out if no pending batch needs it,
 					// otherwise re-add `fallback.fragment` and move the
 					// effect into it
@@ -202,10 +231,9 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 
 		var keys = new Set();
 		var batch = /** @type {Batch} */ (current_batch);
-		var prev = null;
 		var defer = should_defer_append();
 
-		for (var i = 0; i < length; i += 1) {
+		for (var index = 0; index < length; index += 1) {
 			if (
 				hydrating &&
 				hydrate_node.nodeType === COMMENT_NODE &&
@@ -218,46 +246,33 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 				set_hydrating(false);
 			}
 
-			var value = array[i];
-			var key = get_key(value, i);
+			var value = array[index];
+			var key = get_key(value, index);
 
 			var item = first_run ? null : items.get(key);
 
 			if (item) {
 				// update before reconciliation, to trigger any async updates
-				if (is_reactive_value) {
-					internal_set(item.v, value);
-				}
-
-				if (is_reactive_index) {
-					internal_set(/** @type {Value<number>} */ (item.i), i);
-				}
+				if (item.v) internal_set(item.v, value);
+				if (item.i) internal_set(item.i, index);
 
 				if (defer) {
 					batch.skipped_effects.delete(item.e);
 				}
 			} else {
 				item = create_item(
-					first_run ? anchor : null,
-					prev,
+					items,
+					first_run ? anchor : (offscreen_anchor ??= create_text()),
 					value,
 					key,
-					i,
+					index,
 					render_fn,
 					flags,
 					get_collection
 				);
 
-				if (first_run) {
-					item.o = true;
-
-					if (prev === null) {
-						first = item;
-					} else {
-						prev.next = item;
-					}
-
-					prev = item;
+				if (!first_run) {
+					item.e.f |= EFFECT_OFFSCREEN;
 				}
 
 				items.set(key, item);
@@ -268,19 +283,10 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 
 		if (length === 0 && fallback_fn && !fallback) {
 			if (first_run) {
-				fallback = {
-					fragment: null,
-					effect: branch(() => fallback_fn(anchor))
-				};
+				fallback = branch(() => fallback_fn(anchor));
 			} else {
-				var fragment = document.createDocumentFragment();
-				var target = create_text();
-				fragment.append(target);
-
-				fallback = {
-					fragment,
-					effect: branch(() => fallback_fn(target))
-				};
+				fallback = branch(() => fallback_fn((offscreen_anchor ??= create_text())));
+				fallback.f |= EFFECT_OFFSCREEN;
 			}
 		}
 
@@ -321,7 +327,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 	});
 
 	/** @type {EachState} */
-	var state = { effect, flags, items, first };
+	var state = { effect, flags, items, outrogroups: null, fallback };
 
 	first_run = false;
 
@@ -345,21 +351,21 @@ function reconcile(state, array, anchor, flags, get_key) {
 
 	var length = array.length;
 	var items = state.items;
-	var current = state.first;
+	var current = state.effect.first;
 
-	/** @type {undefined | Set<EachItem>} */
+	/** @type {undefined | Set<Effect>} */
 	var seen;
 
-	/** @type {EachItem | null} */
+	/** @type {Effect | null} */
 	var prev = null;
 
-	/** @type {undefined | Set<EachItem>} */
+	/** @type {undefined | Set<Effect>} */
 	var to_animate;
 
-	/** @type {EachItem[]} */
+	/** @type {Effect[]} */
 	var matched = [];
 
-	/** @type {EachItem[]} */
+	/** @type {Effect[]} */
 	var stashed = [];
 
 	/** @type {V} */
@@ -368,8 +374,8 @@ function reconcile(state, array, anchor, flags, get_key) {
 	/** @type {any} */
 	var key;
 
-	/** @type {EachItem | undefined} */
-	var item;
+	/** @type {Effect | undefined} */
+	var effect;
 
 	/** @type {number} */
 	var i;
@@ -378,13 +384,13 @@ function reconcile(state, array, anchor, flags, get_key) {
 		for (i = 0; i < length; i += 1) {
 			value = array[i];
 			key = get_key(value, i);
-			item = /** @type {EachItem} */ (items.get(key));
+			effect = /** @type {EachItem} */ (items.get(key)).e;
 
 			// offscreen == coming in now, no animation in that case,
 			// else this would happen https://github.com/sveltejs/svelte/issues/17181
-			if (item.o) {
-				item.e.nodes?.a?.measure();
-				(to_animate ??= new Set()).add(item);
+			if ((effect.f & EFFECT_OFFSCREEN) === 0) {
+				effect.nodes?.a?.measure();
+				(to_animate ??= new Set()).add(effect);
 			}
 		}
 	}
@@ -393,38 +399,53 @@ function reconcile(state, array, anchor, flags, get_key) {
 		value = array[i];
 		key = get_key(value, i);
 
-		item = /** @type {EachItem} */ (items.get(key));
+		effect = /** @type {EachItem} */ (items.get(key)).e;
 
-		state.first ??= item;
+		if (state.outrogroups !== null) {
+			for (const group of state.outrogroups) {
+				group.pending.delete(effect);
+				group.done.delete(effect);
+			}
+		}
 
-		if (!item.o) {
-			item.o = true;
+		if ((effect.f & EFFECT_OFFSCREEN) !== 0) {
+			effect.f ^= EFFECT_OFFSCREEN;
 
-			var next = prev ? prev.next : current;
+			if (effect === current) {
+				move(effect, null, anchor);
+			} else {
+				var next = prev ? prev.next : current;
 
-			link(state, prev, item);
-			link(state, item, next);
+				if (effect === state.effect.last) {
+					state.effect.last = effect.prev;
+				}
 
-			move(item, next, anchor);
-			prev = item;
+				if (effect.prev) effect.prev.next = effect.next;
+				if (effect.next) effect.next.prev = effect.prev;
+				link(state, prev, effect);
+				link(state, effect, next);
 
-			matched = [];
-			stashed = [];
+				move(effect, next, anchor);
+				prev = effect;
+
+				matched = [];
+				stashed = [];
 
-			current = prev.next;
-			continue;
+				current = prev.next;
+				continue;
+			}
 		}
 
-		if ((item.e.f & INERT) !== 0) {
-			resume_effect(item.e);
+		if ((effect.f & INERT) !== 0) {
+			resume_effect(effect);
 			if (is_animated) {
-				item.e.nodes?.a?.unfix();
-				(to_animate ??= new Set()).delete(item);
+				effect.nodes?.a?.unfix();
+				(to_animate ??= new Set()).delete(effect);
 			}
 		}
 
-		if (item !== current) {
-			if (seen !== undefined && seen.has(item)) {
+		if (effect !== current) {
+			if (seen !== undefined && seen.has(effect)) {
 				if (matched.length < stashed.length) {
 					// more efficient to move later items to the front
 					var start = stashed[0];
@@ -455,14 +476,14 @@ function reconcile(state, array, anchor, flags, get_key) {
 					stashed = [];
 				} else {
 					// more efficient to move earlier items to the back
-					seen.delete(item);
-					move(item, current, anchor);
+					seen.delete(effect);
+					move(effect, current, anchor);
 
-					link(state, item.prev, item.next);
-					link(state, item, prev === null ? state.first : prev.next);
-					link(state, prev, item);
+					link(state, effect.prev, effect.next);
+					link(state, effect, prev === null ? state.effect.first : prev.next);
+					link(state, prev, effect);
 
-					prev = item;
+					prev = effect;
 				}
 
 				continue;
@@ -471,12 +492,8 @@ function reconcile(state, array, anchor, flags, get_key) {
 			matched = [];
 			stashed = [];
 
-			while (current !== null && current !== item) {
-				// If the each block isn't inert and an item has an effect that is already inert,
-				// skip over adding it to our seen Set as the item is already being handled
-				if ((current.e.f & INERT) === 0) {
-					(seen ??= new Set()).add(current);
-				}
+			while (current !== null && current !== effect) {
+				(seen ??= new Set()).add(current);
 				stashed.push(current);
 				current = current.next;
 			}
@@ -484,42 +501,62 @@ function reconcile(state, array, anchor, flags, get_key) {
 			if (current === null) {
 				continue;
 			}
+		}
 
-			item = current;
+		if ((effect.f & EFFECT_OFFSCREEN) === 0) {
+			matched.push(effect);
 		}
 
-		matched.push(item);
-		prev = item;
-		current = item.next;
+		prev = effect;
+		current = effect.next;
 	}
 
-	let has_offscreen_items = items.size > length;
+	if (state.outrogroups !== null) {
+		for (const group of state.outrogroups) {
+			if (group.pending.size === 0) {
+				destroy_effects(array_from(group.done));
+				state.outrogroups?.delete(group);
+			}
+		}
+
+		if (state.outrogroups.size === 0) {
+			state.outrogroups = null;
+		}
+	}
 
 	if (current !== null || seen !== undefined) {
-		var to_destroy = seen === undefined ? [] : array_from(seen);
+		/** @type {Effect[]} */
+		var to_destroy = [];
+
+		if (seen !== undefined) {
+			for (effect of seen) {
+				if ((effect.f & INERT) === 0) {
+					to_destroy.push(effect);
+				}
+			}
+		}
 
 		while (current !== null) {
 			// If the each block isn't inert, then inert effects are currently outroing and will be removed once the transition is finished
-			if ((current.e.f & INERT) === 0) {
+			if ((current.f & INERT) === 0 && current !== state.fallback) {
 				to_destroy.push(current);
 			}
+
 			current = current.next;
 		}
 
 		var destroy_length = to_destroy.length;
 
-		has_offscreen_items = items.size - destroy_length > length;
-
 		if (destroy_length > 0) {
 			var controlled_anchor = (flags & EACH_IS_CONTROLLED) !== 0 && length === 0 ? anchor : null;
 
 			if (is_animated) {
 				for (i = 0; i < destroy_length; i += 1) {
-					to_destroy[i].e.nodes?.a?.measure();
+					to_destroy[i].nodes?.a?.measure();
 				}
 
 				for (i = 0; i < destroy_length; i += 1) {
-					to_destroy[i].e.nodes?.a?.fix();
+					to_destroy[i].nodes?.a?.fix();
 				}
 			}
 
@@ -527,23 +564,11 @@ function reconcile(state, array, anchor, flags, get_key) {
 		}
 	}
 
-	// Append offscreen items at the end
-	if (has_offscreen_items) {
-		for (const item of items.values()) {
-			if (!item.o) {
-				link(state, prev, item);
-				prev = item;
-			}
-		}
-	}
-
-	state.effect.last = prev && prev.e;
-
 	if (is_animated) {
 		queue_micro_task(() => {
 			if (to_animate === undefined) return;
-			for (item of to_animate) {
-				item.e.nodes?.a?.apply();
+			for (effect of to_animate) {
+				effect.nodes?.a?.apply();
 			}
 		});
 	}
@@ -551,8 +576,8 @@ function reconcile(state, array, anchor, flags, get_key) {
 
 /**
  * @template V
- * @param {Node | null} anchor
- * @param {EachItem | null} prev
+ * @param {Map<any, EachItem>} items
+ * @param {Node} anchor
  * @param {V} value
  * @param {unknown} key
  * @param {number} index
@@ -561,96 +586,81 @@ function reconcile(state, array, anchor, flags, get_key) {
  * @param {() => V[]} get_collection
  * @returns {EachItem}
  */
-function create_item(anchor, prev, value, key, index, render_fn, flags, get_collection) {
-	var reactive = (flags & EACH_ITEM_REACTIVE) !== 0;
-	var mutable = (flags & EACH_ITEM_IMMUTABLE) === 0;
+function create_item(items, anchor, value, key, index, render_fn, flags, get_collection) {
+	var v =
+		(flags & EACH_ITEM_REACTIVE) !== 0
+			? (flags & EACH_ITEM_IMMUTABLE) === 0
+				? mutable_source(value, false, false)
+				: source(value)
+			: null;
 
-	var v = reactive ? (mutable ? mutable_source(value, false, false) : source(value)) : value;
-	var i = (flags & EACH_INDEX_REACTIVE) === 0 ? index : source(index);
+	var i = (flags & EACH_INDEX_REACTIVE) !== 0 ? source(index) : null;
 
-	if (DEV && reactive) {
+	if (DEV && v) {
 		// For tracing purposes, we need to link the source signal we create with the
 		// collection + index so that tracing works as intended
-		/** @type {Value} */ (v).trace = () => {
-			var collection_index = typeof i === 'number' ? index : i.v;
+		v.trace = () => {
 			// eslint-disable-next-line @typescript-eslint/no-unused-expressions
-			get_collection()[collection_index];
+			get_collection()[i?.v ?? index];
 		};
 	}
 
-	/** @type {EachItem} */
-	var item = {
-		i,
+	return {
 		v,
-		k: key,
-		// @ts-expect-error
-		e: null,
-		o: false,
-		prev,
-		next: null
-	};
-
-	if (anchor === null) {
-		var fragment = document.createDocumentFragment();
-		fragment.append((anchor = create_text()));
-	}
-
-	item.e = branch(() => render_fn(/** @type {Node} */ (anchor), v, i, get_collection));
-
-	if (prev !== null) {
-		// we only need to set `prev.next = item`, because
-		// `item.prev = prev` was set on initialization.
-		// the effects themselves are already linked
-		prev.next = item;
-	}
+		i,
+		e: branch(() => {
+			render_fn(anchor, v ?? value, i ?? index, get_collection);
 
-	return item;
+			return () => {
+				items.delete(key);
+			};
+		})
+	};
 }
 
 /**
- * @param {EachItem} item
- * @param {EachItem | null} next
+ * @param {Effect} effect
+ * @param {Effect | null} next
  * @param {Text | Element | Comment} anchor
  */
-function move(item, next, anchor) {
-	if (!item.e.nodes) return;
+function move(effect, next, anchor) {
+	if (!effect.nodes) return;
 
-	var end = item.next ? /** @type {EffectNodes} */ (item.next.e.nodes).start : anchor;
+	var node = effect.nodes.start;
+	var end = effect.nodes.end;
 
-	var dest = next ? /** @type {EffectNodes} */ (next.e.nodes).start : anchor;
-	var node = /** @type {TemplateNode} */ (item.e.nodes.start);
+	var dest =
+		next && (next.f & EFFECT_OFFSCREEN) === 0
+			? /** @type {EffectNodes} */ (next.nodes).start
+			: anchor;
 
-	while (node !== null && node !== end) {
+	while (node !== null) {
 		var next_node = /** @type {TemplateNode} */ (get_next_sibling(node));
 		dest.before(node);
+
+		if (node === end) {
+			return;
+		}
+
 		node = next_node;
 	}
 }
 
 /**
  * @param {EachState} state
- * @param {EachItem | null} prev
- * @param {EachItem | null} next
+ * @param {Effect | null} prev
+ * @param {Effect | null} next
  */
 function link(state, prev, next) {
 	if (prev === null) {
-		state.first = next;
-		state.effect.first = next && next.e;
+		state.effect.first = next;
 	} else {
-		if (prev.e.next) {
-			prev.e.next.prev = null;
-		}
-
 		prev.next = next;
-		prev.e.next = next && next.e;
 	}
 
-	if (next !== null) {
-		if (next.e.prev) {
-			next.e.prev.next = null;
-		}
-
+	if (next === null) {
+		state.effect.last = prev;
+	} else {
 		next.prev = prev;
-		next.e.prev = prev && prev.e;
 	}
 }
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index be5ad773e0..717fc35006 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -590,17 +590,11 @@ export function pause_effect(effect, callback, destroy = true) {
 
 	pause_children(effect, transitions, true);
 
-	run_out_transitions(transitions, () => {
+	var fn = () => {
 		if (destroy) destroy_effect(effect);
 		if (callback) callback();
-	});
-}
+	};
 
-/**
- * @param {TransitionManager[]} transitions
- * @param {() => void} fn
- */
-export function run_out_transitions(transitions, fn) {
 	var remaining = transitions.length;
 	if (remaining > 0) {
 		var check = () => --remaining || fn();
@@ -617,7 +611,7 @@ export function run_out_transitions(transitions, fn) {
  * @param {TransitionManager[]} transitions
  * @param {boolean} local
  */
-export function pause_children(effect, transitions, local) {
+function pause_children(effect, transitions, local) {
 	if ((effect.f & INERT) !== 0) return;
 	effect.f ^= INERT;
 
diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts
index 895bfba571..443c21010e 100644
--- a/packages/svelte/src/internal/client/types.d.ts
+++ b/packages/svelte/src/internal/client/types.d.ts
@@ -72,6 +72,11 @@ export type TemplateNode = Text | Element | Comment;
 
 export type Dom = TemplateNode | TemplateNode[];
 
+export type EachOutroGroup = {
+	pending: Set<Effect>;
+	done: Set<Effect>;
+};
+
 export type EachState = {
 	/** the each block effect */
 	effect: Effect;
@@ -79,23 +84,19 @@ export type EachState = {
 	flags: number;
 	/** a key -> item lookup */
 	items: Map<any, EachItem>;
-	/** head of the linked list of items */
-	first: EachItem | null;
+	/** all outro groups that this item is a part of */
+	outrogroups: Set<EachOutroGroup> | null;
+	/** `{:else}` effect */
+	fallback: Effect | null;
 };
 
 export type EachItem = {
+	/** value */
+	v: Source<any> | null;
+	/** index */
+	i: Source<number> | null;
 	/** effect */
 	e: Effect;
-	/** item */
-	v: any | Source<any>;
-	/** index */
-	i: number | Source<number>;
-	/** key */
-	k: unknown;
-	/** true if onscreen */
-	o: boolean;
-	prev: EachItem | null;
-	next: EachItem | null;
 };
 
 export interface TransitionManager {
diff --git a/packages/svelte/tests/manual/each-stress-test/main.svelte b/packages/svelte/tests/manual/each-stress-test/main.svelte
new file mode 100644
index 0000000000..cb69612844
--- /dev/null
+++ b/packages/svelte/tests/manual/each-stress-test/main.svelte
@@ -0,0 +1,194 @@
+<script lang="ts">
+	import { tick } from 'svelte';
+
+	const VALUES = Array.from('abcdefghijklmnopqrstuvwxyz');
+
+	const presets = [
+		// b is never destroyed
+		[
+			"ab",
+			"",
+			"a",
+			"abc"
+		],
+		// the final state is 'abc', not 'cba'
+		[
+			"abc",
+			"",
+			"cba"
+		],
+		// the case in https://github.com/sveltejs/svelte/pull/17240
+		[
+			"abc",
+			"adbc",
+			"adebc"
+		],
+		[
+			"ab",
+			"a",
+			"abc"
+		],
+		[
+			"a",
+			"bc",
+			"bcd"
+		],
+		// add more presets by hitting 'party' and copying from the console
+	];
+
+	function shuffle() {
+		const values = VALUES.slice();
+		const number = Math.floor(Math.random() * VALUES.length);
+		let shuffled = '';
+		for (let i = 0; i < number; i++) {
+			shuffled += (values.splice(Math.floor(Math.random() * (number - i)), 1))[0];
+		}
+
+		return shuffled;
+	}
+
+	function mark(node) {
+		let prev = -1;
+
+		return {
+			duration: transition ? (slow ? 5000 : 500) : 0,
+			tick(t) {
+				const direction = t >= prev ? 'in' : 'out';
+				node.style.color = direction === 'in' ? '' : 'grey';
+
+				prev = t;
+			}
+		}
+	}
+
+	const record = [];
+
+	const sleep = (ms = slow ? 1000 : 100) => new Promise((f) => setTimeout(f, ms));
+
+	async function test(x: string) {
+		console.group(JSON.stringify(x));
+		error = null;
+
+		list = x;
+		record.push(list);
+		if (transition) {
+			await sleep();
+		} else {
+			await tick();
+			await tick();
+		}
+		check('reconcile');
+
+		n += 1;
+		await tick();
+		check('update');
+		console.groupEnd();
+	}
+
+	function check(task: string) {
+		const expected = list.split('').map((c) => `(${c}:${n})`).join('') || '(fallback)';
+
+		const children = Array.from(container.children);
+		const filtered = children.filter((span: HTMLElement) => !span.style.color);
+		const received = filtered.map((span) => span.textContent).join('');
+
+		if (expected !== received) {
+			console.log('expected:', expected);
+			console.log('received:', received);
+			console.log(JSON.stringify(record, null, '  '));
+
+			error = `failed to ${task}`;
+			throw new Error(error);
+		}
+	}
+
+	let list = $state('');
+	let n = $state(0);
+	let error = $state(null);
+	let slow = $state(false);
+	let transition = $state(true);
+	let partying = $state(false);
+
+	let container: HTMLElement;
+</script>
+
+<h1>each block stress test</h1>
+
+<label>
+	<input type="checkbox" bind:checked={transition} />
+	transition
+</label>
+
+<label>
+	<input type="checkbox" bind:checked={slow} />
+	slow
+</label>
+
+<fieldset>
+	<legend>random</legend>
+
+	<button onclick={() => test(shuffle())}>test</button>
+	<button onclick={async () => {
+		if (partying) {
+			partying = false;
+		} else {
+			partying = true;
+			while (partying) await test(shuffle());
+		}
+	}}>{partying ? 'stop' : 'party'}</button>
+</fieldset>
+
+<fieldset>
+	<legend>presets</legend>
+
+	{#each presets as preset, index}
+		<button onclick={async () => {
+			for (let i = 0; i < preset.length; i += 1) {
+				await test(preset[i]);
+			}
+		}}>{index + 1}</button>
+	{/each}
+</fieldset>
+
+<form onsubmit={(e) => {
+	e.preventDefault();
+	test(e.currentTarget.querySelector('input').value);
+}}>
+	<fieldset>
+		<legend>input</legend>
+		<input />
+	</fieldset>
+</form>
+
+<div id="output" bind:this={container}>
+	{#each list as c (c)}
+		<span transition:mark>({c}:{n})</span>
+	{:else}
+		<span transition:mark>(fallback)</span>
+	{/each}
+</div>
+
+{#if error}
+	<p class="error">{error}</p>
+{/if}
+
+<style>
+	fieldset {
+		display: flex;
+		gap: 0.5em;
+		border-radius: 0.5em;
+		corner-shape: squircle;
+		margin: 0 0 1em 0;
+		padding: 0.2em 0.8em 0.8em;
+	}
+
+	legend {
+		padding: 0.2em 0.5em;
+		left: -0.2em;
+		position: relative;
+	}
+
+	.error {
+		color: red;
+	}
+</style>
diff --git a/packages/svelte/tests/runtime-runes/samples/each-updates-12/_config.js b/packages/svelte/tests/runtime-runes/samples/each-updates-12/_config.js
new file mode 100644
index 0000000000..1fee8ceb67
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-updates-12/_config.js
@@ -0,0 +1,33 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, raf }) {
+		const [clear, push] = target.querySelectorAll('button');
+
+		flushSync(() => clear.click());
+		flushSync(() => push.click());
+		raf.tick(500);
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>clear</button>
+				<button>push</button>
+				<span style="opacity: 1;">1</span>
+				<span style="opacity: 0.5;">2</span>
+			`
+		);
+
+		raf.tick(1000);
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>clear</button>
+				<button>push</button>
+				<span style="opacity: 1;">1</span>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/each-updates-12/main.svelte b/packages/svelte/tests/runtime-runes/samples/each-updates-12/main.svelte
new file mode 100644
index 0000000000..a65ebd37a8
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-updates-12/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	function fade(node) {
+		return {
+			duration: 1000,
+			tick(t) {
+				node.style.opacity = t;
+			}
+		}
+	}
+
+	let items = $state([1, 2]);
+</script>
+
+<button onclick={() => items = []}>clear</button>
+<button onclick={() => items.push(items.length + 1)}>push</button>
+
+{#each items as item}
+	<span transition:fade={{duration: 1000}}>{item}</span>
+{/each}
diff --git a/packages/svelte/tests/runtime-runes/samples/each-updates-13/_config.js b/packages/svelte/tests/runtime-runes/samples/each-updates-13/_config.js
new file mode 100644
index 0000000000..fdf02e486c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-updates-13/_config.js
@@ -0,0 +1,23 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, raf }) {
+		const [clear, reverse] = target.querySelectorAll('button');
+
+		flushSync(() => clear.click());
+		flushSync(() => reverse.click());
+		raf.tick(1);
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>clear</button>
+				<button>reverse</button>
+				<span style="opacity: 1;">c</span>
+				<span style="opacity: 1;">b</span>
+				<span style="opacity: 1;">a</span>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/each-updates-13/main.svelte b/packages/svelte/tests/runtime-runes/samples/each-updates-13/main.svelte
new file mode 100644
index 0000000000..3de3382419
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-updates-13/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	function fade(node) {
+		return {
+			duration: 1000,
+			tick(t) {
+				node.style.opacity = t;
+			}
+		}
+	}
+
+	let items = $state(['a', 'b', 'c']);
+</script>
+
+<button onclick={() => items = []}>clear</button>
+<button onclick={() => items = ['c', 'b', 'a']}>reverse</button>
+
+{#each items as item (item)}
+	<span transition:fade={{duration: 1000}}>{item}</span>
+{/each}

From c864d2c778633da749530fe1a5aa24cd7dd0792f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 13:13:49 -0500
Subject: [PATCH 229/347] Version Packages (#17299)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/flat-cars-say.md      | 5 -----
 .changeset/great-bikes-listen.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/flat-cars-say.md
 delete mode 100644 .changeset/great-bikes-listen.md

diff --git a/.changeset/flat-cars-say.md b/.changeset/flat-cars-say.md
deleted file mode 100644
index 1caa75a110..0000000000
--- a/.changeset/flat-cars-say.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: correctly reconcile each blocks after outroing branches are resumed
diff --git a/.changeset/great-bikes-listen.md b/.changeset/great-bikes-listen.md
deleted file mode 100644
index 416e0fcceb..0000000000
--- a/.changeset/great-bikes-listen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: destroy each items after siblings are resumed
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index dc3b63ffd6..2e7cfb50cb 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.45.5
+
+### Patch Changes
+
+- fix: correctly reconcile each blocks after outroing branches are resumed ([#17258](https://github.com/sveltejs/svelte/pull/17258))
+
+- fix: destroy each items after siblings are resumed ([#17258](https://github.com/sveltejs/svelte/pull/17258))
+
 ## 5.45.4
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 2bfc07031d..c39a6676fd 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.45.4",
+  "version": "5.45.5",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index abfc05b688..2ed4a8a710 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.45.4';
+export const VERSION = '5.45.5';
 export const PUBLIC_VERSION = '5';

From 0cdc4315624a715004e192f35bdccf1315fb3e92 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 3 Dec 2025 10:22:49 -0800
Subject: [PATCH 230/347] chore: upgrade dependencies to fix dependabot
 warnings (#17287)

* chore: upgrade babel runtime to fix dependabot warning

* chore: upgrade typescript-eslint

* chore: upgrade js-yaml
---
 package.json                                  |   4 +-
 .../svelte/src/internal/client/dev/inspect.js |   2 -
 pnpm-lock.yaml                                | 844 +++---------------
 3 files changed, 150 insertions(+), 700 deletions(-)

diff --git a/package.json b/package.json
index ad60494bf2..1767c884de 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.29.7",
+    "@changesets/cli": "^2.29.8",
     "@sveltejs/eslint-config": "^8.3.3",
     "@svitejs/changesets-changelog-github-compact": "^1.1.0",
     "@types/node": "^20.11.5",
@@ -41,7 +41,7 @@
     "prettier-plugin-svelte": "^3.4.0",
     "svelte": "workspace:^",
     "typescript": "^5.5.4",
-    "typescript-eslint": "^8.24.0",
+    "typescript-eslint": "^8.48.0",
     "v8-natives": "^1.2.5",
     "vitest": "^2.1.9"
   }
diff --git a/packages/svelte/src/internal/client/dev/inspect.js b/packages/svelte/src/internal/client/dev/inspect.js
index 1ed255b4dd..75b29ce9b1 100644
--- a/packages/svelte/src/internal/client/dev/inspect.js
+++ b/packages/svelte/src/internal/client/dev/inspect.js
@@ -34,8 +34,6 @@ export function inspect(get_value, inspector, show_stack = false) {
 
 				if (!initial) {
 					const stack = get_error('$inspect(...)');
-					// eslint-disable-next-line no-console
-
 					if (stack) {
 						// eslint-disable-next-line no-console
 						console.groupCollapsed('stack trace');
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 70b43ae2ab..0622f345ca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,11 +9,11 @@ importers:
   .:
     devDependencies:
       '@changesets/cli':
-        specifier: ^2.29.7
-        version: 2.29.7(@types/node@20.19.17)
+        specifier: ^2.29.8
+        version: 2.29.8(@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)
+        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.48.0(eslint@9.9.1)(typescript@5.5.4))(typescript@5.5.4)
       '@svitejs/changesets-changelog-github-compact':
         specifier: ^1.1.0
         version: 1.1.0
@@ -54,8 +54,8 @@ importers:
         specifier: ^5.5.4
         version: 5.5.4
       typescript-eslint:
-        specifier: ^8.24.0
-        version: 8.26.0(eslint@9.9.1)(typescript@5.5.4)
+        specifier: ^8.48.0
+        version: 8.48.0(eslint@9.9.1)(typescript@5.5.4)
       v8-natives:
         specifier: ^1.2.5
         version: 1.2.5
@@ -119,16 +119,16 @@ importers:
         version: 1.46.1
       '@rollup/plugin-commonjs':
         specifier: ^28.0.1
-        version: 28.0.1(rollup@4.50.1)
+        version: 28.0.1(rollup@4.52.5)
       '@rollup/plugin-node-resolve':
         specifier: ^15.3.0
-        version: 15.3.0(rollup@4.50.1)
+        version: 15.3.0(rollup@4.52.5)
       '@rollup/plugin-terser':
         specifier: ^0.4.4
-        version: 0.4.4(rollup@4.50.1)
+        version: 0.4.4(rollup@4.52.5)
       '@rollup/plugin-virtual':
         specifier: ^3.0.2
-        version: 3.0.2(rollup@4.50.1)
+        version: 3.0.2(rollup@4.52.5)
       '@types/aria-query':
         specifier: ^5.0.4
         version: 5.0.4
@@ -140,10 +140,10 @@ importers:
         version: 0.5.5(typescript@5.5.4)
       esbuild:
         specifier: ^0.25.10
-        version: 0.25.10
+        version: 0.25.11
       rollup:
         specifier: ^4.22.4
-        version: 4.50.1
+        version: 4.52.5
       source-map:
         specifier: ^0.7.4
         version: 0.7.4
@@ -207,8 +207,8 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/runtime@7.23.8':
-    resolution: {integrity: sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==}
+  '@babel/runtime@7.28.4':
+    resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==}
     engines: {node: '>=6.9.0'}
 
   '@babel/types@7.25.4':
@@ -218,8 +218,8 @@ packages:
   '@bcoe/v8-coverage@0.2.3':
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
-  '@changesets/apply-release-plan@7.0.13':
-    resolution: {integrity: sha512-BIW7bofD2yAWoE8H4V40FikC+1nNFEKBisMECccS16W1rt6qqhNTBDmIw5HaqmMgtLNz9e7oiALiEUuKrQ4oHg==}
+  '@changesets/apply-release-plan@7.0.14':
+    resolution: {integrity: sha512-ddBvf9PHdy2YY0OUiEl3TV78mH9sckndJR14QAt87KLEbIov81XO0q0QAmvooBxXlqRRP8I9B7XOzZwQG7JkWA==}
 
   '@changesets/assemble-release-plan@6.0.9':
     resolution: {integrity: sha512-tPgeeqCHIwNo8sypKlS3gOPmsS3wP0zHt67JDuL20P4QcXiw/O4Hl7oXiuLnP9yg+rXLQ2sScdV1Kkzde61iSQ==}
@@ -227,12 +227,12 @@ packages:
   '@changesets/changelog-git@0.2.1':
     resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==}
 
-  '@changesets/cli@2.29.7':
-    resolution: {integrity: sha512-R7RqWoaksyyKXbKXBTbT4REdy22yH81mcFK6sWtqSanxUCbUi9Uf+6aqxZtDQouIqPdem2W56CdxXgsxdq7FLQ==}
+  '@changesets/cli@2.29.8':
+    resolution: {integrity: sha512-1weuGZpP63YWUYjay/E84qqwcnt5yJMM0tep10Up7Q5cS/DGe2IZ0Uj3HNMxGhCINZuR7aO9WBMdKnPit5ZDPA==}
     hasBin: true
 
-  '@changesets/config@3.1.1':
-    resolution: {integrity: sha512-bd+3Ap2TKXxljCggI0mKPfzCQKeV/TU4yO2h2C6vAihIo8tzseAn2e7klSuiyYYXvgu53zMN1OeYMIQkaQoWnA==}
+  '@changesets/config@3.1.2':
+    resolution: {integrity: sha512-CYiRhA4bWKemdYi/uwImjPxqWNpqGPNbEBdX1BdONALFIDK7MCUj6FPkzD+z9gJcvDFUQJn9aDVf4UG7OT6Kog==}
 
   '@changesets/errors@0.2.0':
     resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==}
@@ -243,8 +243,8 @@ packages:
   '@changesets/get-github-info@0.5.2':
     resolution: {integrity: sha512-JppheLu7S114aEs157fOZDjFqUDpm7eHdq5E8SSR0gUBTEK0cNSHsrSR5a66xs0z3RWuo46QvA3vawp8BxDHvg==}
 
-  '@changesets/get-release-plan@4.0.13':
-    resolution: {integrity: sha512-DWG1pus72FcNeXkM12tx+xtExyH/c9I1z+2aXlObH3i9YA7+WZEVaiHzHl03thpvAgWTRaH64MpfHxozfF7Dvg==}
+  '@changesets/get-release-plan@4.0.14':
+    resolution: {integrity: sha512-yjZMHpUHgl4Xl5gRlolVuxDkm4HgSJqT93Ri1Uz8kGrQb+5iJ8dkXJ20M2j/Y4iV5QzS2c5SeTxVSKX+2eMI0g==}
 
   '@changesets/get-version-range-type@0.4.0':
     resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==}
@@ -255,14 +255,14 @@ packages:
   '@changesets/logger@0.1.1':
     resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==}
 
-  '@changesets/parse@0.4.1':
-    resolution: {integrity: sha512-iwksMs5Bf/wUItfcg+OXrEpravm5rEd9Bf4oyIPL4kVTmJQ7PNDSd6MDYkpSJR1pn7tz/k8Zf2DhTCqX08Ou+Q==}
+  '@changesets/parse@0.4.2':
+    resolution: {integrity: sha512-Uo5MC5mfg4OM0jU3up66fmSn6/NE9INK+8/Vn/7sMVcdWg46zfbvvUSjD9EMonVqPi9fbrJH9SXHn48Tr1f2yA==}
 
   '@changesets/pre@2.0.2':
     resolution: {integrity: sha512-HaL/gEyFVvkf9KFg6484wR9s0qjAXlZ8qWPDkTyKF6+zqjBe/I2mygg3MbpZ++hdi0ToqNUF8cjj7fBy0dg8Ug==}
 
-  '@changesets/read@0.6.5':
-    resolution: {integrity: sha512-UPzNGhsSjHD3Veb0xO/MwvasGe8eMyNrR/sT9gR8Q3DhOQZirgKhhXv/8hVsI0QpPjR004Z9iFxoJU6in3uGMg==}
+  '@changesets/read@0.6.6':
+    resolution: {integrity: sha512-P5QaN9hJSQQKJShzzpBT13FzOSPyHbqdoIBUd2DJdgvnECCyO6LmAOWSV+O8se2TaZJVwSXjL+v9yhb+a9JeJg==}
 
   '@changesets/should-skip-package@0.1.2':
     resolution: {integrity: sha512-qAK/WrqWLNCP22UDdBTMPH5f41elVDlsNyat180A33dWxuUDyNpg6fPi/FyTZwRriVjg0L8gnjJn2F9XAoF0qw==}
@@ -282,12 +282,6 @@ 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/aix-ppc64@0.25.11':
     resolution: {integrity: sha512-Xt1dOL13m8u0WE8iplx9Ibbm+hFAO0GsU2P34UNoDGvZYkY8ifSiy6Zuc1lYxfG7svWE2fzqCUmFp5HCn51gJg==}
     engines: {node: '>=18'}
@@ -300,12 +294,6 @@ packages:
     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-arm64@0.25.11':
     resolution: {integrity: sha512-9slpyFBc4FPPz48+f6jyiXOx/Y4v34TUeDDXJpZqAWQn/08lKGeD8aDp9TMn9jDz2CiEuHwfhRmGBvpnd/PWIQ==}
     engines: {node: '>=18'}
@@ -318,12 +306,6 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.25.10':
-    resolution: {integrity: sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-
   '@esbuild/android-arm@0.25.11':
     resolution: {integrity: sha512-uoa7dU+Dt3HYsethkJ1k6Z9YdcHjTrSb5NUy66ZfZaSV8hEYGD5ZHbEMXnqLFlbBflLsl89Zke7CAdDJ4JI+Gg==}
     engines: {node: '>=18'}
@@ -336,12 +318,6 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.25.10':
-    resolution: {integrity: sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-
   '@esbuild/android-x64@0.25.11':
     resolution: {integrity: sha512-Sgiab4xBjPU1QoPEIqS3Xx+R2lezu0LKIEcYe6pftr56PqPygbB7+szVnzoShbx64MUupqoE0KyRlN7gezbl8g==}
     engines: {node: '>=18'}
@@ -354,12 +330,6 @@ packages:
     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-arm64@0.25.11':
     resolution: {integrity: sha512-VekY0PBCukppoQrycFxUqkCojnTQhdec0vevUL/EDOCnXd9LKWqD/bHwMPzigIJXPhC59Vd1WFIL57SKs2mg4w==}
     engines: {node: '>=18'}
@@ -372,12 +342,6 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.25.10':
-    resolution: {integrity: sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-
   '@esbuild/darwin-x64@0.25.11':
     resolution: {integrity: sha512-+hfp3yfBalNEpTGp9loYgbknjR695HkqtY3d3/JjSRUyPg/xd6q+mQqIb5qdywnDxRZykIHs3axEqU6l1+oWEQ==}
     engines: {node: '>=18'}
@@ -390,12 +354,6 @@ packages:
     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-arm64@0.25.11':
     resolution: {integrity: sha512-CmKjrnayyTJF2eVuO//uSjl/K3KsMIeYeyN7FyDBjsR3lnSJHaXlVoAK8DZa7lXWChbuOk7NjAc7ygAwrnPBhA==}
     engines: {node: '>=18'}
@@ -408,12 +366,6 @@ packages:
     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/freebsd-x64@0.25.11':
     resolution: {integrity: sha512-Dyq+5oscTJvMaYPvW3x3FLpi2+gSZTCE/1ffdwuM6G1ARang/mb3jvjxs0mw6n3Lsw84ocfo9CrNMqc5lTfGOw==}
     engines: {node: '>=18'}
@@ -426,12 +378,6 @@ packages:
     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-arm64@0.25.11':
     resolution: {integrity: sha512-Qr8AzcplUhGvdyUF08A1kHU3Vr2O88xxP0Tm8GcdVOUm25XYcMPp2YqSVHbLuXzYQMf9Bh/iKx7YPqECs6ffLA==}
     engines: {node: '>=18'}
@@ -444,12 +390,6 @@ packages:
     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-arm@0.25.11':
     resolution: {integrity: sha512-TBMv6B4kCfrGJ8cUPo7vd6NECZH/8hPpBHHlYI3qzoYFvWu2AdTvZNuU/7hsbKWqu/COU7NIK12dHAAqBLLXgw==}
     engines: {node: '>=18'}
@@ -462,12 +402,6 @@ packages:
     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-ia32@0.25.11':
     resolution: {integrity: sha512-TmnJg8BMGPehs5JKrCLqyWTVAvielc615jbkOirATQvWWB1NMXY77oLMzsUjRLa0+ngecEmDGqt5jiDC6bfvOw==}
     engines: {node: '>=18'}
@@ -480,12 +414,6 @@ packages:
     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-loong64@0.25.11':
     resolution: {integrity: sha512-DIGXL2+gvDaXlaq8xruNXUJdT5tF+SBbJQKbWy/0J7OhU8gOHOzKmGIlfTTl6nHaCOoipxQbuJi7O++ldrxgMw==}
     engines: {node: '>=18'}
@@ -498,12 +426,6 @@ packages:
     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-mips64el@0.25.11':
     resolution: {integrity: sha512-Osx1nALUJu4pU43o9OyjSCXokFkFbyzjXb6VhGIJZQ5JZi8ylCQ9/LFagolPsHtgw6himDSyb5ETSfmp4rpiKQ==}
     engines: {node: '>=18'}
@@ -516,12 +438,6 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.25.10':
-    resolution: {integrity: sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-
   '@esbuild/linux-ppc64@0.25.11':
     resolution: {integrity: sha512-nbLFgsQQEsBa8XSgSTSlrnBSrpoWh7ioFDUmwo158gIm5NNP+17IYmNWzaIzWmgCxq56vfr34xGkOcZ7jX6CPw==}
     engines: {node: '>=18'}
@@ -534,12 +450,6 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.25.10':
-    resolution: {integrity: sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-
   '@esbuild/linux-riscv64@0.25.11':
     resolution: {integrity: sha512-HfyAmqZi9uBAbgKYP1yGuI7tSREXwIb438q0nqvlpxAOs3XnZ8RsisRfmVsgV486NdjD7Mw2UrFSw51lzUk1ww==}
     engines: {node: '>=18'}
@@ -552,12 +462,6 @@ packages:
     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-s390x@0.25.11':
     resolution: {integrity: sha512-HjLqVgSSYnVXRisyfmzsH6mXqyvj0SA7pG5g+9W7ESgwA70AXYNpfKBqh1KbTxmQVaYxpzA/SvlB9oclGPbApw==}
     engines: {node: '>=18'}
@@ -570,24 +474,12 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.25.10':
-    resolution: {integrity: sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-
   '@esbuild/linux-x64@0.25.11':
     resolution: {integrity: sha512-HSFAT4+WYjIhrHxKBwGmOOSpphjYkcswF449j6EjsjbinTZbp8PJtjsVK1XFJStdzXdy/jaddAep2FGY+wyFAQ==}
     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-arm64@0.25.11':
     resolution: {integrity: sha512-hr9Oxj1Fa4r04dNpWr3P8QKVVsjQhqrMSUzZzf+LZcYjZNqhA3IAfPQdEh1FLVUJSiu6sgAwp3OmwBfbFgG2Xg==}
     engines: {node: '>=18'}
@@ -600,24 +492,12 @@ packages:
     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/netbsd-x64@0.25.11':
     resolution: {integrity: sha512-u7tKA+qbzBydyj0vgpu+5h5AeudxOAGncb8N6C9Kh1N4n7wU1Xw1JDApsRjpShRpXRQlJLb9wY28ELpwdPcZ7A==}
     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-arm64@0.25.11':
     resolution: {integrity: sha512-Qq6YHhayieor3DxFOoYM1q0q1uMFYb7cSpLD2qzDSvK1NAvqFi8Xgivv0cFC6J+hWVw2teCYltyy9/m/14ryHg==}
     engines: {node: '>=18'}
@@ -630,24 +510,12 @@ packages:
     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/openbsd-x64@0.25.11':
     resolution: {integrity: sha512-CN+7c++kkbrckTOz5hrehxWN7uIhFFlmS/hqziSFVWpAzpWrQoAG4chH+nN3Be+Kzv/uuo7zhX716x3Sn2Jduw==}
     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/openharmony-arm64@0.25.11':
     resolution: {integrity: sha512-rOREuNIQgaiR+9QuNkbkxubbp8MSO9rONmwP5nKncnWJ9v5jQ4JxFnLu4zDSRPf3x4u+2VN4pM4RdyIzDty/wQ==}
     engines: {node: '>=18'}
@@ -660,12 +528,6 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.25.10':
-    resolution: {integrity: sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-
   '@esbuild/sunos-x64@0.25.11':
     resolution: {integrity: sha512-nq2xdYaWxyg9DcIyXkZhcYulC6pQ2FuCgem3LI92IwMgIZ69KHeY8T4Y88pcwoLIjbed8n36CyKoYRDygNSGhA==}
     engines: {node: '>=18'}
@@ -678,12 +540,6 @@ packages:
     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-arm64@0.25.11':
     resolution: {integrity: sha512-3XxECOWJq1qMZ3MN8srCJ/QfoLpL+VaxD/WfNRm1O3B4+AZ/BnLVgFbUV3eiRYDMXetciH16dwPbbHqwe1uU0Q==}
     engines: {node: '>=18'}
@@ -696,12 +552,6 @@ packages:
     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-ia32@0.25.11':
     resolution: {integrity: sha512-3ukss6gb9XZ8TlRyJlgLn17ecsK4NSQTmdIXRASVsiS2sQ6zPPZklNJT5GR5tE/MUarymmy8kCEf5xPCNCqVOA==}
     engines: {node: '>=18'}
@@ -714,12 +564,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.25.10':
-    resolution: {integrity: sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-
   '@esbuild/win32-x64@0.25.11':
     resolution: {integrity: sha512-D7Hpz6A2L4hzsRpPaCYkQnGOotdUpDzSGRIv9I+1ITdHROSFUWW95ZPZWQmGka1Fg7W3zFJowyn9WGwMJ0+KPA==}
     engines: {node: '>=18'}
@@ -732,10 +576,6 @@ packages:
     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}
-
   '@eslint-community/regexpp@4.12.2':
     resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
@@ -880,101 +720,51 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.50.1':
-    resolution: {integrity: sha512-HJXwzoZN4eYTdD8bVV22DN8gsPCAj3V20NHKOs8ezfXanGpmVPR7kalUHd+Y31IJp9stdB87VKPFbsGY3H/2ag==}
-    cpu: [arm]
-    os: [android]
-
   '@rollup/rollup-android-arm-eabi@4.52.5':
     resolution: {integrity: sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.50.1':
-    resolution: {integrity: sha512-PZlsJVcjHfcH53mOImyt3bc97Ep3FJDXRpk9sMdGX0qgLmY0EIWxCag6EigerGhLVuL8lDVYNnSo8qnTElO4xw==}
-    cpu: [arm64]
-    os: [android]
-
   '@rollup/rollup-android-arm64@4.52.5':
     resolution: {integrity: sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.50.1':
-    resolution: {integrity: sha512-xc6i2AuWh++oGi4ylOFPmzJOEeAa2lJeGUGb4MudOtgfyyjr4UPNK+eEWTPLvmPJIY/pgw6ssFIox23SyrkkJw==}
-    cpu: [arm64]
-    os: [darwin]
-
   '@rollup/rollup-darwin-arm64@4.52.5':
     resolution: {integrity: sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.50.1':
-    resolution: {integrity: sha512-2ofU89lEpDYhdLAbRdeyz/kX3Y2lpYc6ShRnDjY35bZhd2ipuDMDi6ZTQ9NIag94K28nFMofdnKeHR7BT0CATw==}
-    cpu: [x64]
-    os: [darwin]
-
   '@rollup/rollup-darwin-x64@4.52.5':
     resolution: {integrity: sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.50.1':
-    resolution: {integrity: sha512-wOsE6H2u6PxsHY/BeFHA4VGQN3KUJFZp7QJBmDYI983fgxq5Th8FDkVuERb2l9vDMs1D5XhOrhBrnqcEY6l8ZA==}
-    cpu: [arm64]
-    os: [freebsd]
-
   '@rollup/rollup-freebsd-arm64@4.52.5':
     resolution: {integrity: sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.50.1':
-    resolution: {integrity: sha512-A/xeqaHTlKbQggxCqispFAcNjycpUEHP52mwMQZUNqDUJFFYtPHCXS1VAG29uMlDzIVr+i00tSFWFLivMcoIBQ==}
-    cpu: [x64]
-    os: [freebsd]
-
   '@rollup/rollup-freebsd-x64@4.52.5':
     resolution: {integrity: sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
-    resolution: {integrity: sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg==}
-    cpu: [arm]
-    os: [linux]
-
   '@rollup/rollup-linux-arm-gnueabihf@4.52.5':
     resolution: {integrity: sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==}
     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-arm-musleabihf@4.52.5':
     resolution: {integrity: sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-gnu@4.50.1':
-    resolution: {integrity: sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw==}
-    cpu: [arm64]
-    os: [linux]
-
   '@rollup/rollup-linux-arm64-gnu@4.52.5':
     resolution: {integrity: sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==}
     cpu: [arm64]
     os: [linux]
 
-  '@rollup/rollup-linux-arm64-musl@4.50.1':
-    resolution: {integrity: sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w==}
-    cpu: [arm64]
-    os: [linux]
-
   '@rollup/rollup-linux-arm64-musl@4.52.5':
     resolution: {integrity: sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==}
     cpu: [arm64]
@@ -985,96 +775,46 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
-    resolution: {integrity: sha512-RPhTwWMzpYYrHrJAS7CmpdtHNKtt2Ueo+BlLBjfZEhYBhK00OsEqM08/7f+eohiF6poe0YRDDd8nAvwtE/Y62Q==}
-    cpu: [loong64]
-    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-ppc64-gnu@4.52.5':
     resolution: {integrity: sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==}
     cpu: [ppc64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.50.1':
-    resolution: {integrity: sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ==}
-    cpu: [riscv64]
-    os: [linux]
-
   '@rollup/rollup-linux-riscv64-gnu@4.52.5':
     resolution: {integrity: sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-riscv64-musl@4.50.1':
-    resolution: {integrity: sha512-3Ag8Ls1ggqkGUvSZWYcdgFwriy2lWo+0QlYgEFra/5JGtAd6C5Hw59oojx1DeqcA2Wds2ayRgvJ4qxVTzCHgzg==}
-    cpu: [riscv64]
-    os: [linux]
-
   '@rollup/rollup-linux-riscv64-musl@4.52.5':
     resolution: {integrity: sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==}
     cpu: [riscv64]
     os: [linux]
 
-  '@rollup/rollup-linux-s390x-gnu@4.50.1':
-    resolution: {integrity: sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg==}
-    cpu: [s390x]
-    os: [linux]
-
   '@rollup/rollup-linux-s390x-gnu@4.52.5':
     resolution: {integrity: sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==}
     cpu: [s390x]
     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-gnu@4.52.5':
     resolution: {integrity: sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==}
     cpu: [x64]
     os: [linux]
 
-  '@rollup/rollup-linux-x64-musl@4.50.1':
-    resolution: {integrity: sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg==}
-    cpu: [x64]
-    os: [linux]
-
   '@rollup/rollup-linux-x64-musl@4.52.5':
     resolution: {integrity: sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==}
     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-openharmony-arm64@4.52.5':
     resolution: {integrity: sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.50.1':
-    resolution: {integrity: sha512-hpZB/TImk2FlAFAIsoElM3tLzq57uxnGYwplg6WDyAxbYczSi8O2eQ+H2Lx74504rwKtZ3N2g4bCUkiamzS6TQ==}
-    cpu: [arm64]
-    os: [win32]
-
   '@rollup/rollup-win32-arm64-msvc@4.52.5':
     resolution: {integrity: sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.50.1':
-    resolution: {integrity: sha512-SXjv8JlbzKM0fTJidX4eVsH+Wmnp0/WcD8gJxIZyR6Gay5Qcsmdbi9zVtnbkGPG8v2vMR1AD06lGWy5FLMcG7A==}
-    cpu: [ia32]
-    os: [win32]
-
   '@rollup/rollup-win32-ia32-msvc@4.52.5':
     resolution: {integrity: sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==}
     cpu: [ia32]
@@ -1085,11 +825,6 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.50.1':
-    resolution: {integrity: sha512-StxAO/8ts62KZVRAm4JZYq9+NqNsV7RvimNK+YM7ry//zebEH6meuugqW/P5OFUCjyQgui+9fUxT6d5NShvMvA==}
-    cpu: [x64]
-    os: [win32]
-
   '@rollup/rollup-win32-x64-msvc@4.52.5':
     resolution: {integrity: sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==}
     cpu: [x64]
@@ -1163,20 +898,20 @@ packages:
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
-  '@typescript-eslint/eslint-plugin@8.26.0':
-    resolution: {integrity: sha512-cLr1J6pe56zjKYajK6SSSre6nl1Gj6xDp1TY0trpgPzjVbgDwd09v2Ws37LABxzkicmUjhEeg/fAUjPJJB1v5Q==}
+  '@typescript-eslint/eslint-plugin@8.48.0':
+    resolution: {integrity: sha512-XxXP5tL1txl13YFtrECECQYeZjBZad4fyd3cFV4a19LkAY/bIp9fev3US4S5fDVV2JaYFiKAZ/GRTOLer+mbyQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0
+      '@typescript-eslint/parser': ^8.48.0
       eslint: ^8.57.0 || ^9.0.0
-      typescript: '>=4.8.4 <5.9.0'
+      typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/parser@8.26.0':
-    resolution: {integrity: sha512-mNtXP9LTVBy14ZF3o7JG69gRPBK/2QWtQd0j0oH26HcY/foyJJau6pNUez7QrM5UHnSvwlQcJXKsk0I99B9pOA==}
+  '@typescript-eslint/parser@8.48.0':
+    resolution: {integrity: sha512-jCzKdm/QK0Kg4V4IK/oMlRZlY+QOcdjv89U2NgKHZk1CYTj82/RVSx1mV/0gqCVMJ/DA+Zf/S4NBWNF8GQ+eqQ==}
     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/project-service@8.48.0':
     resolution: {integrity: sha512-Ne4CTZyRh1BecBf84siv42wv5vQvVmgtk8AuiEffKTUo3DrBaGYZueJSxxBZ8fjk/N3DrgChH4TOdIOwOwiqqw==}
@@ -1184,10 +919,6 @@ packages:
     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.48.0':
     resolution: {integrity: sha512-uGSSsbrtJrLduti0Q1Q9+BF1/iFKaxGoQwjWOIVNJv0o6omrdyR8ct37m4xIl5Zzpkp69Kkmvom7QFTtue89YQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1198,40 +929,23 @@ packages:
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/type-utils@8.26.0':
-    resolution: {integrity: sha512-ruk0RNChLKz3zKGn2LwXuVoeBcUMh+jaqzN461uMMdxy5H9epZqIBtYj7UiPXRuOpaALXGbmRuZQhmwHhaS04Q==}
+  '@typescript-eslint/type-utils@8.48.0':
+    resolution: {integrity: sha512-zbeVaVqeXhhab6QNEKfK96Xyc7UQuoFWERhEnj3mLVnUWrQnv15cJNseUni7f3g557gm0e46LZ6IJ4NJVOgOpw==}
     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-eslint/types@8.26.0':
-    resolution: {integrity: sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+      typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/types@8.48.0':
     resolution: {integrity: sha512-cQMcGQQH7kwKoVswD1xdOytxQR60MWKM1di26xSUtxehaDs/32Zpqsu5WJlXTtTTqyAVK8R7hvsUnIXRS+bjvA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.26.0':
-    resolution: {integrity: sha512-tiJ1Hvy/V/oMVRTbEOIeemA2XoylimlDQ03CgPPNaHYZbpsc78Hmngnt+WXZfJX1pjQ711V7g0H7cSJThGYfPQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <5.9.0'
-
   '@typescript-eslint/typescript-estree@8.48.0':
     resolution: {integrity: sha512-ljHab1CSO4rGrQIAyizUS6UGHHCiAYhbfcIZ1zVJr5nMryxlXMVWS3duFPSKvSUbFPwkXMFk1k0EMIjub4sRRQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/utils@8.26.0':
-    resolution: {integrity: sha512-2L2tU3FVwhvU14LndnQCA2frYC8JnPDVKyQtWFPf8IYFMt/ykEN1bPolNhNbCVgOmdzTlWdusCTKA/9nKrf8Ig==}
-    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-eslint/utils@8.48.0':
     resolution: {integrity: sha512-yTJO1XuGxCsSfIVt1+1UrLHtue8xz16V8apzPYI06W0HbEbEWHxHXgZaAgavIkoh+GeV6hKKd5jm0sS6OYxWXQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1239,10 +953,6 @@ packages:
       eslint: ^8.57.0 || ^9.0.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.48.0':
     resolution: {integrity: sha512-T0XJMaRPOH3+LBbAfzR2jalckP1MSG/L9eUtY0DEzUyVaXJ/t6zN0nR7co5kz0Jko/nkSYCBRkz1djvjajVTTg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1369,11 +1079,11 @@ packages:
   birpc@2.5.0:
     resolution: {integrity: sha512-VSWO/W6nNQdyP520F1mhf+Lc2f8pjGQOtoHHm7Ze8Go1kX7akpVIrtTa0fn+HB0QJEDVacl6aO08YE0PgXfdnQ==}
 
-  brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+  brace-expansion@1.1.12:
+    resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
 
-  brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+  brace-expansion@2.0.2:
+    resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
 
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
@@ -1461,15 +1171,6 @@ packages:
   dataloader@1.4.0:
     resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==}
 
-  debug@4.4.1:
-    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
   debug@4.4.3:
     resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
     engines: {node: '>=6.0'}
@@ -1567,11 +1268,6 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
-  esbuild@0.25.10:
-    resolution: {integrity: sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==}
-    engines: {node: '>=18'}
-    hasBin: true
-
   esbuild@0.25.11:
     resolution: {integrity: sha512-KohQwyzrKTQmhXDW1PjCv3Tyspn9n5GcY2RTDqeORIdIJY8yKIF7sTSopFmn/wpMPW4rdPXI0UE5LJLuq3bx0Q==}
     engines: {node: '>=18'}
@@ -1841,6 +1537,10 @@ packages:
     resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
     engines: {node: '>= 4'}
 
+  ignore@7.0.5:
+    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+    engines: {node: '>= 4'}
+
   immutable@4.3.7:
     resolution: {integrity: sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==}
 
@@ -1935,12 +1635,12 @@ packages:
   jackspeak@3.4.3:
     resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
 
-  js-yaml@3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+  js-yaml@3.14.2:
+    resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==}
     hasBin: true
 
-  js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+  js-yaml@4.1.1:
+    resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
 
   jsdom@25.0.1:
@@ -2180,8 +1880,8 @@ packages:
   package-json-from-dist@1.0.0:
     resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
 
-  package-manager-detector@0.2.0:
-    resolution: {integrity: sha512-E385OSk9qDcXhcM9LNSe4sdhx8a9mAPrZ4sMLW+tmxl5ZuGtPUcdFu+MPP2jbgiWAZ6Pfe5soGFMd+0Db5Vrog==}
+  package-manager-detector@0.2.11:
+    resolution: {integrity: sha512-BEnLolu+yuz22S56CU1SUKq3XC3PkwD5wv4ikR4MfGvnRVcmzXR9DwSlW2fEamyTPyXHomBJRzgapeuBvRNzJQ==}
 
   parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
@@ -2307,6 +2007,9 @@ packages:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
 
+  quansync@0.2.11:
+    resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==}
+
   queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
@@ -2321,9 +2024,6 @@ packages:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
 
-  regenerator-runtime@0.14.1:
-    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
-
   regexparam@3.0.0:
     resolution: {integrity: sha512-RSYAtP31mvYLkAHrOlh25pCNQ5hWnT106VukGaaFfuJrZFkGRX5GhUAdPqpSDXxOhA2c4akmRuplv1mRqnBn6Q==}
     engines: {node: '>=8'}
@@ -2347,11 +2047,6 @@ packages:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
-  rollup@4.50.1:
-    resolution: {integrity: sha512-78E9voJHwnXQMiQdiqswVLZwJIzdBKJ1GdI5Zx6XwoFKUIk09/sSrr+05QFzvYb8q6Y9pPV45zzDuYa3907TZA==}
-    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
-    hasBin: true
-
   rollup@4.52.5:
     resolution: {integrity: sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
@@ -2386,11 +2081,6 @@ packages:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
     engines: {node: '>=v12.22.7'}
 
-  semver@7.7.2:
-    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   semver@7.7.3:
     resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
     engines: {node: '>=10'}
@@ -2593,12 +2283,12 @@ packages:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
 
-  typescript-eslint@8.26.0:
-    resolution: {integrity: sha512-PtVz9nAnuNJuAVeUFvwztjuUgSnJInODAUx47VDwWPXzd5vismPOtPtt83tzNXyOjVQbPRp786D6WFW/M2koIA==}
+  typescript-eslint@8.48.0:
+    resolution: {integrity: sha512-fcKOvQD9GUn3Xw63EgiDqhvWJ5jsyZUaekl3KVpGsDJnN46WJTe3jWxtQP9lMZm1LJNkFLlTaWAxK2vUQR+cqw==}
     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@5.5.4:
     resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
@@ -2862,9 +2552,7 @@ snapshots:
     dependencies:
       '@babel/types': 7.25.4
 
-  '@babel/runtime@7.23.8':
-    dependencies:
-      regenerator-runtime: 0.14.1
+  '@babel/runtime@7.28.4': {}
 
   '@babel/types@7.25.4':
     dependencies:
@@ -2874,9 +2562,9 @@ snapshots:
 
   '@bcoe/v8-coverage@0.2.3': {}
 
-  '@changesets/apply-release-plan@7.0.13':
+  '@changesets/apply-release-plan@7.0.14':
     dependencies:
-      '@changesets/config': 3.1.1
+      '@changesets/config': 3.1.2
       '@changesets/get-version-range-type': 0.4.0
       '@changesets/git': 3.0.4
       '@changesets/should-skip-package': 0.1.2
@@ -2888,7 +2576,7 @@ snapshots:
       outdent: 0.5.0
       prettier: 2.8.8
       resolve-from: 5.0.0
-      semver: 7.7.2
+      semver: 7.7.3
 
   '@changesets/assemble-release-plan@6.0.9':
     dependencies:
@@ -2897,25 +2585,25 @@ snapshots:
       '@changesets/should-skip-package': 0.1.2
       '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
-      semver: 7.7.2
+      semver: 7.7.3
 
   '@changesets/changelog-git@0.2.1':
     dependencies:
       '@changesets/types': 6.1.0
 
-  '@changesets/cli@2.29.7(@types/node@20.19.17)':
+  '@changesets/cli@2.29.8(@types/node@20.19.17)':
     dependencies:
-      '@changesets/apply-release-plan': 7.0.13
+      '@changesets/apply-release-plan': 7.0.14
       '@changesets/assemble-release-plan': 6.0.9
       '@changesets/changelog-git': 0.2.1
-      '@changesets/config': 3.1.1
+      '@changesets/config': 3.1.2
       '@changesets/errors': 0.2.0
       '@changesets/get-dependents-graph': 2.1.3
-      '@changesets/get-release-plan': 4.0.13
+      '@changesets/get-release-plan': 4.0.14
       '@changesets/git': 3.0.4
       '@changesets/logger': 0.1.1
       '@changesets/pre': 2.0.2
-      '@changesets/read': 0.6.5
+      '@changesets/read': 0.6.6
       '@changesets/should-skip-package': 0.1.2
       '@changesets/types': 6.1.0
       '@changesets/write': 0.4.0
@@ -2927,16 +2615,16 @@ snapshots:
       fs-extra: 7.0.1
       mri: 1.2.0
       p-limit: 2.3.0
-      package-manager-detector: 0.2.0
+      package-manager-detector: 0.2.11
       picocolors: 1.1.1
       resolve-from: 5.0.0
-      semver: 7.7.2
+      semver: 7.7.3
       spawndamnit: 3.0.1
       term-size: 2.2.1
     transitivePeerDependencies:
       - '@types/node'
 
-  '@changesets/config@3.1.1':
+  '@changesets/config@3.1.2':
     dependencies:
       '@changesets/errors': 0.2.0
       '@changesets/get-dependents-graph': 2.1.3
@@ -2955,7 +2643,7 @@ snapshots:
       '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
       picocolors: 1.1.1
-      semver: 7.7.2
+      semver: 7.7.3
 
   '@changesets/get-github-info@0.5.2':
     dependencies:
@@ -2964,12 +2652,12 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@changesets/get-release-plan@4.0.13':
+  '@changesets/get-release-plan@4.0.14':
     dependencies:
       '@changesets/assemble-release-plan': 6.0.9
-      '@changesets/config': 3.1.1
+      '@changesets/config': 3.1.2
       '@changesets/pre': 2.0.2
-      '@changesets/read': 0.6.5
+      '@changesets/read': 0.6.6
       '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
 
@@ -2987,10 +2675,10 @@ snapshots:
     dependencies:
       picocolors: 1.1.1
 
-  '@changesets/parse@0.4.1':
+  '@changesets/parse@0.4.2':
     dependencies:
       '@changesets/types': 6.1.0
-      js-yaml: 3.14.1
+      js-yaml: 4.1.1
 
   '@changesets/pre@2.0.2':
     dependencies:
@@ -2999,11 +2687,11 @@ snapshots:
       '@manypkg/get-packages': 1.1.3
       fs-extra: 7.0.1
 
-  '@changesets/read@0.6.5':
+  '@changesets/read@0.6.6':
     dependencies:
       '@changesets/git': 3.0.4
       '@changesets/logger': 0.1.1
-      '@changesets/parse': 0.4.1
+      '@changesets/parse': 0.4.2
       '@changesets/types': 6.1.0
       fs-extra: 7.0.1
       p-filter: 2.1.0
@@ -3028,225 +2716,147 @@ snapshots:
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
-  '@esbuild/aix-ppc64@0.25.10':
-    optional: true
-
   '@esbuild/aix-ppc64@0.25.11':
     optional: true
 
   '@esbuild/android-arm64@0.21.5':
     optional: true
 
-  '@esbuild/android-arm64@0.25.10':
-    optional: true
-
   '@esbuild/android-arm64@0.25.11':
     optional: true
 
   '@esbuild/android-arm@0.21.5':
     optional: true
 
-  '@esbuild/android-arm@0.25.10':
-    optional: true
-
   '@esbuild/android-arm@0.25.11':
     optional: true
 
   '@esbuild/android-x64@0.21.5':
     optional: true
 
-  '@esbuild/android-x64@0.25.10':
-    optional: true
-
   '@esbuild/android-x64@0.25.11':
     optional: true
 
   '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
-  '@esbuild/darwin-arm64@0.25.10':
-    optional: true
-
   '@esbuild/darwin-arm64@0.25.11':
     optional: true
 
   '@esbuild/darwin-x64@0.21.5':
     optional: true
 
-  '@esbuild/darwin-x64@0.25.10':
-    optional: true
-
   '@esbuild/darwin-x64@0.25.11':
     optional: true
 
   '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.25.10':
-    optional: true
-
   '@esbuild/freebsd-arm64@0.25.11':
     optional: true
 
   '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/freebsd-x64@0.25.10':
-    optional: true
-
   '@esbuild/freebsd-x64@0.25.11':
     optional: true
 
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
-  '@esbuild/linux-arm64@0.25.10':
-    optional: true
-
   '@esbuild/linux-arm64@0.25.11':
     optional: true
 
   '@esbuild/linux-arm@0.21.5':
     optional: true
 
-  '@esbuild/linux-arm@0.25.10':
-    optional: true
-
   '@esbuild/linux-arm@0.25.11':
     optional: true
 
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
-  '@esbuild/linux-ia32@0.25.10':
-    optional: true
-
   '@esbuild/linux-ia32@0.25.11':
     optional: true
 
   '@esbuild/linux-loong64@0.21.5':
     optional: true
 
-  '@esbuild/linux-loong64@0.25.10':
-    optional: true
-
   '@esbuild/linux-loong64@0.25.11':
     optional: true
 
   '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
-  '@esbuild/linux-mips64el@0.25.10':
-    optional: true
-
   '@esbuild/linux-mips64el@0.25.11':
     optional: true
 
   '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
-  '@esbuild/linux-ppc64@0.25.10':
-    optional: true
-
   '@esbuild/linux-ppc64@0.25.11':
     optional: true
 
   '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
-  '@esbuild/linux-riscv64@0.25.10':
-    optional: true
-
   '@esbuild/linux-riscv64@0.25.11':
     optional: true
 
   '@esbuild/linux-s390x@0.21.5':
     optional: true
 
-  '@esbuild/linux-s390x@0.25.10':
-    optional: true
-
   '@esbuild/linux-s390x@0.25.11':
     optional: true
 
   '@esbuild/linux-x64@0.21.5':
     optional: true
 
-  '@esbuild/linux-x64@0.25.10':
-    optional: true
-
   '@esbuild/linux-x64@0.25.11':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.25.10':
-    optional: true
-
   '@esbuild/netbsd-arm64@0.25.11':
     optional: true
 
   '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/netbsd-x64@0.25.10':
-    optional: true
-
   '@esbuild/netbsd-x64@0.25.11':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.25.10':
-    optional: true
-
   '@esbuild/openbsd-arm64@0.25.11':
     optional: true
 
   '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/openbsd-x64@0.25.10':
-    optional: true
-
   '@esbuild/openbsd-x64@0.25.11':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.25.10':
-    optional: true
-
   '@esbuild/openharmony-arm64@0.25.11':
     optional: true
 
   '@esbuild/sunos-x64@0.21.5':
     optional: true
 
-  '@esbuild/sunos-x64@0.25.10':
-    optional: true
-
   '@esbuild/sunos-x64@0.25.11':
     optional: true
 
   '@esbuild/win32-arm64@0.21.5':
     optional: true
 
-  '@esbuild/win32-arm64@0.25.10':
-    optional: true
-
   '@esbuild/win32-arm64@0.25.11':
     optional: true
 
   '@esbuild/win32-ia32@0.21.5':
     optional: true
 
-  '@esbuild/win32-ia32@0.25.10':
-    optional: true
-
   '@esbuild/win32-ia32@0.25.11':
     optional: true
 
   '@esbuild/win32-x64@0.21.5':
     optional: true
 
-  '@esbuild/win32-x64@0.25.10':
-    optional: true
-
   '@esbuild/win32-x64@0.25.11':
     optional: true
 
@@ -3255,14 +2865,12 @@ snapshots:
       eslint: 9.9.1
       eslint-visitor-keys: 3.4.3
 
-  '@eslint-community/regexpp@4.12.1': {}
-
   '@eslint-community/regexpp@4.12.2': {}
 
   '@eslint/config-array@0.18.0':
     dependencies:
       '@eslint/object-schema': 2.1.4
-      debug: 4.4.1
+      debug: 4.4.3
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -3270,12 +2878,12 @@ snapshots:
   '@eslint/eslintrc@3.1.0':
     dependencies:
       ajv: 6.12.6
-      debug: 4.4.1
+      debug: 4.4.3
       espree: 10.1.0
       globals: 14.0.0
       ignore: 5.3.2
       import-fresh: 3.3.0
-      js-yaml: 4.1.0
+      js-yaml: 4.1.1
       minimatch: 3.1.2
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
@@ -3336,14 +2944,14 @@ snapshots:
 
   '@manypkg/find-root@1.1.0':
     dependencies:
-      '@babel/runtime': 7.23.8
+      '@babel/runtime': 7.28.4
       '@types/node': 12.20.55
       find-up: 4.1.0
       fs-extra: 8.1.0
 
   '@manypkg/get-packages@1.1.3':
     dependencies:
-      '@babel/runtime': 7.23.8
+      '@babel/runtime': 7.28.4
       '@changesets/types': 4.1.0
       '@manypkg/find-root': 1.1.0
       fs-extra: 8.1.0
@@ -3371,9 +2979,9 @@ snapshots:
 
   '@polka/url@1.0.0-next.25': {}
 
-  '@rollup/plugin-commonjs@28.0.1(rollup@4.50.1)':
+  '@rollup/plugin-commonjs@28.0.1(rollup@4.52.5)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.50.1)
+      '@rollup/pluginutils': 5.1.0(rollup@4.52.5)
       commondir: 1.0.1
       estree-walker: 2.0.2
       fdir: 6.5.0(picomatch@4.0.3)
@@ -3381,164 +2989,101 @@ snapshots:
       magic-string: 0.30.17
       picomatch: 4.0.3
     optionalDependencies:
-      rollup: 4.50.1
+      rollup: 4.52.5
 
-  '@rollup/plugin-node-resolve@15.3.0(rollup@4.50.1)':
+  '@rollup/plugin-node-resolve@15.3.0(rollup@4.52.5)':
     dependencies:
-      '@rollup/pluginutils': 5.1.0(rollup@4.50.1)
+      '@rollup/pluginutils': 5.1.0(rollup@4.52.5)
       '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-module: 1.0.0
       resolve: 1.22.8
     optionalDependencies:
-      rollup: 4.50.1
+      rollup: 4.52.5
 
-  '@rollup/plugin-terser@0.4.4(rollup@4.50.1)':
+  '@rollup/plugin-terser@0.4.4(rollup@4.52.5)':
     dependencies:
       serialize-javascript: 6.0.2
       smob: 1.4.1
       terser: 5.27.0
     optionalDependencies:
-      rollup: 4.50.1
+      rollup: 4.52.5
 
-  '@rollup/plugin-virtual@3.0.2(rollup@4.50.1)':
+  '@rollup/plugin-virtual@3.0.2(rollup@4.52.5)':
     optionalDependencies:
-      rollup: 4.50.1
+      rollup: 4.52.5
 
-  '@rollup/pluginutils@5.1.0(rollup@4.50.1)':
+  '@rollup/pluginutils@5.1.0(rollup@4.52.5)':
     dependencies:
       '@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.50.1':
-    optional: true
+      rollup: 4.52.5
 
   '@rollup/rollup-android-arm-eabi@4.52.5':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.50.1':
-    optional: true
-
   '@rollup/rollup-android-arm64@4.52.5':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.50.1':
-    optional: true
-
   '@rollup/rollup-darwin-arm64@4.52.5':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.50.1':
-    optional: true
-
   '@rollup/rollup-darwin-x64@4.52.5':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.50.1':
-    optional: true
-
   '@rollup/rollup-freebsd-arm64@4.52.5':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.50.1':
-    optional: true
-
   '@rollup/rollup-freebsd-x64@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-arm-gnueabihf@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-arm-musleabihf@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-arm64-gnu@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-arm64-musl@4.52.5':
     optional: true
 
   '@rollup/rollup-linux-loong64-gnu@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-loongarch64-gnu@4.50.1':
-    optional: true
-
-  '@rollup/rollup-linux-ppc64-gnu@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-ppc64-gnu@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-riscv64-gnu@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-riscv64-musl@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-s390x-gnu@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-x64-gnu@4.52.5':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.50.1':
-    optional: true
-
   '@rollup/rollup-linux-x64-musl@4.52.5':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.50.1':
-    optional: true
-
   '@rollup/rollup-openharmony-arm64@4.52.5':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.50.1':
-    optional: true
-
   '@rollup/rollup-win32-arm64-msvc@4.52.5':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.50.1':
-    optional: true
-
   '@rollup/rollup-win32-ia32-msvc@4.52.5':
     optional: true
 
   '@rollup/rollup-win32-x64-gnu@4.52.5':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.50.1':
-    optional: true
-
   '@rollup/rollup-win32-x64-msvc@4.52.5':
     optional: true
 
@@ -3555,7 +3100,7 @@ snapshots:
     dependencies:
       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)':
+  '@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.48.0(eslint@9.9.1)(typescript@5.5.4))(typescript@5.5.4)':
     dependencies:
       '@stylistic/eslint-plugin-js': 1.8.0(eslint@9.9.1)
       eslint: 9.9.1
@@ -3564,12 +3109,12 @@ snapshots:
       eslint-plugin-svelte: 3.11.0(eslint@9.9.1)(svelte@packages+svelte)
       globals: 15.15.0
       typescript: 5.5.4
-      typescript-eslint: 8.26.0(eslint@9.9.1)(typescript@5.5.4)
+      typescript-eslint: 8.48.0(eslint@9.9.1)(typescript@5.5.4)
 
   '@sveltejs/vite-plugin-svelte-inspector@5.0.1(@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
       '@sveltejs/vite-plugin-svelte': 6.2.0(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
-      debug: 4.4.1
+      debug: 4.4.3
       svelte: link:packages/svelte
       vite: 7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
     transitivePeerDependencies:
@@ -3578,7 +3123,7 @@ snapshots:
   '@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
       '@sveltejs/vite-plugin-svelte-inspector': 5.0.1(@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))
-      debug: 4.4.1
+      debug: 4.4.3
       deepmerge: 4.3.1
       magic-string: 0.30.17
       svelte: link:packages/svelte
@@ -3619,30 +3164,30 @@ snapshots:
 
   '@types/resolve@1.20.2': {}
 
-  '@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)':
+  '@typescript-eslint/eslint-plugin@8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.9.1)(typescript@5.5.4))(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
-      '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 8.26.0(eslint@9.9.1)(typescript@5.5.4)
-      '@typescript-eslint/scope-manager': 8.26.0
-      '@typescript-eslint/type-utils': 8.26.0(eslint@9.9.1)(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.26.0(eslint@9.9.1)(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 8.26.0
+      '@eslint-community/regexpp': 4.12.2
+      '@typescript-eslint/parser': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/scope-manager': 8.48.0
+      '@typescript-eslint/type-utils': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 8.48.0
       eslint: 9.9.1
       graphemer: 1.4.0
-      ignore: 5.3.2
+      ignore: 7.0.5
       natural-compare: 1.4.0
       ts-api-utils: 2.1.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.26.0(eslint@9.9.1)(typescript@5.5.4)':
+  '@typescript-eslint/parser@8.48.0(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.26.0
-      '@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.1
+      '@typescript-eslint/scope-manager': 8.48.0
+      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 8.48.0
+      debug: 4.4.3
       eslint: 9.9.1
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -3657,11 +3202,6 @@ snapshots:
     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.48.0':
     dependencies:
       '@typescript-eslint/types': 8.48.0
@@ -3671,35 +3211,20 @@ snapshots:
     dependencies:
       typescript: 5.5.4
 
-  '@typescript-eslint/type-utils@8.26.0(eslint@9.9.1)(typescript@5.5.4)':
+  '@typescript-eslint/type-utils@8.48.0(eslint@9.9.1)(typescript@5.5.4)':
     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.1
+      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+      debug: 4.4.3
       eslint: 9.9.1
       ts-api-utils: 2.1.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@8.26.0': {}
-
   '@typescript-eslint/types@8.48.0': {}
 
-  '@typescript-eslint/typescript-estree@8.26.0(typescript@5.5.4)':
-    dependencies:
-      '@typescript-eslint/types': 8.26.0
-      '@typescript-eslint/visitor-keys': 8.26.0
-      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.1.0(typescript@5.5.4)
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/typescript-estree@8.48.0(typescript@5.5.4)':
     dependencies:
       '@typescript-eslint/project-service': 8.48.0(typescript@5.5.4)
@@ -3715,17 +3240,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.26.0(eslint@9.9.1)(typescript@5.5.4)':
-    dependencies:
-      '@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)
-      eslint: 9.9.1
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/utils@8.48.0(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
@@ -3737,11 +3251,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.26.0':
-    dependencies:
-      '@typescript-eslint/types': 8.26.0
-      eslint-visitor-keys: 4.2.1
-
   '@typescript-eslint/visitor-keys@8.48.0':
     dependencies:
       '@typescript-eslint/types': 8.48.0
@@ -3751,7 +3260,7 @@ snapshots:
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 0.2.3
-      debug: 4.4.1
+      debug: 4.4.3
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
@@ -3813,7 +3322,7 @@ snapshots:
 
   agent-base@7.1.1:
     dependencies:
-      debug: 4.4.1
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -3871,12 +3380,12 @@ snapshots:
 
   birpc@2.5.0: {}
 
-  brace-expansion@1.1.11:
+  brace-expansion@1.1.12:
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  brace-expansion@2.0.1:
+  brace-expansion@2.0.2:
     dependencies:
       balanced-match: 1.0.2
 
@@ -3963,10 +3472,6 @@ snapshots:
 
   dataloader@1.4.0: {}
 
-  debug@4.4.1:
-    dependencies:
-      ms: 2.1.3
-
   debug@4.4.3:
     dependencies:
       ms: 2.1.3
@@ -4063,35 +3568,6 @@ 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
-
   esbuild@0.25.11:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.25.11
@@ -4169,7 +3645,7 @@ snapshots:
       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
+      semver: 7.7.3
       svelte-eslint-parser: 1.3.0(svelte@packages+svelte)
     optionalDependencies:
       svelte: link:packages/svelte
@@ -4188,7 +3664,7 @@ snapshots:
   eslint@9.9.1:
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
-      '@eslint-community/regexpp': 4.12.1
+      '@eslint-community/regexpp': 4.12.2
       '@eslint/config-array': 0.18.0
       '@eslint/eslintrc': 3.1.0
       '@eslint/js': 9.9.1
@@ -4198,7 +3674,7 @@ snapshots:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.6
-      debug: 4.4.1
+      debug: 4.4.3
       escape-string-regexp: 4.0.0
       eslint-scope: 8.4.0
       eslint-visitor-keys: 4.2.1
@@ -4399,14 +3875,14 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.4.1
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.5:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.4.1
+      debug: 4.4.3
     transitivePeerDependencies:
       - supports-color
 
@@ -4422,6 +3898,8 @@ snapshots:
 
   ignore@5.3.2: {}
 
+  ignore@7.0.5: {}
+
   immutable@4.3.7:
     optional: true
 
@@ -4494,7 +3972,7 @@ snapshots:
   istanbul-lib-source-maps@5.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
-      debug: 4.4.1
+      debug: 4.4.3
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
@@ -4510,12 +3988,12 @@ snapshots:
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
 
-  js-yaml@3.14.1:
+  js-yaml@3.14.2:
     dependencies:
       argparse: 1.0.10
       esprima: 4.0.1
 
-  js-yaml@4.1.0:
+  js-yaml@4.1.1:
     dependencies:
       argparse: 2.0.1
 
@@ -4644,7 +4122,7 @@ snapshots:
 
   make-dir@4.0.0:
     dependencies:
-      semver: 7.7.2
+      semver: 7.7.3
 
   merge2@1.4.1: {}
 
@@ -4661,11 +4139,11 @@ snapshots:
 
   minimatch@3.1.2:
     dependencies:
-      brace-expansion: 1.1.11
+      brace-expansion: 1.1.12
 
   minimatch@9.0.5:
     dependencies:
-      brace-expansion: 2.0.1
+      brace-expansion: 2.0.2
 
   minipass@7.1.2: {}
 
@@ -4734,7 +4212,9 @@ snapshots:
 
   package-json-from-dist@1.0.0: {}
 
-  package-manager-detector@0.2.0: {}
+  package-manager-detector@0.2.11:
+    dependencies:
+      quansync: 0.2.11
 
   parent-module@1.0.1:
     dependencies:
@@ -4825,6 +4305,8 @@ snapshots:
 
   punycode@2.3.1: {}
 
+  quansync@0.2.11: {}
+
   queue-microtask@1.2.3: {}
 
   randombytes@2.1.0:
@@ -4834,7 +4316,7 @@ snapshots:
   read-yaml-file@1.1.0:
     dependencies:
       graceful-fs: 4.2.11
-      js-yaml: 3.14.1
+      js-yaml: 3.14.2
       pify: 4.0.1
       strip-bom: 3.0.0
 
@@ -4843,8 +4325,6 @@ snapshots:
       picomatch: 2.3.1
     optional: true
 
-  regenerator-runtime@0.14.1: {}
-
   regexparam@3.0.0: {}
 
   resolve-from@4.0.0: {}
@@ -4861,33 +4341,6 @@ snapshots:
 
   reusify@1.0.4: {}
 
-  rollup@4.50.1:
-    dependencies:
-      '@types/estree': 1.0.8
-    optionalDependencies:
-      '@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
-
   rollup@4.52.5:
     dependencies:
       '@types/estree': 1.0.8
@@ -4943,8 +4396,6 @@ snapshots:
     dependencies:
       xmlchars: 2.2.0
 
-  semver@7.7.2: {}
-
   semver@7.7.3: {}
 
   serialize-javascript@6.0.2:
@@ -5115,11 +4566,12 @@ snapshots:
     dependencies:
       prelude-ls: 1.2.1
 
-  typescript-eslint@8.26.0(eslint@9.9.1)(typescript@5.5.4):
+  typescript-eslint@8.48.0(eslint@9.9.1)(typescript@5.5.4):
     dependencies:
-      '@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)
-      '@typescript-eslint/parser': 8.26.0(eslint@9.9.1)(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.26.0(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/eslint-plugin': 8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.9.1)(typescript@5.5.4))(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/parser': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
       eslint: 9.9.1
       typescript: 5.5.4
     transitivePeerDependencies:
@@ -5161,7 +4613,7 @@ snapshots:
   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
+      debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 1.1.2
       vite: 5.4.20(@types/node@20.19.17)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)
@@ -5184,7 +4636,7 @@ snapshots:
   vite-plugin-inspect@11.3.3(vite@7.1.11(@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
+      debug: 4.4.3
       error-stack-parser-es: 1.0.5
       ohash: 2.0.11
       open: 10.2.0
@@ -5200,7 +4652,7 @@ snapshots:
     dependencies:
       esbuild: 0.21.5
       postcss: 8.5.6
-      rollup: 4.50.1
+      rollup: 4.52.5
     optionalDependencies:
       '@types/node': 20.19.17
       fsevents: 2.3.3
@@ -5237,7 +4689,7 @@ snapshots:
       '@vitest/spy': 2.1.9
       '@vitest/utils': 2.1.9
       chai: 5.3.3
-      debug: 4.4.1
+      debug: 4.4.3
       expect-type: 1.2.2
       magic-string: 0.30.17
       pathe: 1.1.2

From 46603d93cbe072ea463a099894e2bccdd264051e Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 5 Dec 2025 09:44:23 -0800
Subject: [PATCH 231/347] fix: add `srcObject` to permitted `<audio>`/`<video>`
 attributes (#17310)

---
 .changeset/plenty-poets-read.md | 5 +++++
 packages/svelte/elements.d.ts   | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .changeset/plenty-poets-read.md

diff --git a/.changeset/plenty-poets-read.md b/.changeset/plenty-poets-read.md
new file mode 100644
index 0000000000..0c506d371e
--- /dev/null
+++ b/.changeset/plenty-poets-read.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: add `srcObject` to permitted `<audio>`/`<video>` attributes
diff --git a/packages/svelte/elements.d.ts b/packages/svelte/elements.d.ts
index 17ff100729..606e1ca8cf 100644
--- a/packages/svelte/elements.d.ts
+++ b/packages/svelte/elements.d.ts
@@ -1239,6 +1239,7 @@ export interface HTMLMediaAttributes<T extends HTMLMediaElement> extends HTMLAtt
 	playsinline?: boolean | undefined | null;
 	preload?: 'auto' | 'none' | 'metadata' | '' | undefined | null;
 	src?: string | undefined | null;
+	srcobject?: MediaStream | MediaSource | File | Blob;
 	/**
 	 * a value between 0 and 1
 	 */

From 0990095aed863ce5edfb55417ab9e5cabe1296d0 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 5 Dec 2025 14:59:46 -0800
Subject: [PATCH 232/347] fix: don't issue a11y warning for video without
 captions if it has no `src` (#17311)

---
 .changeset/dark-buckets-hang.md                       |  5 +++++
 .../phases/2-analyze/visitors/shared/a11y/index.js    |  8 ++++++++
 .../samples/a11y-media-has-caption/input.svelte       | 11 ++++++-----
 .../samples/a11y-media-has-caption/warnings.json      |  6 +++---
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/dark-buckets-hang.md

diff --git a/.changeset/dark-buckets-hang.md b/.changeset/dark-buckets-hang.md
new file mode 100644
index 0000000000..92ee103e3d
--- /dev/null
+++ b/.changeset/dark-buckets-hang.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't issue a11y warning for `<video>` without captions if it has no `src`
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 8c5bf55e5f..717ee4bf50 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
@@ -486,9 +486,17 @@ export function check_element(node, context) {
 		case 'video': {
 			const aria_hidden_attribute = attribute_map.get('aria-hidden');
 			const aria_hidden_exist = aria_hidden_attribute && get_static_value(aria_hidden_attribute);
+
 			if (attribute_map.has('muted') || aria_hidden_exist === 'true' || has_spread) {
 				return;
 			}
+
+			if (!attribute_map.has('src')) {
+				// don't warn about missing captions if `<video>` has no `src` —
+				// could e.g. be playing a MediaStream
+				return;
+			}
+
 			let has_caption = false;
 			const track = /** @type {AST.RegularElement | undefined} */ (
 				node.fragment.nodes.find((i) => i.type === 'RegularElement' && i.name === 'track')
diff --git a/packages/svelte/tests/validator/samples/a11y-media-has-caption/input.svelte b/packages/svelte/tests/validator/samples/a11y-media-has-caption/input.svelte
index 2e479d97da..9d83ca8771 100644
--- a/packages/svelte/tests/validator/samples/a11y-media-has-caption/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-media-has-caption/input.svelte
@@ -1,6 +1,7 @@
-<video><track kind="captions"/></video>
-<video></video>
-<video><track /></video>
+<video src="x"><track kind="captions"/></video>
+<video src="x"></video>
+<video src="x"><track /></video>
 <audio></audio>
-<video aria-hidden="true"></video>
-<video aria-hidden="false"></video>
+<video src="x" aria-hidden="true"></video>
+<video src="x" aria-hidden="false"></video>
+<video></video> <!-- no src -->
diff --git a/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json b/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
index 2a7de1f730..c596f23806 100644
--- a/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-media-has-caption/warnings.json
@@ -2,7 +2,7 @@
 	{
 		"code": "a11y_media_has_caption",
 		"end": {
-			"column": 15,
+			"column": 23,
 			"line": 2
 		},
 		"message": "`<video>` elements must have a `<track kind=\"captions\">`",
@@ -14,7 +14,7 @@
 	{
 		"code": "a11y_media_has_caption",
 		"end": {
-			"column": 24,
+			"column": 32,
 			"line": 3
 		},
 		"message": "`<video>` elements must have a `<track kind=\"captions\">`",
@@ -26,7 +26,7 @@
 	{
 		"code": "a11y_media_has_caption",
 		"end": {
-			"column": 35,
+			"column": 43,
 			"line": 6
 		},
 		"message": "`<video>` elements must have a `<track kind=\"captions\">`",

From 275fa8231f43b610c43ad711e41015309c9701cf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 21:38:46 -0800
Subject: [PATCH 233/347] Version Packages (#17312)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/dark-buckets-hang.md | 5 -----
 .changeset/plenty-poets-read.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/dark-buckets-hang.md
 delete mode 100644 .changeset/plenty-poets-read.md

diff --git a/.changeset/dark-buckets-hang.md b/.changeset/dark-buckets-hang.md
deleted file mode 100644
index 92ee103e3d..0000000000
--- a/.changeset/dark-buckets-hang.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't issue a11y warning for `<video>` without captions if it has no `src`
diff --git a/.changeset/plenty-poets-read.md b/.changeset/plenty-poets-read.md
deleted file mode 100644
index 0c506d371e..0000000000
--- a/.changeset/plenty-poets-read.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: add `srcObject` to permitted `<audio>`/`<video>` attributes
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 2e7cfb50cb..755f58bd06 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.45.6
+
+### Patch Changes
+
+- fix: don't issue a11y warning for `<video>` without captions if it has no `src` ([#17311](https://github.com/sveltejs/svelte/pull/17311))
+
+- fix: add `srcObject` to permitted `<audio>`/`<video>` attributes ([#17310](https://github.com/sveltejs/svelte/pull/17310))
+
 ## 5.45.5
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index c39a6676fd..a8f085dbd4 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.45.5",
+  "version": "5.45.6",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 2ed4a8a710..9be5192733 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.45.5';
+export const VERSION = '5.45.6';
 export const PUBLIC_VERSION = '5';

From ad91827a239bb4f76d2943918780c5c92b93e5c7 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Sun, 7 Dec 2025 02:52:58 -0800
Subject: [PATCH 234/347] docs: update link to sveltesociety (#17320)

---
 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 f9101b4792..4c1d19a262 100644
--- a/documentation/docs/07-misc/99-faq.md
+++ b/documentation/docs/07-misc/99-faq.md
@@ -18,7 +18,7 @@ There are online forums and chats which are a great place for discussion about b
 
 ## Are there any third-party resources?
 
-Svelte Society maintains a [list of books and videos](https://sveltesociety.dev/resources).
+Svelte Society maintains a [list of books and videos](https://sveltesociety.dev/collection/a-list-of-books-and-courses-ac01dd10363184fa).
 
 ## How can I get VS Code to syntax-highlight my .svelte files?
 

From 44058da346847d358fe0bd0a181992abe3d5ce97 Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Mon, 8 Dec 2025 09:08:42 -0700
Subject: [PATCH 235/347] fix: Don't crash on `hydratable` serialization
 failures (#17315)

* fix: Don't crash on `hydratable` serialization failures

* better

* Update two-lizards-poke.md

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>

---------

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 .changeset/two-lizards-poke.md                |  5 ++++
 .../svelte/src/internal/server/hydratable.js  | 28 ++++++++-----------
 .../hydratable-unserializable/_config.js      |  6 ++++
 .../hydratable-unserializable/main.svelte     |  5 ++++
 4 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/two-lizards-poke.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/hydratable-unserializable/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/hydratable-unserializable/main.svelte

diff --git a/.changeset/two-lizards-poke.md b/.changeset/two-lizards-poke.md
new file mode 100644
index 0000000000..fecfbd482e
--- /dev/null
+++ b/.changeset/two-lizards-poke.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't crash on `hydratable` serialization failure
diff --git a/packages/svelte/src/internal/server/hydratable.js b/packages/svelte/src/internal/server/hydratable.js
index 5711885ed4..81f59ab2fd 100644
--- a/packages/svelte/src/internal/server/hydratable.js
+++ b/packages/svelte/src/internal/server/hydratable.js
@@ -57,8 +57,16 @@ function encode(key, value, unresolved) {
 
 	entry.serialized = devalue.uneval(entry.value, (value, uneval) => {
 		if (is_promise(value)) {
+			// we serialize promises as `"${i}"`, because it's impossible for that string
+			// to occur 'naturally' (since the quote marks would have to be escaped)
+			// this placeholder is returned synchronously from `uneval`, which includes it in the
+			// serialized string. Later (at least one microtask from now), when `p.then` runs, it'll
+			// be replaced.
+			const placeholder = `"${uid++}"`;
 			const p = value
-				.then((v) => `r(${uneval(v)})`)
+				.then((v) => {
+					entry.serialized = entry.serialized.replace(placeholder, `r(${uneval(v)})`);
+				})
 				.catch((devalue_error) =>
 					e.hydratable_serialization_failed(
 						key,
@@ -66,23 +74,11 @@ function encode(key, value, unresolved) {
 					)
 				);
 
-			// prevent unhandled rejections from crashing the server
-			p.catch(() => {});
-
-			// track which promises are still resolving when render is complete
 			unresolved?.set(p, key);
-			p.finally(() => unresolved?.delete(p));
-
-			// we serialize promises as `"${i}"`, because it's impossible for that string
-			// to occur 'naturally' (since the quote marks would have to be escaped)
-			const placeholder = `"${uid++}"`;
-
-			(entry.promises ??= []).push(
-				p.then((s) => {
-					entry.serialized = entry.serialized.replace(placeholder, s);
-				})
-			);
+			// prevent unhandled rejections from crashing the server, track which promises are still resolving when render is complete
+			p.catch(() => {}).finally(() => unresolved?.delete(p));
 
+			(entry.promises ??= []).push(p);
 			return placeholder;
 		}
 	});
diff --git a/packages/svelte/tests/server-side-rendering/samples/hydratable-unserializable/_config.js b/packages/svelte/tests/server-side-rendering/samples/hydratable-unserializable/_config.js
new file mode 100644
index 0000000000..79b0c90fe6
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/hydratable-unserializable/_config.js
@@ -0,0 +1,6 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['async'],
+	error: 'hydratable_serialization_failed'
+});
diff --git a/packages/svelte/tests/server-side-rendering/samples/hydratable-unserializable/main.svelte b/packages/svelte/tests/server-side-rendering/samples/hydratable-unserializable/main.svelte
new file mode 100644
index 0000000000..e104dec12b
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/hydratable-unserializable/main.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+    import { hydratable } from 'svelte';
+
+    hydratable('key', () => new Promise(() => { throw new Error('nope') }));
+</script>
\ No newline at end of file

From 26d3d689a6dff1130848c374dcb9da06955c89b9 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Mon, 8 Dec 2025 08:35:23 -0800
Subject: [PATCH 236/347] chore: upgrade glob to fix dependabot warning
 (#17300)

---
 package.json   |   2 +-
 pnpm-lock.yaml | 144 ++++++++++++++++++++++++-------------------------
 2 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/package.json b/package.json
index 1767c884de..12e59a2665 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "prettier-plugin-svelte": "^3.4.0",
     "svelte": "workspace:^",
     "typescript": "^5.5.4",
-    "typescript-eslint": "^8.48.0",
+    "typescript-eslint": "^8.48.1",
     "v8-natives": "^1.2.5",
     "vitest": "^2.1.9"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0622f345ca..05298fe8e3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,7 +13,7 @@ importers:
         version: 2.29.8(@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.48.0(eslint@9.9.1)(typescript@5.5.4))(typescript@5.5.4)
+        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.48.1(eslint@9.9.1)(typescript@5.5.4))(typescript@5.5.4)
       '@svitejs/changesets-changelog-github-compact':
         specifier: ^1.1.0
         version: 1.1.0
@@ -54,8 +54,8 @@ importers:
         specifier: ^5.5.4
         version: 5.5.4
       typescript-eslint:
-        specifier: ^8.48.0
-        version: 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+        specifier: ^8.48.1
+        version: 8.48.1(eslint@9.9.1)(typescript@5.5.4)
       v8-natives:
         specifier: ^1.2.5
         version: 1.2.5
@@ -898,63 +898,63 @@ packages:
   '@types/resolve@1.20.2':
     resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
 
-  '@typescript-eslint/eslint-plugin@8.48.0':
-    resolution: {integrity: sha512-XxXP5tL1txl13YFtrECECQYeZjBZad4fyd3cFV4a19LkAY/bIp9fev3US4S5fDVV2JaYFiKAZ/GRTOLer+mbyQ==}
+  '@typescript-eslint/eslint-plugin@8.48.1':
+    resolution: {integrity: sha512-X63hI1bxl5ohelzr0LY5coufyl0LJNthld+abwxpCoo6Gq+hSqhKwci7MUWkXo67mzgUK6YFByhmaHmUcuBJmA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.48.0
+      '@typescript-eslint/parser': ^8.48.1
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/parser@8.48.0':
-    resolution: {integrity: sha512-jCzKdm/QK0Kg4V4IK/oMlRZlY+QOcdjv89U2NgKHZk1CYTj82/RVSx1mV/0gqCVMJ/DA+Zf/S4NBWNF8GQ+eqQ==}
+  '@typescript-eslint/parser@8.48.1':
+    resolution: {integrity: sha512-PC0PDZfJg8sP7cmKe6L3QIL8GZwU5aRvUFedqSIpw3B+QjRSUZeeITC2M5XKeMXEzL6wccN196iy3JLwKNvDVA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/project-service@8.48.0':
-    resolution: {integrity: sha512-Ne4CTZyRh1BecBf84siv42wv5vQvVmgtk8AuiEffKTUo3DrBaGYZueJSxxBZ8fjk/N3DrgChH4TOdIOwOwiqqw==}
+  '@typescript-eslint/project-service@8.48.1':
+    resolution: {integrity: sha512-HQWSicah4s9z2/HifRPQ6b6R7G+SBx64JlFQpgSSHWPKdvCZX57XCbszg/bapbRsOEv42q5tayTYcEFpACcX1w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/scope-manager@8.48.0':
-    resolution: {integrity: sha512-uGSSsbrtJrLduti0Q1Q9+BF1/iFKaxGoQwjWOIVNJv0o6omrdyR8ct37m4xIl5Zzpkp69Kkmvom7QFTtue89YQ==}
+  '@typescript-eslint/scope-manager@8.48.1':
+    resolution: {integrity: sha512-rj4vWQsytQbLxC5Bf4XwZ0/CKd362DkWMUkviT7DCS057SK64D5lH74sSGzhI6PDD2HCEq02xAP9cX68dYyg1w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/tsconfig-utils@8.48.0':
-    resolution: {integrity: sha512-WNebjBdFdyu10sR1M4OXTt2OkMd5KWIL+LLfeH9KhgP+jzfDV/LI3eXzwJ1s9+Yc0Kzo2fQCdY/OpdusCMmh6w==}
+  '@typescript-eslint/tsconfig-utils@8.48.1':
+    resolution: {integrity: sha512-k0Jhs4CpEffIBm6wPaCXBAD7jxBtrHjrSgtfCjUvPp9AZ78lXKdTR8fxyZO5y4vWNlOvYXRtngSZNSn+H53Jkw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/type-utils@8.48.0':
-    resolution: {integrity: sha512-zbeVaVqeXhhab6QNEKfK96Xyc7UQuoFWERhEnj3mLVnUWrQnv15cJNseUni7f3g557gm0e46LZ6IJ4NJVOgOpw==}
+  '@typescript-eslint/type-utils@8.48.1':
+    resolution: {integrity: sha512-1jEop81a3LrJQLTf/1VfPQdhIY4PlGDBc/i67EVWObrtvcziysbLN3oReexHOM6N3jyXgCrkBsZpqwH0hiDOQg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/types@8.48.0':
-    resolution: {integrity: sha512-cQMcGQQH7kwKoVswD1xdOytxQR60MWKM1di26xSUtxehaDs/32Zpqsu5WJlXTtTTqyAVK8R7hvsUnIXRS+bjvA==}
+  '@typescript-eslint/types@8.48.1':
+    resolution: {integrity: sha512-+fZ3LZNeiELGmimrujsDCT4CRIbq5oXdHe7chLiW8qzqyPMnn1puNstCrMNVAqwcl2FdIxkuJ4tOs/RFDBVc/Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.48.0':
-    resolution: {integrity: sha512-ljHab1CSO4rGrQIAyizUS6UGHHCiAYhbfcIZ1zVJr5nMryxlXMVWS3duFPSKvSUbFPwkXMFk1k0EMIjub4sRRQ==}
+  '@typescript-eslint/typescript-estree@8.48.1':
+    resolution: {integrity: sha512-/9wQ4PqaefTK6POVTjJaYS0bynCgzh6ClJHGSBj06XEHjkfylzB+A3qvyaXnErEZSaxhIo4YdyBgq6j4RysxDg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/utils@8.48.0':
-    resolution: {integrity: sha512-yTJO1XuGxCsSfIVt1+1UrLHtue8xz16V8apzPYI06W0HbEbEWHxHXgZaAgavIkoh+GeV6hKKd5jm0sS6OYxWXQ==}
+  '@typescript-eslint/utils@8.48.1':
+    resolution: {integrity: sha512-fAnhLrDjiVfey5wwFRwrweyRlCmdz5ZxXz2G/4cLn0YDLjTapmN4gcCsTBR1N2rWnZSDeWpYtgLDsJt+FpmcwA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/visitor-keys@8.48.0':
-    resolution: {integrity: sha512-T0XJMaRPOH3+LBbAfzR2jalckP1MSG/L9eUtY0DEzUyVaXJ/t6zN0nR7co5kz0Jko/nkSYCBRkz1djvjajVTTg==}
+  '@typescript-eslint/visitor-keys@8.48.1':
+    resolution: {integrity: sha512-BmxxndzEWhE4TIEEMBs8lP3MBWN3jFPs/p6gPm/wkv02o41hI6cq9AuSmGAaTTHPtA1FTi2jBre4A9rm5ZmX+Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@vitest/coverage-v8@2.1.9':
@@ -1472,8 +1472,8 @@ packages:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
 
-  glob@10.4.5:
-    resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
+  glob@10.5.0:
+    resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==}
     hasBin: true
 
   globals@14.0.0:
@@ -2283,8 +2283,8 @@ packages:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
 
-  typescript-eslint@8.48.0:
-    resolution: {integrity: sha512-fcKOvQD9GUn3Xw63EgiDqhvWJ5jsyZUaekl3KVpGsDJnN46WJTe3jWxtQP9lMZm1LJNkFLlTaWAxK2vUQR+cqw==}
+  typescript-eslint@8.48.1:
+    resolution: {integrity: sha512-FbOKN1fqNoXp1hIl5KYpObVrp0mCn+CLgn479nmu2IsRMrx2vyv74MmsBLVlhg8qVwNFGbXSp8fh1zp8pEoC2A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -3100,7 +3100,7 @@ snapshots:
     dependencies:
       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.48.0(eslint@9.9.1)(typescript@5.5.4))(typescript@5.5.4)':
+  '@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.48.1(eslint@9.9.1)(typescript@5.5.4))(typescript@5.5.4)':
     dependencies:
       '@stylistic/eslint-plugin-js': 1.8.0(eslint@9.9.1)
       eslint: 9.9.1
@@ -3109,7 +3109,7 @@ snapshots:
       eslint-plugin-svelte: 3.11.0(eslint@9.9.1)(svelte@packages+svelte)
       globals: 15.15.0
       typescript: 5.5.4
-      typescript-eslint: 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+      typescript-eslint: 8.48.1(eslint@9.9.1)(typescript@5.5.4)
 
   '@sveltejs/vite-plugin-svelte-inspector@5.0.1(@sveltejs/vite-plugin-svelte@6.2.0(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0)))(svelte@packages+svelte)(vite@7.1.11(@types/node@24.5.2)(lightningcss@1.23.0)(sass@1.70.0)(terser@5.27.0))':
     dependencies:
@@ -3164,14 +3164,14 @@ snapshots:
 
   '@types/resolve@1.20.2': {}
 
-  '@typescript-eslint/eslint-plugin@8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.9.1)(typescript@5.5.4))(eslint@9.9.1)(typescript@5.5.4)':
+  '@typescript-eslint/eslint-plugin@8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.9.1)(typescript@5.5.4))(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
-      '@typescript-eslint/scope-manager': 8.48.0
-      '@typescript-eslint/type-utils': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 8.48.0
+      '@typescript-eslint/parser': 8.48.1(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/scope-manager': 8.48.1
+      '@typescript-eslint/type-utils': 8.48.1(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.48.1(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 8.48.1
       eslint: 9.9.1
       graphemer: 1.4.0
       ignore: 7.0.5
@@ -3181,41 +3181,41 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.48.0(eslint@9.9.1)(typescript@5.5.4)':
+  '@typescript-eslint/parser@8.48.1(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.48.0
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 8.48.0
+      '@typescript-eslint/scope-manager': 8.48.1
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 8.48.1
       debug: 4.4.3
       eslint: 9.9.1
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.48.0(typescript@5.5.4)':
+  '@typescript-eslint/project-service@8.48.1(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.48.0(typescript@5.5.4)
-      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/tsconfig-utils': 8.48.1(typescript@5.5.4)
+      '@typescript-eslint/types': 8.48.1
       debug: 4.4.3
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@8.48.0':
+  '@typescript-eslint/scope-manager@8.48.1':
     dependencies:
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/visitor-keys': 8.48.0
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/visitor-keys': 8.48.1
 
-  '@typescript-eslint/tsconfig-utils@8.48.0(typescript@5.5.4)':
+  '@typescript-eslint/tsconfig-utils@8.48.1(typescript@5.5.4)':
     dependencies:
       typescript: 5.5.4
 
-  '@typescript-eslint/type-utils@8.48.0(eslint@9.9.1)(typescript@5.5.4)':
+  '@typescript-eslint/type-utils@8.48.1(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.48.1(eslint@9.9.1)(typescript@5.5.4)
       debug: 4.4.3
       eslint: 9.9.1
       ts-api-utils: 2.1.0(typescript@5.5.4)
@@ -3223,14 +3223,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@8.48.0': {}
+  '@typescript-eslint/types@8.48.1': {}
 
-  '@typescript-eslint/typescript-estree@8.48.0(typescript@5.5.4)':
+  '@typescript-eslint/typescript-estree@8.48.1(typescript@5.5.4)':
     dependencies:
-      '@typescript-eslint/project-service': 8.48.0(typescript@5.5.4)
-      '@typescript-eslint/tsconfig-utils': 8.48.0(typescript@5.5.4)
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/visitor-keys': 8.48.0
+      '@typescript-eslint/project-service': 8.48.1(typescript@5.5.4)
+      '@typescript-eslint/tsconfig-utils': 8.48.1(typescript@5.5.4)
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/visitor-keys': 8.48.1
       debug: 4.4.3
       minimatch: 9.0.5
       semver: 7.7.3
@@ -3240,20 +3240,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.48.0(eslint@9.9.1)(typescript@5.5.4)':
+  '@typescript-eslint/utils@8.48.1(eslint@9.9.1)(typescript@5.5.4)':
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
-      '@typescript-eslint/scope-manager': 8.48.0
-      '@typescript-eslint/types': 8.48.0
-      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.5.4)
+      '@typescript-eslint/scope-manager': 8.48.1
+      '@typescript-eslint/types': 8.48.1
+      '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.5.4)
       eslint: 9.9.1
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.48.0':
+  '@typescript-eslint/visitor-keys@8.48.1':
     dependencies:
-      '@typescript-eslint/types': 8.48.0
+      '@typescript-eslint/types': 8.48.1
       eslint-visitor-keys: 4.2.1
 
   '@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))':
@@ -3620,7 +3620,7 @@ snapshots:
   eslint-plugin-n@17.16.1(eslint@9.9.1)(typescript@5.5.4):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.9.1)
-      '@typescript-eslint/utils': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.48.1(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)
@@ -3832,7 +3832,7 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
-  glob@10.4.5:
+  glob@10.5.0:
     dependencies:
       foreground-child: 3.3.0
       jackspeak: 3.4.3
@@ -4501,7 +4501,7 @@ snapshots:
   test-exclude@7.0.1:
     dependencies:
       '@istanbuljs/schema': 0.1.3
-      glob: 10.4.5
+      glob: 10.5.0
       minimatch: 9.0.5
 
   text-table@0.2.0: {}
@@ -4566,12 +4566,12 @@ snapshots:
     dependencies:
       prelude-ls: 1.2.1
 
-  typescript-eslint@8.48.0(eslint@9.9.1)(typescript@5.5.4):
+  typescript-eslint@8.48.1(eslint@9.9.1)(typescript@5.5.4):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.48.0(@typescript-eslint/parser@8.48.0(eslint@9.9.1)(typescript@5.5.4))(eslint@9.9.1)(typescript@5.5.4)
-      '@typescript-eslint/parser': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
-      '@typescript-eslint/typescript-estree': 8.48.0(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.48.0(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/eslint-plugin': 8.48.1(@typescript-eslint/parser@8.48.1(eslint@9.9.1)(typescript@5.5.4))(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/parser': 8.48.1(eslint@9.9.1)(typescript@5.5.4)
+      '@typescript-eslint/typescript-estree': 8.48.1(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.48.1(eslint@9.9.1)(typescript@5.5.4)
       eslint: 9.9.1
       typescript: 5.5.4
     transitivePeerDependencies:

From 123fab27311b17ca49fc17ded3a99bcafcf5adf2 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Mon, 8 Dec 2025 20:16:55 +0100
Subject: [PATCH 237/347] fix: add more css selectors to `print()` (#17330)

* fix: add more css selectors to `print()`

* fix
---
 .changeset/silver-bobcats-lie.md              |  5 ++++
 packages/svelte/src/compiler/print/index.js   | 24 +++++++++++++++++++
 .../tests/print/samples/style/input.svelte    | 11 +++++++++
 .../tests/print/samples/style/output.svelte   | 22 +++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 .changeset/silver-bobcats-lie.md

diff --git a/.changeset/silver-bobcats-lie.md b/.changeset/silver-bobcats-lie.md
new file mode 100644
index 0000000000..c51262f95d
--- /dev/null
+++ b/.changeset/silver-bobcats-lie.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: add more css selectors to `print()`
diff --git a/packages/svelte/src/compiler/print/index.js b/packages/svelte/src/compiler/print/index.js
index abd8b56297..8b39bdd739 100644
--- a/packages/svelte/src/compiler/print/index.js
+++ b/packages/svelte/src/compiler/print/index.js
@@ -181,6 +181,18 @@ const css_visitors = {
 		}
 	},
 
+	AttributeSelector(node, context) {
+		context.write(`[${node.name}`);
+		if (node.matcher) {
+			context.write(node.matcher);
+			context.write(`"${node.value}"`);
+			if (node.flags) {
+				context.write(` ${node.flags}`);
+			}
+		}
+		context.write(']');
+	},
+
 	Block(node, context) {
 		context.write('{');
 
@@ -221,10 +233,22 @@ const css_visitors = {
 		context.write(`${node.property}: ${node.value};`);
 	},
 
+	IdSelector(node, context) {
+		context.write(`#${node.name}`);
+	},
+
+	NestingSelector(node, context) {
+		context.write('&');
+	},
+
 	Nth(node, context) {
 		context.write(node.value);
 	},
 
+	Percentage(node, context) {
+		context.write(`${node.value}%`);
+	},
+
 	PseudoClassSelector(node, context) {
 		context.write(`:${node.name}`);
 
diff --git a/packages/svelte/tests/print/samples/style/input.svelte b/packages/svelte/tests/print/samples/style/input.svelte
index 94312774ec..afa00bee7a 100644
--- a/packages/svelte/tests/print/samples/style/input.svelte
+++ b/packages/svelte/tests/print/samples/style/input.svelte
@@ -16,6 +16,7 @@
 
   @keyframes fade {
     from { opacity: 0; }
+    50% { opacity: 0.5; }
     to   { opacity: 1; }
   }
 
@@ -40,4 +41,14 @@
   .container .item, nav > ul.menu {
     color: red;
   }
+  #id-selector { color: red; }
+  [data-attribute] { color: red; }
+  [data-attribute="value"] { color: red; }
+
+  .card {
+    background: white;
+    &:hover {
+      background: gray;
+    }
+  }
 </style>
diff --git a/packages/svelte/tests/print/samples/style/output.svelte b/packages/svelte/tests/print/samples/style/output.svelte
index 0f87f10941..03168cccae 100644
--- a/packages/svelte/tests/print/samples/style/output.svelte
+++ b/packages/svelte/tests/print/samples/style/output.svelte
@@ -19,6 +19,9 @@
 		from {
 			opacity: 0;
 		}
+		50%% {
+			opacity: 0.5;
+		}
 		to {
 			opacity: 1;
 		}
@@ -66,4 +69,23 @@
 	nav > ul.menu {
 		color: red;
 	}
+
+	#id-selector {
+		color: red;
+	}
+
+	[data-attribute] {
+		color: red;
+	}
+
+	[data-attribute="value"] {
+		color: red;
+	}
+
+	.card {
+		background: white;
+		&:hover {
+			background: gray;
+		}
+	}
 </style>

From 6ae3e908a1c9ad2fbfa52a576c286f6577dc3bf0 Mon Sep 17 00:00:00 2001
From: Random Fads <g_raffiti@hotmail.com>
Date: Mon, 8 Dec 2025 20:22:40 +0100
Subject: [PATCH 238/347] fix: Added the "off" value to the TS definition for
 textarea's wrap attribute (#17326)

* fix: Added the "off" value to the TS definition for textarea's wrap attribute.

https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/textarea#wrap

* changeset

---------

Co-authored-by: Anonymous <anon@inter.net>
Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 .changeset/four-apples-camp.md | 5 +++++
 packages/svelte/elements.d.ts  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/four-apples-camp.md

diff --git a/.changeset/four-apples-camp.md b/.changeset/four-apples-camp.md
new file mode 100644
index 0000000000..84bd2eba6a
--- /dev/null
+++ b/.changeset/four-apples-camp.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: Add `<textarea wrap="off">` as a valid attribute value
diff --git a/packages/svelte/elements.d.ts b/packages/svelte/elements.d.ts
index 606e1ca8cf..4dba2c5c32 100644
--- a/packages/svelte/elements.d.ts
+++ b/packages/svelte/elements.d.ts
@@ -1422,7 +1422,7 @@ export interface HTMLTextareaAttributes extends HTMLAttributes<HTMLTextAreaEleme
 	// needs both casing variants because language tools does lowercase names of non-shorthand attributes
 	defaultValue?: string | string[] | number | undefined | null;
 	defaultvalue?: string | string[] | number | undefined | null;
-	wrap?: 'hard' | 'soft' | undefined | null;
+	wrap?: 'hard' | 'soft' | 'off' | undefined | null;
 
 	'on:change'?: ChangeEventHandler<HTMLTextAreaElement> | undefined | null;
 	onchange?: ChangeEventHandler<HTMLTextAreaElement> | undefined | null;

From 5efbfa8e2b73244d2a9b55bee16f92e97587b55d Mon Sep 17 00:00:00 2001
From: Davi Oliveira da Silva <davicampinas@gmail.com>
Date: Mon, 8 Dec 2025 16:51:17 -0300
Subject: [PATCH 239/347] docs: Updated docs to include usage of $bindable for
 bidirectional bindings and its possible riscs (#17121)

* docs: clarify usage of $bindable for bidirectional bindings and its possivle riscs

* Update documentation/docs/02-runes/06-$bindable.md

---------

Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 documentation/docs/02-runes/06-$bindable.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/02-runes/06-$bindable.md b/documentation/docs/02-runes/06-$bindable.md
index c12c2bf490..3675a56b16 100644
--- a/documentation/docs/02-runes/06-$bindable.md
+++ b/documentation/docs/02-runes/06-$bindable.md
@@ -4,7 +4,7 @@ title: $bindable
 
 Ordinarily, props go one way, from parent to child. This makes it easy to understand how data flows around your app.
 
-In Svelte, component props can be _bound_, which means that data can also flow _up_ from child to parent. This isn't something you should do often, but it can simplify your code if used sparingly and carefully.
+In Svelte, component props can be _bound_, which means that data can also flow _up_ from child to parent. This isn't something you should do often — overuse can make your data flow unpredictable and your components harder to maintain — but it can simplify your code if used sparingly and carefully.
 
 It also means that a state proxy can be _mutated_ in the child.
 

From ebf7d94a7158b488baa28719ad04f53da304df6f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 11:54:48 -0800
Subject: [PATCH 240/347] Version Packages (#17328)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/four-apples-camp.md   |  5 -----
 .changeset/silver-bobcats-lie.md |  5 -----
 .changeset/two-lizards-poke.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/four-apples-camp.md
 delete mode 100644 .changeset/silver-bobcats-lie.md
 delete mode 100644 .changeset/two-lizards-poke.md

diff --git a/.changeset/four-apples-camp.md b/.changeset/four-apples-camp.md
deleted file mode 100644
index 84bd2eba6a..0000000000
--- a/.changeset/four-apples-camp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"svelte": patch
----
-
-fix: Add `<textarea wrap="off">` as a valid attribute value
diff --git a/.changeset/silver-bobcats-lie.md b/.changeset/silver-bobcats-lie.md
deleted file mode 100644
index c51262f95d..0000000000
--- a/.changeset/silver-bobcats-lie.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: add more css selectors to `print()`
diff --git a/.changeset/two-lizards-poke.md b/.changeset/two-lizards-poke.md
deleted file mode 100644
index fecfbd482e..0000000000
--- a/.changeset/two-lizards-poke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't crash on `hydratable` serialization failure
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 755f58bd06..83919026b0 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.45.7
+
+### Patch Changes
+
+- fix: Add `<textarea wrap="off">` as a valid attribute value ([#17326](https://github.com/sveltejs/svelte/pull/17326))
+
+- fix: add more css selectors to `print()` ([#17330](https://github.com/sveltejs/svelte/pull/17330))
+
+- fix: don't crash on `hydratable` serialization failure ([#17315](https://github.com/sveltejs/svelte/pull/17315))
+
 ## 5.45.6
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index a8f085dbd4..e420b9bc75 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.45.6",
+  "version": "5.45.7",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 9be5192733..300c6eb156 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.45.6';
+export const VERSION = '5.45.7';
 export const PUBLIC_VERSION = '5';

From 7ec9e4b3b182b2ac2b5c0e3c8cbdda7d962b19d6 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 8 Dec 2025 12:07:51 -0800
Subject: [PATCH 241/347] fix: prevent erroneous `state_referenced_locally`
 warnings on prop fallbacks (#17329)

* failing test

* fix: prevent erroneous `state_referenced_locally` warnings on prop fallbacks
---
 .changeset/rude-points-attend.md                     |  5 +++++
 .../phases/2-analyze/visitors/VariableDeclarator.js  | 12 +++++++++++-
 .../samples/static-state-reference/input.svelte      |  3 ++-
 .../samples/static-state-reference/warnings.json     | 12 ++++++------
 4 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/rude-points-attend.md

diff --git a/.changeset/rude-points-attend.md b/.changeset/rude-points-attend.md
new file mode 100644
index 0000000000..b8e69c5064
--- /dev/null
+++ b/.changeset/rude-points-attend.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: prevent erroneous `state_referenced_locally` warnings on prop fallbacks
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 dfb1d54040..5cf231ad01 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js
@@ -146,5 +146,15 @@ export function VariableDeclarator(node, context) {
 		}
 	}
 
-	context.next();
+	if (node.init && get_rune(node.init, context.state.scope) === '$props') {
+		// prevent erroneous `state_referenced_locally` warnings on prop fallbacks
+		context.visit(node.id, {
+			...context.state,
+			function_depth: context.state.function_depth + 1
+		});
+
+		context.visit(node.init);
+	} else {
+		context.next();
+	}
 }
diff --git a/packages/svelte/tests/validator/samples/static-state-reference/input.svelte b/packages/svelte/tests/validator/samples/static-state-reference/input.svelte
index 9037760321..fdcf343626 100644
--- a/packages/svelte/tests/validator/samples/static-state-reference/input.svelte
+++ b/packages/svelte/tests/validator/samples/static-state-reference/input.svelte
@@ -9,7 +9,8 @@
 	console.log(doubled);
 
 	let {
-		prop
+		prop,
+		other_prop = prop
 	} = $props();
 	let prop_state = $state(prop);
 	let prop_derived = $derived(prop);
diff --git a/packages/svelte/tests/validator/samples/static-state-reference/warnings.json b/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
index a0ae24e37b..76e752573e 100644
--- a/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
+++ b/packages/svelte/tests/validator/samples/static-state-reference/warnings.json
@@ -39,36 +39,36 @@
 		"code": "state_referenced_locally",
 		"end": {
 			"column": 29,
-			"line": 14
+			"line": 15
 		},
 		"message": "This reference only captures the initial value of `prop`. Did you mean to reference it inside a closure instead?",
 		"start": {
 			"column": 25,
-			"line": 14
+			"line": 15
 		}
 	},
 	{
 		"code": "state_referenced_locally",
 		"end": {
 			"column": 17,
-			"line": 16
+			"line": 17
 		},
 		"message": "This reference only captures the initial value of `prop`. Did you mean to reference it inside a closure instead?",
 		"start": {
 			"column": 13,
-			"line": 16
+			"line": 17
 		}
 	},
 	{
 		"code": "state_referenced_locally",
 		"end": {
 			"column": 25,
-			"line": 17
+			"line": 18
 		},
 		"message": "This reference only captures the initial value of `prop_derived`. Did you mean to reference it inside a closure instead?",
 		"start": {
 			"column": 13,
-			"line": 17
+			"line": 18
 		}
 	}
 ]

From 3cabb525345c21185c3cca607e6605c6424694b2 Mon Sep 17 00:00:00 2001
From: Ryan Atkinson <mail@ryanatkn.com>
Date: Mon, 8 Dec 2025 17:19:29 -0500
Subject: [PATCH 242/347] fix: set Root start/end to null when fragment
 contains only whitespace (#17125)

* fix: set Root start/end to null when fragment contains only whitespace

* format

* always set root.start to 0 and root.end to template.length

* Update .changeset/fruity-knives-ring.md

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 .changeset/fruity-knives-ring.md              |   5 +
 .../src/compiler/phases/1-parse/index.js      |  17 +--
 .../output.json                               |   2 +-
 .../samples/comment-before-script/output.json |   2 +-
 .../samples/css-nth-syntax/output.json        |   2 +-
 .../samples/css-pseudo-classes/output.json    |   4 +-
 .../samples/generic-snippets/output.json      |   2 +-
 .../samples/loose-valid-each-as/output.json   |   2 +-
 .../parser-modern/samples/options/output.json |   2 +-
 .../script-style-no-markup/input.svelte       |   6 +
 .../script-style-no-markup/output.json        | 112 ++++++++++++++++++
 .../semicolon-inside-quotes/output.json       |   2 +-
 .../samples/snippets/output.json              |   2 +-
 .../typescript-in-event-handler/output.json   |   2 +-
 14 files changed, 136 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/fruity-knives-ring.md
 create mode 100644 packages/svelte/tests/parser-modern/samples/script-style-no-markup/input.svelte
 create mode 100644 packages/svelte/tests/parser-modern/samples/script-style-no-markup/output.json

diff --git a/.changeset/fruity-knives-ring.md b/.changeset/fruity-knives-ring.md
new file mode 100644
index 0000000000..059b2df1c7
--- /dev/null
+++ b/.changeset/fruity-knives-ring.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: set AST `root.start` to `0` and `root.end` to `template.length`
diff --git a/packages/svelte/src/compiler/phases/1-parse/index.js b/packages/svelte/src/compiler/phases/1-parse/index.js
index 7017d013da..3b5f83d58f 100644
--- a/packages/svelte/src/compiler/phases/1-parse/index.js
+++ b/packages/svelte/src/compiler/phases/1-parse/index.js
@@ -117,21 +117,8 @@ export class Parser {
 			e.unexpected_eof(this.index);
 		}
 
-		if (this.root.fragment.nodes.length) {
-			let start = /** @type {number} */ (this.root.fragment.nodes[0].start);
-			while (regex_whitespace.test(template[start])) start += 1;
-
-			let end = /** @type {number} */ (
-				this.root.fragment.nodes[this.root.fragment.nodes.length - 1].end
-			);
-			while (regex_whitespace.test(template[end - 1])) end -= 1;
-
-			this.root.start = start;
-			this.root.end = end;
-		} else {
-			// @ts-ignore
-			this.root.start = this.root.end = null;
-		}
+		this.root.start = 0;
+		this.root.end = template.length;
 
 		const options_index = this.root.fragment.nodes.findIndex(
 			/** @param {any} thing */
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
index b26ee2866f..13cc5fea7b 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
@@ -1,7 +1,7 @@
 {
 	"css": null,
 	"js": [],
-	"start": 37,
+	"start": 0,
 	"end": 117,
 	"type": "Root",
 	"fragment": {
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
index 827ad85d92..8d77165297 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
@@ -2,7 +2,7 @@
 	"css": null,
 	"js": [],
 	"start": 0,
-	"end": 27,
+	"end": 76,
 	"type": "Root",
 	"fragment": {
 		"type": "Fragment",
diff --git a/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json b/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
index 26b4998587..3ce5f33d09 100644
--- a/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
+++ b/packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
@@ -1079,7 +1079,7 @@
 		}
 	},
 	"js": [],
-	"start": 808,
+	"start": 0,
 	"end": 820,
 	"type": "Root",
 	"fragment": {
diff --git a/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json b/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
index e410cf2a80..d052affe46 100644
--- a/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
+++ b/packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
@@ -398,8 +398,8 @@
 		}
 	},
 	"js": [],
-	"start": null,
-	"end": null,
+	"start": 0,
+	"end": 386,
 	"type": "Root",
 	"fragment": {
 		"type": "Fragment",
diff --git a/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json b/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
index 5a0e64894d..8e1654feed 100644
--- a/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
+++ b/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
@@ -1,7 +1,7 @@
 {
 	"css": null,
 	"js": [],
-	"start": 30,
+	"start": 0,
 	"end": 192,
 	"type": "Root",
 	"fragment": {
diff --git a/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json b/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
index 6096907d5d..b428cff0b2 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
@@ -1,7 +1,7 @@
 {
 	"css": null,
 	"js": [],
-	"start": 45,
+	"start": 0,
 	"end": 119,
 	"type": "Root",
 	"fragment": {
diff --git a/packages/svelte/tests/parser-modern/samples/options/output.json b/packages/svelte/tests/parser-modern/samples/options/output.json
index 62c9fc1b9d..08ce8d43b7 100644
--- a/packages/svelte/tests/parser-modern/samples/options/output.json
+++ b/packages/svelte/tests/parser-modern/samples/options/output.json
@@ -2,7 +2,7 @@
 	"css": null,
 	"js": [],
 	"start": 0,
-	"end": 102,
+	"end": 169,
 	"type": "Root",
 	"fragment": {
 		"type": "Fragment",
diff --git a/packages/svelte/tests/parser-modern/samples/script-style-no-markup/input.svelte b/packages/svelte/tests/parser-modern/samples/script-style-no-markup/input.svelte
new file mode 100644
index 0000000000..c4dc4d5271
--- /dev/null
+++ b/packages/svelte/tests/parser-modern/samples/script-style-no-markup/input.svelte
@@ -0,0 +1,6 @@
+<script>
+	// script and style but no markup
+</script>
+<style>
+	div { color: red; }
+</style>
diff --git a/packages/svelte/tests/parser-modern/samples/script-style-no-markup/output.json b/packages/svelte/tests/parser-modern/samples/script-style-no-markup/output.json
new file mode 100644
index 0000000000..b5e42e9217
--- /dev/null
+++ b/packages/svelte/tests/parser-modern/samples/script-style-no-markup/output.json
@@ -0,0 +1,112 @@
+{
+	"css": {
+		"type": "StyleSheet",
+		"start": 54,
+		"end": 91,
+		"attributes": [],
+		"children": [
+			{
+				"type": "Rule",
+				"prelude": {
+					"type": "SelectorList",
+					"start": 63,
+					"end": 66,
+					"children": [
+						{
+							"type": "ComplexSelector",
+							"start": 63,
+							"end": 66,
+							"children": [
+								{
+									"type": "RelativeSelector",
+									"combinator": null,
+									"selectors": [
+										{
+											"type": "TypeSelector",
+											"name": "div",
+											"start": 63,
+											"end": 66
+										}
+									],
+									"start": 63,
+									"end": 66
+								}
+							]
+						}
+					]
+				},
+				"block": {
+					"type": "Block",
+					"start": 67,
+					"end": 82,
+					"children": [
+						{
+							"type": "Declaration",
+							"start": 69,
+							"end": 79,
+							"property": "color",
+							"value": "red"
+						}
+					]
+				},
+				"start": 63,
+				"end": 82
+			}
+		],
+		"content": {
+			"start": 61,
+			"end": 83,
+			"styles": "\n\tdiv { color: red; }\n",
+			"comment": null
+		}
+	},
+	"js": [],
+	"start": 0,
+	"end": 91,
+	"type": "Root",
+	"fragment": {
+		"type": "Fragment",
+		"nodes": [
+			{
+				"type": "Text",
+				"start": 53,
+				"end": 54,
+				"raw": "\n",
+				"data": "\n"
+			}
+		]
+	},
+	"options": null,
+	"instance": {
+		"type": "Script",
+		"start": 0,
+		"end": 53,
+		"context": "default",
+		"content": {
+			"type": "Program",
+			"start": 8,
+			"end": 44,
+			"loc": {
+				"start": {
+					"line": 1,
+					"column": 0
+				},
+				"end": {
+					"line": 3,
+					"column": 0
+				}
+			},
+			"body": [],
+			"sourceType": "module",
+			"trailingComments": [
+				{
+					"type": "Line",
+					"value": " script and style but no markup",
+					"start": 10,
+					"end": 43
+				}
+			]
+		},
+		"attributes": []
+	}
+}
diff --git a/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json b/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
index e95ccb4094..312bd7701e 100644
--- a/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
+++ b/packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
@@ -77,7 +77,7 @@
 	},
 	"js": [],
 	"start": 0,
-	"end": 35,
+	"end": 205,
 	"type": "Root",
 	"fragment": {
 		"type": "Fragment",
diff --git a/packages/svelte/tests/parser-modern/samples/snippets/output.json b/packages/svelte/tests/parser-modern/samples/snippets/output.json
index d760fe2e2d..c217ef94e9 100644
--- a/packages/svelte/tests/parser-modern/samples/snippets/output.json
+++ b/packages/svelte/tests/parser-modern/samples/snippets/output.json
@@ -1,7 +1,7 @@
 {
 	"css": null,
 	"js": [],
-	"start": 29,
+	"start": 0,
 	"end": 101,
 	"type": "Root",
 	"fragment": {
diff --git a/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json b/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
index 4281d6fa46..a1d6ed56bf 100644
--- a/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
+++ b/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
@@ -1,7 +1,7 @@
 {
 	"css": null,
 	"js": [],
-	"start": 54,
+	"start": 0,
 	"end": 173,
 	"type": "Root",
 	"fragment": {

From 01cd35211b63a4d29e5b1d9a40a86f824f760413 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 14:31:36 -0800
Subject: [PATCH 243/347] Version Packages (#17331)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/fruity-knives-ring.md | 5 -----
 .changeset/rude-points-attend.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/fruity-knives-ring.md
 delete mode 100644 .changeset/rude-points-attend.md

diff --git a/.changeset/fruity-knives-ring.md b/.changeset/fruity-knives-ring.md
deleted file mode 100644
index 059b2df1c7..0000000000
--- a/.changeset/fruity-knives-ring.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: set AST `root.start` to `0` and `root.end` to `template.length`
diff --git a/.changeset/rude-points-attend.md b/.changeset/rude-points-attend.md
deleted file mode 100644
index b8e69c5064..0000000000
--- a/.changeset/rude-points-attend.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: prevent erroneous `state_referenced_locally` warnings on prop fallbacks
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 83919026b0..b6ea395a9d 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.45.8
+
+### Patch Changes
+
+- fix: set AST `root.start` to `0` and `root.end` to `template.length` ([#17125](https://github.com/sveltejs/svelte/pull/17125))
+
+- fix: prevent erroneous `state_referenced_locally` warnings on prop fallbacks ([#17329](https://github.com/sveltejs/svelte/pull/17329))
+
 ## 5.45.7
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index e420b9bc75..86838513d2 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.45.7",
+  "version": "5.45.8",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 300c6eb156..69dae8a24e 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.45.7';
+export const VERSION = '5.45.8';
 export const PUBLIC_VERSION = '5';

From a584ff134703cb340c90fef608646209d585cfb5 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Thu, 11 Dec 2025 01:31:58 +0100
Subject: [PATCH 244/347] fix: correctly print `!doctype` during `print`
 (#17341)

---
 .changeset/smooth-comics-shine.md                    |  5 +++++
 packages/svelte/src/compiler/print/index.js          |  5 +++--
 .../tests/print/samples/html-document/input.svelte   | 11 +++++++++++
 .../tests/print/samples/html-document/output.svelte  | 12 ++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/smooth-comics-shine.md
 create mode 100644 packages/svelte/tests/print/samples/html-document/input.svelte
 create mode 100644 packages/svelte/tests/print/samples/html-document/output.svelte

diff --git a/.changeset/smooth-comics-shine.md b/.changeset/smooth-comics-shine.md
new file mode 100644
index 0000000000..4bf26ed9f1
--- /dev/null
+++ b/.changeset/smooth-comics-shine.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly print `!doctype` during `print`
diff --git a/packages/svelte/src/compiler/print/index.js b/packages/svelte/src/compiler/print/index.js
index 8b39bdd739..4aed743dba 100644
--- a/packages/svelte/src/compiler/print/index.js
+++ b/packages/svelte/src/compiler/print/index.js
@@ -112,12 +112,13 @@ function base_element(node, context) {
 	}
 
 	const multiline_attributes = attributes(node.attributes, child_context);
-
+	const is_doctype_node = node.name.toLowerCase() === '!doctype';
 	const is_self_closing =
 		is_void(node.name) || (node.type === 'Component' && node.fragment.nodes.length === 0);
 	let multiline_content = false;
 
-	if (is_self_closing) {
+	if (is_doctype_node) child_context.write(`>`);
+	else if (is_self_closing) {
 		child_context.write(`${multiline_attributes ? '' : ' '}/>`);
 	} else {
 		child_context.write('>');
diff --git a/packages/svelte/tests/print/samples/html-document/input.svelte b/packages/svelte/tests/print/samples/html-document/input.svelte
new file mode 100644
index 0000000000..8f1b4accab
--- /dev/null
+++ b/packages/svelte/tests/print/samples/html-document/input.svelte
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Svelte App</title>
+    </head>
+    <body>
+        <div>Hello World</div>
+    </body>
+</html>
diff --git a/packages/svelte/tests/print/samples/html-document/output.svelte b/packages/svelte/tests/print/samples/html-document/output.svelte
new file mode 100644
index 0000000000..765f9ca84b
--- /dev/null
+++ b/packages/svelte/tests/print/samples/html-document/output.svelte
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<meta
+			name="viewport"
+			content="width=device-width, initial-scale=1.0"
+		/>
+		<title>Svelte App</title>
+	</head>
+	<body><div>Hello World</div></body>
+</html>

From 866ae6cdc759f04f83373251cbca38070e6f1536 Mon Sep 17 00:00:00 2001
From: Razin Shafayet <sumonislamk29@gmail.com>
Date: Thu, 11 Dec 2025 07:11:22 +0600
Subject: [PATCH 245/347] docs: update #each to reflect support for null and
 undefined (#17339)

* docs: update #each to reflect support for null and undefined

* update

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 documentation/docs/03-template-syntax/03-each.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/documentation/docs/03-template-syntax/03-each.md b/documentation/docs/03-template-syntax/03-each.md
index 006cadd152..57ed0def71 100644
--- a/documentation/docs/03-template-syntax/03-each.md
+++ b/documentation/docs/03-template-syntax/03-each.md
@@ -12,7 +12,9 @@ title: {#each ...}
 {#each expression as name, index}...{/each}
 ```
 
-Iterating over values can be done with an each block. The values in question can be arrays, array-like objects (i.e. anything with a `length` property), or iterables like `Map` and `Set` — in other words, anything that can be used with `Array.from`.
+Iterating over values can be done with an each block. The values in question can be arrays, array-like objects (i.e. anything with a `length` property), or iterables like `Map` and `Set`— in other words, anything that can be used with `Array.from`.
+
+If the value is `null` or `undefined`, it is treated the same as an empty array (which will cause [else blocks](#Else-blocks) to be rendered, where applicable).
 
 ```svelte
 <h1>Shopping list</h1>

From 4e6104a9393e1b24831909bb3f6811568c3db413 Mon Sep 17 00:00:00 2001
From: Yash <69746573+xambassador@users.noreply.github.com>
Date: Fri, 12 Dec 2025 00:31:59 +0530
Subject: [PATCH 246/347] fix typo (#17347)

---
 packages/svelte/tests/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte/tests/README.md b/packages/svelte/tests/README.md
index 6dde66f6cb..9e450a7176 100644
--- a/packages/svelte/tests/README.md
+++ b/packages/svelte/tests/README.md
@@ -1,6 +1,6 @@
 # Test repo
 
-This repo tries to migrate as many tests from the currente Svelte project over to test against the new compiler/runtime.
+This repo tries to migrate as many tests from the current Svelte project over to test against the new compiler/runtime.
 
 ## Differences to the old test suite
 

From b268ccbf44a68353abd5e5dd9e48376afcd8a1ba Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 11 Dec 2025 15:19:40 -0500
Subject: [PATCH 247/347] fix: correctly reschedule deferred effects when
 reviving a batch after async work (#17332)

* WIP

* test

* fix: correctly reschedule deferred effects when reviving a batch after async work
---
 .changeset/lucky-wasps-grab.md                |  5 +++
 .../src/internal/client/reactivity/batch.js   | 33 ++++++++-----------
 .../Child.svelte                              |  3 ++
 .../async-reschedule-during-flush/_config.js  | 26 +++++++++++++++
 .../async-reschedule-during-flush/main.svelte | 23 +++++++++++++
 5 files changed, 71 insertions(+), 19 deletions(-)
 create mode 100644 .changeset/lucky-wasps-grab.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/main.svelte

diff --git a/.changeset/lucky-wasps-grab.md b/.changeset/lucky-wasps-grab.md
new file mode 100644
index 0000000000..d2d2283ccd
--- /dev/null
+++ b/.changeset/lucky-wasps-grab.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly reschedule deferred effects when reviving a batch after async work
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 24dee51419..6f941c7ff2 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -44,7 +44,6 @@ import { eager_effect, unlink_effect } from './effects.js';
  *   effect: Effect | null;
  *   effects: Effect[];
  *   render_effects: Effect[];
- *   block_effects: Effect[];
  * }} EffectTarget
  */
 
@@ -128,15 +127,15 @@ export class Batch {
 
 	/**
 	 * Deferred effects (which run after async work has completed) that are DIRTY
-	 * @type {Effect[]}
+	 * @type {Set<Effect>}
 	 */
-	#dirty_effects = [];
+	#dirty_effects = new Set();
 
 	/**
 	 * Deferred effects that are MAYBE_DIRTY
-	 * @type {Effect[]}
+	 * @type {Set<Effect>}
 	 */
-	#maybe_dirty_effects = [];
+	#maybe_dirty_effects = new Set();
 
 	/**
 	 * A set of branches that still exist, but will be destroyed when this batch
@@ -167,8 +166,7 @@ export class Batch {
 			parent: null,
 			effect: null,
 			effects: [],
-			render_effects: [],
-			block_effects: []
+			render_effects: []
 		};
 
 		for (const root of root_effects) {
@@ -187,7 +185,6 @@ export class Batch {
 		if (this.is_deferred()) {
 			this.#defer_effects(target.effects);
 			this.#defer_effects(target.render_effects);
-			this.#defer_effects(target.block_effects);
 		} else {
 			// 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.
@@ -228,8 +225,7 @@ export class Batch {
 					parent: target,
 					effect,
 					effects: [],
-					render_effects: [],
-					block_effects: []
+					render_effects: []
 				};
 			}
 
@@ -241,7 +237,7 @@ export class Batch {
 				} else if (async_mode_flag && (flags & (RENDER_EFFECT | MANAGED_EFFECT)) !== 0) {
 					target.render_effects.push(effect);
 				} else if (is_dirty(effect)) {
-					if ((effect.f & BLOCK_EFFECT) !== 0) target.block_effects.push(effect);
+					if ((effect.f & BLOCK_EFFECT) !== 0) this.#dirty_effects.add(effect);
 					update_effect(effect);
 				}
 
@@ -263,7 +259,6 @@ export class Batch {
 					// once the boundary is ready?
 					this.#defer_effects(target.effects);
 					this.#defer_effects(target.render_effects);
-					this.#defer_effects(target.block_effects);
 
 					target = /** @type {EffectTarget} */ (target.parent);
 				}
@@ -279,8 +274,11 @@ export class Batch {
 	 */
 	#defer_effects(effects) {
 		for (const e of effects) {
-			const target = (e.f & DIRTY) !== 0 ? this.#dirty_effects : this.#maybe_dirty_effects;
-			target.push(e);
+			if ((e.f & DIRTY) !== 0) {
+				this.#dirty_effects.add(e);
+			} else if ((e.f & MAYBE_DIRTY) !== 0) {
+				this.#maybe_dirty_effects.add(e);
+			}
 
 			// Since we're not executing these effects now, we need to clear any WAS_MARKED flags
 			// so that other batches can correctly reach these effects during their own traversal
@@ -390,8 +388,7 @@ export class Batch {
 				parent: null,
 				effect: null,
 				effects: [],
-				render_effects: [],
-				block_effects: []
+				render_effects: []
 			};
 
 			for (const batch of batches) {
@@ -484,6 +481,7 @@ export class Batch {
 
 	revive() {
 		for (const e of this.#dirty_effects) {
+			this.#maybe_dirty_effects.delete(e);
 			set_signal_status(e, DIRTY);
 			schedule_effect(e);
 		}
@@ -493,9 +491,6 @@ export class Batch {
 			schedule_effect(e);
 		}
 
-		this.#dirty_effects = [];
-		this.#maybe_dirty_effects = [];
-
 		this.flush();
 	}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/Child.svelte
new file mode 100644
index 0000000000..2684005fcf
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/Child.svelte
@@ -0,0 +1,3 @@
+<script>
+	$effect(() => {})
+</script>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/_config.js b/packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/_config.js
new file mode 100644
index 0000000000..a837d02f9f
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/_config.js
@@ -0,0 +1,26 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const [a, b, resolve] = target.querySelectorAll('button');
+
+		a.click();
+		await tick();
+
+		b.click();
+		await tick();
+
+		resolve.click();
+		await tick();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>a (true)</button>
+				<button>b (true)</button>
+				<button>resolve</button>
+				42
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/main.svelte
new file mode 100644
index 0000000000..48940017a8
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-reschedule-during-flush/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	import Child from './Child.svelte';
+
+	let a = $state(false);
+	let b = $state(false);
+
+	let deferred = [];
+
+	function push(value) {
+		const d = Promise.withResolvers();
+		deferred.push(() => d.resolve(value))
+		return d.promise;
+	}
+</script>
+
+<button onclick={() => a = !a}>a ({a})</button>
+<button onclick={() => b = !b}>b ({b})</button>
+<button onclick={() => deferred.shift()()}>resolve</button>
+
+{#if a}
+	{await push(42)}
+	<Child />
+{/if}

From a544a9d5f3b1be263ff029c5d1fda9abb961660f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 15:31:08 -0500
Subject: [PATCH 248/347] Version Packages (#17343)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/lucky-wasps-grab.md    | 5 -----
 .changeset/smooth-comics-shine.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/lucky-wasps-grab.md
 delete mode 100644 .changeset/smooth-comics-shine.md

diff --git a/.changeset/lucky-wasps-grab.md b/.changeset/lucky-wasps-grab.md
deleted file mode 100644
index d2d2283ccd..0000000000
--- a/.changeset/lucky-wasps-grab.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: correctly reschedule deferred effects when reviving a batch after async work
diff --git a/.changeset/smooth-comics-shine.md b/.changeset/smooth-comics-shine.md
deleted file mode 100644
index 4bf26ed9f1..0000000000
--- a/.changeset/smooth-comics-shine.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: correctly print `!doctype` during `print`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index b6ea395a9d..8acbef1e84 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # svelte
 
+## 5.45.9
+
+### Patch Changes
+
+- fix: correctly reschedule deferred effects when reviving a batch after async work ([#17332](https://github.com/sveltejs/svelte/pull/17332))
+
+- fix: correctly print `!doctype` during `print` ([#17341](https://github.com/sveltejs/svelte/pull/17341))
+
 ## 5.45.8
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 86838513d2..abd151542d 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.45.8",
+  "version": "5.45.9",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 69dae8a24e..d17a8a9a9c 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.45.8';
+export const VERSION = '5.45.9';
 export const PUBLIC_VERSION = '5';

From 00459a1d78a657e7372b2c92a8604cef8af1c511 Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Thu, 11 Dec 2025 20:23:05 -0700
Subject: [PATCH 249/347] fix: race condition when importing
 `AsyncLocalStorage` (#17350)

* fix: race condition when importing `AsyncLocalStorage`

* types:

* tweak

* remove a line

* comment

* dumb esbuild

* final final pt2 final

* ugh
---
 .changeset/early-showers-marry.md             |  5 ++++
 .../src/internal/server/render-context.js     | 28 +++++++++++++------
 packages/svelte/tests/runtime-browser/test.ts |  1 +
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/early-showers-marry.md

diff --git a/.changeset/early-showers-marry.md b/.changeset/early-showers-marry.md
new file mode 100644
index 0000000000..a599cefe64
--- /dev/null
+++ b/.changeset/early-showers-marry.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: race condition when importing `AsyncLocalStorage`
diff --git a/packages/svelte/src/internal/server/render-context.js b/packages/svelte/src/internal/server/render-context.js
index a33fff69d3..7a014a1b15 100644
--- a/packages/svelte/src/internal/server/render-context.js
+++ b/packages/svelte/src/internal/server/render-context.js
@@ -2,7 +2,7 @@
 /** @import { AsyncLocalStorage } from 'node:async_hooks' */
 /** @import { RenderContext } from '#server' */
 
-import { deferred } from '../shared/utils.js';
+import { deferred, noop } from '../shared/utils.js';
 import * as e from './errors.js';
 
 /** @type {Promise<void> | null} */
@@ -56,14 +56,26 @@ export async function with_render_context(fn) {
 
 /** @type {AsyncLocalStorage<RenderContext | null> | null} */
 let als = null;
+/** @type {Promise<void> | null} */
+let als_import = null;
 
-export async function init_render_context() {
-	if (als !== null) return;
-	try {
-		// @ts-ignore -- we don't include node types in the production build
-		const { AsyncLocalStorage } = await import('node:async_hooks');
-		als = new AsyncLocalStorage();
-	} catch {}
+/**
+ *
+ * @returns {Promise<void>}
+ */
+export function init_render_context() {
+	// It's important the right side of this assignment can run a maximum of one time
+	// otherwise it's possible for a very, very well-timed race condition to assign to `als`
+	// at the beginning of a render, and then another render to assign to it again, which causes
+	// the first render's second half to use a new instance of `als` which doesn't have its
+	// context anymore.
+	// @ts-ignore -- we don't include node types in the production build
+	als_import ??= import('node:async_hooks')
+		.then((hooks) => {
+			als = new hooks.AsyncLocalStorage();
+		})
+		.then(noop, noop);
+	return als_import;
 }
 
 // this has to be a function because rollup won't treeshake it if it's a constant
diff --git a/packages/svelte/tests/runtime-browser/test.ts b/packages/svelte/tests/runtime-browser/test.ts
index 63e601b115..597b2909dc 100644
--- a/packages/svelte/tests/runtime-browser/test.ts
+++ b/packages/svelte/tests/runtime-browser/test.ts
@@ -164,6 +164,7 @@ async function run_test(
 				}
 			],
 			bundle: true,
+			platform: 'node',
 			format: 'iife',
 			globalName: 'test_ssr'
 		});

From 5f249abeae003e8cbe535ef0ddc92c815c33dc3a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 22:26:58 -0500
Subject: [PATCH 250/347] Version Packages (#17353)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/early-showers-marry.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/early-showers-marry.md

diff --git a/.changeset/early-showers-marry.md b/.changeset/early-showers-marry.md
deleted file mode 100644
index a599cefe64..0000000000
--- a/.changeset/early-showers-marry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: race condition when importing `AsyncLocalStorage`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 8acbef1e84..d67510fd07 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.45.10
+
+### Patch Changes
+
+- fix: race condition when importing `AsyncLocalStorage` ([#17350](https://github.com/sveltejs/svelte/pull/17350))
+
 ## 5.45.9
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index abd151542d..ebbc3a0e62 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.45.9",
+  "version": "5.45.10",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index d17a8a9a9c..e1b98ad1a8 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.45.9';
+export const VERSION = '5.45.10';
 export const PUBLIC_VERSION = '5';

From c86c4fdca10f9d46a024c1f672e60e1737c1f110 Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Fri, 12 Dec 2025 13:59:26 -0700
Subject: [PATCH 251/347] feat: Add CSP support for `hydratable` (#17338)

---
 .changeset/soft-donkeys-serve.md              |  5 ++
 .../docs/06-runtime/05-hydratable.md          | 58 +++++++++++++++++
 .../98-reference/.generated/server-errors.md  |  6 ++
 .../svelte/messages/server-errors/errors.md   |  4 ++
 packages/svelte/src/internal/server/crypto.js | 41 ++++++++++++
 .../svelte/src/internal/server/crypto.test.ts | 15 +++++
 packages/svelte/src/internal/server/errors.js | 12 ++++
 packages/svelte/src/internal/server/index.js  |  9 ++-
 .../svelte/src/internal/server/renderer.js    | 62 +++++++++++++------
 .../svelte/src/internal/server/types.d.ts     |  7 +++
 packages/svelte/src/legacy/legacy-server.js   | 13 ++--
 packages/svelte/src/server/index.d.ts         |  4 +-
 .../samples/csp-config-error/_config.js       |  7 +++
 .../csp-config-error/_expected_head.html      | 12 ++++
 .../samples/csp-config-error/main.svelte      |  4 ++
 .../samples/csp-hash/_config.js               |  7 +++
 .../samples/csp-hash/_expected_head.html      | 12 ++++
 .../samples/csp-hash/main.svelte              |  4 ++
 .../samples/csp-nonce/_config.js              |  6 ++
 .../samples/csp-nonce/_expected_head.html     | 12 ++++
 .../samples/csp-nonce/main.svelte             |  4 ++
 .../tests/server-side-rendering/test.ts       | 11 +++-
 packages/svelte/types/index.d.ts              |  9 +++
 23 files changed, 294 insertions(+), 30 deletions(-)
 create mode 100644 .changeset/soft-donkeys-serve.md
 create mode 100644 packages/svelte/src/internal/server/crypto.js
 create mode 100644 packages/svelte/src/internal/server/crypto.test.ts
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/csp-config-error/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/csp-config-error/_expected_head.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/csp-config-error/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/csp-hash/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/csp-hash/_expected_head.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/csp-hash/main.svelte
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/csp-nonce/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/csp-nonce/_expected_head.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/csp-nonce/main.svelte

diff --git a/.changeset/soft-donkeys-serve.md b/.changeset/soft-donkeys-serve.md
new file mode 100644
index 0000000000..f0c7236694
--- /dev/null
+++ b/.changeset/soft-donkeys-serve.md
@@ -0,0 +1,5 @@
+---
+"svelte": minor
+---
+
+feat: Add `csp` option to `render(...)`, and emit hashes when using `hydratable`
diff --git a/documentation/docs/06-runtime/05-hydratable.md b/documentation/docs/06-runtime/05-hydratable.md
index a5302f264d..f8d5130581 100644
--- a/documentation/docs/06-runtime/05-hydratable.md
+++ b/documentation/docs/06-runtime/05-hydratable.md
@@ -63,3 +63,61 @@ All data returned from a `hydratable` function must be serializable. But this do
 {await promises.one}
 {await promises.two}
 ```
+
+## CSP
+
+`hydratable` adds an inline `<script>` block to the `head` returned from `render`. If you're using [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) (CSP), this script will likely fail to run. You can provide a `nonce` to `render`:
+
+```js
+/// file: server.js
+import { render } from 'svelte/server';
+import App from './App.svelte';
+// ---cut---
+const nonce = crypto.randomUUID();
+
+const { head, body } = await render(App, {
+	csp: { nonce }
+});
+```
+
+This will add the `nonce` to the script block, on the assumption that you will later add the same nonce to the CSP header of the document that contains it:
+
+```js
+/// file: server.js
+let response = new Response();
+let nonce = 'xyz123';
+// ---cut---
+response.headers.set(
+  'Content-Security-Policy',
+  `script-src 'nonce-${nonce}'`
+ );
+```
+
+It's essential that a `nonce` — which, British slang definition aside, means 'number used once' — is only used when dynamically server rendering an individual response.
+
+If instead you are generating static HTML ahead of time, you must use hashes instead:
+
+```js
+/// file: server.js
+import { render } from 'svelte/server';
+import App from './App.svelte';
+// ---cut---
+const { head, body, hashes } = await render(App, {
+	csp: { hash: true }
+});
+```
+
+`hashes.script` will be an array of strings like `["sha256-abcd123"]`. As with `nonce`, the hashes should be used in your CSP header:
+
+```js
+/// file: server.js
+let response = new Response();
+let hashes = { script: ['sha256-xyz123'] };
+// ---cut---
+response.headers.set(
+  'Content-Security-Policy',
+  `script-src ${hashes.script.map((hash) => `'${hash}'`).join(' ')}`
+ );
+```
+
+We recommend using `nonce` over hash if you can, as `hash` will interfere with streaming SSR in the future.
diff --git a/documentation/docs/98-reference/.generated/server-errors.md b/documentation/docs/98-reference/.generated/server-errors.md
index 4d05e04207..c98756afec 100644
--- a/documentation/docs/98-reference/.generated/server-errors.md
+++ b/documentation/docs/98-reference/.generated/server-errors.md
@@ -55,6 +55,12 @@ Cause:
 %stack%
 ```
 
+### invalid_csp
+
+```
+`csp.nonce` was set while `csp.hash` was `true`. These options cannot be used simultaneously.
+```
+
 ### lifecycle_function_unavailable
 
 ```
diff --git a/packages/svelte/messages/server-errors/errors.md b/packages/svelte/messages/server-errors/errors.md
index ac2ecc0a40..fd4c17e2a7 100644
--- a/packages/svelte/messages/server-errors/errors.md
+++ b/packages/svelte/messages/server-errors/errors.md
@@ -43,6 +43,10 @@ This error occurs when using `hydratable` multiple times with the same key. To a
 > Cause:
 > %stack%
 
+## invalid_csp
+
+> `csp.nonce` was set while `csp.hash` was `true`. These options cannot be used simultaneously.
+
 ## lifecycle_function_unavailable
 
 > `%name%(...)` is not available on the server
diff --git a/packages/svelte/src/internal/server/crypto.js b/packages/svelte/src/internal/server/crypto.js
new file mode 100644
index 0000000000..8727635481
--- /dev/null
+++ b/packages/svelte/src/internal/server/crypto.js
@@ -0,0 +1,41 @@
+import { BROWSER } from 'esm-env';
+
+let text_encoder;
+// TODO - remove this and use global `crypto` when we drop Node 18
+let crypto;
+
+/** @param {string} data */
+export async function sha256(data) {
+	text_encoder ??= new TextEncoder();
+
+	// @ts-expect-error
+	crypto ??= globalThis.crypto?.subtle?.digest
+		? globalThis.crypto
+		: // @ts-ignore - we don't install node types in the prod build
+			(await import('node:crypto')).webcrypto;
+
+	const hash_buffer = await crypto.subtle.digest('SHA-256', text_encoder.encode(data));
+
+	return base64_encode(hash_buffer);
+}
+
+/**
+ * @param {Uint8Array} bytes
+ * @returns {string}
+ */
+export function base64_encode(bytes) {
+	// Using `Buffer` is faster than iterating
+	// @ts-ignore
+	if (!BROWSER && globalThis.Buffer) {
+		// @ts-ignore
+		return globalThis.Buffer.from(bytes).toString('base64');
+	}
+
+	let binary = '';
+
+	for (let i = 0; i < bytes.length; i++) {
+		binary += String.fromCharCode(bytes[i]);
+	}
+
+	return btoa(binary);
+}
diff --git a/packages/svelte/src/internal/server/crypto.test.ts b/packages/svelte/src/internal/server/crypto.test.ts
new file mode 100644
index 0000000000..2bde86676d
--- /dev/null
+++ b/packages/svelte/src/internal/server/crypto.test.ts
@@ -0,0 +1,15 @@
+import { assert, test } from 'vitest';
+import { sha256 } from './crypto.js';
+
+const inputs = [
+	['hello world', 'uU0nuZNNPgilLlLX2n2r+sSE7+N6U4DukIj3rOLvzek='],
+	['', '47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='],
+	['abcd', 'iNQmb9TmM40TuEX88olXnSCciXgjuSF9o+Fhk28DFYk='],
+	['the quick brown fox jumps over the lazy dog', 'Bcbgjx2f2voDFH/Lj4LxJMdtL3Dj2Ynciq2159dFC+w='],
+	['工欲善其事，必先利其器', 'oPOthkQ1c5BbPpvrr5WlUBJPyD5e6JeVdWcqBs9zvjA=']
+];
+
+test.each(inputs)('sha256("%s")', async (input, expected) => {
+	const actual = await sha256(input);
+	assert.equal(actual, expected);
+});
diff --git a/packages/svelte/src/internal/server/errors.js b/packages/svelte/src/internal/server/errors.js
index 3d6c0ffbdd..c966c32062 100644
--- a/packages/svelte/src/internal/server/errors.js
+++ b/packages/svelte/src/internal/server/errors.js
@@ -80,6 +80,18 @@ ${stack}\nhttps://svelte.dev/e/hydratable_serialization_failed`);
 	throw error;
 }
 
+/**
+ * `csp.nonce` was set while `csp.hash` was `true`. These options cannot be used simultaneously.
+ * @returns {never}
+ */
+export function invalid_csp() {
+	const error = new Error(`invalid_csp\n\`csp.nonce\` was set while \`csp.hash\` was \`true\`. These options cannot be used simultaneously.\nhttps://svelte.dev/e/invalid_csp`);
+
+	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 c0dbdbda14..015db09a64 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -1,7 +1,6 @@
 /** @import { ComponentType, SvelteComponent, Component } from 'svelte' */
-/** @import { RenderOutput } from '#server' */
+/** @import { Csp, RenderOutput } from '#server' */
 /** @import { Store } from '#shared' */
-/** @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';
@@ -18,6 +17,7 @@ import { EMPTY_COMMENT, BLOCK_CLOSE, BLOCK_OPEN, BLOCK_OPEN_ELSE } from './hydra
 import { validate_store } from '../shared/validate.js';
 import { is_boolean_attribute, is_raw_text_element, is_void } from '../../utils.js';
 import { Renderer } from './renderer.js';
+import * as e from './errors.js';
 
 // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
 // https://infra.spec.whatwg.org/#noncharacter
@@ -56,10 +56,13 @@ export function element(renderer, tag, attributes_fn = noop, children_fn = noop)
  * 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> | ComponentType<SvelteComponent<Props>>} component
- * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string }} [options]
+ * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string; csp?: Csp }} [options]
  * @returns {RenderOutput}
  */
 export function render(component, options = {}) {
+	if (options.csp?.hash && options.csp.nonce) {
+		e.invalid_csp();
+	}
 	return Renderer.render(/** @type {Component<Props>} */ (component), options);
 }
 
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 0cfb1a7a93..1ecc90ba1f 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -1,5 +1,5 @@
 /** @import { Component } from 'svelte' */
-/** @import { HydratableContext, RenderOutput, SSRContext, SyncRenderOutput } from './types.js' */
+/** @import { Csp, HydratableContext, RenderOutput, SSRContext, SyncRenderOutput, Sha256Source } from './types.js' */
 /** @import { MaybePromise } from '#shared' */
 import { async_mode_flag } from '../flags/index.js';
 import { abort } from './abort-signal.js';
@@ -9,7 +9,7 @@ import * as w from './warnings.js';
 import { BLOCK_CLOSE, BLOCK_OPEN } from './hydration.js';
 import { attributes } from './index.js';
 import { get_render_context, with_render_context, init_render_context } from './render-context.js';
-import { DEV } from 'esm-env';
+import { sha256 } from './crypto.js';
 
 /** @typedef {'head' | 'body'} RendererType */
 /** @typedef {{ [key in RendererType]: string }} AccumulatedContent */
@@ -376,13 +376,13 @@ export class Renderer {
 	 * 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]
+	 * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string; csp?: Csp }} [options]
 	 * @returns {RenderOutput}
 	 */
 	static render(component, options = {}) {
 		/** @type {AccumulatedContent | undefined} */
 		let sync;
-		/** @type {Promise<AccumulatedContent> | undefined} */
+		/** @type {Promise<AccumulatedContent & { hashes: { script: Sha256Source[] } }> | undefined} */
 		let async;
 
 		const result = /** @type {RenderOutput} */ ({});
@@ -404,6 +404,11 @@ export class Renderer {
 					return (sync ??= Renderer.#render(component, options)).body;
 				}
 			},
+			hashes: {
+				value: {
+					script: ''
+				}
+			},
 			then: {
 				value:
 					/**
@@ -420,7 +425,8 @@ export class Renderer {
 							const user_result = onfulfilled({
 								head: result.head,
 								body: result.body,
-								html: result.body
+								html: result.body,
+								hashes: { script: [] }
 							});
 							return Promise.resolve(user_result);
 						}
@@ -514,8 +520,8 @@ export class Renderer {
 	 *
 	 * @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>}
+	 * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string; csp?: Csp }} options
+	 * @returns {Promise<AccumulatedContent & { hashes: { script: Sha256Source[] } }>}
 	 */
 	static async #render_async(component, options) {
 		const previous_context = ssr_context;
@@ -585,19 +591,19 @@ export class Renderer {
 			await comparison;
 		}
 
-		return await Renderer.#hydratable_block(ctx);
+		return await this.#hydratable_block(ctx);
 	}
 
 	/**
 	 * @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
+	 * @param {{ props?: Omit<Props, '$$slots' | '$$events'>; context?: Map<any, any>; idPrefix?: string; csp?: Csp }} options
 	 * @returns {Renderer}
 	 */
 	static #open_render(mode, component, options) {
 		const renderer = new Renderer(
-			new SSRState(mode, options.idPrefix ? options.idPrefix + '-' : '')
+			new SSRState(mode, options.idPrefix ? options.idPrefix + '-' : '', options.csp)
 		);
 
 		renderer.push(BLOCK_OPEN);
@@ -623,6 +629,7 @@ export class Renderer {
 	/**
 	 * @param {AccumulatedContent} content
 	 * @param {Renderer} renderer
+	 * @returns {AccumulatedContent & { hashes: { script: Sha256Source[] } }}
 	 */
 	static #close_render(content, renderer) {
 		for (const cleanup of renderer.#collect_on_destroy()) {
@@ -638,14 +645,17 @@ export class Renderer {
 
 		return {
 			head,
-			body
+			body,
+			hashes: {
+				script: renderer.global.csp.script_hashes
+			}
 		};
 	}
 
 	/**
 	 * @param {HydratableContext} ctx
 	 */
-	static async #hydratable_block(ctx) {
+	async #hydratable_block(ctx) {
 		if (ctx.lookup.size === 0) {
 			return null;
 		}
@@ -669,9 +679,7 @@ export class Renderer {
 				${prelude}`;
 		}
 
-		// TODO csp -- have discussed but not implemented
-		return `
-		<script>
+		const body = `
 			{
 				${prelude}
 
@@ -681,11 +689,27 @@ export class Renderer {
 					h.set(k, v);
 				}
 			}
-		</script>`;
+		`;
+
+		let csp_attr = '';
+		if (this.global.csp.nonce) {
+			csp_attr = ` nonce="${this.global.csp.nonce}"`;
+		} else if (this.global.csp.hash) {
+			// note to future selves: this doesn't need to be optimized with a Map<body, hash>
+			// because the it's impossible for identical data to occur multiple times in a single render
+			// (this would require the same hydratable key:value pair to be serialized multiple times)
+			const hash = await sha256(body);
+			this.global.csp.script_hashes.push(`sha256-${hash}`);
+		}
+
+		return `\n\t\t<script${csp_attr}>${body}</script>`;
 	}
 }
 
 export class SSRState {
+	/** @readonly @type {Csp & { script_hashes: Sha256Source[] }} */
+	csp;
+
 	/** @readonly @type {'sync' | 'async'} */
 	mode;
 
@@ -700,10 +724,12 @@ export class SSRState {
 
 	/**
 	 * @param {'sync' | 'async'} mode
-	 * @param {string} [id_prefix]
+	 * @param {string} id_prefix
+	 * @param {Csp} csp
 	 */
-	constructor(mode, id_prefix = '') {
+	constructor(mode, id_prefix = '', csp = { hash: false }) {
 		this.mode = mode;
+		this.csp = { ...csp, script_hashes: [] };
 
 		let uid = 1;
 		this.uid = () => `${id_prefix}s${uid++}`;
diff --git a/packages/svelte/src/internal/server/types.d.ts b/packages/svelte/src/internal/server/types.d.ts
index 05ee34fb17..ea6282c176 100644
--- a/packages/svelte/src/internal/server/types.d.ts
+++ b/packages/svelte/src/internal/server/types.d.ts
@@ -15,6 +15,8 @@ export interface SSRContext {
 	element?: Element;
 }
 
+export type Csp = { nonce?: string; hash?: boolean };
+
 export interface HydratableLookupEntry {
 	value: unknown;
 	serialized: string;
@@ -33,6 +35,8 @@ export interface RenderContext {
 	hydratable: HydratableContext;
 }
 
+export type Sha256Source = `sha256-${string}`;
+
 export interface SyncRenderOutput {
 	/** HTML that goes into the `<head>` */
 	head: string;
@@ -40,6 +44,9 @@ export interface SyncRenderOutput {
 	html: string;
 	/** HTML that goes somewhere into the `<body>` */
 	body: string;
+	hashes: {
+		script: Sha256Source[];
+	};
 }
 
 export type RenderOutput = SyncRenderOutput & PromiseLike<SyncRenderOutput>;
diff --git a/packages/svelte/src/legacy/legacy-server.js b/packages/svelte/src/legacy/legacy-server.js
index a50d961751..05b329bea1 100644
--- a/packages/svelte/src/legacy/legacy-server.js
+++ b/packages/svelte/src/legacy/legacy-server.js
@@ -1,14 +1,14 @@
 /** @import { SvelteComponent } from '../index.js' */
+/** @import { Csp } from '#server' */
 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 */
+/** @typedef {{ head: string, html: string, css: { code: string, map: null }; hashes?: { script: `sha256-${string}`[] } }} LegacyRenderResult */
 
 /**
  * Takes a Svelte 5 component and returns a Svelte 4 compatible component constructor.
@@ -25,10 +25,10 @@ export { createClassComponent };
  */
 export function asClassComponent(component) {
 	const component_constructor = as_class_component(component);
-	/** @type {(props?: {}, opts?: { $$slots?: {}; context?: Map<any, any>; }) => LegacyRenderResult & PromiseLike<LegacyRenderResult> } */
-	const _render = (props, { context } = {}) => {
+	/** @type {(props?: {}, opts?: { $$slots?: {}; context?: Map<any, any>; csp?: Csp }) => LegacyRenderResult & PromiseLike<LegacyRenderResult> } */
+	const _render = (props, { context, csp } = {}) => {
 		// @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 });
+		const result = render(component, { props, context, csp });
 
 		const munged = Object.defineProperties(
 			/** @type {LegacyRenderResult & PromiseLike<LegacyRenderResult>} */ ({}),
@@ -65,7 +65,8 @@ export function asClassComponent(component) {
 							return onfulfilled({
 								css: munged.css,
 								head: result.head,
-								html: result.body
+								html: result.body,
+								hashes: result.hashes
 							});
 						}, onrejected);
 					}
diff --git a/packages/svelte/src/server/index.d.ts b/packages/svelte/src/server/index.d.ts
index d5a3b813e6..f54bd5a5ca 100644
--- a/packages/svelte/src/server/index.d.ts
+++ b/packages/svelte/src/server/index.d.ts
@@ -1,4 +1,4 @@
-import type { RenderOutput } from '#server';
+import type { Csp, RenderOutput } from '#server';
 import type { ComponentProps, Component, SvelteComponent, ComponentType } from 'svelte';
 
 /**
@@ -16,6 +16,7 @@ export function render<
 					props?: Omit<Props, '$$slots' | '$$events'>;
 					context?: Map<any, any>;
 					idPrefix?: string;
+					csp?: Csp;
 				}
 			]
 		: [
@@ -24,6 +25,7 @@ export function render<
 					props: Omit<Props, '$$slots' | '$$events'>;
 					context?: Map<any, any>;
 					idPrefix?: string;
+					csp?: Csp;
 				}
 			]
 ): RenderOutput;
diff --git a/packages/svelte/tests/server-side-rendering/samples/csp-config-error/_config.js b/packages/svelte/tests/server-side-rendering/samples/csp-config-error/_config.js
new file mode 100644
index 0000000000..03626fc37b
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/csp-config-error/_config.js
@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['async'],
+	csp: { hash: true, nonce: 'test-nonce' },
+	error: 'invalid_csp'
+});
diff --git a/packages/svelte/tests/server-side-rendering/samples/csp-config-error/_expected_head.html b/packages/svelte/tests/server-side-rendering/samples/csp-config-error/_expected_head.html
new file mode 100644
index 0000000000..fb3c95f51f
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/csp-config-error/_expected_head.html
@@ -0,0 +1,12 @@
+<script nonce="test-nonce">
+{
+	const r = (v) => Promise.resolve(v);
+	const h = (window.__svelte ??= {}).h ??= new Map();
+
+	for (const [k, v] of [
+		["key",r("bar")]
+	]) {
+		h.set(k, v);
+	}
+}
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/csp-config-error/main.svelte b/packages/svelte/tests/server-side-rendering/samples/csp-config-error/main.svelte
new file mode 100644
index 0000000000..2c4726edf4
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/csp-config-error/main.svelte
@@ -0,0 +1,4 @@
+<script>
+	import { hydratable } from "svelte";
+    const foo = await hydratable('key', () => Promise.resolve('bar'));
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/csp-hash/_config.js b/packages/svelte/tests/server-side-rendering/samples/csp-hash/_config.js
new file mode 100644
index 0000000000..fe28087d86
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/csp-hash/_config.js
@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['async'],
+	csp: { hash: true },
+	script_hashes: ['sha256-J0xwNm40i0NVEdHYeMRThG7y90X+P/I1ElZGnpQ0AbU=']
+});
diff --git a/packages/svelte/tests/server-side-rendering/samples/csp-hash/_expected_head.html b/packages/svelte/tests/server-side-rendering/samples/csp-hash/_expected_head.html
new file mode 100644
index 0000000000..56319255d6
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/csp-hash/_expected_head.html
@@ -0,0 +1,12 @@
+<script>
+{
+	const r = (v) => Promise.resolve(v);
+				const h = (window.__svelte ??= {}).h ??= new Map();
+
+	for (const [k, v] of [
+		["key",r("bar")]
+	]) {
+		h.set(k, v);
+	}
+}
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/csp-hash/main.svelte b/packages/svelte/tests/server-side-rendering/samples/csp-hash/main.svelte
new file mode 100644
index 0000000000..2c4726edf4
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/csp-hash/main.svelte
@@ -0,0 +1,4 @@
+<script>
+	import { hydratable } from "svelte";
+    const foo = await hydratable('key', () => Promise.resolve('bar'));
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/csp-nonce/_config.js b/packages/svelte/tests/server-side-rendering/samples/csp-nonce/_config.js
new file mode 100644
index 0000000000..320c0f67f8
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/csp-nonce/_config.js
@@ -0,0 +1,6 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['async'],
+	csp: { nonce: 'test-nonce' }
+});
diff --git a/packages/svelte/tests/server-side-rendering/samples/csp-nonce/_expected_head.html b/packages/svelte/tests/server-side-rendering/samples/csp-nonce/_expected_head.html
new file mode 100644
index 0000000000..fb3c95f51f
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/csp-nonce/_expected_head.html
@@ -0,0 +1,12 @@
+<script nonce="test-nonce">
+{
+	const r = (v) => Promise.resolve(v);
+	const h = (window.__svelte ??= {}).h ??= new Map();
+
+	for (const [k, v] of [
+		["key",r("bar")]
+	]) {
+		h.set(k, v);
+	}
+}
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/csp-nonce/main.svelte b/packages/svelte/tests/server-side-rendering/samples/csp-nonce/main.svelte
new file mode 100644
index 0000000000..2c4726edf4
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/csp-nonce/main.svelte
@@ -0,0 +1,4 @@
+<script>
+	import { hydratable } from "svelte";
+    const foo = await hydratable('key', () => Promise.resolve('bar'));
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/test.ts b/packages/svelte/tests/server-side-rendering/test.ts
index 4b33685608..2bfc84c7a1 100644
--- a/packages/svelte/tests/server-side-rendering/test.ts
+++ b/packages/svelte/tests/server-side-rendering/test.ts
@@ -21,6 +21,8 @@ interface SSRTest extends BaseTest {
 	id_prefix?: string;
 	withoutNormalizeHtml?: boolean;
 	error?: string;
+	csp?: { nonce: string } | { hash: true };
+	script_hashes?: string[];
 }
 
 // TODO remove this shim when we can
@@ -77,7 +79,8 @@ const { test, run } = suite_with_variants<SSRTest, 'sync' | 'async', CompileOpti
 		try {
 			const render_result = render(Component, {
 				props: config.props || {},
-				idPrefix: config.id_prefix
+				idPrefix: config.id_prefix,
+				csp: config.csp
 			});
 			rendered = is_async ? await render_result : render_result;
 		} catch (error) {
@@ -94,7 +97,7 @@ const { test, run } = suite_with_variants<SSRTest, 'sync' | 'async', CompileOpti
 			assert.fail('Expected an error to be thrown, but rendering succeeded.');
 		}
 
-		const { body, head } = rendered;
+		const { body, head, hashes } = rendered;
 
 		fs.writeFileSync(
 			`${test_dir}/_output/${is_async ? 'async_rendered.html' : 'rendered.html'}`,
@@ -140,6 +143,10 @@ const { test, run } = suite_with_variants<SSRTest, 'sync' | 'async', CompileOpti
 				}
 			}
 		}
+
+		if (config.script_hashes !== undefined) {
+			assert.deepEqual(hashes.script, config.script_hashes);
+		}
 	}
 );
 
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 9ace341e16..d276b2a628 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -2553,6 +2553,7 @@ declare module 'svelte/server' {
 						props?: Omit<Props, '$$slots' | '$$events'>;
 						context?: Map<any, any>;
 						idPrefix?: string;
+						csp?: Csp;
 					}
 				]
 			: [
@@ -2561,9 +2562,14 @@ declare module 'svelte/server' {
 						props: Omit<Props, '$$slots' | '$$events'>;
 						context?: Map<any, any>;
 						idPrefix?: string;
+						csp?: Csp;
 					}
 				]
 	): RenderOutput;
+	type Csp = { nonce?: string; hash?: boolean };
+
+	type Sha256Source = `sha256-${string}`;
+
 	interface SyncRenderOutput {
 		/** HTML that goes into the `<head>` */
 		head: string;
@@ -2571,6 +2577,9 @@ declare module 'svelte/server' {
 		html: string;
 		/** HTML that goes somewhere into the `<body>` */
 		body: string;
+		hashes: {
+			script: Sha256Source[];
+		};
 	}
 
 	type RenderOutput = SyncRenderOutput & PromiseLike<SyncRenderOutput>;

From 435da13fddaf1872a3fb46a7e8a20bb73322148e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Dec 2025 18:52:20 -0500
Subject: [PATCH 252/347] Version Packages (#17358)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/soft-donkeys-serve.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/soft-donkeys-serve.md

diff --git a/.changeset/soft-donkeys-serve.md b/.changeset/soft-donkeys-serve.md
deleted file mode 100644
index f0c7236694..0000000000
--- a/.changeset/soft-donkeys-serve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"svelte": minor
----
-
-feat: Add `csp` option to `render(...)`, and emit hashes when using `hydratable`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index d67510fd07..86718d924c 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.46.0
+
+### Minor Changes
+
+- feat: Add `csp` option to `render(...)`, and emit hashes when using `hydratable` ([#17338](https://github.com/sveltejs/svelte/pull/17338))
+
 ## 5.45.10
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index ebbc3a0e62..74c80536d3 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.45.10",
+  "version": "5.46.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index e1b98ad1a8..4d102bbfbd 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.45.10';
+export const VERSION = '5.46.0';
 export const PUBLIC_VERSION = '5';

From 95a895a9d91d93ea6a9f8814e2ae57ccc25ee164 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 22 Dec 2025 13:48:20 -0500
Subject: [PATCH 253/347] fix: prevent infinite loop when HMRing a component
 with an `await` (#17380)

* fix: prevent infinite loop when HMRing a component with an `await`

* update test

* fix

* reintroduce old logic to fix ever-growing stack of block effects

* update snapshot

* tweak names for clarity, simplify `update` slightly

---------

Co-authored-by: Simon Holthausen <simon.holthausen@vercel.com>
---
 .changeset/giant-gifts-mate.md                |  5 +++
 .../3-transform/client/transform-client.js    | 10 +----
 .../svelte/src/internal/client/dev/hmr.js     | 39 ++++++++++++-------
 .../hmr/_expected/client/index.svelte.js      |  5 +--
 playgrounds/sandbox/run.js                    |  1 +
 playgrounds/sandbox/svelte.config.js          |  2 +-
 6 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 .changeset/giant-gifts-mate.md

diff --git a/.changeset/giant-gifts-mate.md b/.changeset/giant-gifts-mate.md
new file mode 100644
index 0000000000..dc2486b698
--- /dev/null
+++ b/.changeset/giant-gifts-mate.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: prevent infinite loop when HMRing a component with an `await`
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 f51042eb7c..5c00aa591f 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
@@ -519,14 +519,9 @@ export function client_component(analysis, options) {
 
 	if (options.hmr) {
 		const id = b.id(analysis.name);
-		const HMR = b.id('$.HMR');
-
-		const existing = b.member(id, HMR, true);
-		const incoming = b.member(b.id('module.default'), HMR, true);
 
 		const accept_fn_body = [
-			b.stmt(b.assignment('=', b.member(incoming, 'source'), b.member(existing, 'source'))),
-			b.stmt(b.call('$.set', b.member(existing, 'source'), b.member(incoming, 'original')))
+			b.stmt(b.call(b.member(b.member(id, b.id('$.HMR'), true), 'update'), b.id('module.default')))
 		];
 
 		if (analysis.css.hash) {
@@ -535,8 +530,7 @@ export function client_component(analysis, options) {
 		}
 
 		const hmr = b.block([
-			b.stmt(b.assignment('=', id, b.call('$.hmr', id, b.thunk(b.member(existing, 'source'))))),
-
+			b.stmt(b.assignment('=', id, b.call('$.hmr', id))),
 			b.stmt(b.call('import.meta.hot.accept', b.arrow([b.id('module')], b.block(accept_fn_body))))
 		]);
 
diff --git a/packages/svelte/src/internal/client/dev/hmr.js b/packages/svelte/src/internal/client/dev/hmr.js
index 709a1b2722..9fa4e6ccbd 100644
--- a/packages/svelte/src/internal/client/dev/hmr.js
+++ b/packages/svelte/src/internal/client/dev/hmr.js
@@ -1,23 +1,25 @@
-/** @import { Source, Effect, TemplateNode } from '#client' */
+/** @import { Effect, TemplateNode } from '#client' */
 import { FILENAME, HMR } from '../../../constants.js';
 import { EFFECT_TRANSPARENT } from '#client/constants';
 import { hydrate_node, hydrating } from '../dom/hydration.js';
 import { block, branch, destroy_effect } from '../reactivity/effects.js';
-import { source } from '../reactivity/sources.js';
+import { set, source } from '../reactivity/sources.js';
 import { set_should_intro } from '../render.js';
 import { get } from '../runtime.js';
 
 /**
  * @template {(anchor: Comment, props: any) => any} Component
- * @param {Component} original
- * @param {() => Source<Component>} get_source
+ * @param {Component} fn
  */
-export function hmr(original, get_source) {
+export function hmr(fn) {
+	const current = source(fn);
+
 	/**
 	 * @param {TemplateNode} anchor
 	 * @param {any} props
 	 */
 	function wrapper(anchor, props) {
+		let component = {};
 		let instance = {};
 
 		/** @type {Effect} */
@@ -26,8 +28,9 @@ export function hmr(original, get_source) {
 		let ran = false;
 
 		block(() => {
-			const source = get_source();
-			const component = get(source);
+			if (component === (component = get(current))) {
+				return;
+			}
 
 			if (effect) {
 				// @ts-ignore
@@ -62,16 +65,24 @@ export function hmr(original, get_source) {
 	}
 
 	// @ts-expect-error
-	wrapper[FILENAME] = original[FILENAME];
+	wrapper[FILENAME] = fn[FILENAME];
 
 	// @ts-ignore
 	wrapper[HMR] = {
-		// When we accept an update, we set the original source to the new component
-		original,
-		// The `get_source` parameter reads `wrapper[HMR].source`, but in the `accept`
-		// function we always replace it with `previous[HMR].source`, which in practice
-		// means we only ever update the original
-		source: source(original)
+		fn,
+		current,
+		update: (/** @type {any} */ incoming) => {
+			// This logic ensures that the first version of the component is the one
+			// whose update function and therefore block effect is preserved across updates.
+			// If we don't do this dance and instead just use `incoming` as the new component
+			// and then update, we'll create an ever-growing stack of block effects.
+
+			// Trigger the original block effect
+			set(wrapper[HMR].current, incoming[HMR].fn);
+
+			// Replace the incoming source with the original one
+			incoming[HMR].current = wrapper[HMR].current;
+		}
 	};
 
 	return wrapper;
diff --git a/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js
index 1fac1338c5..66d1a5af5a 100644
--- a/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/hmr/_expected/client/index.svelte.js
@@ -11,11 +11,10 @@ function Hmr($$anchor) {
 }
 
 if (import.meta.hot) {
-	Hmr = $.hmr(Hmr, () => Hmr[$.HMR].source);
+	Hmr = $.hmr(Hmr);
 
 	import.meta.hot.accept((module) => {
-		module.default[$.HMR].source = Hmr[$.HMR].source;
-		$.set(Hmr[$.HMR].source, module.default[$.HMR].original);
+		Hmr[$.HMR].update(module.default);
 	});
 }
 
diff --git a/playgrounds/sandbox/run.js b/playgrounds/sandbox/run.js
index 35bffb67a2..f79243d4e7 100644
--- a/playgrounds/sandbox/run.js
+++ b/playgrounds/sandbox/run.js
@@ -95,6 +95,7 @@ for (const generate of /** @type {const} */ (['client', 'server'])) {
 		if (generate === 'server' || FROM_HTML) {
 			from_html = compile(source, {
 				dev: DEV,
+				hmr: DEV,
 				filename: input,
 				generate,
 				runes: argv.values.runes,
diff --git a/playgrounds/sandbox/svelte.config.js b/playgrounds/sandbox/svelte.config.js
index 68ac605385..e1a6f1385b 100644
--- a/playgrounds/sandbox/svelte.config.js
+++ b/playgrounds/sandbox/svelte.config.js
@@ -1,6 +1,6 @@
 export default {
 	compilerOptions: {
-		hmr: false,
+		hmr: true,
 
 		experimental: {
 			async: true

From acd752524b0973036295aac2420a515ec55a5dd8 Mon Sep 17 00:00:00 2001
From: That Richan <11839880+that-richan@users.noreply.github.com>
Date: Mon, 22 Dec 2025 21:06:54 +0100
Subject: [PATCH 254/347] feat: type `currentTarget` in `on` function (#17370)

* feat: type `currentTarget` in `on` function

* `EventTarget &` is redundant, `Element` already extends `EventTarget`

* no need for optional chaining

* add currentTarget for other overloads

* update changeset

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/bumpy-radios-live.md        | 5 +++++
 packages/svelte/src/events/public.d.ts | 8 ++++----
 packages/svelte/tests/types/events.ts  | 2 ++
 packages/svelte/types/index.d.ts       | 8 ++++----
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/bumpy-radios-live.md

diff --git a/.changeset/bumpy-radios-live.md b/.changeset/bumpy-radios-live.md
new file mode 100644
index 0000000000..f5aa4129c7
--- /dev/null
+++ b/.changeset/bumpy-radios-live.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: type `currentTarget` in `on` function
diff --git a/packages/svelte/src/events/public.d.ts b/packages/svelte/src/events/public.d.ts
index ff42e523b3..bf7b20c108 100644
--- a/packages/svelte/src/events/public.d.ts
+++ b/packages/svelte/src/events/public.d.ts
@@ -8,7 +8,7 @@
 export function on<Type extends keyof WindowEventMap>(
 	window: Window,
 	type: Type,
-	handler: (this: Window, event: WindowEventMap[Type]) => any,
+	handler: (this: Window, event: WindowEventMap[Type] & { currentTarget: Window }) => any,
 	options?: AddEventListenerOptions | undefined
 ): () => void;
 /**
@@ -19,7 +19,7 @@ export function on<Type extends keyof WindowEventMap>(
 export function on<Type extends keyof DocumentEventMap>(
 	document: Document,
 	type: Type,
-	handler: (this: Document, event: DocumentEventMap[Type]) => any,
+	handler: (this: Document, event: DocumentEventMap[Type] & { currentTarget: Document }) => any,
 	options?: AddEventListenerOptions | undefined
 ): () => void;
 /**
@@ -30,7 +30,7 @@ export function on<Type extends keyof DocumentEventMap>(
 export function on<Element extends HTMLElement, Type extends keyof HTMLElementEventMap>(
 	element: Element,
 	type: Type,
-	handler: (this: Element, event: HTMLElementEventMap[Type]) => any,
+	handler: (this: Element, event: HTMLElementEventMap[Type] & { currentTarget: Element }) => any,
 	options?: AddEventListenerOptions | undefined
 ): () => void;
 /**
@@ -41,7 +41,7 @@ export function on<Element extends HTMLElement, Type extends keyof HTMLElementEv
 export function on<Element extends MediaQueryList, Type extends keyof MediaQueryListEventMap>(
 	element: Element,
 	type: Type,
-	handler: (this: Element, event: MediaQueryListEventMap[Type]) => any,
+	handler: (this: Element, event: MediaQueryListEventMap[Type] & { currentTarget: Element }) => any,
 	options?: AddEventListenerOptions | undefined
 ): () => void;
 /**
diff --git a/packages/svelte/tests/types/events.ts b/packages/svelte/tests/types/events.ts
index 77891952be..a334cb5493 100644
--- a/packages/svelte/tests/types/events.ts
+++ b/packages/svelte/tests/types/events.ts
@@ -8,6 +8,8 @@ on(window, 'click', (e) => e.button);
 
 on(document, 'click', (e) => e.button);
 
+on(document.createElement('input'), 'input', (e) => e.currentTarget.value);
+
 on(
 	document.body,
 	'clidck',
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index d276b2a628..c0b89d8736 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -2810,7 +2810,7 @@ declare module 'svelte/events' {
 	export function on<Type extends keyof WindowEventMap>(
 		window: Window,
 		type: Type,
-		handler: (this: Window, event: WindowEventMap[Type]) => any,
+		handler: (this: Window, event: WindowEventMap[Type] & { currentTarget: Window }) => any,
 		options?: AddEventListenerOptions | undefined
 	): () => void;
 	/**
@@ -2821,7 +2821,7 @@ declare module 'svelte/events' {
 	export function on<Type extends keyof DocumentEventMap>(
 		document: Document,
 		type: Type,
-		handler: (this: Document, event: DocumentEventMap[Type]) => any,
+		handler: (this: Document, event: DocumentEventMap[Type] & { currentTarget: Document }) => any,
 		options?: AddEventListenerOptions | undefined
 	): () => void;
 	/**
@@ -2832,7 +2832,7 @@ declare module 'svelte/events' {
 	export function on<Element extends HTMLElement, Type extends keyof HTMLElementEventMap>(
 		element: Element,
 		type: Type,
-		handler: (this: Element, event: HTMLElementEventMap[Type]) => any,
+		handler: (this: Element, event: HTMLElementEventMap[Type] & { currentTarget: Element }) => any,
 		options?: AddEventListenerOptions | undefined
 	): () => void;
 	/**
@@ -2843,7 +2843,7 @@ declare module 'svelte/events' {
 	export function on<Element extends MediaQueryList, Type extends keyof MediaQueryListEventMap>(
 		element: Element,
 		type: Type,
-		handler: (this: Element, event: MediaQueryListEventMap[Type]) => any,
+		handler: (this: Element, event: MediaQueryListEventMap[Type] & { currentTarget: Element }) => any,
 		options?: AddEventListenerOptions | undefined
 	): () => void;
 	/**

From 31ac74fac7b1d6a1dc7aff1e462e657730aadfde Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 22 Dec 2025 15:09:30 -0500
Subject: [PATCH 255/347] fix: skip static optimisation for stateless deriveds
 after await (#17389)

---
 .changeset/deep-pears-juggle.md                          | 5 +++++
 .../phases/3-transform/client/visitors/RegularElement.js | 4 +++-
 .../phases/3-transform/client/visitors/shared/utils.js   | 2 +-
 .../samples/async-static-derived-after-await/_config.js  | 9 +++++++++
 .../samples/async-static-derived-after-await/main.svelte | 6 ++++++
 5 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/deep-pears-juggle.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-static-derived-after-await/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-static-derived-after-await/main.svelte

diff --git a/.changeset/deep-pears-juggle.md b/.changeset/deep-pears-juggle.md
new file mode 100644
index 0000000000..4cba6b7dee
--- /dev/null
+++ b/.changeset/deep-pears-juggle.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: skip static optimisation for stateless deriveds after `await`
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 50cef67171..690715df84 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
@@ -336,7 +336,9 @@ export function RegularElement(node, context) {
 		trimmed.every(
 			(node) =>
 				node.type === 'Text' ||
-				(!node.metadata.expression.has_state && !node.metadata.expression.has_await)
+				(!node.metadata.expression.has_state &&
+					!node.metadata.expression.has_await &&
+					!node.metadata.expression.has_blockers())
 		) &&
 		trimmed.some((node) => node.type === 'ExpressionTag');
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
index 6145f66d87..7256073096 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/utils.js
@@ -134,7 +134,7 @@ export function build_template_chunk(
 
 			const evaluated = state.scope.evaluate(value);
 
-			has_await ||= node.metadata.expression.has_await;
+			has_await ||= node.metadata.expression.has_await || node.metadata.expression.has_blockers();
 			has_state ||= has_await || (node.metadata.expression.has_state && !evaluated.is_known);
 
 			if (values.length === 1) {
diff --git a/packages/svelte/tests/runtime-runes/samples/async-static-derived-after-await/_config.js b/packages/svelte/tests/runtime-runes/samples/async-static-derived-after-await/_config.js
new file mode 100644
index 0000000000..5c95b3149c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-static-derived-after-await/_config.js
@@ -0,0 +1,9 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, `<p>hello</p>`);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-static-derived-after-await/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-static-derived-after-await/main.svelte
new file mode 100644
index 0000000000..9ecc839c3c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-static-derived-after-await/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	await 0;
+	let message = $derived('hello');
+</script>
+
+<p>{message}</p>

From d8085c24badd48bfcba4d5344f9327e3b2f8fae8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Dec 2025 09:09:13 +0100
Subject: [PATCH 256/347] Version Packages (#17388)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/bumpy-radios-live.md |  5 -----
 .changeset/deep-pears-juggle.md |  5 -----
 .changeset/giant-gifts-mate.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/bumpy-radios-live.md
 delete mode 100644 .changeset/deep-pears-juggle.md
 delete mode 100644 .changeset/giant-gifts-mate.md

diff --git a/.changeset/bumpy-radios-live.md b/.changeset/bumpy-radios-live.md
deleted file mode 100644
index f5aa4129c7..0000000000
--- a/.changeset/bumpy-radios-live.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: type `currentTarget` in `on` function
diff --git a/.changeset/deep-pears-juggle.md b/.changeset/deep-pears-juggle.md
deleted file mode 100644
index 4cba6b7dee..0000000000
--- a/.changeset/deep-pears-juggle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: skip static optimisation for stateless deriveds after `await`
diff --git a/.changeset/giant-gifts-mate.md b/.changeset/giant-gifts-mate.md
deleted file mode 100644
index dc2486b698..0000000000
--- a/.changeset/giant-gifts-mate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: prevent infinite loop when HMRing a component with an `await`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 86718d924c..dc0edbaf79 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.46.1
+
+### Patch Changes
+
+- fix: type `currentTarget` in `on` function ([#17370](https://github.com/sveltejs/svelte/pull/17370))
+
+- fix: skip static optimisation for stateless deriveds after `await` ([#17389](https://github.com/sveltejs/svelte/pull/17389))
+
+- fix: prevent infinite loop when HMRing a component with an `await` ([#17380](https://github.com/sveltejs/svelte/pull/17380))
+
 ## 5.46.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 74c80536d3..7affd91207 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.46.0",
+  "version": "5.46.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 4d102bbfbd..c28af94e19 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.46.0';
+export const VERSION = '5.46.1';
 export const PUBLIC_VERSION = '5';

From fcdb28c8827288055c95d2e79fd13cfce31b2175 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 26 Dec 2025 10:47:14 -0500
Subject: [PATCH 257/347] chore: disable HMR in playground (#17397)

---
 playgrounds/sandbox/svelte.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playgrounds/sandbox/svelte.config.js b/playgrounds/sandbox/svelte.config.js
index e1a6f1385b..68ac605385 100644
--- a/playgrounds/sandbox/svelte.config.js
+++ b/playgrounds/sandbox/svelte.config.js
@@ -1,6 +1,6 @@
 export default {
 	compilerOptions: {
-		hmr: true,
+		hmr: false,
 
 		experimental: {
 			async: true

From 965bf6ceec0c6ee5347df6b04781fe9fe41aa5a5 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 26 Dec 2025 11:47:32 -0500
Subject: [PATCH 258/347] chore: better async setContext test (#17398)

---
 .../samples/async-set-context/A.svelte              | 13 +++++++++++++
 .../samples/async-set-context/B.svelte              | 12 ++++++++++++
 .../async-set-context/{Inner.svelte => C.svelte}    |  3 ++-
 .../samples/async-set-context/Outer.svelte          |  9 ---------
 .../samples/async-set-context/_config.js            |  4 ++--
 .../samples/async-set-context/main.svelte           |  4 ++--
 6 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-set-context/A.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-set-context/B.svelte
 rename packages/svelte/tests/runtime-runes/samples/async-set-context/{Inner.svelte => C.svelte} (60%)
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/async-set-context/Outer.svelte

diff --git a/packages/svelte/tests/runtime-runes/samples/async-set-context/A.svelte b/packages/svelte/tests/runtime-runes/samples/async-set-context/A.svelte
new file mode 100644
index 0000000000..5b85a553d4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-set-context/A.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import { setContext } from "svelte";
+	import B from "./B.svelte";
+
+	let greeting = 'hello';
+	setContext("greeting", greeting);
+
+	await Promise.resolve();
+
+	let recipient = 'world';
+</script>
+
+<B {recipient} />
diff --git a/packages/svelte/tests/runtime-runes/samples/async-set-context/B.svelte b/packages/svelte/tests/runtime-runes/samples/async-set-context/B.svelte
new file mode 100644
index 0000000000..2c93263ca5
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-set-context/B.svelte
@@ -0,0 +1,12 @@
+<script lang="ts">
+	import { setContext } from "svelte";
+	import C from "./C.svelte";
+
+	let { recipient } = $props();
+
+	// svelte-ignore state_referenced_locally
+	setContext("recipient", recipient);
+	await Promise.resolve();
+</script>
+
+<C />
diff --git a/packages/svelte/tests/runtime-runes/samples/async-set-context/Inner.svelte b/packages/svelte/tests/runtime-runes/samples/async-set-context/C.svelte
similarity index 60%
rename from packages/svelte/tests/runtime-runes/samples/async-set-context/Inner.svelte
rename to packages/svelte/tests/runtime-runes/samples/async-set-context/C.svelte
index 2c7fd5d43d..2aebf7a64f 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-set-context/Inner.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-set-context/C.svelte
@@ -2,6 +2,7 @@
 	import { getContext } from "svelte";
 
   let greeting = getContext("greeting");
+  let recipient = getContext("recipient");
 </script>
 
-<p>{greeting}</p>
\ No newline at end of file
+<p>{greeting} {recipient}</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-set-context/Outer.svelte b/packages/svelte/tests/runtime-runes/samples/async-set-context/Outer.svelte
deleted file mode 100644
index 9a493c5b75..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/async-set-context/Outer.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-<script lang="ts">
-	import { setContext } from "svelte";
-	import Inner from "./Inner.svelte";
-
-	setContext("greeting", "hi");
-	await Promise.resolve();
-</script>
-
-<Inner />
diff --git a/packages/svelte/tests/runtime-runes/samples/async-set-context/_config.js b/packages/svelte/tests/runtime-runes/samples/async-set-context/_config.js
index 041f67a39e..aebed211cc 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-set-context/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/async-set-context/_config.js
@@ -3,9 +3,9 @@ import { test } from '../../test';
 
 export default test({
 	mode: ['client', 'async-server'],
-	ssrHtml: `<p>hi</p>`,
+	ssrHtml: `<p>hello world</p>`,
 	async test({ assert, target }) {
 		await tick();
-		assert.htmlEqual(target.innerHTML, '<p>hi</p>');
+		assert.htmlEqual(target.innerHTML, '<p>hello world</p>');
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/async-set-context/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-set-context/main.svelte
index 01b46bda93..e2189e7eb8 100644
--- a/packages/svelte/tests/runtime-runes/samples/async-set-context/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/async-set-context/main.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import Outer from "./Outer.svelte";
+	import A from "./A.svelte";
 
 	await Promise.resolve();
 </script>
 
-<Outer />
+<A />

From b1f44c46c3336df55ee6ebe38225ad746841af70 Mon Sep 17 00:00:00 2001
From: Tee Ming <chewteeming01@gmail.com>
Date: Sat, 3 Jan 2026 23:43:31 +0800
Subject: [PATCH 259/347] fix: correctly compile server code when using
 `$inspect` after a top-level await expression (#17407)

* add fix and test

* changeset

* Apply suggestion from @teemingc
---
 .changeset/spicy-years-stick.md                  |  5 +++++
 .../phases/3-transform/shared/transform-async.js |  9 ++++++++-
 .../async-top-level-inspect-server/_config.js    |  8 ++++++++
 .../_expected/client/index.svelte.js             | 16 ++++++++++++++++
 .../_expected/server/index.svelte.js             | 15 +++++++++++++++
 .../async-top-level-inspect-server/index.svelte  |  6 ++++++
 6 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/spicy-years-stick.md
 create mode 100644 packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_config.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_expected/client/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_expected/server/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/index.svelte

diff --git a/.changeset/spicy-years-stick.md b/.changeset/spicy-years-stick.md
new file mode 100644
index 0000000000..76834e8381
--- /dev/null
+++ b/.changeset/spicy-years-stick.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: remove `$inspect` calls after await expressions when compiling for production server code
diff --git a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
index 2b9c219d7d..8d3a6b2769 100644
--- a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
+++ b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
@@ -86,7 +86,14 @@ export function transform_body(instance_body, runner, transform) {
 			}
 
 			if (s.node.type === 'ExpressionStatement') {
-				const expression = /** @type {ESTree.Expression} */ (transform(s.node.expression));
+				// the expression may be a $inspect call, which will be transformed into an empty statement
+				const expression = /** @type {ESTree.Expression | ESTree.EmptyStatement} */ (
+					transform(s.node.expression)
+				);
+
+				if (expression.type === 'EmptyStatement') {
+					return null;
+				}
 
 				return expression.type === 'AwaitExpression'
 					? b.thunk(expression, true)
diff --git a/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_config.js b/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_config.js
new file mode 100644
index 0000000000..6214e6b429
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_config.js
@@ -0,0 +1,8 @@
+import { test } from '../../test';
+
+export default test({
+	compileOptions: {
+		experimental: { async: true },
+		dev: false
+	}
+});
diff --git a/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_expected/client/index.svelte.js
new file mode 100644
index 0000000000..e8aa8dfa11
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_expected/client/index.svelte.js
@@ -0,0 +1,16 @@
+import 'svelte/internal/disclose-version';
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/client';
+
+var root = $.from_html(`<p> </p>`);
+
+export default function Async_top_level_inspect_server($$anchor) {
+	var data;
+	var $$promises = $.run([async () => data = await Promise.resolve(42),,]);
+	var p = root();
+	var text = $.child(p, true);
+
+	$.reset(p);
+	$.template_effect(() => $.set_text(text, data), void 0, void 0, [$$promises[1]]);
+	$.append($$anchor, p);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_expected/server/index.svelte.js
new file mode 100644
index 0000000000..eb99a2fe1d
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/_expected/server/index.svelte.js
@@ -0,0 +1,15 @@
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/server';
+
+export default function Async_top_level_inspect_server($$renderer) {
+	var data;
+	var $$promises = $$renderer.run([async () => data = await Promise.resolve(42),,]);
+
+	$$renderer.push(`<p>`);
+
+	$$renderer.async([$$promises[1]], ($$renderer) => {
+		$$renderer.push(() => $.escape(data));
+	});
+
+	$$renderer.push(`</p>`);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/index.svelte b/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/index.svelte
new file mode 100644
index 0000000000..06bb995b1e
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-top-level-inspect-server/index.svelte
@@ -0,0 +1,6 @@
+<script>
+	let data = await Promise.resolve(42);
+	$inspect(data);
+</script>
+
+<p>{data}</p>

From 37f08493c966401326b4bab9763e92c0a977f71a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 5 Jan 2026 11:55:14 +0000
Subject: [PATCH 260/347] chore: eagerly assign labels to async deriveds
 (#17420)

---
 .../client/visitors/VariableDeclaration.js            | 11 +++++------
 .../svelte/src/internal/client/reactivity/deriveds.js |  5 ++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

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 57dba202ba..16aa164d84 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
@@ -209,11 +209,11 @@ export function VariableDeclaration(node, context) {
 						let call = b.call(
 							'$.async_derived',
 							b.thunk(expression, true),
+							dev && b.literal(declarator.id.name),
 							location ? b.literal(location) : undefined
 						);
 
 						call = should_save ? save(call) : b.await(call);
-						if (dev) call = b.call('$.tag', call, b.literal(declarator.id.name));
 
 						declarations.push(b.declarator(declarator.id, call));
 					} else {
@@ -244,17 +244,16 @@ export function VariableDeclaration(node, context) {
 							call = b.call(
 								'$.async_derived',
 								b.thunk(expression, true),
+								dev &&
+									b.literal(
+										`[$derived ${declarator.id.type === 'ArrayPattern' ? 'iterable' : 'object'}]`
+									),
 								location ? b.literal(location) : undefined
 							);
 
 							call = should_save ? save(call) : b.await(call);
 						}
 
-						if (dev) {
-							const label = `[$derived ${declarator.id.type === 'ArrayPattern' ? 'iterable' : 'object'}]`;
-							call = b.call('$.tag', call, b.literal(label));
-						}
-
 						declarations.push(b.declarator(id, call));
 					}
 
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index b2d5d59ae1..ee8ba29c21 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -93,11 +93,12 @@ export function derived(fn) {
 /**
  * @template V
  * @param {() => V | Promise<V>} fn
+ * @param {string} [label]
  * @param {string} [location] If provided, print a warning if the value is not read immediately after update
  * @returns {Promise<Source<V>>}
  */
 /*#__NO_SIDE_EFFECTS__*/
-export function async_derived(fn, location) {
+export function async_derived(fn, label, location) {
 	let parent = /** @type {Effect | null} */ (active_effect);
 
 	if (parent === null) {
@@ -109,6 +110,8 @@ export function async_derived(fn, location) {
 	var promise = /** @type {Promise<V>} */ (/** @type {unknown} */ (undefined));
 	var signal = source(/** @type {V} */ (UNINITIALIZED));
 
+	if (DEV) signal.label = label;
+
 	// only suspend in async deriveds created on initialisation
 	var should_suspend = !active_reaction;
 

From 1482ae8726a40329fe540fb7f20e3517edd318fd Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 7 Jan 2026 15:38:00 +0000
Subject: [PATCH 261/347] chore: remove `async_body` (#17425)

* chore: remove unused async_body

* unused
---
 packages/svelte/src/internal/client/index.js  |  1 -
 .../src/internal/client/reactivity/async.js   | 46 -------------------
 2 files changed, 47 deletions(-)

diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index a2add3ec59..a2666d8712 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -98,7 +98,6 @@ export {
 	with_script
 } from './dom/template.js';
 export {
-	async_body,
 	for_await_track_reactivity_loss,
 	run,
 	save,
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index e48aff3d7f..631af24807 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -25,7 +25,6 @@ import {
 	set_from_async_derived
 } from './deriveds.js';
 import { aborted } from './effects.js';
-import { hydrate_next, hydrating, set_hydrate_node, skip_nodes } from '../dom/hydration.js';
 
 /**
  * @param {Array<Promise<void>>} blockers
@@ -211,51 +210,6 @@ export function unset_context() {
 	}
 }
 
-/**
- * @param {TemplateNode} anchor
- * @param {(target: TemplateNode) => Promise<void>} fn
- */
-export async function async_body(anchor, fn) {
-	var boundary = get_boundary();
-	var batch = /** @type {Batch} */ (current_batch);
-	var blocking = !boundary.is_pending();
-
-	boundary.update_pending_count(1);
-	batch.increment(blocking);
-
-	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 {
-		var promise = fn(anchor);
-	} 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 {
-		boundary.update_pending_count(-1);
-		batch.decrement(blocking);
-
-		unset_context();
-	}
-}
-
 /**
  * @param {Array<() => void | Promise<void>>} thunks
  */

From 41e86438145d42c8ddf00fe1a44eaf3a7b8319c8 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 7 Jan 2026 16:39:10 +0000
Subject: [PATCH 262/347] fix: clear batch between runs (alternative approach)
 (#17424)

* fix: clear batch between runs

* changeset

* add comment and note-to-self

* associate effects with boundaries, albeit clumsily

* remove unused async_body

* dry out

* fix

* simplify

* clarify

* tweak

* unused

* unused

* add an explanatory comment
---
 .changeset/tall-clocks-turn.md                |   5 +
 .../src/internal/client/dom/blocks/async.js   |   2 +-
 .../internal/client/dom/blocks/boundary.js    |  65 ++++++---
 .../src/internal/client/reactivity/async.js   |  12 +-
 .../src/internal/client/reactivity/batch.js   | 124 ++++++------------
 .../internal/client/reactivity/deriveds.js    |   2 +-
 .../src/internal/client/reactivity/utils.js   |  40 ++++++
 .../Child.svelte                              |  15 +++
 .../async-clear-batch-between-runs/_config.js |  32 +++++
 .../main.svelte                               |  19 +++
 10 files changed, 209 insertions(+), 107 deletions(-)
 create mode 100644 .changeset/tall-clocks-turn.md
 create mode 100644 packages/svelte/src/internal/client/reactivity/utils.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/main.svelte

diff --git a/.changeset/tall-clocks-turn.md b/.changeset/tall-clocks-turn.md
new file mode 100644
index 0000000000..22cefcff30
--- /dev/null
+++ b/.changeset/tall-clocks-turn.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: clear batch between runs
diff --git a/packages/svelte/src/internal/client/dom/blocks/async.js b/packages/svelte/src/internal/client/dom/blocks/async.js
index 3d320d2ea9..3bc1eecba7 100644
--- a/packages/svelte/src/internal/client/dom/blocks/async.js
+++ b/packages/svelte/src/internal/client/dom/blocks/async.js
@@ -21,7 +21,7 @@ import { get_boundary } from './boundary.js';
 export function async(node, blockers = [], expressions = [], fn) {
 	var boundary = get_boundary();
 	var batch = /** @type {Batch} */ (current_batch);
-	var blocking = !boundary.is_pending();
+	var blocking = boundary.is_rendered();
 
 	boundary.update_pending_count(1);
 	batch.increment(blocking);
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 140e876330..92f4c0a104 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -2,8 +2,10 @@
 import {
 	BOUNDARY_EFFECT,
 	COMMENT_NODE,
+	DIRTY,
 	EFFECT_PRESERVED,
-	EFFECT_TRANSPARENT
+	EFFECT_TRANSPARENT,
+	MAYBE_DIRTY
 } from '#client/constants';
 import { HYDRATION_START_ELSE } from '../../../../constants.js';
 import { component_context, set_component_context } from '../../context.js';
@@ -20,7 +22,8 @@ import {
 	active_reaction,
 	get,
 	set_active_effect,
-	set_active_reaction
+	set_active_reaction,
+	set_signal_status
 } from '../../runtime.js';
 import {
 	hydrate_next,
@@ -34,11 +37,12 @@ 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 } from '../../reactivity/batch.js';
+import { Batch, schedule_effect } 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';
 import { create_text } from '../operations.js';
+import { defer_effect } from '../../reactivity/utils.js';
 
 /**
  * @typedef {{
@@ -64,7 +68,7 @@ export class Boundary {
 	/** @type {Boundary | null} */
 	parent;
 
-	#pending = false;
+	is_pending = false;
 
 	/** @type {TemplateNode} */
 	#anchor;
@@ -101,6 +105,12 @@ export class Boundary {
 
 	#is_creating_fallback = false;
 
+	/** @type {Set<Effect>} */
+	#dirty_effects = new Set();
+
+	/** @type {Set<Effect>} */
+	#maybe_dirty_effects = new Set();
+
 	/**
 	 * A source containing the number of pending async deriveds/expressions.
 	 * Only created if `$effect.pending()` is used inside the boundary,
@@ -134,7 +144,7 @@ export class Boundary {
 
 		this.parent = /** @type {Effect} */ (active_effect).b;
 
-		this.#pending = !!this.#props.pending;
+		this.is_pending = !!this.#props.pending;
 
 		this.#effect = block(() => {
 			/** @type {Effect} */ (active_effect).b = this;
@@ -164,7 +174,7 @@ export class Boundary {
 				if (this.#pending_count > 0) {
 					this.#show_pending_snippet();
 				} else {
-					this.#pending = false;
+					this.is_pending = false;
 				}
 			}
 
@@ -187,7 +197,7 @@ export class Boundary {
 
 		// 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;
+		this.is_pending = false;
 	}
 
 	#hydrate_pending_content() {
@@ -212,7 +222,7 @@ export class Boundary {
 					this.#pending_effect = null;
 				});
 
-				this.#pending = false;
+				this.is_pending = false;
 			}
 		});
 	}
@@ -220,7 +230,7 @@ export class Boundary {
 	#get_anchor() {
 		var anchor = this.#anchor;
 
-		if (this.#pending) {
+		if (this.is_pending) {
 			this.#pending_anchor = create_text();
 			this.#anchor.before(this.#pending_anchor);
 
@@ -231,11 +241,19 @@ export class Boundary {
 	}
 
 	/**
-	 * Returns `true` if the effect exists inside a boundary whose pending snippet is shown
+	 * Defer an effect inside a pending boundary until the boundary resolves
+	 * @param {Effect} effect
+	 */
+	defer_effect(effect) {
+		defer_effect(effect, this.#dirty_effects, this.#maybe_dirty_effects);
+	}
+
+	/**
+	 * Returns `false` 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());
+	is_rendered() {
+		return !this.is_pending && (!this.parent || this.parent.is_rendered());
 	}
 
 	has_pending_snippet() {
@@ -298,7 +316,24 @@ export class Boundary {
 		this.#pending_count += d;
 
 		if (this.#pending_count === 0) {
-			this.#pending = false;
+			this.is_pending = false;
+
+			// any effects that were encountered and deferred during traversal
+			// should be rescheduled — after the next traversal (which will happen
+			// immediately, due to the same update that brought us here)
+			// the effects will be flushed
+			for (const e of this.#dirty_effects) {
+				set_signal_status(e, DIRTY);
+				schedule_effect(e);
+			}
+
+			for (const e of this.#maybe_dirty_effects) {
+				set_signal_status(e, MAYBE_DIRTY);
+				schedule_effect(e);
+			}
+
+			this.#dirty_effects.clear();
+			this.#maybe_dirty_effects.clear();
 
 			if (this.#pending_effect) {
 				pause_effect(this.#pending_effect, () => {
@@ -394,7 +429,7 @@ export class Boundary {
 
 			// 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.is_pending = this.has_pending_snippet();
 
 			this.#main_effect = this.#run(() => {
 				this.#is_creating_fallback = false;
@@ -404,7 +439,7 @@ export class Boundary {
 			if (this.#pending_count > 0) {
 				this.#show_pending_snippet();
 			} else {
-				this.#pending = false;
+				this.is_pending = false;
 			}
 		};
 
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 631af24807..334bf8f145 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -218,7 +218,7 @@ export function run(thunks) {
 
 	var boundary = get_boundary();
 	var batch = /** @type {Batch} */ (current_batch);
-	var blocking = !boundary.is_pending();
+	var blocking = boundary.is_rendered();
 
 	boundary.update_pending_count(1);
 	batch.increment(blocking);
@@ -252,17 +252,13 @@ export function run(thunks) {
 					throw STALE_REACTION;
 				}
 
-				try {
-					restore();
-					return fn();
-				} finally {
-					// TODO do we need it here as well as below?
-					unset_context();
-				}
+				restore();
+				return fn();
 			})
 			.catch(handle_error)
 			.finally(() => {
 				unset_context();
+				current_batch?.deactivate();
 			});
 
 		promises.push(promise);
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 6f941c7ff2..6dd90ba1b4 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -1,5 +1,6 @@
 /** @import { Fork } from 'svelte' */
 /** @import { Derived, Effect, Reaction, Source, Value } from '#client' */
+/** @import { Boundary } from '../dom/blocks/boundary' */
 import {
 	BLOCK_EFFECT,
 	BRANCH_EFFECT,
@@ -17,7 +18,6 @@ import {
 	EAGER_EFFECT,
 	HEAD_EFFECT,
 	ERROR_VALUE,
-	WAS_MARKED,
 	MANAGED_EFFECT
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
@@ -37,15 +37,7 @@ import { DEV } from 'esm-env';
 import { invoke_error_boundary } from '../error-handling.js';
 import { flush_eager_effects, old_values, set_eager_effects, source, update } from './sources.js';
 import { eager_effect, unlink_effect } from './effects.js';
-
-/**
- * @typedef {{
- *   parent: EffectTarget | null;
- *   effect: Effect | null;
- *   effects: Effect[];
- *   render_effects: Effect[];
- * }} EffectTarget
- */
+import { defer_effect } from './utils.js';
 
 /** @type {Set<Batch>} */
 const batches = new Set();
@@ -161,16 +153,14 @@ export class Batch {
 
 		this.apply();
 
-		/** @type {EffectTarget} */
-		var target = {
-			parent: null,
-			effect: null,
-			effects: [],
-			render_effects: []
-		};
+		/** @type {Effect[]} */
+		var effects = [];
+
+		/** @type {Effect[]} */
+		var render_effects = [];
 
 		for (const root of root_effects) {
-			this.#traverse_effect_tree(root, target);
+			this.#traverse_effect_tree(root, effects, render_effects);
 			// Note: #traverse_effect_tree runs block effects eagerly, which can schedule effects,
 			// which means queued_root_effects now may be filled again.
 
@@ -183,16 +173,16 @@ export class Batch {
 		}
 
 		if (this.is_deferred()) {
-			this.#defer_effects(target.effects);
-			this.#defer_effects(target.render_effects);
+			this.#defer_effects(render_effects);
+			this.#defer_effects(effects);
 		} else {
 			// 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 = this;
 			current_batch = null;
 
-			flush_queued_effects(target.render_effects);
-			flush_queued_effects(target.effects);
+			flush_queued_effects(render_effects);
+			flush_queued_effects(effects);
 
 			previous_batch = null;
 
@@ -206,13 +196,17 @@ export class Batch {
 	 * Traverse the effect tree, executing effects or stashing
 	 * them for later execution as appropriate
 	 * @param {Effect} root
-	 * @param {EffectTarget} target
+	 * @param {Effect[]} effects
+	 * @param {Effect[]} render_effects
 	 */
-	#traverse_effect_tree(root, target) {
+	#traverse_effect_tree(root, effects, render_effects) {
 		root.f ^= CLEAN;
 
 		var effect = root.first;
 
+		/** @type {Effect | null} */
+		var pending_boundary = null;
+
 		while (effect !== null) {
 			var flags = effect.f;
 			var is_branch = (flags & (BRANCH_EFFECT | ROOT_EFFECT)) !== 0;
@@ -220,24 +214,32 @@ export class Batch {
 
 			var skip = is_skippable_branch || (flags & INERT) !== 0 || this.skipped_effects.has(effect);
 
-			if ((effect.f & BOUNDARY_EFFECT) !== 0 && effect.b?.is_pending()) {
-				target = {
-					parent: target,
-					effect,
-					effects: [],
-					render_effects: []
-				};
+			// Inside a `<svelte:boundary>` with a pending snippet,
+			// all effects are deferred until the boundary resolves
+			// (except block/async effects, which run immediately)
+			if (
+				async_mode_flag &&
+				pending_boundary === null &&
+				(flags & BOUNDARY_EFFECT) !== 0 &&
+				effect.b?.is_pending
+			) {
+				pending_boundary = effect;
 			}
 
 			if (!skip && effect.fn !== null) {
 				if (is_branch) {
 					effect.f ^= CLEAN;
+				} else if (
+					pending_boundary !== null &&
+					(flags & (EFFECT | RENDER_EFFECT | MANAGED_EFFECT)) !== 0
+				) {
+					/** @type {Boundary} */ (pending_boundary.b).defer_effect(effect);
 				} else if ((flags & EFFECT) !== 0) {
-					target.effects.push(effect);
+					effects.push(effect);
 				} else if (async_mode_flag && (flags & (RENDER_EFFECT | MANAGED_EFFECT)) !== 0) {
-					target.render_effects.push(effect);
+					render_effects.push(effect);
 				} else if (is_dirty(effect)) {
-					if ((effect.f & BLOCK_EFFECT) !== 0) this.#dirty_effects.add(effect);
+					if ((flags & BLOCK_EFFECT) !== 0) this.#dirty_effects.add(effect);
 					update_effect(effect);
 				}
 
@@ -253,14 +255,8 @@ export class Batch {
 			effect = effect.next;
 
 			while (effect === null && parent !== null) {
-				if (parent === target.effect) {
-					// TODO rather than traversing into pending boundaries and deferring the effects,
-					// could we just attach the effects _to_ the pending boundary and schedule them
-					// once the boundary is ready?
-					this.#defer_effects(target.effects);
-					this.#defer_effects(target.render_effects);
-
-					target = /** @type {EffectTarget} */ (target.parent);
+				if (parent === pending_boundary) {
+					pending_boundary = null;
 				}
 
 				effect = parent.next;
@@ -273,36 +269,8 @@ export class Batch {
 	 * @param {Effect[]} effects
 	 */
 	#defer_effects(effects) {
-		for (const e of effects) {
-			if ((e.f & DIRTY) !== 0) {
-				this.#dirty_effects.add(e);
-			} else if ((e.f & MAYBE_DIRTY) !== 0) {
-				this.#maybe_dirty_effects.add(e);
-			}
-
-			// Since we're not executing these effects now, we need to clear any WAS_MARKED flags
-			// so that other batches can correctly reach these effects during their own traversal
-			this.#clear_marked(e.deps);
-
-			// mark as clean so they get scheduled if they depend on pending async state
-			set_signal_status(e, CLEAN);
-		}
-	}
-
-	/**
-	 * @param {Value[] | null} deps
-	 */
-	#clear_marked(deps) {
-		if (deps === null) return;
-
-		for (const dep of deps) {
-			if ((dep.f & DERIVED) === 0 || (dep.f & WAS_MARKED) === 0) {
-				continue;
-			}
-
-			dep.f ^= WAS_MARKED;
-
-			this.#clear_marked(/** @type {Derived} */ (dep).deps);
+		for (var i = 0; i < effects.length; i += 1) {
+			defer_effect(effects[i], this.#dirty_effects, this.#maybe_dirty_effects);
 		}
 	}
 
@@ -383,14 +351,6 @@ export class Batch {
 			var previous_batch_values = batch_values;
 			var is_earlier = true;
 
-			/** @type {EffectTarget} */
-			var dummy_target = {
-				parent: null,
-				effect: null,
-				effects: [],
-				render_effects: []
-			};
-
 			for (const batch of batches) {
 				if (batch === this) {
 					is_earlier = false;
@@ -439,10 +399,10 @@ export class Batch {
 						batch.apply();
 
 						for (const root of queued_root_effects) {
-							batch.#traverse_effect_tree(root, dummy_target);
+							batch.#traverse_effect_tree(root, [], []);
 						}
 
-						// TODO do we need to do anything with `target`? defer block effects?
+						// TODO do we need to do anything with the dummy effect arrays?
 
 						batch.deactivate();
 					}
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index ee8ba29c21..9dc324d3f9 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -150,7 +150,7 @@ export function async_derived(fn, label, location) {
 		var batch = /** @type {Batch} */ (current_batch);
 
 		if (should_suspend) {
-			var blocking = !boundary.is_pending();
+			var blocking = boundary.is_rendered();
 
 			boundary.update_pending_count(1);
 			batch.increment(blocking);
diff --git a/packages/svelte/src/internal/client/reactivity/utils.js b/packages/svelte/src/internal/client/reactivity/utils.js
new file mode 100644
index 0000000000..0dd6b3212d
--- /dev/null
+++ b/packages/svelte/src/internal/client/reactivity/utils.js
@@ -0,0 +1,40 @@
+/** @import { Derived, Effect, Value } from '#client' */
+import { CLEAN, DERIVED, DIRTY, MAYBE_DIRTY, WAS_MARKED } from '#client/constants';
+import { set_signal_status } from '../runtime.js';
+
+/**
+ * @param {Value[] | null} deps
+ */
+function clear_marked(deps) {
+	if (deps === null) return;
+
+	for (const dep of deps) {
+		if ((dep.f & DERIVED) === 0 || (dep.f & WAS_MARKED) === 0) {
+			continue;
+		}
+
+		dep.f ^= WAS_MARKED;
+
+		clear_marked(/** @type {Derived} */ (dep).deps);
+	}
+}
+
+/**
+ * @param {Effect} effect
+ * @param {Set<Effect>} dirty_effects
+ * @param {Set<Effect>} maybe_dirty_effects
+ */
+export function defer_effect(effect, dirty_effects, maybe_dirty_effects) {
+	if ((effect.f & DIRTY) !== 0) {
+		dirty_effects.add(effect);
+	} else if ((effect.f & MAYBE_DIRTY) !== 0) {
+		maybe_dirty_effects.add(effect);
+	}
+
+	// Since we're not executing these effects now, we need to clear any WAS_MARKED flags
+	// so that other batches can correctly reach these effects during their own traversal
+	clear_marked(effect.deps);
+
+	// mark as clean so they get scheduled if they depend on pending async state
+	set_signal_status(effect, CLEAN);
+}
diff --git a/packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/Child.svelte b/packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/Child.svelte
new file mode 100644
index 0000000000..d156cc99af
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/Child.svelte
@@ -0,0 +1,15 @@
+<script>
+	let { x, y, deferred } = $props();
+
+	y = await deferred.promise;
+</script>
+
+<p>x: {x}</p>
+
+<svelte:boundary>
+	{#snippet pending()}
+		<p>Loading...</p>
+	{/snippet}
+
+	<p>y: {y}</p>
+</svelte:boundary>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/_config.js b/packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/_config.js
new file mode 100644
index 0000000000..fbf003f8e2
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/_config.js
@@ -0,0 +1,32 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	html: `
+		<button>x</button>
+		<button>y</button>
+		<p>loading...</p>
+	`,
+
+	async test({ assert, target }) {
+		await tick();
+
+		const [button1, button2] = target.querySelectorAll('button');
+
+		button1.click();
+		await tick();
+
+		button2.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>x</button>
+				<button>y</button>
+				<p>x: x2</p>
+				<p>y: y2</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/main.svelte
new file mode 100644
index 0000000000..57ab32a6ca
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-clear-batch-between-runs/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	import Child from './Child.svelte';
+
+	let x = $state('x1');
+	let y = $state('y1');
+
+	const deferred = Promise.withResolvers();
+</script>
+
+<button onclick={() => x = 'x2'}>x</button>
+<button onclick={() => deferred.resolve('y2')}>y</button>
+
+<svelte:boundary>
+	<Child {x} {y} {deferred} />
+
+	{#snippet pending()}
+		<p>loading...</p>
+	{/snippet}
+</svelte:boundary>

From 044dce9da54cdf2dc1c8d268038364c4ac22b110 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 7 Jan 2026 18:37:01 +0000
Subject: [PATCH 263/347] fix: adjust `loc` property of `Program` nodes created
 from `<script>` elements (#17428)

* fix: adjust program location to prevent corrupted sourcemaps

* update changeset

* go the other way
---
 .changeset/tall-phones-fix.md                            | 5 +++++
 .../svelte/src/compiler/phases/1-parse/read/script.js    | 9 ++++++++-
 .../parser-legacy/samples/binding-shorthand/output.json  | 2 +-
 .../tests/parser-legacy/samples/binding/output.json      | 2 +-
 .../parser-legacy/samples/dynamic-import/output.json     | 2 +-
 .../samples/each-block-destructured/output.json          | 2 +-
 .../parser-legacy/samples/generic-snippets/output.json   | 2 +-
 .../samples/javascript-comments/output.json              | 2 +-
 .../svelte/tests/parser-legacy/samples/refs/output.json  | 2 +-
 .../script-attribute-with-curly-braces/output.json       | 2 +-
 .../samples/script-comment-only/output.json              | 2 +-
 .../samples/script-context-module-unquoted/output.json   | 6 +++---
 .../tests/parser-legacy/samples/script/output.json       | 2 +-
 .../samples/whitespace-after-script-tag/output.json      | 4 ++--
 .../samples/comment-before-function-binding/output.json  | 2 +-
 .../samples/comment-before-script/output.json            | 4 ++--
 .../parser-modern/samples/generic-snippets/output.json   | 2 +-
 .../samples/loose-valid-each-as/output.json              | 2 +-
 .../tests/parser-modern/samples/options/output.json      | 8 ++++----
 .../samples/script-style-no-markup/output.json           | 2 +-
 .../tests/parser-modern/samples/snippets/output.json     | 2 +-
 .../samples/typescript-in-event-handler/output.json      | 2 +-
 22 files changed, 40 insertions(+), 28 deletions(-)
 create mode 100644 .changeset/tall-phones-fix.md

diff --git a/.changeset/tall-phones-fix.md b/.changeset/tall-phones-fix.md
new file mode 100644
index 0000000000..29e57c060f
--- /dev/null
+++ b/.changeset/tall-phones-fix.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: adjust `loc` property of `Program` nodes created from `<script>` elements
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/script.js b/packages/svelte/src/compiler/phases/1-parse/read/script.js
index 9ce449f200..db3c50a8d1 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/script.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/script.js
@@ -6,6 +6,7 @@ import { regex_not_newline_characters } from '../../patterns.js';
 import * as e from '../../../errors.js';
 import * as w from '../../../warnings.js';
 import { is_text_attribute } from '../../../utils/ast.js';
+import { locator } from '../../../state.js';
 
 const regex_closing_script_tag = /<\/script\s*>/;
 const regex_starts_with_closing_script_tag = /^<\/script\s*>/;
@@ -39,9 +40,15 @@ export function read_script(parser, start, attributes) {
 		parser.acorn_error(err);
 	}
 
-	// TODO is this necessary?
 	ast.start = script_start;
 
+	if (ast.loc) {
+		// Acorn always uses `0` as the start of a `Program`, but for sourcemap purposes
+		// we need it to be the start of the `<script>` contents
+		({ line: ast.loc.start.line, column: ast.loc.start.column } = locator(start));
+		({ line: ast.loc.end.line, column: ast.loc.end.column } = locator(parser.index));
+	}
+
 	/** @type {'default' | 'module'} */
 	let context = 'default';
 
diff --git a/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json b/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
index 9c48025ff9..711bd54525 100644
--- a/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/binding-shorthand/output.json
@@ -63,7 +63,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-legacy/samples/binding/output.json b/packages/svelte/tests/parser-legacy/samples/binding/output.json
index 17a78f051c..b103e03683 100644
--- a/packages/svelte/tests/parser-legacy/samples/binding/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/binding/output.json
@@ -73,7 +73,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json b/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json
index ee19d58742..76bb6c7eb6 100644
--- a/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/dynamic-import/output.json
@@ -21,7 +21,7 @@
 				},
 				"end": {
 					"line": 9,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
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 637da24aea..684051e304 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
@@ -190,7 +190,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json b/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json
index 9cb5d765e8..76605f5192 100644
--- a/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/generic-snippets/output.json
@@ -258,7 +258,7 @@
 				},
 				"end": {
 					"line": 2,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [],
diff --git a/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json b/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
index 4723564f17..3775c48228 100644
--- a/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/javascript-comments/output.json
@@ -298,7 +298,7 @@
 				},
 				"end": {
 					"line": 31,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-legacy/samples/refs/output.json b/packages/svelte/tests/parser-legacy/samples/refs/output.json
index 7f30946fc5..1e8efe78f8 100644
--- a/packages/svelte/tests/parser-legacy/samples/refs/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/refs/output.json
@@ -73,7 +73,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json b/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json
index e0b50e3b92..4ad004c88a 100644
--- a/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script-attribute-with-curly-braces/output.json
@@ -73,7 +73,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json b/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json
index b04a823e8d..0f7d0b8465 100644
--- a/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script-comment-only/output.json
@@ -37,7 +37,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [],
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 64250cb302..34a640200c 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
@@ -24,12 +24,12 @@
 			"end": 77,
 			"loc": {
 				"start": {
-					"line": 1,
+					"line": 5,
 					"column": 0
 				},
 				"end": {
 					"line": 7,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
@@ -84,7 +84,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-legacy/samples/script/output.json b/packages/svelte/tests/parser-legacy/samples/script/output.json
index d3d4abd6b2..14d2805216 100644
--- a/packages/svelte/tests/parser-legacy/samples/script/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/script/output.json
@@ -73,7 +73,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json b/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json
index 69b2382442..8853c32f9c 100644
--- a/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json
+++ b/packages/svelte/tests/parser-legacy/samples/whitespace-after-script-tag/output.json
@@ -72,8 +72,8 @@
 					"column": 0
 				},
 				"end": {
-					"line": 3,
-					"column": 0
+					"line": 8,
+					"column": 1
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
index 13cc5fea7b..27692e98b4 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-function-binding/output.json
@@ -272,7 +272,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
index 8d77165297..8840aad85a 100644
--- a/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
+++ b/packages/svelte/tests/parser-modern/samples/comment-before-script/output.json
@@ -34,12 +34,12 @@
 			"end": 67,
 			"loc": {
 				"start": {
-					"line": 1,
+					"line": 2,
 					"column": 0
 				},
 				"end": {
 					"line": 4,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json b/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
index 8e1654feed..f29eb6fc72 100644
--- a/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
+++ b/packages/svelte/tests/parser-modern/samples/generic-snippets/output.json
@@ -296,7 +296,7 @@
 				},
 				"end": {
 					"line": 2,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [],
diff --git a/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json b/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
index b428cff0b2..441cf71519 100644
--- a/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
+++ b/packages/svelte/tests/parser-modern/samples/loose-valid-each-as/output.json
@@ -227,7 +227,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [
diff --git a/packages/svelte/tests/parser-modern/samples/options/output.json b/packages/svelte/tests/parser-modern/samples/options/output.json
index 08ce8d43b7..c220811175 100644
--- a/packages/svelte/tests/parser-modern/samples/options/output.json
+++ b/packages/svelte/tests/parser-modern/samples/options/output.json
@@ -111,12 +111,12 @@
 			"end": 93,
 			"loc": {
 				"start": {
-					"line": 1,
+					"line": 3,
 					"column": 0
 				},
 				"end": {
 					"line": 4,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [],
@@ -182,12 +182,12 @@
 			"end": 160,
 			"loc": {
 				"start": {
-					"line": 1,
+					"line": 6,
 					"column": 0
 				},
 				"end": {
 					"line": 7,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [],
diff --git a/packages/svelte/tests/parser-modern/samples/script-style-no-markup/output.json b/packages/svelte/tests/parser-modern/samples/script-style-no-markup/output.json
index b5e42e9217..db58a62148 100644
--- a/packages/svelte/tests/parser-modern/samples/script-style-no-markup/output.json
+++ b/packages/svelte/tests/parser-modern/samples/script-style-no-markup/output.json
@@ -93,7 +93,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [],
diff --git a/packages/svelte/tests/parser-modern/samples/snippets/output.json b/packages/svelte/tests/parser-modern/samples/snippets/output.json
index c217ef94e9..f358e2a60c 100644
--- a/packages/svelte/tests/parser-modern/samples/snippets/output.json
+++ b/packages/svelte/tests/parser-modern/samples/snippets/output.json
@@ -230,7 +230,7 @@
 				},
 				"end": {
 					"line": 1,
-					"column": 18
+					"column": 27
 				}
 			},
 			"body": [],
diff --git a/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json b/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
index a1d6ed56bf..7b521513f4 100644
--- a/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
+++ b/packages/svelte/tests/parser-modern/samples/typescript-in-event-handler/output.json
@@ -396,7 +396,7 @@
 				},
 				"end": {
 					"line": 3,
-					"column": 0
+					"column": 9
 				}
 			},
 			"body": [

From ac7c7646bcee53870dd96e9174728ffa1d63411d Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 8 Jan 2026 09:10:13 -0500
Subject: [PATCH 264/347] fix: don't transform references of function
 declarations in legacy mode (#17431)

---
 .changeset/better-games-invite.md                     |  5 +++++
 .../svelte/src/compiler/phases/2-analyze/index.js     |  3 ++-
 .../compiler/phases/2-analyze/visitors/EachBlock.js   |  4 +++-
 .../samples/binding-indirect-fn/_config.js            |  7 +++++++
 .../samples/binding-indirect-fn/main.svelte           | 11 +++++++++++
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/better-games-invite.md
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/binding-indirect-fn/_config.js
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/binding-indirect-fn/main.svelte

diff --git a/.changeset/better-games-invite.md b/.changeset/better-games-invite.md
new file mode 100644
index 0000000000..8361a1e9bb
--- /dev/null
+++ b/.changeset/better-games-invite.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't transform references of function declarations in legacy mode
diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 6d23e4d265..ef0b35f560 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -657,7 +657,8 @@ export function analyze_component(root, source, options) {
 									if (
 										binding &&
 										binding.kind === 'normal' &&
-										binding.declaration_kind !== 'import'
+										binding.declaration_kind !== 'import' &&
+										binding.declaration_kind !== 'function'
 									) {
 										binding.kind = 'state';
 										binding.mutated = true;
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js
index 81a9c1e2d1..5681966475 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/EachBlock.js
@@ -54,7 +54,9 @@ export function EachBlock(node, context) {
 
 		// collect transitive dependencies...
 		for (const binding of node.metadata.expression.dependencies) {
-			collect_transitive_dependencies(binding, node.metadata.transitive_deps);
+			if (binding.declaration_kind !== 'function') {
+				collect_transitive_dependencies(binding, node.metadata.transitive_deps);
+			}
 		}
 
 		// ...and ensure they are marked as state, so they can be turned
diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-indirect-fn/_config.js b/packages/svelte/tests/runtime-legacy/samples/binding-indirect-fn/_config.js
new file mode 100644
index 0000000000..f17a7f4825
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/binding-indirect-fn/_config.js
@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		assert.htmlEqual(target.innerHTML, `<input>`);
+	}
+});
diff --git a/packages/svelte/tests/runtime-legacy/samples/binding-indirect-fn/main.svelte b/packages/svelte/tests/runtime-legacy/samples/binding-indirect-fn/main.svelte
new file mode 100644
index 0000000000..9c1e23a0f4
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/binding-indirect-fn/main.svelte
@@ -0,0 +1,11 @@
+<script>
+  $: items = [{ value: 'hello' }];
+
+  function fn(value) {
+		return true;
+	}
+</script>
+
+{#each items.filter(fn) as item}
+  <input bind:value={item.value} />
+{/each}

From 05a85d305a19f4c71e6dbfa5f967697234f180f1 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 8 Jan 2026 13:15:12 -0500
Subject: [PATCH 265/347] chore: use normalization helper for hydration tests
 (#17434)

---
 packages/svelte/tests/hydration/test.ts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/svelte/tests/hydration/test.ts b/packages/svelte/tests/hydration/test.ts
index ba13d2c611..d7257c71d3 100644
--- a/packages/svelte/tests/hydration/test.ts
+++ b/packages/svelte/tests/hydration/test.ts
@@ -131,19 +131,12 @@ const { test, run } = suite<HydrationTest>(async (config, cwd) => {
 
 		flushSync();
 
-		const normalize = (string: string) =>
-			string
-				.trim()
-				.replaceAll('\r\n', '\n')
-				.replaceAll('/>', '>')
-				.replace(/<!--.+?-->/g, '');
-
 		const expected = read(`${cwd}/_expected.html`) ?? rendered.html;
-		assert.equal(normalize(target.innerHTML), normalize(expected));
+		assert_html_equal(target.innerHTML, expected);
 
 		if (rendered.head) {
 			const expected = read(`${cwd}/_expected_head.html`) ?? rendered.head;
-			assert.equal(normalize(head.innerHTML), normalize(expected));
+			assert_html_equal(head.innerHTML, expected);
 		}
 
 		if (config.snapshot) {

From 4f49ea896129091175f1945f67fcb29d28ef8d0c Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 8 Jan 2026 15:15:13 -0500
Subject: [PATCH 266/347] fix: don't revert source to UNINITIALIZED state when
 time travelling (#17409)

* add failing test

* WIP

* remove comment

* changeset

* fix: clear batch between runs

* changeset

* fix

* unused
---
 .changeset/thick-islands-pull.md              |  5 ++++
 .../internal/client/dom/blocks/boundary.js    |  8 +++---
 .../src/internal/client/reactivity/batch.js   |  3 ++-
 .../_config.js                                | 18 +++++++++++++
 .../main.svelte                               | 25 +++++++++++++++++++
 5 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/thick-islands-pull.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-with-effect-and-boundary/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-derived-with-effect-and-boundary/main.svelte

diff --git a/.changeset/thick-islands-pull.md b/.changeset/thick-islands-pull.md
new file mode 100644
index 0000000000..f987d72260
--- /dev/null
+++ b/.changeset/thick-islands-pull.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't revert source to UNINITIALIZED state when time travelling
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 92f4c0a104..cc4bc34e7b 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -161,6 +161,10 @@ export class Boundary {
 					this.#hydrate_pending_content();
 				} else {
 					this.#hydrate_resolved_content();
+
+					if (this.#pending_count === 0) {
+						this.is_pending = false;
+					}
 				}
 			} else {
 				var anchor = this.#get_anchor();
@@ -194,10 +198,6 @@ export class Boundary {
 		} 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.is_pending = false;
 	}
 
 	#hydrate_pending_content() {
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 6dd90ba1b4..d6d23dc9c5 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -38,6 +38,7 @@ import { invoke_error_boundary } from '../error-handling.js';
 import { flush_eager_effects, old_values, set_eager_effects, source, update } from './sources.js';
 import { eager_effect, unlink_effect } from './effects.js';
 import { defer_effect } from './utils.js';
+import { UNINITIALIZED } from '../../../constants.js';
 
 /** @type {Set<Batch>} */
 const batches = new Set();
@@ -281,7 +282,7 @@ export class Batch {
 	 * @param {any} value
 	 */
 	capture(source, value) {
-		if (!this.previous.has(source)) {
+		if (value !== UNINITIALIZED && !this.previous.has(source)) {
 			this.previous.set(source, value);
 		}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-with-effect-and-boundary/_config.js b/packages/svelte/tests/runtime-runes/samples/async-derived-with-effect-and-boundary/_config.js
new file mode 100644
index 0000000000..49428f90ad
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-with-effect-and-boundary/_config.js
@@ -0,0 +1,18 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+
+	async test({ assert, target }) {
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<p>baz: 69</p>
+				<p></p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-derived-with-effect-and-boundary/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-derived-with-effect-and-boundary/main.svelte
new file mode 100644
index 0000000000..0e05d0c414
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-derived-with-effect-and-boundary/main.svelte
@@ -0,0 +1,25 @@
+<script>
+	let foo = $state(null);
+
+	$effect(() => {
+		foo = 69;
+	});
+
+	let bar = $derived(await 1);
+
+	let baz = $derived(foo ? foo * bar : null);
+
+	const qux = "qux";
+</script>
+
+<p>baz: {baz}</p>
+
+<svelte:boundary>
+	{#snippet pending()}
+		<p>Loading...</p>
+	{/snippet}
+
+	{#if qux}
+		<p></p>
+	{/if}
+</svelte:boundary>

From 7ad5772309dc27313ff044b183e44b67e8e14d2b Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 8 Jan 2026 17:28:30 -0500
Subject: [PATCH 267/347] fix: notify deriveds of changes to sources inside
 forks (#17437)

* failing tests

* update tests

* update write versions when committing forks

* remove second test, for now

* changeset

* fix: correctly update writable deriveds inside forks (#17438)

* fix: correctly update writable deriveds inside forks

* tweak

* changeset

* on second thoughts, minimise the diff, and revisit later

* missed a spot
---
 .changeset/empty-paths-smile.md               |  5 +++++
 .changeset/seven-llamas-care.md               |  5 +++++
 .../src/internal/client/reactivity/batch.js   | 13 ++++++++---
 .../async-fork-derived-writable/_config.js    | 14 ++++++++++++
 .../async-fork-derived-writable/main.svelte   | 22 +++++++++++++++++++
 .../samples/async-fork-derived/_config.js     | 16 ++++++++++++++
 .../samples/async-fork-derived/main.svelte    | 16 ++++++++++++++
 7 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/empty-paths-smile.md
 create mode 100644 .changeset/seven-llamas-care.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-derived-writable/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-derived-writable/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-derived/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-derived/main.svelte

diff --git a/.changeset/empty-paths-smile.md b/.changeset/empty-paths-smile.md
new file mode 100644
index 0000000000..687ad19b24
--- /dev/null
+++ b/.changeset/empty-paths-smile.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: notify deriveds of changes to sources inside forks
diff --git a/.changeset/seven-llamas-care.md b/.changeset/seven-llamas-care.md
new file mode 100644
index 0000000000..1b41b4848a
--- /dev/null
+++ b/.changeset/seven-llamas-care.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: correctly update writable deriveds inside forks
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index d6d23dc9c5..9b80df34e4 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -25,6 +25,7 @@ import { deferred, define_property } from '../../shared/utils.js';
 import {
 	active_effect,
 	get,
+	increment_write_version,
 	is_dirty,
 	is_updating_effect,
 	set_is_updating_effect,
@@ -920,13 +921,18 @@ export function fork(fn) {
 
 	flushSync(fn);
 
-	batch_values = null;
-
 	// revert state changes
 	for (var [source, value] of batch.previous) {
 		source.v = value;
 	}
 
+	// make writable deriveds dirty, so they recalculate correctly
+	for (source of batch.current.keys()) {
+		if ((source.f & DERIVED) !== 0) {
+			set_signal_status(source, DIRTY);
+		}
+	}
+
 	return {
 		commit: async () => {
 			if (committed) {
@@ -942,9 +948,10 @@ export function fork(fn) {
 
 			batch.is_fork = false;
 
-			// apply changes
+			// apply changes and update write versions so deriveds see the change
 			for (var [source, value] of batch.current) {
 				source.v = value;
+				source.wv = increment_write_version();
 			}
 
 			// trigger any `$state.eager(...)` expressions with the new state.
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-derived-writable/_config.js b/packages/svelte/tests/runtime-runes/samples/async-fork-derived-writable/_config.js
new file mode 100644
index 0000000000..b089b714ec
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-derived-writable/_config.js
@@ -0,0 +1,14 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		const [btn] = target.querySelectorAll('button');
+
+		btn.click();
+		await tick();
+		// d should be 10 (real-world: s=1, d=1*10) before commit, not 20 (fork: s=2, d=2*10)
+		// After commit, d should be 99 (the written value)
+		assert.deepEqual(logs, [10, 99]);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-derived-writable/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-fork-derived-writable/main.svelte
new file mode 100644
index 0000000000..bc118a558a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-derived-writable/main.svelte
@@ -0,0 +1,22 @@
+<script>
+	import { fork } from 'svelte';
+
+	let s = $state(1);
+	let d = $derived(s * 10);
+</script>
+
+<button onclick={async () => {
+	const f = fork(() => {
+		// First modify s, then write to d
+		// If d is evaluated in fork context, it would see s=2 and compute d=20
+		// But it should evaluate in real-world context to get d=10
+		s = 2;
+		d = 99;
+	});
+
+	// Should be 10 (real-world value: s=1, so d=1*10=10), not 20 (fork value)
+	console.log(d);
+	await f.commit();
+	// Should be 99 (the value we wrote)
+	console.log(d);
+}}>++</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-derived/_config.js b/packages/svelte/tests/runtime-runes/samples/async-fork-derived/_config.js
new file mode 100644
index 0000000000..59ae376167
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-derived/_config.js
@@ -0,0 +1,16 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		const [increment] = target.querySelectorAll('button');
+
+		increment.click();
+		await tick();
+		assert.deepEqual(logs, [1, 2]);
+
+		increment.click();
+		await tick();
+		assert.deepEqual(logs, [1, 2, 2, 3]);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-derived/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-fork-derived/main.svelte
new file mode 100644
index 0000000000..93761869d6
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-derived/main.svelte
@@ -0,0 +1,16 @@
+<script>
+	import { fork } from 'svelte';
+
+	let s = $state(1);
+	let d = $derived(s);
+</script>
+
+<button onclick={async () => {
+	const f = fork(() => {
+		s = s + 1;
+	});
+
+	console.log(d);
+	await f.commit();
+	console.log(d);
+}}>++</button>

From c6ce1ffeffe1ecff45611b8ec4e653836f113b5d Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 9 Jan 2026 12:13:29 -0500
Subject: [PATCH 268/347] chore: move set_signal_status into separate module
 (#17441)

---
 .../src/internal/client/dom/blocks/boundary.js       |  4 ++--
 .../svelte/src/internal/client/reactivity/batch.js   |  2 +-
 .../src/internal/client/reactivity/deriveds.js       |  2 +-
 .../svelte/src/internal/client/reactivity/effects.js |  2 +-
 .../svelte/src/internal/client/reactivity/sources.js |  2 +-
 .../svelte/src/internal/client/reactivity/status.js  | 12 ++++++++++++
 .../svelte/src/internal/client/reactivity/utils.js   |  2 +-
 packages/svelte/src/internal/client/runtime.js       | 12 +-----------
 packages/svelte/src/legacy/legacy-client.js          |  3 ++-
 9 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 packages/svelte/src/internal/client/reactivity/status.js

diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index cc4bc34e7b..61262a6576 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -22,8 +22,7 @@ import {
 	active_reaction,
 	get,
 	set_active_effect,
-	set_active_reaction,
-	set_signal_status
+	set_active_reaction
 } from '../../runtime.js';
 import {
 	hydrate_next,
@@ -43,6 +42,7 @@ import { tag } from '../../dev/tracing.js';
 import { createSubscriber } from '../../../../reactivity/create-subscriber.js';
 import { create_text } from '../operations.js';
 import { defer_effect } from '../../reactivity/utils.js';
+import { set_signal_status } from '../../reactivity/status.js';
 
 /**
  * @typedef {{
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 9b80df34e4..4c50781817 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -29,7 +29,6 @@ import {
 	is_dirty,
 	is_updating_effect,
 	set_is_updating_effect,
-	set_signal_status,
 	update_effect
 } from '../runtime.js';
 import * as e from '../errors.js';
@@ -40,6 +39,7 @@ import { flush_eager_effects, old_values, set_eager_effects, source, update } fr
 import { eager_effect, unlink_effect } from './effects.js';
 import { defer_effect } from './utils.js';
 import { UNINITIALIZED } from '../../../constants.js';
+import { set_signal_status } from './status.js';
 
 /** @type {Set<Batch>} */
 const batches = new Set();
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 9dc324d3f9..b8a0982b05 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -17,7 +17,6 @@ import {
 import {
 	active_reaction,
 	active_effect,
-	set_signal_status,
 	update_reaction,
 	increment_write_version,
 	set_active_effect,
@@ -37,6 +36,7 @@ import { UNINITIALIZED } from '../../../constants.js';
 import { batch_values, current_batch } from './batch.js';
 import { unset_context } from './async.js';
 import { deferred } from '../../shared/utils.js';
+import { set_signal_status } from './status.js';
 
 /** @type {Effect | null} */
 export let current_async_effect = null;
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 717fc35006..80ce63e0cf 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -9,7 +9,6 @@ import {
 	remove_reactions,
 	set_active_reaction,
 	set_is_destroying_effect,
-	set_signal_status,
 	untrack,
 	untracking
 } from '../runtime.js';
@@ -44,6 +43,7 @@ import { component_context, dev_current_component_function, dev_stack } from '..
 import { Batch, current_batch, schedule_effect } from './batch.js';
 import { flatten } from './async.js';
 import { without_reactive_context } from '../dom/elements/bindings/shared.js';
+import { set_signal_status } from './status.js';
 
 /**
  * @param {'$effect' | '$effect.pre' | '$inspect'} rune
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 3f8d6cb09f..fcdd389fe4 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -6,7 +6,6 @@ import {
 	untracked_writes,
 	get,
 	set_untracked_writes,
-	set_signal_status,
 	untrack,
 	increment_write_version,
 	update_effect,
@@ -40,6 +39,7 @@ import { component_context, is_runes } from '../context.js';
 import { Batch, batch_values, eager_block_effects, schedule_effect } from './batch.js';
 import { proxy } from '../proxy.js';
 import { execute_derived } from './deriveds.js';
+import { set_signal_status } from './status.js';
 
 /** @type {Set<any>} */
 export let eager_effects = new Set();
diff --git a/packages/svelte/src/internal/client/reactivity/status.js b/packages/svelte/src/internal/client/reactivity/status.js
new file mode 100644
index 0000000000..d3aaa35968
--- /dev/null
+++ b/packages/svelte/src/internal/client/reactivity/status.js
@@ -0,0 +1,12 @@
+/** @import { Signal } from '#client' */
+import { CLEAN, DIRTY, MAYBE_DIRTY } from '#client/constants';
+
+const STATUS_MASK = ~(DIRTY | MAYBE_DIRTY | CLEAN);
+
+/**
+ * @param {Signal} signal
+ * @param {number} status
+ */
+export function set_signal_status(signal, status) {
+	signal.f = (signal.f & STATUS_MASK) | status;
+}
diff --git a/packages/svelte/src/internal/client/reactivity/utils.js b/packages/svelte/src/internal/client/reactivity/utils.js
index 0dd6b3212d..0d27cb8b84 100644
--- a/packages/svelte/src/internal/client/reactivity/utils.js
+++ b/packages/svelte/src/internal/client/reactivity/utils.js
@@ -1,6 +1,6 @@
 /** @import { Derived, Effect, Value } from '#client' */
 import { CLEAN, DERIVED, DIRTY, MAYBE_DIRTY, WAS_MARKED } from '#client/constants';
-import { set_signal_status } from '../runtime.js';
+import { set_signal_status } from './status.js';
 
 /**
  * @param {Value[] | null} deps
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 64c8409b8f..1b901268fc 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -56,6 +56,7 @@ import { handle_error } from './error-handling.js';
 import { UNINITIALIZED } from '../../constants.js';
 import { captured_signals } from './legacy.js';
 import { without_reactive_context } from './dom/elements/bindings/shared.js';
+import { set_signal_status } from './reactivity/status.js';
 
 export let is_updating_effect = false;
 
@@ -718,17 +719,6 @@ export function untrack(fn) {
 	}
 }
 
-const STATUS_MASK = ~(DIRTY | MAYBE_DIRTY | CLEAN);
-
-/**
- * @param {Signal} signal
- * @param {number} status
- * @returns {void}
- */
-export function set_signal_status(signal, status) {
-	signal.f = (signal.f & STATUS_MASK) | status;
-}
-
 /**
  * @param {Record<string | symbol, unknown>} obj
  * @param {Array<string | symbol>} keys
diff --git a/packages/svelte/src/legacy/legacy-client.js b/packages/svelte/src/legacy/legacy-client.js
index d4a053d1aa..ec90d2312c 100644
--- a/packages/svelte/src/legacy/legacy-client.js
+++ b/packages/svelte/src/legacy/legacy-client.js
@@ -3,7 +3,7 @@ import { DIRTY, LEGACY_PROPS, MAYBE_DIRTY } from '../internal/client/constants.j
 import { user_pre_effect } from '../internal/client/reactivity/effects.js';
 import { mutable_source, set } from '../internal/client/reactivity/sources.js';
 import { hydrate, mount, unmount } from '../internal/client/render.js';
-import { active_effect, get, set_signal_status } from '../internal/client/runtime.js';
+import { active_effect, get } from '../internal/client/runtime.js';
 import { flushSync } from '../internal/client/reactivity/batch.js';
 import { define_property, is_array } from '../internal/shared/utils.js';
 import * as e from '../internal/client/errors.js';
@@ -12,6 +12,7 @@ import { DEV } from 'esm-env';
 import { FILENAME } from '../constants.js';
 import { component_context, dev_current_component_function } from '../internal/client/context.js';
 import { async_mode_flag } from '../internal/flags/index.js';
+import { set_signal_status } from '../internal/client/reactivity/status.js';
 
 /**
  * Takes the same options as a Svelte 4 component and the component function and returns a Svelte 4 compatible component.

From f04f22ea4990c4d8336a205571cdbc05ecf819bb Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 9 Jan 2026 12:47:12 -0500
Subject: [PATCH 269/347] chore: use update_derived_status instead of
 set_signal_status where appropriate (#17442)

Co-authored-by: David Roizenman <hmnd@users.noreply.github.com>
---
 .../src/internal/client/reactivity/deriveds.js |  5 ++---
 .../src/internal/client/reactivity/sources.js  |  8 +++++---
 .../src/internal/client/reactivity/status.js   | 17 +++++++++++++++--
 packages/svelte/src/internal/client/runtime.js | 18 +++++++++++-------
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index b8a0982b05..48002d759f 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -36,7 +36,7 @@ import { UNINITIALIZED } from '../../../constants.js';
 import { batch_values, current_batch } from './batch.js';
 import { unset_context } from './async.js';
 import { deferred } from '../../shared/utils.js';
-import { set_signal_status } from './status.js';
+import { update_derived_status } from './status.js';
 
 /** @type {Effect | null} */
 export let current_async_effect = null;
@@ -385,7 +385,6 @@ export function update_derived(derived) {
 			batch_values.set(derived, value);
 		}
 	} else {
-		var status = (derived.f & CONNECTED) === 0 ? MAYBE_DIRTY : CLEAN;
-		set_signal_status(derived, status);
+		update_derived_status(derived);
 	}
 }
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index fcdd389fe4..6333962f41 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -39,7 +39,7 @@ import { component_context, is_runes } from '../context.js';
 import { Batch, batch_values, eager_block_effects, schedule_effect } from './batch.js';
 import { proxy } from '../proxy.js';
 import { execute_derived } from './deriveds.js';
-import { set_signal_status } from './status.js';
+import { set_signal_status, update_derived_status } from './status.js';
 
 /** @type {Set<any>} */
 export let eager_effects = new Set();
@@ -218,12 +218,14 @@ export function internal_set(source, value) {
 		}
 
 		if ((source.f & DERIVED) !== 0) {
+			const derived = /** @type {Derived} */ (source);
+
 			// if we are assigning to a dirty derived we set it to clean/maybe dirty but we also eagerly execute it to track the dependencies
 			if ((source.f & DIRTY) !== 0) {
-				execute_derived(/** @type {Derived} */ (source));
+				execute_derived(derived);
 			}
 
-			set_signal_status(source, (source.f & CONNECTED) !== 0 ? CLEAN : MAYBE_DIRTY);
+			update_derived_status(derived);
 		}
 
 		source.wv = increment_write_version();
diff --git a/packages/svelte/src/internal/client/reactivity/status.js b/packages/svelte/src/internal/client/reactivity/status.js
index d3aaa35968..024285e73a 100644
--- a/packages/svelte/src/internal/client/reactivity/status.js
+++ b/packages/svelte/src/internal/client/reactivity/status.js
@@ -1,5 +1,5 @@
-/** @import { Signal } from '#client' */
-import { CLEAN, DIRTY, MAYBE_DIRTY } from '#client/constants';
+/** @import { Derived, Signal } from '#client' */
+import { CLEAN, CONNECTED, DIRTY, MAYBE_DIRTY } from '#client/constants';
 
 const STATUS_MASK = ~(DIRTY | MAYBE_DIRTY | CLEAN);
 
@@ -10,3 +10,16 @@ const STATUS_MASK = ~(DIRTY | MAYBE_DIRTY | CLEAN);
 export function set_signal_status(signal, status) {
 	signal.f = (signal.f & STATUS_MASK) | status;
 }
+
+/**
+ * Set a derived's status to CLEAN or MAYBE_DIRTY based on its connection state.
+ * @param {Derived} derived
+ */
+export function update_derived_status(derived) {
+	// Only mark as MAYBE_DIRTY if disconnected and has dependencies.
+	if ((derived.f & CONNECTED) !== 0 || derived.deps === null) {
+		set_signal_status(derived, CLEAN);
+	} else {
+		set_signal_status(derived, MAYBE_DIRTY);
+	}
+}
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 1b901268fc..e1a442830b 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -56,7 +56,7 @@ import { handle_error } from './error-handling.js';
 import { UNINITIALIZED } from '../../constants.js';
 import { captured_signals } from './legacy.js';
 import { without_reactive_context } from './dom/elements/bindings/shared.js';
-import { set_signal_status } from './reactivity/status.js';
+import { set_signal_status, update_derived_status } from './reactivity/status.js';
 
 export let is_updating_effect = false;
 
@@ -375,16 +375,20 @@ function remove_reaction(signal, dependency) {
 		// allows us to skip the expensive work of disconnecting and immediately reconnecting it
 		(new_deps === null || !new_deps.includes(dependency))
 	) {
-		set_signal_status(dependency, MAYBE_DIRTY);
+		const derived = /** @type {Derived} */ (dependency);
+
 		// If we are working with a derived that is owned by an effect, then mark it as being
 		// disconnected and remove the mark flag, as it cannot be reliably removed otherwise
-		if ((dependency.f & CONNECTED) !== 0) {
-			dependency.f ^= CONNECTED;
-			dependency.f &= ~WAS_MARKED;
+		if ((derived.f & CONNECTED) !== 0) {
+			derived.f ^= CONNECTED;
+			derived.f &= ~WAS_MARKED;
 		}
+
+		update_derived_status(derived);
+
 		// Disconnect any reactions owned by this reaction
-		destroy_derived_effects(/** @type {Derived} **/ (dependency));
-		remove_reactions(/** @type {Derived} **/ (dependency), 0);
+		destroy_derived_effects(derived);
+		remove_reactions(derived, 0);
 	}
 }
 

From 359be81c094b35d12a2ce320127bfaa0ef431b6a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 9 Jan 2026 12:52:21 -0500
Subject: [PATCH 270/347] chore: tidy up (#17443)

* tidy up

* unused
---
 packages/svelte/src/internal/client/reactivity/deriveds.js | 3 ---
 packages/svelte/src/internal/client/runtime.js             | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 48002d759f..0fe83d7108 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -3,15 +3,12 @@
 import { DEV } from 'esm-env';
 import {
 	ERROR_VALUE,
-	CLEAN,
 	DERIVED,
 	DIRTY,
 	EFFECT_PRESERVED,
-	MAYBE_DIRTY,
 	STALE_REACTION,
 	ASYNC,
 	WAS_MARKED,
-	CONNECTED,
 	DESTROYED
 } from '#client/constants';
 import {
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index e1a442830b..5f215b0d31 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -1,4 +1,4 @@
-/** @import { Derived, Effect, Reaction, Signal, Source, Value } from '#client' */
+/** @import { Derived, Effect, Reaction, Source, Value } from '#client' */
 import { DEV } from 'esm-env';
 import { get_descriptors, get_prototype_of, index_of } from '../shared/utils.js';
 import {
@@ -28,7 +28,6 @@ import { old_values } from './reactivity/sources.js';
 import {
 	destroy_derived_effects,
 	execute_derived,
-	current_async_effect,
 	recent_async_deriveds,
 	update_derived
 } from './reactivity/deriveds.js';
@@ -44,7 +43,6 @@ import {
 	set_dev_current_component_function,
 	set_dev_stack
 } from './context.js';
-import * as w from './warnings.js';
 import {
 	Batch,
 	batch_values,

From f8bdadc1bf5e1122494b0269f04634f46e8225bf Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 9 Jan 2026 13:23:47 -0500
Subject: [PATCH 271/347] chore: simplify is_dirty (#17444)

* chore: simplify is_dirty

* tidy up
---
 .../src/internal/client/reactivity/effects.js |  2 +-
 .../svelte/src/internal/client/runtime.js     | 21 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 80ce63e0cf..4cba446afc 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -328,7 +328,7 @@ export function legacy_pre_effect_reset() {
 
 			// If the effect is CLEAN, then make it MAYBE_DIRTY. This ensures we traverse through
 			// the effects dependencies and correctly ensure each dependency is up-to-date.
-			if ((effect.f & CLEAN) !== 0) {
+			if ((effect.f & CLEAN) !== 0 && effect.deps !== null) {
 				set_signal_status(effect, MAYBE_DIRTY);
 			}
 
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 5f215b0d31..ffd61ed776 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -166,21 +166,18 @@ export function is_dirty(reaction) {
 	}
 
 	if ((flags & MAYBE_DIRTY) !== 0) {
-		var dependencies = reaction.deps;
+		var dependencies = /** @type {Value[]} */ (reaction.deps);
+		var length = dependencies.length;
 
-		if (dependencies !== null) {
-			var length = dependencies.length;
+		for (var i = 0; i < length; i++) {
+			var dependency = dependencies[i];
 
-			for (var i = 0; i < length; i++) {
-				var dependency = dependencies[i];
-
-				if (is_dirty(/** @type {Derived} */ (dependency))) {
-					update_derived(/** @type {Derived} */ (dependency));
-				}
+			if (is_dirty(/** @type {Derived} */ (dependency))) {
+				update_derived(/** @type {Derived} */ (dependency));
+			}
 
-				if (dependency.wv > reaction.wv) {
-					return true;
-				}
+			if (dependency.wv > reaction.wv) {
+				return true;
 			}
 		}
 

From 5588832d1792130eade828410dc3777f9a713bc8 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 9 Jan 2026 15:57:22 -0500
Subject: [PATCH 272/347] fix: prevent derives without dependencies from ever
 re-running (#17445)

* fix: prevent derives without dependencies from ever re-running

* tweak
---
 .changeset/plenty-candies-notice.md           |  5 ++++
 .../internal/client/reactivity/deriveds.js    | 17 ++++++++++----
 .../fork-derived-class-instance/_config.js    | 22 ++++++++++++++++++
 .../fork-derived-class-instance/main.svelte   | 23 +++++++++++++++++++
 4 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/plenty-candies-notice.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/main.svelte

diff --git a/.changeset/plenty-candies-notice.md b/.changeset/plenty-candies-notice.md
new file mode 100644
index 0000000000..41c5fce12a
--- /dev/null
+++ b/.changeset/plenty-candies-notice.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: prevent derives without dependencies from ever re-running
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 0fe83d7108..59fb0f15aa 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -9,7 +9,8 @@ import {
 	STALE_REACTION,
 	ASYNC,
 	WAS_MARKED,
-	DESTROYED
+	DESTROYED,
+	CLEAN
 } from '#client/constants';
 import {
 	active_reaction,
@@ -33,7 +34,7 @@ import { UNINITIALIZED } from '../../../constants.js';
 import { batch_values, current_batch } from './batch.js';
 import { unset_context } from './async.js';
 import { deferred } from '../../shared/utils.js';
-import { update_derived_status } from './status.js';
+import { set_signal_status, update_derived_status } from './status.js';
 
 /** @type {Effect | null} */
 export let current_async_effect = null;
@@ -356,15 +357,21 @@ export function update_derived(derived) {
 	var value = execute_derived(derived);
 
 	if (!derived.equals(value)) {
+		derived.wv = increment_write_version();
+
 		// in a fork, we don't update the underlying value, just `batch_values`.
 		// the underlying value will be updated when the fork is committed.
 		// otherwise, the next time we get here after a 'real world' state
 		// change, `derived.equals` may incorrectly return `true`
-		if (!current_batch?.is_fork) {
+		if (!current_batch?.is_fork || derived.deps === null) {
 			derived.v = value;
-		}
 
-		derived.wv = increment_write_version();
+			// deriveds without dependencies should never be recomputed
+			if (derived.deps === null) {
+				set_signal_status(derived, CLEAN);
+				return;
+			}
+		}
 	}
 
 	// don't mark derived clean if we're reading it inside a
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/_config.js b/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/_config.js
new file mode 100644
index 0000000000..feac447536
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/_config.js
@@ -0,0 +1,22 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const [fork] = target.querySelectorAll('button');
+
+		fork.click();
+		await tick();
+
+		const [, increment] = target.querySelectorAll('button');
+		const p = target.querySelector('p');
+
+		assert.equal(p?.textContent, '0');
+
+		increment.click();
+		await tick();
+
+		assert.equal(p?.textContent, '1');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/main.svelte b/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/main.svelte
new file mode 100644
index 0000000000..3623c1df66
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	import { fork } from 'svelte';
+
+	class Counter {
+		count = $state(0);
+	}
+
+	let condition = $state(false);
+	let counter = $derived(new Counter());
+</script>
+
+<button onclick={() => {
+	fork(() => {
+		condition = true;
+	}).commit();
+}}>fork</button>
+
+{#if condition}
+	<button onclick={() => {
+		counter.count++;
+	}}>click</button>
+	<p>{counter.count}</p>
+{/if}

From 286b40c4526ce9970cb81ddd5e65b93b722fe468 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 9 Jan 2026 15:57:22 -0500
Subject: [PATCH 273/347] fix: prevent derives without dependencies from ever
 re-running (#17445)

* fix: prevent derives without dependencies from ever re-running

* tweak

Co-authored-by: David Roizenman <hmnd@users.noreply.github.com>
---
 .changeset/plenty-candies-notice.md           |  5 ++++
 .../internal/client/reactivity/deriveds.js    | 17 ++++++++++----
 .../fork-derived-class-instance/_config.js    | 22 ++++++++++++++++++
 .../fork-derived-class-instance/main.svelte   | 23 +++++++++++++++++++
 4 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/plenty-candies-notice.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/main.svelte

diff --git a/.changeset/plenty-candies-notice.md b/.changeset/plenty-candies-notice.md
new file mode 100644
index 0000000000..41c5fce12a
--- /dev/null
+++ b/.changeset/plenty-candies-notice.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: prevent derives without dependencies from ever re-running
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 0fe83d7108..59fb0f15aa 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -9,7 +9,8 @@ import {
 	STALE_REACTION,
 	ASYNC,
 	WAS_MARKED,
-	DESTROYED
+	DESTROYED,
+	CLEAN
 } from '#client/constants';
 import {
 	active_reaction,
@@ -33,7 +34,7 @@ import { UNINITIALIZED } from '../../../constants.js';
 import { batch_values, current_batch } from './batch.js';
 import { unset_context } from './async.js';
 import { deferred } from '../../shared/utils.js';
-import { update_derived_status } from './status.js';
+import { set_signal_status, update_derived_status } from './status.js';
 
 /** @type {Effect | null} */
 export let current_async_effect = null;
@@ -356,15 +357,21 @@ export function update_derived(derived) {
 	var value = execute_derived(derived);
 
 	if (!derived.equals(value)) {
+		derived.wv = increment_write_version();
+
 		// in a fork, we don't update the underlying value, just `batch_values`.
 		// the underlying value will be updated when the fork is committed.
 		// otherwise, the next time we get here after a 'real world' state
 		// change, `derived.equals` may incorrectly return `true`
-		if (!current_batch?.is_fork) {
+		if (!current_batch?.is_fork || derived.deps === null) {
 			derived.v = value;
-		}
 
-		derived.wv = increment_write_version();
+			// deriveds without dependencies should never be recomputed
+			if (derived.deps === null) {
+				set_signal_status(derived, CLEAN);
+				return;
+			}
+		}
 	}
 
 	// don't mark derived clean if we're reading it inside a
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/_config.js b/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/_config.js
new file mode 100644
index 0000000000..feac447536
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/_config.js
@@ -0,0 +1,22 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const [fork] = target.querySelectorAll('button');
+
+		fork.click();
+		await tick();
+
+		const [, increment] = target.querySelectorAll('button');
+		const p = target.querySelector('p');
+
+		assert.equal(p?.textContent, '0');
+
+		increment.click();
+		await tick();
+
+		assert.equal(p?.textContent, '1');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/main.svelte b/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/main.svelte
new file mode 100644
index 0000000000..3623c1df66
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-class-instance/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	import { fork } from 'svelte';
+
+	class Counter {
+		count = $state(0);
+	}
+
+	let condition = $state(false);
+	let counter = $derived(new Counter());
+</script>
+
+<button onclick={() => {
+	fork(() => {
+		condition = true;
+	}).commit();
+}}>fork</button>
+
+{#if condition}
+	<button onclick={() => {
+		counter.count++;
+	}}>click</button>
+	<p>{counter.count}</p>
+{/if}

From 2c2339028657fa52f38bd904bef88927288438c5 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 9 Jan 2026 18:26:58 -0500
Subject: [PATCH 274/347] chore: const -> var

---
 packages/svelte/src/internal/client/runtime.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index ffd61ed776..52b24030fa 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -370,7 +370,7 @@ function remove_reaction(signal, dependency) {
 		// allows us to skip the expensive work of disconnecting and immediately reconnecting it
 		(new_deps === null || !new_deps.includes(dependency))
 	) {
-		const derived = /** @type {Derived} */ (dependency);
+		var derived = /** @type {Derived} */ (dependency);
 
 		// If we are working with a derived that is owned by an effect, then mark it as being
 		// disconnected and remove the mark flag, as it cannot be reliably removed otherwise

From ae224bea4937d1349366cb170a62cd438a1eb580 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 12 Jan 2026 14:59:07 -0500
Subject: [PATCH 275/347] fix: always reconnect deriveds in get, when
 appropriate (#17451)

* failing test

* fix: always reconnect deriveds in get, when appropriate

* shuffle code around a bit

* note to self
---
 .changeset/major-towns-grab.md                |  5 ++++
 .../svelte/src/internal/client/runtime.js     | 25 +++++++++---------
 .../samples/async-fork-snippet-dev/_config.js | 24 +++++++++++++++++
 .../async-fork-snippet-dev/main.svelte        | 26 +++++++++++++++++++
 4 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/major-towns-grab.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-snippet-dev/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-fork-snippet-dev/main.svelte

diff --git a/.changeset/major-towns-grab.md b/.changeset/major-towns-grab.md
new file mode 100644
index 0000000000..de66b70313
--- /dev/null
+++ b/.changeset/major-towns-grab.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: always reconnect deriveds in get, when appropriate
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 52b24030fa..82c5f5a06f 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -596,14 +596,14 @@ export function get(signal) {
 		}
 	}
 
-	if (is_destroying_effect) {
-		if (old_values.has(signal)) {
-			return old_values.get(signal);
-		}
+	if (is_destroying_effect && old_values.has(signal)) {
+		return old_values.get(signal);
+	}
 
-		if (is_derived) {
-			var derived = /** @type {Derived} */ (signal);
+	if (is_derived) {
+		var derived = /** @type {Derived} */ (signal);
 
+		if (is_destroying_effect) {
 			var value = derived.v;
 
 			// if the derived is dirty and has reactions, or depends on the values that just changed, re-execute
@@ -619,14 +619,13 @@ export function get(signal) {
 
 			return value;
 		}
-	} else if (
-		is_derived &&
-		(!batch_values?.has(signal) || (current_batch?.is_fork && !effect_tracking()))
-	) {
-		derived = /** @type {Derived} */ (signal);
 
-		if (is_dirty(derived)) {
-			update_derived(derived);
+		// TODO this should probably just be `!batch_values?.has(derived)` — the second bit
+		// should be taken care of by clearing `batch_values` in `mark_reactions`?
+		if (!batch_values?.has(derived) || (current_batch?.is_fork && !effect_tracking())) {
+			if (is_dirty(derived)) {
+				update_derived(derived);
+			}
 		}
 
 		if (is_updating_effect && effect_tracking() && (derived.f & CONNECTED) === 0) {
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-snippet-dev/_config.js b/packages/svelte/tests/runtime-runes/samples/async-fork-snippet-dev/_config.js
new file mode 100644
index 0000000000..2fb00562f5
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-snippet-dev/_config.js
@@ -0,0 +1,24 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	compileOptions: {
+		dev: true
+	},
+
+	async test({ assert, target }) {
+		const [fork] = target.querySelectorAll('button');
+
+		fork.click();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, '<button>fork</button><button>false</button>');
+
+		const [, toggle] = target.querySelectorAll('button');
+
+		toggle.click();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, '<button>fork</button><button>true</button>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-fork-snippet-dev/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-fork-snippet-dev/main.svelte
new file mode 100644
index 0000000000..6945fcd153
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-fork-snippet-dev/main.svelte
@@ -0,0 +1,26 @@
+<script>
+	import { fork } from 'svelte';
+
+	let condition = $state(false);
+	let checked = $state(false);
+
+	const d = $derived({ checked });
+</script>
+
+<button onclick={() => {
+	fork(() => {
+		condition = true;
+	}).commit();
+}}>fork</button>
+
+{#if condition}
+	<!-- in dev, snippet arguments are read eagerly, outside a tracking context -->
+	<!-- this test checks that doing so doesn't prevent the derived from connecting -->
+	{#snippet foo({ checked })}
+		{checked}
+	{/snippet}
+
+	<button onclick={() => (checked = !checked)}>
+		{@render foo(d)}
+	</button>
+{/if}

From 7dbb5b478893056e4a9c43bdee5e34e64d86e588 Mon Sep 17 00:00:00 2001
From: David <david@hmnd.io>
Date: Mon, 12 Jan 2026 12:14:08 -0800
Subject: [PATCH 276/347] fix: derived reactivity and perf regressions (#17362)

* add test sample

* add test for sveltejs/kit#15059

* fix: reconnect deriveds inside branch effects

* add changeset

* fix: derived with no deps always set as MAYBE_DIRTY

fixes #17342

* add test for #17342

* additional changeset

* refactor: extract setting derived status to helper, apply to sources.js

* add test case for #17352

* fix: reconnect child deriveds when evaluating connected parent derived

fixes #17352

* fix import order causing Cannot read properties of undefined on dev load

* remove duplicate iteration over deps

* minor style tweaks

* oops, fix merge

* use update_derived_status, so that we never set a dep-less derived MAYBE_DIRTY

* tweak

* reaction.deps cannot be null for a MAYBE_DIRTY derived

* make it such that reactions without deps are never MAYBE_DIRTY

* since we no longer need to check reaction.deps === null, we can revert this bit

* more explicit check

* tidy up

* more

* gah whoops

* move import

* simplify test

* make dep-less derived behaviour more explicit, move it above is_destroying_effect handling

* remove test - this is adequately covered by #17445

* replace tricky unit test with component-based test

* remove incorrect test

* remove the BRANCH_EFFECT stuff

* tidy up

* DRY

* tweak, add explanatory comment

* tweak

* explanatory comment

* remove changeset

* update changeset

---------

Co-authored-by: Tee Ming <chewteeming01@gmail.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/beige-sloths-cry.md                |  5 ++
 .../svelte/src/internal/client/runtime.js     | 26 +++++++---
 .../derived-read-outside-reaction/_config.js  | 47 +++++++++++++++++++
 .../derived-read-outside-reaction/main.svelte | 30 ++++++++++++
 4 files changed, 101 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/beige-sloths-cry.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/derived-read-outside-reaction/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/derived-read-outside-reaction/main.svelte

diff --git a/.changeset/beige-sloths-cry.md b/.changeset/beige-sloths-cry.md
new file mode 100644
index 0000000000..013fd2f6cc
--- /dev/null
+++ b/.changeset/beige-sloths-cry.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: reconnect clean deriveds when they are read in a reactive context
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 82c5f5a06f..0e12324d72 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -620,15 +620,27 @@ export function get(signal) {
 			return value;
 		}
 
-		// TODO this should probably just be `!batch_values?.has(derived)` — the second bit
-		// should be taken care of by clearing `batch_values` in `mark_reactions`?
-		if (!batch_values?.has(derived) || (current_batch?.is_fork && !effect_tracking())) {
-			if (is_dirty(derived)) {
-				update_derived(derived);
+		// connect disconnected deriveds if we are reading them inside an effect,
+		// or inside another derived that is already connected
+		var should_connect =
+			(derived.f & CONNECTED) === 0 &&
+			!untracking &&
+			active_reaction !== null &&
+			(is_updating_effect || (active_reaction.f & CONNECTED) !== 0);
+
+		var is_new = derived.deps === null;
+
+		if (is_dirty(derived)) {
+			if (should_connect) {
+				// set the flag before `update_derived`, so that the derived
+				// is added as a reaction to its dependencies
+				derived.f |= CONNECTED;
 			}
+
+			update_derived(derived);
 		}
 
-		if (is_updating_effect && effect_tracking() && (derived.f & CONNECTED) === 0) {
+		if (should_connect && !is_new) {
 			reconnect(derived);
 		}
 	}
@@ -652,7 +664,7 @@ export function get(signal) {
 function reconnect(derived) {
 	if (derived.deps === null) return;
 
-	derived.f ^= CONNECTED;
+	derived.f |= CONNECTED;
 
 	for (const dep of derived.deps) {
 		(dep.reactions ??= []).push(derived);
diff --git a/packages/svelte/tests/runtime-runes/samples/derived-read-outside-reaction/_config.js b/packages/svelte/tests/runtime-runes/samples/derived-read-outside-reaction/_config.js
new file mode 100644
index 0000000000..f3a71b93e6
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/derived-read-outside-reaction/_config.js
@@ -0,0 +1,47 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	html: `
+		<button>+1</button>
+		<button>add number</button>
+		<p>1, 2, 3</p>
+	`,
+
+	test({ assert, target }) {
+		const [button1, button2] = target.querySelectorAll('button');
+
+		button1.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>+1</button>
+				<button>add number</button>
+				<p>2, 4, 6</p>
+			`
+		);
+
+		button2.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>+1</button>
+				<button>add number</button>
+				<p>2, 4, 6, 8</p>
+			`
+		);
+
+		button1.click();
+		flushSync();
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>+1</button>
+				<button>add number</button>
+				<p>3, 6, 9, 12</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/derived-read-outside-reaction/main.svelte b/packages/svelte/tests/runtime-runes/samples/derived-read-outside-reaction/main.svelte
new file mode 100644
index 0000000000..0b5096dfa4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/derived-read-outside-reaction/main.svelte
@@ -0,0 +1,30 @@
+<script lang="ts">
+	class Item {
+		product: number;
+
+		constructor(n: number) {
+			this.product = $derived(multiplier * n);
+		}
+	}
+
+	let numbers = $state([1, 2, 3]);
+	let multiplier = $state(1);
+
+	let items = $derived(numbers.map((n) => new Item(n)))
+	let products = $derived(items.map(item => item.product));
+</script>
+
+<button onclick={() => {
+	multiplier += 1;
+}}>+1</button>
+
+<button onclick={() => {
+	numbers.push(numbers.length + 1);
+
+	// this is load-bearing — by reading it outside a reaction, we recompute
+	// `products`, removing it as a reaction from `Item.product` dependencies,
+	// but we don't add it as a reaction to the new `Item.product` dependencies
+	products;
+}}>add number</button>
+
+<p>{products.join(', ')}</p>

From 51c7f7152c244512067fa52312e15a596d1ae1c9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 15:15:00 -0500
Subject: [PATCH 277/347] Version Packages (#17410)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/better-games-invite.md   |  5 -----
 .changeset/empty-paths-smile.md     |  5 -----
 .changeset/major-towns-grab.md      |  5 -----
 .changeset/plenty-candies-notice.md |  5 -----
 .changeset/seven-llamas-care.md     |  5 -----
 .changeset/spicy-years-stick.md     |  5 -----
 .changeset/tall-clocks-turn.md      |  5 -----
 .changeset/tall-phones-fix.md       |  5 -----
 .changeset/thick-islands-pull.md    |  5 -----
 packages/svelte/CHANGELOG.md        | 22 ++++++++++++++++++++++
 packages/svelte/package.json        |  2 +-
 packages/svelte/src/version.js      |  2 +-
 12 files changed, 24 insertions(+), 47 deletions(-)
 delete mode 100644 .changeset/better-games-invite.md
 delete mode 100644 .changeset/empty-paths-smile.md
 delete mode 100644 .changeset/major-towns-grab.md
 delete mode 100644 .changeset/plenty-candies-notice.md
 delete mode 100644 .changeset/seven-llamas-care.md
 delete mode 100644 .changeset/spicy-years-stick.md
 delete mode 100644 .changeset/tall-clocks-turn.md
 delete mode 100644 .changeset/tall-phones-fix.md
 delete mode 100644 .changeset/thick-islands-pull.md

diff --git a/.changeset/better-games-invite.md b/.changeset/better-games-invite.md
deleted file mode 100644
index 8361a1e9bb..0000000000
--- a/.changeset/better-games-invite.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't transform references of function declarations in legacy mode
diff --git a/.changeset/empty-paths-smile.md b/.changeset/empty-paths-smile.md
deleted file mode 100644
index 687ad19b24..0000000000
--- a/.changeset/empty-paths-smile.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: notify deriveds of changes to sources inside forks
diff --git a/.changeset/major-towns-grab.md b/.changeset/major-towns-grab.md
deleted file mode 100644
index de66b70313..0000000000
--- a/.changeset/major-towns-grab.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: always reconnect deriveds in get, when appropriate
diff --git a/.changeset/plenty-candies-notice.md b/.changeset/plenty-candies-notice.md
deleted file mode 100644
index 41c5fce12a..0000000000
--- a/.changeset/plenty-candies-notice.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: prevent derives without dependencies from ever re-running
diff --git a/.changeset/seven-llamas-care.md b/.changeset/seven-llamas-care.md
deleted file mode 100644
index 1b41b4848a..0000000000
--- a/.changeset/seven-llamas-care.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: correctly update writable deriveds inside forks
diff --git a/.changeset/spicy-years-stick.md b/.changeset/spicy-years-stick.md
deleted file mode 100644
index 76834e8381..0000000000
--- a/.changeset/spicy-years-stick.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: remove `$inspect` calls after await expressions when compiling for production server code
diff --git a/.changeset/tall-clocks-turn.md b/.changeset/tall-clocks-turn.md
deleted file mode 100644
index 22cefcff30..0000000000
--- a/.changeset/tall-clocks-turn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: clear batch between runs
diff --git a/.changeset/tall-phones-fix.md b/.changeset/tall-phones-fix.md
deleted file mode 100644
index 29e57c060f..0000000000
--- a/.changeset/tall-phones-fix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: adjust `loc` property of `Program` nodes created from `<script>` elements
diff --git a/.changeset/thick-islands-pull.md b/.changeset/thick-islands-pull.md
deleted file mode 100644
index f987d72260..0000000000
--- a/.changeset/thick-islands-pull.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't revert source to UNINITIALIZED state when time travelling
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index dc0edbaf79..c8670d5d3c 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,27 @@
 # svelte
 
+## 5.46.2
+
+### Patch Changes
+
+- fix: don't transform references of function declarations in legacy mode ([#17431](https://github.com/sveltejs/svelte/pull/17431))
+
+- fix: notify deriveds of changes to sources inside forks ([#17437](https://github.com/sveltejs/svelte/pull/17437))
+
+- fix: always reconnect deriveds in get, when appropriate ([#17451](https://github.com/sveltejs/svelte/pull/17451))
+
+- fix: prevent derives without dependencies from ever re-running ([`286b40c4526ce9970cb81ddd5e65b93b722fe468`](https://github.com/sveltejs/svelte/commit/286b40c4526ce9970cb81ddd5e65b93b722fe468))
+
+- fix: correctly update writable deriveds inside forks ([#17437](https://github.com/sveltejs/svelte/pull/17437))
+
+- fix: remove `$inspect` calls after await expressions when compiling for production server code ([#17407](https://github.com/sveltejs/svelte/pull/17407))
+
+- fix: clear batch between runs ([#17424](https://github.com/sveltejs/svelte/pull/17424))
+
+- fix: adjust `loc` property of `Program` nodes created from `<script>` elements ([#17428](https://github.com/sveltejs/svelte/pull/17428))
+
+- fix: don't revert source to UNINITIALIZED state when time travelling ([#17409](https://github.com/sveltejs/svelte/pull/17409))
+
 ## 5.46.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 7affd91207..243dd9c23b 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.46.1",
+  "version": "5.46.2",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index c28af94e19..de7c0e9fbb 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.46.1';
+export const VERSION = '5.46.2';
 export const PUBLIC_VERSION = '5';

From ed8dcd063625062f03291f2f086fee75e1dc5105 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Jan 2026 16:57:22 -0500
Subject: [PATCH 278/347] Version Packages (#17458)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/beige-sloths-cry.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/beige-sloths-cry.md

diff --git a/.changeset/beige-sloths-cry.md b/.changeset/beige-sloths-cry.md
deleted file mode 100644
index 013fd2f6cc..0000000000
--- a/.changeset/beige-sloths-cry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: reconnect clean deriveds when they are read in a reactive context
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index c8670d5d3c..f822258e36 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.46.3
+
+### Patch Changes
+
+- fix: reconnect clean deriveds when they are read in a reactive context ([#17362](https://github.com/sveltejs/svelte/pull/17362))
+
 ## 5.46.2
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 243dd9c23b..d7c25b28f1 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.46.2",
+  "version": "5.46.3",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index de7c0e9fbb..9f84875407 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.46.2';
+export const VERSION = '5.46.3';
 export const PUBLIC_VERSION = '5';

From 6d90b96e990d9dd45f55effb4431393c3e610937 Mon Sep 17 00:00:00 2001
From: "Dominik G." <dominik.goepel@gmx.de>
Date: Tue, 13 Jan 2026 21:49:41 +0000
Subject: [PATCH 279/347] chore: edit changelog (#17463)

* chore: 5.46.2 was never published, merge the changes into 5.46.3 to avoid confusion

* chore: add notice about missing 5.46.2
---
 packages/svelte/CHANGELOG.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index f822258e36..bf22761869 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -6,10 +6,6 @@
 
 - fix: reconnect clean deriveds when they are read in a reactive context ([#17362](https://github.com/sveltejs/svelte/pull/17362))
 
-## 5.46.2
-
-### Patch Changes
-
 - fix: don't transform references of function declarations in legacy mode ([#17431](https://github.com/sveltejs/svelte/pull/17431))
 
 - fix: notify deriveds of changes to sources inside forks ([#17437](https://github.com/sveltejs/svelte/pull/17437))
@@ -28,6 +24,12 @@
 
 - fix: don't revert source to UNINITIALIZED state when time travelling ([#17409](https://github.com/sveltejs/svelte/pull/17409))
 
+## 5.46.2
+
+### Notice
+
+Not published due to CI issue
+
 ## 5.46.1
 
 ### Patch Changes

From ef81048e238844b729942441541d6dcfe6c8ccca Mon Sep 17 00:00:00 2001
From: Elliott Johnson <hello@ell.iott.dev>
Date: Thu, 15 Jan 2026 09:13:33 -0700
Subject: [PATCH 280/347] Merge commit from fork

* fix: Use `devalue.uneval` to serialize `hydratable` keys

* oops
---
 .changeset/tasty-vans-repeat.md                    |  5 +++++
 packages/svelte/src/internal/server/renderer.js    |  3 ++-
 .../samples/hydratable-script-escape/_config.js    | 14 ++++++++++++++
 .../samples/hydratable-script-escape/main.svelte   |  9 +++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/tasty-vans-repeat.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-script-escape/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/hydratable-script-escape/main.svelte

diff --git a/.changeset/tasty-vans-repeat.md b/.changeset/tasty-vans-repeat.md
new file mode 100644
index 0000000000..d95e8de7e7
--- /dev/null
+++ b/.changeset/tasty-vans-repeat.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: use `devalue.uneval` to serialize `hydratable` keys
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 1ecc90ba1f..82f8025759 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -10,6 +10,7 @@ import { BLOCK_CLOSE, BLOCK_OPEN } from './hydration.js';
 import { attributes } from './index.js';
 import { get_render_context, with_render_context, init_render_context } from './render-context.js';
 import { sha256 } from './crypto.js';
+import * as devalue from 'devalue';
 
 /** @typedef {'head' | 'body'} RendererType */
 /** @typedef {{ [key in RendererType]: string }} AccumulatedContent */
@@ -669,7 +670,7 @@ export class Renderer {
 				for (const p of v.promises) await p;
 			}
 
-			entries.push(`[${JSON.stringify(k)},${v.serialized}]`);
+			entries.push(`[${devalue.uneval(k)},${v.serialized}]`);
 		}
 
 		let prelude = `const h = (window.__svelte ??= {}).h ??= new Map();`;
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-script-escape/_config.js b/packages/svelte/tests/runtime-runes/samples/hydratable-script-escape/_config.js
new file mode 100644
index 0000000000..bc51795565
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-script-escape/_config.js
@@ -0,0 +1,14 @@
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	mode: ['hydrate'],
+
+	props: {
+		key: '</script><script>throw new Error("pwned")</script>'
+	},
+
+	async test() {
+		// this test will fail when evaluating the `head` script if the vulnerability is present
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/hydratable-script-escape/main.svelte b/packages/svelte/tests/runtime-runes/samples/hydratable-script-escape/main.svelte
new file mode 100644
index 0000000000..1327492190
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/hydratable-script-escape/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	import { hydratable } from "svelte";
+
+	const { key } = $props();
+
+	const value = await hydratable(key, () => Promise.resolve('safe'));
+</script>
+
+<p>{value}</p>

From cfc7e0a8c3b1846f0c17388735eb0263b53b93a2 Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Thu, 15 Jan 2026 09:15:26 -0700
Subject: [PATCH 281/347] chore: Upgrade devalue (#17475)

---
 packages/svelte/package.json |  2 +-
 pnpm-lock.yaml               | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index d7c25b28f1..8bd600545f 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -174,7 +174,7 @@
     "aria-query": "^5.3.1",
     "axobject-query": "^4.1.0",
     "clsx": "^2.1.1",
-    "devalue": "^5.5.0",
+    "devalue": "^5.6.2",
     "esm-env": "^1.2.1",
     "esrap": "^2.2.1",
     "is-reference": "^3.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 05298fe8e3..b616fc0577 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -90,8 +90,8 @@ importers:
         specifier: ^2.1.1
         version: 2.1.1
       devalue:
-        specifier: ^5.5.0
-        version: 5.5.0
+        specifier: ^5.6.2
+        version: 5.6.2
       esm-env:
         specifier: ^1.2.1
         version: 1.2.1
@@ -1219,8 +1219,8 @@ packages:
     engines: {node: '>=0.10'}
     hasBin: true
 
-  devalue@5.5.0:
-    resolution: {integrity: sha512-69sM5yrHfFLJt0AZ9QqZXGCPfJ7fQjvpln3Rq5+PS03LD32Ost1Q9N+eEnaQwGRIriKkMImXD56ocjQmfjbV3w==}
+  devalue@5.6.2:
+    resolution: {integrity: sha512-nPRkjWzzDQlsejL1WVifk5rvcFi/y1onBRxjaFMjZeR9mFpqu2gmAZ9xUB9/IEanEP/vBtGeGganC/GO1fmufg==}
 
   dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
@@ -3500,7 +3500,7 @@ snapshots:
   detect-libc@1.0.3:
     optional: true
 
-  devalue@5.5.0: {}
+  devalue@5.6.2: {}
 
   dir-glob@3.0.1:
     dependencies:

From 0718a26b435b927428dee57a71a91c1a77dc19cb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 09:22:53 -0700
Subject: [PATCH 282/347] Version Packages (#17476)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/tasty-vans-repeat.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/tasty-vans-repeat.md

diff --git a/.changeset/tasty-vans-repeat.md b/.changeset/tasty-vans-repeat.md
deleted file mode 100644
index d95e8de7e7..0000000000
--- a/.changeset/tasty-vans-repeat.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: use `devalue.uneval` to serialize `hydratable` keys
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index bf22761869..a767760641 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.46.4
+
+### Patch Changes
+
+- fix: use `devalue.uneval` to serialize `hydratable` keys ([`ef81048e238844b729942441541d6dcfe6c8ccca`](https://github.com/sveltejs/svelte/commit/ef81048e238844b729942441541d6dcfe6c8ccca))
+
 ## 5.46.3
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 8bd600545f..1723e3d00a 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.46.3",
+  "version": "5.46.4",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 9f84875407..96c48a055c 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.46.3';
+export const VERSION = '5.46.4';
 export const PUBLIC_VERSION = '5';

From 17c22969d8f7b1723eae58075fbb32b530518e22 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Fri, 16 Jan 2026 22:33:11 +0100
Subject: [PATCH 283/347] fix: don't reset static elements with debug/snippets
 (#17477)

---
 .changeset/little-aliens-pick.md                          | 5 +++++
 .../phases/3-transform/client/visitors/RegularElement.js  | 7 ++++---
 .../phases/3-transform/client/visitors/shared/fragment.js | 5 ++---
 .../tests/hydration/samples/no-reset-debug/_config.js     | 3 +++
 .../tests/hydration/samples/no-reset-debug/main.svelte    | 8 ++++++++
 .../tests/hydration/samples/no-reset-snippet/_config.js   | 3 +++
 .../tests/hydration/samples/no-reset-snippet/main.svelte  | 6 ++++++
 7 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/little-aliens-pick.md
 create mode 100644 packages/svelte/tests/hydration/samples/no-reset-debug/_config.js
 create mode 100644 packages/svelte/tests/hydration/samples/no-reset-debug/main.svelte
 create mode 100644 packages/svelte/tests/hydration/samples/no-reset-snippet/_config.js
 create mode 100644 packages/svelte/tests/hydration/samples/no-reset-snippet/main.svelte

diff --git a/.changeset/little-aliens-pick.md b/.changeset/little-aliens-pick.md
new file mode 100644
index 0000000000..1433625551
--- /dev/null
+++ b/.changeset/little-aliens-pick.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: don't reset static elements with debug/snippets
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 690715df84..c780350d3e 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
@@ -21,7 +21,7 @@ import {
 	build_set_class,
 	build_set_style
 } from './shared/element.js';
-import { process_children } from './shared/fragment.js';
+import { process_children, is_static_element } from './shared/fragment.js';
 import { build_render_statement, build_template_chunk, Memoizer } from './shared/utils.js';
 import { visit_event_attribute } from './shared/events.js';
 
@@ -356,8 +356,9 @@ export function RegularElement(node, context) {
 		let arg = context.state.node;
 
 		// If `hydrate_node` is set inside the element, we need to reset it
-		// after the element has been hydrated
-		let needs_reset = trimmed.some((node) => node.type !== 'Text');
+		// after the element has been hydrated. We need to check if any child
+		// would actually advance the hydrate_node cursor - static elements don't.
+		let needs_reset = trimmed.some((node) => node.type !== 'Text' && !is_static_element(node));
 
 		// The same applies if it's a `<template>` element, since we need to
 		// set the value of `hydrate_node` to `node.content`
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
index ff931842d8..59b93f24ef 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
@@ -98,7 +98,7 @@ export function process_children(nodes, initial, is_element, context) {
 
 			let child_state = context.state;
 
-			if (is_static_element(node, context.state)) {
+			if (is_static_element(node)) {
 				skipped += 1;
 			} else if (
 				node.type === 'EachBlock' &&
@@ -137,9 +137,8 @@ export function process_children(nodes, initial, is_element, context) {
 
 /**
  * @param {AST.SvelteNode} node
- * @param {ComponentContext["state"]} state
  */
-function is_static_element(node, state) {
+export function is_static_element(node) {
 	if (node.type !== 'RegularElement') return false;
 	if (node.fragment.metadata.dynamic) return false;
 	if (is_custom_element_node(node)) return false; // we're setting all attributes on custom elements through properties
diff --git a/packages/svelte/tests/hydration/samples/no-reset-debug/_config.js b/packages/svelte/tests/hydration/samples/no-reset-debug/_config.js
new file mode 100644
index 0000000000..f47bee71df
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/no-reset-debug/_config.js
@@ -0,0 +1,3 @@
+import { test } from '../../test';
+
+export default test({});
diff --git a/packages/svelte/tests/hydration/samples/no-reset-debug/main.svelte b/packages/svelte/tests/hydration/samples/no-reset-debug/main.svelte
new file mode 100644
index 0000000000..915aa0152d
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/no-reset-debug/main.svelte
@@ -0,0 +1,8 @@
+<script>
+	let test = 42;
+</script>
+
+<div>
+	{@debug test}
+	<span>something</span>
+</div>
\ No newline at end of file
diff --git a/packages/svelte/tests/hydration/samples/no-reset-snippet/_config.js b/packages/svelte/tests/hydration/samples/no-reset-snippet/_config.js
new file mode 100644
index 0000000000..f47bee71df
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/no-reset-snippet/_config.js
@@ -0,0 +1,3 @@
+import { test } from '../../test';
+
+export default test({});
diff --git a/packages/svelte/tests/hydration/samples/no-reset-snippet/main.svelte b/packages/svelte/tests/hydration/samples/no-reset-snippet/main.svelte
new file mode 100644
index 0000000000..c6668c0684
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/no-reset-snippet/main.svelte
@@ -0,0 +1,6 @@
+<div>
+	{#snippet test()}
+		
+	{/snippet}
+	<span>something</span>
+</div>
\ No newline at end of file

From a903e9408b6d916fa45a57fb570ac6b74742717d Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Fri, 16 Jan 2026 22:35:05 +0100
Subject: [PATCH 284/347] fix: mark subtree of svelte boundary as dynamic
 (#17468)

---
 .changeset/curly-cats-make.md                                | 5 +++++
 .../src/compiler/phases/2-analyze/visitors/SvelteBoundary.js | 3 +++
 .../tests/runtime-runes/samples/static-boundary/_config.js   | 5 +++++
 .../tests/runtime-runes/samples/static-boundary/main.svelte  | 5 +++++
 4 files changed, 18 insertions(+)
 create mode 100644 .changeset/curly-cats-make.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/static-boundary/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/static-boundary/main.svelte

diff --git a/.changeset/curly-cats-make.md b/.changeset/curly-cats-make.md
new file mode 100644
index 0000000000..393f8ec7e8
--- /dev/null
+++ b/.changeset/curly-cats-make.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: mark subtree of svelte boundary as dynamic
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/SvelteBoundary.js
index 35af96ba12..e0014aa7b2 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/SvelteBoundary.js
@@ -1,6 +1,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { Context } from '../types' */
 import * as e from '../../../errors.js';
+import { mark_subtree_dynamic } from './shared/fragment.js';
 
 const valid = ['onerror', 'failed', 'pending'];
 
@@ -23,5 +24,7 @@ export function SvelteBoundary(node, context) {
 		}
 	}
 
+	mark_subtree_dynamic(context.path);
+
 	context.next();
 }
diff --git a/packages/svelte/tests/runtime-runes/samples/static-boundary/_config.js b/packages/svelte/tests/runtime-runes/samples/static-boundary/_config.js
new file mode 100644
index 0000000000..d986ed8cd5
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/static-boundary/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	html: '<div><div>test</div></div>'
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/static-boundary/main.svelte b/packages/svelte/tests/runtime-runes/samples/static-boundary/main.svelte
new file mode 100644
index 0000000000..7f43a1afaf
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/static-boundary/main.svelte
@@ -0,0 +1,5 @@
+<div>
+	<svelte:boundary>
+		<div>test</div>
+	</svelte:boundary>
+</div>
\ No newline at end of file

From b934372a3cfb75437e2d3a7aac3c171b17887bcc Mon Sep 17 00:00:00 2001
From: Conduitry <git@chor.date>
Date: Fri, 16 Jan 2026 21:36:02 +0000
Subject: [PATCH 285/347] chore: prevent two concurrent running release
 workflows (#17465)

---
 .github/workflows/release.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b78346d883..80d2ad1f8e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,11 @@ on:
     branches:
       - main
 
+concurrency:
+  # prevent two release workflows from running at once
+  # race conditions here can result in releases failing
+  group: ${{ github.workflow }}
+
 permissions: {}
 jobs:
   release:

From 3046004ec3486d814b9f842024a7fa7dcc2444cb Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Sun, 18 Jan 2026 15:06:18 -0500
Subject: [PATCH 286/347] chore: use injected css in sandbox (#17485)

---
 playgrounds/sandbox/svelte.config.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/playgrounds/sandbox/svelte.config.js b/playgrounds/sandbox/svelte.config.js
index 68ac605385..33e8c98908 100644
--- a/playgrounds/sandbox/svelte.config.js
+++ b/playgrounds/sandbox/svelte.config.js
@@ -1,5 +1,8 @@
 export default {
+	/** @type {import('svelte/compiler').CompileOptions} */
 	compilerOptions: {
+		css: 'injected',
+
 		hmr: false,
 
 		experimental: {

From 645eb1225803a5042f7e1c622ac7fb0634e6bf2a Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Sun, 18 Jan 2026 22:53:11 +0100
Subject: [PATCH 287/347] feat: customizable select (#17429)

* feat: customizable select

* fix: treat inner of options as separate templates

* fix: add hydration comment

* fix: clear with textContent

* fix: mark rich content option as dynamic and allow optgroup

* fix: allow select with rich content and rename

* chore: revert tests

* fix: recursively check rich options

* chore: change name of template

* fix: mark boundary as dynamic

* chore: add snapshot tests

* chore: include comprehensive hydration test

* fix: consider `selectedelement` as ancestor of `option` elements

* fix: make `:has` work with `selectedcontent`

* chore: failing test for css

* fix: also return parent for adjacent_only

* fix: move hydration marker at the end

* chore: apply suggestions from code review

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

* fix: treat text elements in select and optgroup as rich

* fix hydration

* colocate code

* drop the element, it's cleaner

* rename module

* update test

* Update .changeset/chubby-dingos-laugh.md

* fix a11y warning that occurs when button only contains selectedcontent

* remove unused parameter

* last part is redundant

* simplify

* unnecessary, the constraints overlap

* this is taken care of during analysis

* simplify

* tweak

* tweak

* tweak

* fix/tweak

* tweak

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/chubby-dingos-laugh.md             |   5 +
 .../phases/2-analyze/css/css-prune.js         |  60 +++
 .../2-analyze/visitors/RegularElement.js      |  15 +-
 .../2-analyze/visitors/shared/a11y/index.js   |   4 +
 .../client/visitors/RegularElement.js         |  61 ++-
 .../server/visitors/RegularElement.js         |  40 +-
 packages/svelte/src/compiler/phases/nodes.js  |  95 ++++
 packages/svelte/src/html-tree-validation.js   |   6 +-
 .../dom/elements/customizable-select.js       |  51 +++
 packages/svelte/src/internal/client/index.js  |   1 +
 .../svelte/src/internal/server/renderer.js    |  10 +-
 .../css/samples/selectedcontent/expected.css  |  44 ++
 .../css/samples/selectedcontent/input.svelte  |  53 +++
 .../samples/optgroup-rich-content/_config.js  |  31 ++
 .../optgroup-rich-content/_expected.html      |   1 +
 .../samples/optgroup-rich-content/main.svelte |  16 +
 .../option-rich-content-continues/_config.js  |  34 ++
 .../_expected.html                            |   1 +
 .../option-rich-content-continues/main.svelte |  12 +
 .../option-rich-content-static/_config.js     |  39 ++
 .../option-rich-content-static/_expected.html |   1 +
 .../option-rich-content-static/main.svelte    |   5 +
 .../samples/rich-select/Option.svelte         |   1 +
 .../hydration/samples/rich-select/_config.js  |   3 +
 .../hydration/samples/rich-select/main.svelte | 173 ++++++++
 .../samples/optgroup-rich-content/_config.js  |  31 ++
 .../samples/optgroup-rich-content/main.svelte |  19 +
 .../samples/option-rich-content/_config.js    |  37 ++
 .../samples/option-rich-content/main.svelte   |  15 +
 .../rich-option-component/Content.svelte      |   5 +
 .../samples/rich-option-component/_config.js  |  26 ++
 .../samples/rich-option-component/main.svelte |  15 +
 .../select-with-rich-content/Option.svelte    |   1 +
 .../_expected/client/Option.svelte.js         |  11 +
 .../_expected/client/index.svelte.js          | 412 ++++++++++++++++++
 .../_expected/server/Option.svelte.js         |   7 +
 .../_expected/server/index.svelte.js          | 233 ++++++++++
 .../select-with-rich-content/index.svelte     | 157 +++++++
 .../a11y-consider-explicit-label/input.svelte |  11 +
 39 files changed, 1728 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/chubby-dingos-laugh.md
 create mode 100644 packages/svelte/src/internal/client/dom/elements/customizable-select.js
 create mode 100644 packages/svelte/tests/css/samples/selectedcontent/expected.css
 create mode 100644 packages/svelte/tests/css/samples/selectedcontent/input.svelte
 create mode 100644 packages/svelte/tests/hydration/samples/optgroup-rich-content/_config.js
 create mode 100644 packages/svelte/tests/hydration/samples/optgroup-rich-content/_expected.html
 create mode 100644 packages/svelte/tests/hydration/samples/optgroup-rich-content/main.svelte
 create mode 100644 packages/svelte/tests/hydration/samples/option-rich-content-continues/_config.js
 create mode 100644 packages/svelte/tests/hydration/samples/option-rich-content-continues/_expected.html
 create mode 100644 packages/svelte/tests/hydration/samples/option-rich-content-continues/main.svelte
 create mode 100644 packages/svelte/tests/hydration/samples/option-rich-content-static/_config.js
 create mode 100644 packages/svelte/tests/hydration/samples/option-rich-content-static/_expected.html
 create mode 100644 packages/svelte/tests/hydration/samples/option-rich-content-static/main.svelte
 create mode 100644 packages/svelte/tests/hydration/samples/rich-select/Option.svelte
 create mode 100644 packages/svelte/tests/hydration/samples/rich-select/_config.js
 create mode 100644 packages/svelte/tests/hydration/samples/rich-select/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/optgroup-rich-content/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/optgroup-rich-content/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/option-rich-content/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/option-rich-content/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/rich-option-component/Content.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/rich-option-component/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/rich-option-component/main.svelte
 create mode 100644 packages/svelte/tests/snapshot/samples/select-with-rich-content/Option.svelte
 create mode 100644 packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/client/Option.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/client/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/Option.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/select-with-rich-content/index.svelte

diff --git a/.changeset/chubby-dingos-laugh.md b/.changeset/chubby-dingos-laugh.md
new file mode 100644
index 0000000000..cd7b990e50
--- /dev/null
+++ b/.changeset/chubby-dingos-laugh.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: customizable `<select>` elements
diff --git a/packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js b/packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js
index 8a4d8cb350..7242c69d8c 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js
@@ -770,7 +770,39 @@ function get_ancestor_elements(node, adjacent_only, seen = new Set()) {
 		}
 
 		if (parent.type === 'RegularElement' || parent.type === 'SvelteElement') {
+			// Special handling for <option> inside <select>: elements inside <option> should
+			// also be considered descendants of <selectedcontent>, which clones the selected option's content
+			if (parent.type === 'RegularElement' && parent.name === 'option') {
+				const is_direct_child = ancestors.length === 0;
+
+				const select_element = path.findLast(
+					(element, j) => element.type === 'RegularElement' && element.name === 'select' && j < i
+				);
+
+				if (select_element && (!adjacent_only || is_direct_child)) {
+					/** @type {Compiler.AST.RegularElement | null} */
+					let selectedcontent_element = null;
+					walk(select_element, null, {
+						RegularElement(child, context) {
+							if (child.name === 'selectedcontent') {
+								selectedcontent_element = child;
+								context.stop();
+								return;
+							}
+							context.next();
+						}
+					});
+
+					if (adjacent_only && is_direct_child && selectedcontent_element) {
+						return [selectedcontent_element, parent];
+					} else if (selectedcontent_element) {
+						ancestors.push(selectedcontent_element);
+					}
+				}
+			}
+
 			ancestors.push(parent);
+
 			if (adjacent_only) {
 				break;
 			}
@@ -817,6 +849,34 @@ function get_descendant_elements(node, adjacent_only, seen = new Set()) {
 
 	walk_children(node.type === 'RenderTag' ? node : node.fragment);
 
+	// Special handling for <selectedcontent>: it clones the content of the selected <option>,
+	// so descendants of <option> elements in the same <select> should also be considered descendants
+	if (node.type === 'RegularElement' && node.name === 'selectedcontent') {
+		const path = node.metadata.path;
+		const select_element = path.findLast(
+			(/** @type {Compiler.AST.SvelteNode} */ element) =>
+				element.type === 'RegularElement' && element.name === 'select'
+		);
+
+		if (select_element) {
+			walk(
+				select_element,
+				{ inside_option: false },
+				{
+					_(child, context) {
+						if (child.type === 'RegularElement' && child.name === 'option') {
+							context.next({ inside_option: true });
+						} else if (context.state.inside_option) {
+							walk_children(child);
+						} else {
+							context.next();
+						}
+					}
+				}
+			);
+		}
+	}
+
 	return descendants;
 }
 
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 5fce138089..1f3a93c67e 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
@@ -7,7 +7,11 @@ import {
 } from '../../../../html-tree-validation.js';
 import * as e from '../../../errors.js';
 import * as w from '../../../warnings.js';
-import { create_attribute, is_custom_element_node } from '../../nodes.js';
+import {
+	create_attribute,
+	is_custom_element_node,
+	is_customizable_select_element
+} from '../../nodes.js';
 import { regex_starts_with_newline } from '../../patterns.js';
 import { check_element } from './shared/a11y/index.js';
 import { validate_element } from './shared/element.js';
@@ -74,6 +78,15 @@ export function RegularElement(node, context) {
 		node.metadata.synthetic_value_node = child;
 	}
 
+	// Special case: <select>, <option> or <optgroup> with rich content needs special hydration handling
+	// We mark the subtree as dynamic so parent elements properly include the child init code
+	if (is_customizable_select_element(node)) {
+		// Mark the element's own fragment as dynamic so it's not treated as static
+		node.fragment.metadata.dynamic = true;
+		// Also mark ancestor fragments so parents properly include the child init code
+		mark_subtree_dynamic(context.path);
+	}
+
 	const binding = context.state.scope.get(node.name);
 	if (
 		binding !== null &&
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 717ee4bf50..50b107d068 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
@@ -831,6 +831,10 @@ function has_content(element) {
 				return true;
 			}
 
+			if (node.name === 'selectedcontent') {
+				return true;
+			}
+
 			if (!has_content(node)) {
 				continue;
 			}
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 c780350d3e..3b3cf4c325 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,12 @@ 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 { create_attribute, ExpressionMetadata, is_custom_element_node } from '../../../nodes.js';
+import {
+	create_attribute,
+	ExpressionMetadata,
+	is_custom_element_node,
+	is_customizable_select_element
+} from '../../../nodes.js';
 import { clean_nodes, determine_namespace_for_children } from '../../utils.js';
 import { build_getter } from '../utils.js';
 import {
@@ -24,6 +29,9 @@ import {
 import { process_children, is_static_element } from './shared/fragment.js';
 import { build_render_statement, build_template_chunk, Memoizer } from './shared/utils.js';
 import { visit_event_attribute } from './shared/events.js';
+import { Template } from '../transform-template/template.js';
+import { transform_template } from '../transform-template/index.js';
+import { TEMPLATE_FRAGMENT } from '../../../../../constants.js';
 
 /**
  * @param {AST.RegularElement} node
@@ -351,6 +359,57 @@ export function RegularElement(node, context) {
 				b.stmt(b.assignment('=', b.member(context.state.node, 'textContent'), value))
 			);
 		}
+	} else if (is_customizable_select_element(node)) {
+		// For <option>, <optgroup>, or <select> elements with rich content, we need to branch based on browser support.
+		// Modern browsers preserve rich HTML in options, older browsers strip it to text only.
+		// We create a separate template for the rich content and append it to the element.
+
+		const element_node = context.state.node;
+
+		// Add a hydration marker inside the option element so $.child() has an anchor to find
+		context.state.template.push_comment();
+
+		// Create a separate template for the rich content
+		const template_name = context.state.scope.root.unique(`${node.name}_content`);
+		const fragment_id = b.id(context.state.scope.generate('fragment'));
+		const anchor_id = b.id(context.state.scope.generate('anchor'));
+
+		// Create state with a new template for the rich content
+		/** @type {typeof state} */
+		const select_state = {
+			...state,
+			init: [],
+			update: [],
+			after_update: [],
+			template: new Template()
+		};
+
+		process_children(
+			trimmed,
+			(is_text) => b.call('$.first_child', fragment_id, is_text && b.true),
+			false,
+			{
+				...context,
+				state: select_state
+			}
+		);
+
+		// Transform the template to $.from_html(...) and hoist it
+		const template = transform_template(select_state, metadata.namespace, TEMPLATE_FRAGMENT);
+		context.state.hoisted.push(b.var(template_name, template));
+
+		// Build the rich content function body
+		// The anchor is the child of the element (a hydration marker during hydration)
+		const body = b.block([
+			b.var(anchor_id, b.call('$.child', element_node)),
+			b.var(fragment_id, b.call(template_name)),
+			...select_state.init,
+			...(select_state.update.length > 0 ? [build_render_statement(select_state)] : []),
+			...select_state.after_update,
+			b.stmt(b.call('$.append', anchor_id, fragment_id))
+		]);
+
+		child_state.init.push(b.stmt(b.call('$.customizable_select', element_node, b.arrow([], body))));
 	} else {
 		/** @type {Expression} */
 		let arg = context.state.node;
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 f74b1185a0..79858b95d9 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
@@ -15,6 +15,7 @@ import {
 	PromiseOptimiser,
 	create_async_block
 } from './shared/utils.js';
+import { is_customizable_select_element } from '../../../nodes.js';
 
 /**
  * @param {AST.RegularElement} node
@@ -124,6 +125,10 @@ export function RegularElement(node, context) {
 
 		const [attributes, ...rest] = prepare_element_spread_object(node, context, optimiser.transform);
 
+		if (is_customizable_select_element(node)) {
+			rest.push(b.true);
+		}
+
 		const statement = b.stmt(b.call('$$renderer.select', attributes, fn, ...rest));
 
 		if (optimiser.expressions.length > 0) {
@@ -149,14 +154,34 @@ export function RegularElement(node, context) {
 			const inner_state = { ...state, template: [], init: [] };
 			process_children(trimmed, { ...context, state: inner_state });
 
-			body = b.arrow(
-				[b.id('$$renderer')],
-				b.block([...state.init, ...build_template(inner_state.template)])
-			);
+			/** @type {import('estree').Statement[]} */
+			const body_statements = [...state.init, ...build_template(inner_state.template)];
+
+			if (dev) {
+				const location = locator(node.start);
+				body_statements.unshift(
+					b.stmt(
+						b.call(
+							'$.push_element',
+							b.id('$$renderer'),
+							b.literal(node.name),
+							b.literal(location.line),
+							b.literal(location.column)
+						)
+					)
+				);
+				body_statements.push(b.stmt(b.call('$.pop_element')));
+			}
+
+			body = b.arrow([b.id('$$renderer')], b.block(body_statements));
 		}
 
 		const [attributes, ...rest] = prepare_element_spread_object(node, context, optimiser.transform);
 
+		if (is_customizable_select_element(node)) {
+			rest.push(b.true);
+		}
+
 		const statement = b.stmt(b.call('$$renderer.option', attributes, body, ...rest));
 
 		if (optimiser.expressions.length > 0) {
@@ -192,7 +217,14 @@ export function RegularElement(node, context) {
 			)
 		);
 	} else {
+		// For optgroup or select with rich content, add hydration marker at the start
 		process_children(trimmed, { ...context, state });
+		if (
+			(node.name === 'optgroup' || node.name === 'select') &&
+			is_customizable_select_element(node)
+		) {
+			state.template.push(b.literal('<!>'));
+		}
 	}
 
 	if (!node_is_void) {
diff --git a/packages/svelte/src/compiler/phases/nodes.js b/packages/svelte/src/compiler/phases/nodes.js
index 313880cf5b..f302603409 100644
--- a/packages/svelte/src/compiler/phases/nodes.js
+++ b/packages/svelte/src/compiler/phases/nodes.js
@@ -148,3 +148,98 @@ export function get_name(node) {
 
 	return null;
 }
+
+/**
+ * Checks if an <option>, <optgroup>, or <select> element has rich content that requires special hydration handling.
+ * Rich content is anything beyond simple text, expressions, and comments for <option>,
+ * anything beyond <option> children for <optgroup>,
+ * or anything beyond <option>, <optgroup>, and empty text for <select>.
+ * Control flow blocks are recursively checked - they only count as rich content if they contain rich content.
+ * @param {AST.RegularElement} node
+ * @returns {boolean}
+ */
+export function is_customizable_select_element(node) {
+	if (node.name === 'select' || node.name === 'optgroup' || node.name === 'option') {
+		for (const child of find_descendants(node.fragment)) {
+			if (child.type === 'RegularElement') {
+				if (node.name === 'select' && child.name !== 'option' && child.name !== 'optgroup') {
+					return true;
+				}
+
+				if (node.name === 'optgroup' && child.name !== 'option') {
+					return true;
+				}
+
+				if (node.name === 'option') {
+					return true;
+				}
+			}
+
+			// Text nodes directly in <select> or <optgroup> are rich content
+			else if (child.type === 'Text') {
+				if (node.name === 'select' || node.name === 'optgroup') {
+					return true;
+				}
+			}
+
+			// Any non-RegularElement, non-Text node is rich content
+			else {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * @param {AST.Fragment | null} fragment
+ * @returns {Iterable<AST.SvelteNode>}
+ */
+function* find_descendants(fragment) {
+	if (fragment === null) return;
+
+	for (const node of fragment.nodes) {
+		switch (node.type) {
+			case 'SnippetBlock':
+			case 'DebugTag':
+			case 'ConstTag':
+			case 'Comment':
+			case 'ExpressionTag':
+				break;
+
+			case 'Text':
+				if (node.data.trim() !== '') {
+					yield node;
+				}
+				break;
+
+			case 'IfBlock':
+				yield* find_descendants(node.consequent);
+				yield* find_descendants(node.alternate);
+				break;
+
+			case 'EachBlock':
+				yield* find_descendants(node.body);
+				yield* find_descendants(node.fallback ?? null);
+				break;
+
+			case 'KeyBlock':
+				yield* find_descendants(node.fragment);
+				break;
+
+			case 'AwaitBlock':
+				yield* find_descendants(node.pending);
+				yield* find_descendants(node.then);
+				yield* find_descendants(node.catch);
+				break;
+
+			case 'SvelteBoundary':
+				yield* find_descendants(node.fragment);
+				break;
+
+			default:
+				yield node;
+		}
+	}
+}
diff --git a/packages/svelte/src/html-tree-validation.js b/packages/svelte/src/html-tree-validation.js
index 4ec4ecf26f..d05cb81a71 100644
--- a/packages/svelte/src/html-tree-validation.js
+++ b/packages/svelte/src/html-tree-validation.js
@@ -80,9 +80,9 @@ export function closing_tag_omitted(current, next) {
  */
 const disallowed_children = {
 	...autoclosing_children,
-	optgroup: { only: ['option', '#text'] },
 	// Strictly speaking, seeing an <option> doesn't mean we're in a <select>, but we assume it here
-	option: { only: ['#text'] },
+	// option or optgroup does not have an `only` restriction because newer browsers support rich HTML content
+	// inside option elements. For older browsers, hydration will handle the mismatch.
 	form: { descendant: ['form'] },
 	a: { descendant: ['a'] },
 	button: { descendant: ['button'] },
@@ -92,8 +92,6 @@ const disallowed_children = {
 	h4: { descendant: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'] },
 	h5: { descendant: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'] },
 	h6: { descendant: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'] },
-	// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inselect
-	select: { only: ['option', 'optgroup', '#text', 'hr', 'script', 'template'] },
 
 	// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-intd
 	// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-incaption
diff --git a/packages/svelte/src/internal/client/dom/elements/customizable-select.js b/packages/svelte/src/internal/client/dom/elements/customizable-select.js
new file mode 100644
index 0000000000..5bf2144d1c
--- /dev/null
+++ b/packages/svelte/src/internal/client/dom/elements/customizable-select.js
@@ -0,0 +1,51 @@
+import { hydrating, reset, set_hydrate_node, set_hydrating } from '../hydration.js';
+import { create_comment } from '../operations.js';
+
+/** @type {boolean | null} */
+let supported = null;
+
+/**
+ * Checks if the browser supports rich HTML content inside `<option>` elements.
+ * Modern browsers preserve HTML elements inside options, while older browsers
+ * strip them during parsing, leaving only text content.
+ * @returns {boolean}
+ */
+function is_supported() {
+	if (supported === null) {
+		var select = document.createElement('select');
+		select.innerHTML = '<option><span>t</span></option>';
+		supported = /** @type {Element} */ (select.firstChild)?.firstChild?.nodeType === 1;
+	}
+
+	return supported;
+}
+
+/**
+ * Handles rich HTML content inside `<option>`, `<optgroup>`, or `<select>` elements with browser-specific branching.
+ * Modern browsers preserve HTML inside options, while older browsers strip it to text only.
+ *
+ * @param {HTMLOptionElement | HTMLOptGroupElement | HTMLSelectElement} element The element to process
+ * @param {() => void} rich_fn Function to process rich HTML content (modern browsers)
+ */
+export function customizable_select(element, rich_fn) {
+	var was_hydrating = hydrating;
+
+	if (!is_supported()) {
+		set_hydrating(false);
+		element.textContent = '';
+		element.append(create_comment(''));
+	}
+
+	try {
+		rich_fn();
+	} finally {
+		if (was_hydrating) {
+			if (hydrating) {
+				reset(element);
+			} else {
+				set_hydrating(true);
+				set_hydrate_node(element);
+			}
+		}
+	}
+}
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index a2666d8712..4792bc7230 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -42,6 +42,7 @@ export {
 export { set_class } from './dom/elements/class.js';
 export { apply, event, delegate, replay_events } from './dom/elements/events.js';
 export { autofocus, remove_textarea_child } from './dom/elements/misc.js';
+export { customizable_select } from './dom/elements/customizable-select.js';
 export { set_style } from './dom/elements/style.js';
 export { animation, transition } from './dom/elements/transitions.js';
 export { bind_active_element } from './dom/elements/bindings/document.js';
diff --git a/packages/svelte/src/internal/server/renderer.js b/packages/svelte/src/internal/server/renderer.js
index 82f8025759..4da0b05cfd 100644
--- a/packages/svelte/src/internal/server/renderer.js
+++ b/packages/svelte/src/internal/server/renderer.js
@@ -220,9 +220,10 @@ export class Renderer {
 	 * @param {Record<string, boolean> | undefined} [classes]
 	 * @param {Record<string, string> | undefined} [styles]
 	 * @param {number | undefined} [flags]
+	 * @param {boolean | undefined} [is_rich]
 	 * @returns {void}
 	 */
-	select(attrs, fn, css_hash, classes, styles, flags) {
+	select(attrs, fn, css_hash, classes, styles, flags, is_rich) {
 		const { value, ...select_attrs } = attrs;
 
 		this.push(`<select${attributes(select_attrs, css_hash, classes, styles, flags)}>`);
@@ -230,7 +231,7 @@ export class Renderer {
 			renderer.local.select_value = value;
 			fn(renderer);
 		});
-		this.push('</select>');
+		this.push(`${is_rich ? '<!>' : ''}</select>`);
 	}
 
 	/**
@@ -240,8 +241,9 @@ export class Renderer {
 	 * @param {Record<string, boolean> | undefined} [classes]
 	 * @param {Record<string, string> | undefined} [styles]
 	 * @param {number | undefined} [flags]
+	 * @param {boolean | undefined} [is_rich]
 	 */
-	option(attrs, body, css_hash, classes, styles, flags) {
+	option(attrs, body, css_hash, classes, styles, flags, is_rich) {
 		this.#out.push(`<option${attributes(attrs, css_hash, classes, styles, flags)}`);
 
 		/**
@@ -258,7 +260,7 @@ export class Renderer {
 				renderer.#out.push(' selected');
 			}
 
-			renderer.#out.push(`>${body}</option>`);
+			renderer.#out.push(`>${body}${is_rich ? '<!>' : ''}</option>`);
 
 			// super edge case, but may as well handle it
 			if (head) {
diff --git a/packages/svelte/tests/css/samples/selectedcontent/expected.css b/packages/svelte/tests/css/samples/selectedcontent/expected.css
new file mode 100644
index 0000000000..87b4e04de7
--- /dev/null
+++ b/packages/svelte/tests/css/samples/selectedcontent/expected.css
@@ -0,0 +1,44 @@
+
+	select.svelte-xyz,
+	.svelte-xyz::picker(select) {
+	  appearance: base-select;
+	}
+	selectedcontent.svelte-xyz b:where(.svelte-xyz){
+		color: red;
+	}
+	e.svelte-xyz{
+		selectedcontent:where(.svelte-xyz) &{
+			color: green;
+		}
+	}
+	select.svelte-xyz > button:where(.svelte-xyz) > selectedcontent:where(.svelte-xyz) > b:where(.svelte-xyz) {
+		color: blue;
+	}
+
+	select.svelte-xyz > button:where(.svelte-xyz) > selectedcontent:where(.svelte-xyz) i:where(.svelte-xyz) {
+		color: blue;
+	}
+
+	selectedcontent.svelte-xyz:has(b:where(.svelte-xyz)){
+		background-color: rebeccapurple;
+	}
+
+	selectedcontent.svelte-xyz:has(i:where(.svelte-xyz)){
+		background-color: rebeccapurple;
+	}
+
+	option.svelte-xyz > b:where(.svelte-xyz){
+		color: orange;
+	}
+
+	option.svelte-xyz b:where(.svelte-xyz){
+		color: #ff3e00;
+	}
+
+	option.svelte-xyz > b:where(.svelte-xyz) > i:where(.svelte-xyz){
+		text-decoration: underline;
+	}
+
+	option.svelte-xyz i:where(.svelte-xyz){
+		text-decoration: dashed;
+	}
diff --git a/packages/svelte/tests/css/samples/selectedcontent/input.svelte b/packages/svelte/tests/css/samples/selectedcontent/input.svelte
new file mode 100644
index 0000000000..b8305551d7
--- /dev/null
+++ b/packages/svelte/tests/css/samples/selectedcontent/input.svelte
@@ -0,0 +1,53 @@
+<select>
+	<button aria-label="Selected value">
+		<selectedcontent></selectedcontent>
+	</button>
+	<option>plain text</option>
+	<option><b>rich <i>italic</i></b><e>content</e></option>
+</select>
+
+<style>
+	select,
+	::picker(select) {
+	  appearance: base-select;
+	}
+	selectedcontent b{
+		color: red;
+	}
+	e{
+		selectedcontent &{
+			color: green;
+		}
+	}
+	select > button > selectedcontent > b {
+		color: blue;
+	}
+
+	select > button > selectedcontent i {
+		color: blue;
+	}
+
+	selectedcontent:has(b){
+		background-color: rebeccapurple;
+	}
+
+	selectedcontent:has(i){
+		background-color: rebeccapurple;
+	}
+
+	option > b{
+		color: orange;
+	}
+
+	option b{
+		color: #ff3e00;
+	}
+
+	option > b > i{
+		text-decoration: underline;
+	}
+
+	option i{
+		text-decoration: dashed;
+	}
+</style>
\ No newline at end of file
diff --git a/packages/svelte/tests/hydration/samples/optgroup-rich-content/_config.js b/packages/svelte/tests/hydration/samples/optgroup-rich-content/_config.js
new file mode 100644
index 0000000000..36ca2e6ae5
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/optgroup-rich-content/_config.js
@@ -0,0 +1,31 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	// This test verifies that hydration works correctly for
+	// optgroup elements with rich HTML content (non-option elements inside optgroup)
+	snapshot(target) {
+		const select = target.querySelector('select');
+
+		return {
+			select
+		};
+	},
+
+	async test(assert, target) {
+		const optgroup = target.querySelector('optgroup');
+		const options = target.querySelectorAll('option');
+		const button = target.querySelector('button');
+
+		// Check options content - the span inside optgroup gets stripped but text remains
+		assert.equal(options[0]?.textContent, 'hello hello');
+		assert.equal(options[1]?.textContent, 'Plain option');
+
+		// Update via button click
+		flushSync(() => {
+			button?.click();
+		});
+
+		assert.equal(options[0]?.textContent, 'changed changed');
+	}
+});
diff --git a/packages/svelte/tests/hydration/samples/optgroup-rich-content/_expected.html b/packages/svelte/tests/hydration/samples/optgroup-rich-content/_expected.html
new file mode 100644
index 0000000000..911b92770b
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/optgroup-rich-content/_expected.html
@@ -0,0 +1 @@
+<select><optgroup label="Fruits">hello <option value="a"><span>hello</span> hello</option><option value="b">Plain option</option></optgroup><optgroup label="Static Group"><option value="c">Another option</option></optgroup></select> <button></button>
diff --git a/packages/svelte/tests/hydration/samples/optgroup-rich-content/main.svelte b/packages/svelte/tests/hydration/samples/optgroup-rich-content/main.svelte
new file mode 100644
index 0000000000..227c4d56d5
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/optgroup-rich-content/main.svelte
@@ -0,0 +1,16 @@
+<script>
+	let label = $state('hello');
+</script>
+
+<select>
+	<optgroup label="Fruits">
+		<span class="group-header">{label}</span>
+		<option value="a"><span>{label}</span> {label}</option>
+		<option value="b">Plain option</option>
+	</optgroup>
+	<optgroup label="Static Group">
+		<option value="c">Another option</option>
+	</optgroup>
+</select>
+
+<button onclick={() => label = "changed"}></button>
diff --git a/packages/svelte/tests/hydration/samples/option-rich-content-continues/_config.js b/packages/svelte/tests/hydration/samples/option-rich-content-continues/_config.js
new file mode 100644
index 0000000000..a2163b7c67
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/option-rich-content-continues/_config.js
@@ -0,0 +1,34 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	// This test verifies that hydration continues correctly after
+	// an option element with rich HTML content
+	snapshot(target) {
+		const select = target.querySelector('select');
+		const options = target.querySelectorAll('option');
+		const p = target.querySelector('p');
+		const button = target.querySelector('button');
+
+		return {
+			select,
+			option1: options[0],
+			option2: options[1],
+			p,
+			button
+		};
+	},
+
+	async test(assert, target) {
+		const option = target.querySelector('option');
+		const button = target.querySelector('button');
+
+		assert.equal(option?.textContent, 'hello hello');
+
+		flushSync(() => {
+			button?.click();
+		});
+
+		assert.equal(option?.textContent, 'changed changed');
+	}
+});
diff --git a/packages/svelte/tests/hydration/samples/option-rich-content-continues/_expected.html b/packages/svelte/tests/hydration/samples/option-rich-content-continues/_expected.html
new file mode 100644
index 0000000000..d3e209c990
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/option-rich-content-continues/_expected.html
@@ -0,0 +1 @@
+<select><option value="a">hello hello</option><option value="b">Plain text</option></select> <button></button>
diff --git a/packages/svelte/tests/hydration/samples/option-rich-content-continues/main.svelte b/packages/svelte/tests/hydration/samples/option-rich-content-continues/main.svelte
new file mode 100644
index 0000000000..47edc28035
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/option-rich-content-continues/main.svelte
@@ -0,0 +1,12 @@
+<script>
+	let label = $state('hello');
+	let count = $state(42);
+</script>
+
+<select>
+	<!-- this would fail during hydration if rich_option handling is not correct -->
+	<option value="a"><span>{label}</span> {label}</option>
+	<option value="b">Plain text</option>
+</select>
+	
+<button onclick={() => label = "changed"}></button>
diff --git a/packages/svelte/tests/hydration/samples/option-rich-content-static/_config.js b/packages/svelte/tests/hydration/samples/option-rich-content-static/_config.js
new file mode 100644
index 0000000000..ca8c2b6ec1
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/option-rich-content-static/_config.js
@@ -0,0 +1,39 @@
+import { test } from '../../test';
+
+export default test({
+	// This test verifies that completely static select with rich option content
+	// hydrates correctly and the content is preserved
+	snapshot(target) {
+		const select = target.querySelector('select');
+		const options = target.querySelectorAll('option');
+
+		return {
+			select,
+			option1: options[0],
+			option2: options[1],
+			option3: options[2]
+		};
+	},
+
+	async test(assert, target) {
+		const options = target.querySelectorAll('option');
+
+		// Verify the rich content is present in the options
+		assert.equal(options[0]?.textContent, 'Bold Option');
+		assert.equal(options[1]?.textContent, 'Italic Option');
+		assert.equal(options[2]?.textContent, 'Plain Option');
+
+		// Check that the rich elements are actually there (on supporting browsers)
+		const strong = options[0]?.querySelector('strong');
+		const em = options[1]?.querySelector('em');
+
+		// These may or may not exist depending on browser support
+		// but the text content should always be correct
+		if (strong) {
+			assert.equal(strong.textContent, 'Bold');
+		}
+		if (em) {
+			assert.equal(em.textContent, 'Italic');
+		}
+	}
+});
diff --git a/packages/svelte/tests/hydration/samples/option-rich-content-static/_expected.html b/packages/svelte/tests/hydration/samples/option-rich-content-static/_expected.html
new file mode 100644
index 0000000000..93cfa49dd1
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/option-rich-content-static/_expected.html
@@ -0,0 +1 @@
+<select><option value="a"><strong>Bold</strong> Option</option><option value="b"><em>Italic</em> Option</option><option value="c">Plain Option</option></select>
diff --git a/packages/svelte/tests/hydration/samples/option-rich-content-static/main.svelte b/packages/svelte/tests/hydration/samples/option-rich-content-static/main.svelte
new file mode 100644
index 0000000000..bd81687434
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/option-rich-content-static/main.svelte
@@ -0,0 +1,5 @@
+<select>
+	<option value="a"><strong>Bold</strong> Option</option>
+	<option value="b"><em>Italic</em> Option</option>
+	<option value="c">Plain Option</option>
+</select>
diff --git a/packages/svelte/tests/hydration/samples/rich-select/Option.svelte b/packages/svelte/tests/hydration/samples/rich-select/Option.svelte
new file mode 100644
index 0000000000..783915d571
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/rich-select/Option.svelte
@@ -0,0 +1 @@
+<option>Option component</option>
\ No newline at end of file
diff --git a/packages/svelte/tests/hydration/samples/rich-select/_config.js b/packages/svelte/tests/hydration/samples/rich-select/_config.js
new file mode 100644
index 0000000000..f47bee71df
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/rich-select/_config.js
@@ -0,0 +1,3 @@
+import { test } from '../../test';
+
+export default test({});
diff --git a/packages/svelte/tests/hydration/samples/rich-select/main.svelte b/packages/svelte/tests/hydration/samples/rich-select/main.svelte
new file mode 100644
index 0000000000..bb77d8e57a
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/rich-select/main.svelte
@@ -0,0 +1,173 @@
+<script>
+	let items = [1, 2, 3];
+	let show = true;
+	let html = '<option>From HTML</option>';
+
+	import Option from './Option.svelte';
+</script>
+
+<!-- select with rich option (has span inside) - SHOULD use customizable_select_element -->
+<select>
+	<option><span>Rich</span></option>
+</select>
+
+<!-- select with each containing plain options - should NOT use customizable_select_element -->
+<select>
+	{#each items as item}
+		<option>{item}</option>
+	{/each}
+</select>
+
+<!-- select with if containing plain options - should NOT use customizable_select_element -->
+<select>
+	{#if show}
+		<option>Visible</option>
+	{/if}
+</select>
+
+<!-- select with key containing plain options - should NOT use customizable_select_element -->
+<select>
+	{#key items}
+		<option>Keyed</option>
+	{/key}
+</select>
+
+<!-- select with snippet defined at top level and rendered - should NOT use customizable_select_element -->
+{#snippet opt()}
+	<option>Snippet</option>
+{/snippet}
+<select>
+	{@render opt()}
+</select>
+
+<!-- select with const inside each (should be ignored) - should NOT use customizable_select_element -->
+<select>
+	{#each items as item}
+		{@const x = item * 2}
+		<option>{x}</option>
+	{/each}
+</select>
+
+<!-- optgroup with rich option - SHOULD use customizable_select_element -->
+<select>
+	<optgroup label="Group">
+		<option><strong>Bold</strong></option>
+	</optgroup>
+</select>
+
+<!-- optgroup with each containing plain options - should NOT use customizable_select_element -->
+<select>
+	<optgroup label="Group">
+		{#each items as item}
+			<option>{item}</option>
+		{/each}
+	</optgroup>
+</select>
+
+<!-- option with rich content (span) - SHOULD use customizable_select_element -->
+<select>
+	<option value="a"><em>Italic</em> text</option>
+</select>
+
+<!-- nested: select > each > option with rich content - SHOULD use customizable_select_element on option -->
+<select>
+	{#each items as item}
+		<option><span>{item}</span></option>
+	{/each}
+</select>
+
+<!-- nested: select > if > each > plain options - should NOT use customizable_select_element -->
+<select>
+	{#if show}
+		{#each items as item}
+			<option>{item}</option>
+		{/each}
+	{/if}
+</select>
+
+<!-- select with svelte:boundary containing plain options - should NOT use customizable_select_element -->
+<select>
+	<svelte:boundary>
+		<option>Boundary</option>
+	</svelte:boundary>
+</select>
+
+<!-- select with svelte:boundary containing rich options - SHOULD use customizable_select_element on option -->
+<select>
+	<svelte:boundary>
+		<option><span>Rich in boundary</span></option>
+	</svelte:boundary>
+</select>
+
+<!-- select with Component - SHOULD be treated as rich content -->
+<select>
+	<Option />
+</select>
+
+<!-- select with @render snippet - SHOULD be treated as rich content -->
+{#snippet option_snippet()}
+	<option>Rendered</option>
+{/snippet}
+<select>
+	{@render option_snippet()}
+</select>
+
+<!-- select with @html - SHOULD be treated as rich content -->
+<select>
+	{@html html}
+</select>
+
+<!-- optgroup with Component - SHOULD be treated as rich content -->
+<select>
+	<optgroup label="Group">
+		<Option />
+	</optgroup>
+</select>
+
+<!-- optgroup with @render - SHOULD be treated as rich content -->
+{#snippet option_snippet2()}
+	<option>Rendered in group</option>
+{/snippet}
+<select>
+	<optgroup label="Group">
+		{@render option_snippet2()}
+	</optgroup>
+</select>
+
+<!-- option with @html inside - SHOULD use customizable_select_element -->
+<select>
+	<option>{@html '<strong>Bold HTML</strong>'}</option>
+</select>
+
+<!-- each block inside select with Component - SHOULD be treated as rich -->
+<select>
+	{#each items as item}
+		<Option />
+	{/each}
+</select>
+
+<!-- if block inside select with @render - SHOULD be treated as rich -->
+{#snippet conditional_option()}
+	<option>Conditional</option>
+{/snippet}
+<select>
+	{#if show}
+		{@render conditional_option()}
+	{/if}
+</select>
+
+<!-- select with button/selectedcontent and static options - SHOULD use customizable_select_element -->
+<select>
+	<button><selectedcontent></selectedcontent></button>
+	<option>cool</option>
+	<option>cooler</option>
+	<option>coolerone</option>
+</select>
+
+<!-- select with button/selectedcontent and dynamic options - SHOULD use customizable_select_element -->
+<select>
+	<button><selectedcontent></selectedcontent></button>
+	{#each items as item}
+		<option>{item}</option>
+	{/each}
+</select>
diff --git a/packages/svelte/tests/runtime-runes/samples/optgroup-rich-content/_config.js b/packages/svelte/tests/runtime-runes/samples/optgroup-rich-content/_config.js
new file mode 100644
index 0000000000..9de60bcb56
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/optgroup-rich-content/_config.js
@@ -0,0 +1,31 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+// Test that optgroup with rich HTML content (non-option elements) and dynamic expressions works correctly
+export default test({
+	mode: ['client', 'hydrate'],
+	test({ assert, target }) {
+		const select = /** @type {HTMLSelectElement} */ (target.querySelector('select'));
+		const optgroups = target.querySelectorAll('optgroup');
+		const options = target.querySelectorAll('option');
+		const button = /** @type {HTMLButtonElement} */ (target.querySelector('button'));
+
+		assert.ok(select);
+		assert.equal(optgroups.length, 2);
+		assert.equal(options.length, 4);
+
+		// Check initial option content (rich content inside optgroup)
+		assert.equal(options[0]?.textContent, 'apple apple');
+		assert.equal(options[1]?.textContent, 'banana');
+		assert.equal(options[2]?.textContent, 'carrot carrot');
+		assert.equal(options[3]?.textContent, 'Plain celery');
+
+		// Click button to change dynamic content
+		button.click();
+		flushSync();
+
+		// Check updated option content
+		assert.equal(options[0]?.textContent, 'orange orange');
+		assert.equal(options[2]?.textContent, 'broccoli broccoli');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/optgroup-rich-content/main.svelte b/packages/svelte/tests/runtime-runes/samples/optgroup-rich-content/main.svelte
new file mode 100644
index 0000000000..03777a1cfb
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/optgroup-rich-content/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	let fruit = $state('apple');
+	let vegetable = $state('carrot');
+</script>
+
+<select>
+	<optgroup label="Fruits">
+		<span class="fruits-header">{fruit}</span>
+		<option value="a"><span>{fruit}</span> {fruit}</option>
+		<option value="b">banana</option>
+	</optgroup>
+	<optgroup label="Vegetables">
+		<em class="veggies-header">{vegetable}</em>
+		<option value="c"><em>{vegetable}</em> {vegetable}</option>
+		<option value="d">Plain celery</option>
+	</optgroup>
+</select>
+
+<button onclick={() => { fruit = 'orange'; vegetable = 'broccoli'; }}>Change</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/option-rich-content/_config.js b/packages/svelte/tests/runtime-runes/samples/option-rich-content/_config.js
new file mode 100644
index 0000000000..3c9e5847cd
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/option-rich-content/_config.js
@@ -0,0 +1,37 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+// Test that rich HTML content in <option> elements compiles without errors
+// and that the component functions correctly (on browsers that support it)
+export default test({
+	mode: ['client'],
+	test({ assert, target }) {
+		const select = /** @type {HTMLSelectElement} */ (target.querySelector('select'));
+		const p = /** @type {HTMLParagraphElement} */ (target.querySelector('p'));
+		const button = /** @type {HTMLButtonElement} */ (target.querySelector('button'));
+
+		assert.ok(select);
+		assert.ok(p);
+		assert.ok(button);
+		assert.equal(select.value, 'a');
+		assert.equal(p.textContent, 'Selected: a');
+
+		// Verify options exist
+		assert.equal(select.options.length, 3);
+
+		// Change selection
+		select.value = 'b';
+		select.dispatchEvent(new Event('change'));
+		flushSync();
+
+		assert.equal(p.textContent, 'Selected: b');
+
+		// Test reactivity of content within option (only works on browsers that support rich options)
+		// On modern browsers, clicking the button should update the text inside the span
+		button.click();
+		flushSync();
+
+		// The option text content should be updated on browsers that support rich options
+		// For this test, we just verify the component doesn't crash
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/option-rich-content/main.svelte b/packages/svelte/tests/runtime-runes/samples/option-rich-content/main.svelte
new file mode 100644
index 0000000000..37351ab058
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/option-rich-content/main.svelte
@@ -0,0 +1,15 @@
+<script>
+	let selected = $state('a');
+	let label_a = $state('Option');
+	let label_b = $state('Strong');
+</script>
+
+<select bind:value={selected}>
+	<option value="a"><span>{label_a}</span> A</option>
+	<option value="b"><strong>{label_b}</strong> B</option>
+	<option value="c">Plain C</option>
+</select>
+
+<p>Selected: {selected}</p>
+
+<button onclick={() => label_a = 'Changed'}>Change A</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/rich-option-component/Content.svelte b/packages/svelte/tests/runtime-runes/samples/rich-option-component/Content.svelte
new file mode 100644
index 0000000000..437ab3e793
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/rich-option-component/Content.svelte
@@ -0,0 +1,5 @@
+<script>
+	let { text } = $props();
+</script>
+
+<span>{text}</span>
diff --git a/packages/svelte/tests/runtime-runes/samples/rich-option-component/_config.js b/packages/svelte/tests/runtime-runes/samples/rich-option-component/_config.js
new file mode 100644
index 0000000000..39d0db6590
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/rich-option-component/_config.js
@@ -0,0 +1,26 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+// Test that components can be used inside <option> elements.
+// This tests two scenarios:
+// 1. A component that wraps the entire <option> element
+// 2. A component used as content inside an <option> element
+//
+// In jsdom (which doesn't support rich options), the HTML content is stripped,
+// so we only verify the component doesn't crash and values work correctly.
+export default test({
+	test({ assert, target }) {
+		const option1 = target.querySelector('option');
+		const button = target.querySelector('button');
+
+		assert.ok(option1);
+
+		assert.equal(option1?.textContent, 'bb');
+
+		flushSync(() => {
+			button?.click();
+		});
+
+		assert.equal(option1?.textContent, 'aa');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/rich-option-component/main.svelte b/packages/svelte/tests/runtime-runes/samples/rich-option-component/main.svelte
new file mode 100644
index 0000000000..aed1342dfd
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/rich-option-component/main.svelte
@@ -0,0 +1,15 @@
+<script>
+	import Content from './Content.svelte';
+
+	let content = $state('b');
+</script>
+
+
+<!-- Test 2: Option with component as content -->
+<select>
+	<option value="x"><span>{content}</span><Content text={content} /></option>
+</select>
+
+<button onclick={() => content = content === 'a' ? 'b' : 'a'}>
+	Toggle Content
+</button>
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/select-with-rich-content/Option.svelte b/packages/svelte/tests/snapshot/samples/select-with-rich-content/Option.svelte
new file mode 100644
index 0000000000..89c9c1c111
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/select-with-rich-content/Option.svelte
@@ -0,0 +1 @@
+<option>Component Option</option>
diff --git a/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/client/Option.svelte.js b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/client/Option.svelte.js
new file mode 100644
index 0000000000..a4b18a011b
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/client/Option.svelte.js
@@ -0,0 +1,11 @@
+import 'svelte/internal/disclose-version';
+import 'svelte/internal/flags/legacy';
+import * as $ from 'svelte/internal/client';
+
+var root = $.from_html(`<option>Component Option</option>`);
+
+export default function Option($$anchor) {
+	var option = root();
+
+	$.append($$anchor, option);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/client/index.svelte.js
new file mode 100644
index 0000000000..8f8b115d70
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/client/index.svelte.js
@@ -0,0 +1,412 @@
+import 'svelte/internal/disclose-version';
+import 'svelte/internal/flags/legacy';
+import * as $ from 'svelte/internal/client';
+import Option from './Option.svelte';
+
+const opt = ($$anchor) => {
+	var option = root_1();
+
+	$.append($$anchor, option);
+};
+
+const option_snippet = ($$anchor) => {
+	var option_1 = root_2();
+
+	$.append($$anchor, option_1);
+};
+
+const option_snippet2 = ($$anchor) => {
+	var option_2 = root_3();
+
+	$.append($$anchor, option_2);
+};
+
+const conditional_option = ($$anchor) => {
+	var option_3 = root_4();
+
+	$.append($$anchor, option_3);
+};
+
+var root_1 = $.from_html(`<option>Snippet</option>`);
+var root_2 = $.from_html(`<option>Rendered</option>`);
+var root_3 = $.from_html(`<option>Rendered in group</option>`);
+var root_4 = $.from_html(`<option>Conditional</option>`);
+var option_content = $.from_html(`<span>Rich</span>`, 1);
+var root_5 = $.from_html(`<option> </option>`);
+var root_6 = $.from_html(`<option>Visible</option>`);
+var root_7 = $.from_html(`<option>Keyed</option>`);
+var select_content = $.from_html(`<!>`, 1);
+var root_8 = $.from_html(`<option> </option>`);
+var option_content_1 = $.from_html(`<strong>Bold</strong>`, 1);
+var root_9 = $.from_html(`<option> </option>`);
+var option_content_2 = $.from_html(`<em>Italic</em> text`, 1);
+var option_content_3 = $.from_html(`<span> </span>`, 1);
+var root_10 = $.from_html(`<option><!></option>`);
+var root_12 = $.from_html(`<option> </option>`);
+var root_13 = $.from_html(`<option>Boundary</option>`);
+var option_content_4 = $.from_html(`<span>Rich in boundary</span>`, 1);
+var root_14 = $.from_html(`<option><!></option>`);
+var select_content_1 = $.from_html(`<!>`, 1);
+var select_content_2 = $.from_html(`<!>`, 1);
+var select_content_3 = $.from_html(`<!>`, 1);
+var optgroup_content = $.from_html(`<!>`, 1);
+var optgroup_content_1 = $.from_html(`<!>`, 1);
+var option_content_5 = $.from_html(`<!>`, 1);
+var select_content_4 = $.from_html(`<!>`, 1);
+var select_content_5 = $.from_html(`<!>`, 1);
+var root = $.from_html(`<select><option><!></option></select> <select></select> <select><!></select> <select><!></select>  <select><!></select> <select></select> <select><optgroup label="Group"><option><!></option></optgroup></select> <select><optgroup label="Group"></optgroup></select> <select><option><!></option></select> <select></select> <select><!></select> <select><!></select> <select><!></select> <select><!></select>  <select><!></select> <select><!></select> <select><optgroup label="Group"><!></optgroup></select>  <select><optgroup label="Group"><!></optgroup></select> <select><option><!></option></select> <select><!></select>  <select><!></select>`, 1);
+
+export default function Select_with_rich_content($$anchor) {
+	let items = [1, 2, 3];
+	let show = true;
+	let html = '<option>From HTML</option>';
+	var fragment = root();
+	var select = $.first_child(fragment);
+	var option_4 = $.child(select);
+
+	$.customizable_select(option_4, () => {
+		var anchor = $.child(option_4);
+		var fragment_1 = option_content();
+
+		$.append(anchor, fragment_1);
+	});
+
+	$.reset(select);
+
+	var select_1 = $.sibling(select, 2);
+
+	$.each(select_1, 5, () => items, $.index, ($$anchor, item) => {
+		var option_5 = root_5();
+		var text = $.child(option_5, true);
+
+		$.reset(option_5);
+
+		var option_5_value = {};
+
+		$.template_effect(() => {
+			$.set_text(text, $.get(item));
+
+			if (option_5_value !== (option_5_value = $.get(item))) {
+				option_5.__value = $.get(item);
+			}
+		});
+
+		$.append($$anchor, option_5);
+	});
+
+	$.reset(select_1);
+
+	var select_2 = $.sibling(select_1, 2);
+	var node = $.child(select_2);
+
+	{
+		var consequent = ($$anchor) => {
+			var option_6 = root_6();
+
+			$.append($$anchor, option_6);
+		};
+
+		$.if(node, ($$render) => {
+			if (show) $$render(consequent);
+		});
+	}
+
+	$.reset(select_2);
+
+	var select_3 = $.sibling(select_2, 2);
+	var node_1 = $.child(select_3);
+
+	$.key(node_1, () => items, ($$anchor) => {
+		var option_7 = root_7();
+
+		$.append($$anchor, option_7);
+	});
+
+	$.reset(select_3);
+
+	var select_4 = $.sibling(select_3, 2);
+
+	$.customizable_select(select_4, () => {
+		var anchor_1 = $.child(select_4);
+		var fragment_2 = select_content();
+		var node_2 = $.first_child(fragment_2);
+
+		opt(node_2);
+		$.append(anchor_1, fragment_2);
+	});
+
+	var select_5 = $.sibling(select_4, 2);
+
+	$.each(select_5, 5, () => items, $.index, ($$anchor, item) => {
+		const x = $.derived_safe_equal(() => $.get(item) * 2);
+		var option_8 = root_8();
+		var text_1 = $.child(option_8, true);
+
+		$.reset(option_8);
+
+		var option_8_value = {};
+
+		$.template_effect(() => {
+			$.set_text(text_1, $.get(x));
+
+			if (option_8_value !== (option_8_value = $.get(x))) {
+				option_8.__value = $.get(x);
+			}
+		});
+
+		$.append($$anchor, option_8);
+	});
+
+	$.reset(select_5);
+
+	var select_6 = $.sibling(select_5, 2);
+	var optgroup = $.child(select_6);
+	var option_9 = $.child(optgroup);
+
+	$.customizable_select(option_9, () => {
+		var anchor_2 = $.child(option_9);
+		var fragment_3 = option_content_1();
+
+		$.append(anchor_2, fragment_3);
+	});
+
+	$.reset(optgroup);
+	$.reset(select_6);
+
+	var select_7 = $.sibling(select_6, 2);
+	var optgroup_1 = $.child(select_7);
+
+	$.each(optgroup_1, 5, () => items, $.index, ($$anchor, item) => {
+		var option_10 = root_9();
+		var text_2 = $.child(option_10, true);
+
+		$.reset(option_10);
+
+		var option_10_value = {};
+
+		$.template_effect(() => {
+			$.set_text(text_2, $.get(item));
+
+			if (option_10_value !== (option_10_value = $.get(item))) {
+				option_10.__value = $.get(item);
+			}
+		});
+
+		$.append($$anchor, option_10);
+	});
+
+	$.reset(optgroup_1);
+	$.reset(select_7);
+
+	var select_8 = $.sibling(select_7, 2);
+	var option_11 = $.child(select_8);
+
+	$.customizable_select(option_11, () => {
+		var anchor_3 = $.child(option_11);
+		var fragment_4 = option_content_2();
+
+		$.next();
+		$.append(anchor_3, fragment_4);
+	});
+
+	option_11.value = option_11.__value = 'a';
+	$.reset(select_8);
+
+	var select_9 = $.sibling(select_8, 2);
+
+	$.each(select_9, 5, () => items, $.index, ($$anchor, item) => {
+		var option_12 = root_10();
+
+		$.customizable_select(option_12, () => {
+			var anchor_4 = $.child(option_12);
+			var fragment_5 = option_content_3();
+			var span = $.first_child(fragment_5);
+			var text_3 = $.child(span, true);
+
+			$.reset(span);
+			$.template_effect(() => $.set_text(text_3, $.get(item)));
+			$.append(anchor_4, fragment_5);
+		});
+
+		$.append($$anchor, option_12);
+	});
+
+	$.reset(select_9);
+
+	var select_10 = $.sibling(select_9, 2);
+	var node_3 = $.child(select_10);
+
+	{
+		var consequent_1 = ($$anchor) => {
+			var fragment_6 = $.comment();
+			var node_4 = $.first_child(fragment_6);
+
+			$.each(node_4, 1, () => items, $.index, ($$anchor, item) => {
+				var option_13 = root_12();
+				var text_4 = $.child(option_13, true);
+
+				$.reset(option_13);
+
+				var option_13_value = {};
+
+				$.template_effect(() => {
+					$.set_text(text_4, $.get(item));
+
+					if (option_13_value !== (option_13_value = $.get(item))) {
+						option_13.__value = $.get(item);
+					}
+				});
+
+				$.append($$anchor, option_13);
+			});
+
+			$.append($$anchor, fragment_6);
+		};
+
+		$.if(node_3, ($$render) => {
+			if (show) $$render(consequent_1);
+		});
+	}
+
+	$.reset(select_10);
+
+	var select_11 = $.sibling(select_10, 2);
+	var node_5 = $.child(select_11);
+
+	$.boundary(node_5, {}, ($$anchor) => {
+		var option_14 = root_13();
+
+		$.append($$anchor, option_14);
+	});
+
+	$.reset(select_11);
+
+	var select_12 = $.sibling(select_11, 2);
+	var node_6 = $.child(select_12);
+
+	$.boundary(node_6, {}, ($$anchor) => {
+		var option_15 = root_14();
+
+		$.customizable_select(option_15, () => {
+			var anchor_5 = $.child(option_15);
+			var fragment_7 = option_content_4();
+
+			$.append(anchor_5, fragment_7);
+		});
+
+		$.append($$anchor, option_15);
+	});
+
+	$.reset(select_12);
+
+	var select_13 = $.sibling(select_12, 2);
+
+	$.customizable_select(select_13, () => {
+		var anchor_6 = $.child(select_13);
+		var fragment_8 = select_content_1();
+		var node_7 = $.first_child(fragment_8);
+
+		Option(node_7, {});
+		$.append(anchor_6, fragment_8);
+	});
+
+	var select_14 = $.sibling(select_13, 2);
+
+	$.customizable_select(select_14, () => {
+		var anchor_7 = $.child(select_14);
+		var fragment_9 = select_content_2();
+		var node_8 = $.first_child(fragment_9);
+
+		option_snippet(node_8);
+		$.append(anchor_7, fragment_9);
+	});
+
+	var select_15 = $.sibling(select_14, 2);
+
+	$.customizable_select(select_15, () => {
+		var anchor_8 = $.child(select_15);
+		var fragment_10 = select_content_3();
+		var node_9 = $.first_child(fragment_10);
+
+		$.html(node_9, () => html);
+		$.append(anchor_8, fragment_10);
+	});
+
+	var select_16 = $.sibling(select_15, 2);
+	var optgroup_2 = $.child(select_16);
+
+	$.customizable_select(optgroup_2, () => {
+		var anchor_9 = $.child(optgroup_2);
+		var fragment_11 = optgroup_content();
+		var node_10 = $.first_child(fragment_11);
+
+		Option(node_10, {});
+		$.append(anchor_9, fragment_11);
+	});
+
+	$.reset(select_16);
+
+	var select_17 = $.sibling(select_16, 2);
+	var optgroup_3 = $.child(select_17);
+
+	$.customizable_select(optgroup_3, () => {
+		var anchor_10 = $.child(optgroup_3);
+		var fragment_12 = optgroup_content_1();
+		var node_11 = $.first_child(fragment_12);
+
+		option_snippet2(node_11);
+		$.append(anchor_10, fragment_12);
+	});
+
+	$.reset(select_17);
+
+	var select_18 = $.sibling(select_17, 2);
+	var option_16 = $.child(select_18);
+
+	$.customizable_select(option_16, () => {
+		var anchor_11 = $.child(option_16);
+		var fragment_13 = option_content_5();
+		var node_12 = $.first_child(fragment_13);
+
+		$.html(node_12, () => '<strong>Bold HTML</strong>');
+		$.append(anchor_11, fragment_13);
+	});
+
+	$.reset(select_18);
+
+	var select_19 = $.sibling(select_18, 2);
+
+	$.customizable_select(select_19, () => {
+		var anchor_12 = $.child(select_19);
+		var fragment_14 = select_content_4();
+		var node_13 = $.first_child(fragment_14);
+
+		$.each(node_13, 1, () => items, $.index, ($$anchor, item) => {
+			Option($$anchor, {});
+		});
+
+		$.append(anchor_12, fragment_14);
+	});
+
+	var select_20 = $.sibling(select_19, 2);
+
+	$.customizable_select(select_20, () => {
+		var anchor_13 = $.child(select_20);
+		var fragment_16 = select_content_5();
+		var node_14 = $.first_child(fragment_16);
+
+		{
+			var consequent_2 = ($$anchor) => {
+				conditional_option($$anchor);
+			};
+
+			$.if(node_14, ($$render) => {
+				if (show) $$render(consequent_2);
+			});
+		}
+
+		$.append(anchor_13, fragment_16);
+	});
+
+	$.append($$anchor, fragment);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/Option.svelte.js b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/Option.svelte.js
new file mode 100644
index 0000000000..1c76c9493b
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/Option.svelte.js
@@ -0,0 +1,7 @@
+import * as $ from 'svelte/internal/server';
+
+export default function Option($$renderer) {
+	$$renderer.option({}, ($$renderer) => {
+		$$renderer.push(`Component Option`);
+	});
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/index.svelte.js
new file mode 100644
index 0000000000..acf873ac09
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/select-with-rich-content/_expected/server/index.svelte.js
@@ -0,0 +1,233 @@
+import * as $ from 'svelte/internal/server';
+import Option from './Option.svelte';
+
+function opt($$renderer) {
+	$$renderer.option({}, ($$renderer) => {
+		$$renderer.push(`Snippet`);
+	});
+}
+
+function option_snippet($$renderer) {
+	$$renderer.option({}, ($$renderer) => {
+		$$renderer.push(`Rendered`);
+	});
+}
+
+function option_snippet2($$renderer) {
+	$$renderer.option({}, ($$renderer) => {
+		$$renderer.push(`Rendered in group`);
+	});
+}
+
+function conditional_option($$renderer) {
+	$$renderer.option({}, ($$renderer) => {
+		$$renderer.push(`Conditional`);
+	});
+}
+
+export default function Select_with_rich_content($$renderer) {
+	let items = [1, 2, 3];
+	let show = true;
+	let html = '<option>From HTML</option>';
+
+	$$renderer.push(`<select>`);
+
+	$$renderer.option(
+		{},
+		($$renderer) => {
+			$$renderer.push(`<span>Rich</span>`);
+		},
+		void 0,
+		void 0,
+		void 0,
+		void 0,
+		true
+	);
+
+	$$renderer.push(`</select> <select><!--[-->`);
+
+	const each_array = $.ensure_array_like(items);
+
+	for (let $$index = 0, $$length = each_array.length; $$index < $$length; $$index++) {
+		let item = each_array[$$index];
+
+		$$renderer.option({}, item);
+	}
+
+	$$renderer.push(`<!--]--></select> <select>`);
+
+	if (show) {
+		$$renderer.push('<!--[-->');
+
+		$$renderer.option({}, ($$renderer) => {
+			$$renderer.push(`Visible`);
+		});
+	} else {
+		$$renderer.push('<!--[!-->');
+	}
+
+	$$renderer.push(`<!--]--></select> <select><!---->`);
+
+	{
+		$$renderer.option({}, ($$renderer) => {
+			$$renderer.push(`Keyed`);
+		});
+	}
+
+	$$renderer.push(`<!----></select>  <select>`);
+	opt($$renderer);
+	$$renderer.push(`<!----><!></select> <select><!--[-->`);
+
+	const each_array_1 = $.ensure_array_like(items);
+
+	for (let $$index_1 = 0, $$length = each_array_1.length; $$index_1 < $$length; $$index_1++) {
+		let item = each_array_1[$$index_1];
+		const x = item * 2;
+
+		$$renderer.option({}, x);
+	}
+
+	$$renderer.push(`<!--]--></select> <select><optgroup label="Group">`);
+
+	$$renderer.option(
+		{},
+		($$renderer) => {
+			$$renderer.push(`<strong>Bold</strong>`);
+		},
+		void 0,
+		void 0,
+		void 0,
+		void 0,
+		true
+	);
+
+	$$renderer.push(`</optgroup></select> <select><optgroup label="Group"><!--[-->`);
+
+	const each_array_2 = $.ensure_array_like(items);
+
+	for (let $$index_2 = 0, $$length = each_array_2.length; $$index_2 < $$length; $$index_2++) {
+		let item = each_array_2[$$index_2];
+
+		$$renderer.option({}, item);
+	}
+
+	$$renderer.push(`<!--]--></optgroup></select> <select>`);
+
+	$$renderer.option(
+		{ value: 'a' },
+		($$renderer) => {
+			$$renderer.push(`<em>Italic</em> text`);
+		},
+		void 0,
+		void 0,
+		void 0,
+		void 0,
+		true
+	);
+
+	$$renderer.push(`</select> <select><!--[-->`);
+
+	const each_array_3 = $.ensure_array_like(items);
+
+	for (let $$index_3 = 0, $$length = each_array_3.length; $$index_3 < $$length; $$index_3++) {
+		let item = each_array_3[$$index_3];
+
+		$$renderer.option(
+			{},
+			($$renderer) => {
+				$$renderer.push(`<span>${$.escape(item)}</span>`);
+			},
+			void 0,
+			void 0,
+			void 0,
+			void 0,
+			true
+		);
+	}
+
+	$$renderer.push(`<!--]--></select> <select>`);
+
+	if (show) {
+		$$renderer.push('<!--[-->');
+		$$renderer.push(`<!--[-->`);
+
+		const each_array_4 = $.ensure_array_like(items);
+
+		for (let $$index_4 = 0, $$length = each_array_4.length; $$index_4 < $$length; $$index_4++) {
+			let item = each_array_4[$$index_4];
+
+			$$renderer.option({}, item);
+		}
+
+		$$renderer.push(`<!--]-->`);
+	} else {
+		$$renderer.push('<!--[!-->');
+	}
+
+	$$renderer.push(`<!--]--></select> <select><!--[-->`);
+
+	{
+		$$renderer.option({}, ($$renderer) => {
+			$$renderer.push(`Boundary`);
+		});
+	}
+
+	$$renderer.push(`<!--]--></select> <select><!--[-->`);
+
+	{
+		$$renderer.option(
+			{},
+			($$renderer) => {
+				$$renderer.push(`<span>Rich in boundary</span>`);
+			},
+			void 0,
+			void 0,
+			void 0,
+			void 0,
+			true
+		);
+	}
+
+	$$renderer.push(`<!--]--></select> <select>`);
+	Option($$renderer, {});
+	$$renderer.push(`<!----><!></select>  <select>`);
+	option_snippet($$renderer);
+	$$renderer.push(`<!----><!></select> <select>${$.html(html)}<!></select> <select><optgroup label="Group">`);
+	Option($$renderer, {});
+	$$renderer.push(`<!----><!></optgroup></select>  <select><optgroup label="Group">`);
+	option_snippet2($$renderer);
+	$$renderer.push(`<!----><!></optgroup></select> <select>`);
+
+	$$renderer.option(
+		{},
+		($$renderer) => {
+			$$renderer.push(`${$.html('<strong>Bold HTML</strong>')}`);
+		},
+		void 0,
+		void 0,
+		void 0,
+		void 0,
+		true
+	);
+
+	$$renderer.push(`</select> <select><!--[-->`);
+
+	const each_array_5 = $.ensure_array_like(items);
+
+	for (let $$index_5 = 0, $$length = each_array_5.length; $$index_5 < $$length; $$index_5++) {
+		let item = each_array_5[$$index_5];
+
+		Option($$renderer, {});
+	}
+
+	$$renderer.push(`<!--]--><!></select>  <select>`);
+
+	if (show) {
+		$$renderer.push('<!--[-->');
+		conditional_option($$renderer);
+	} else {
+		$$renderer.push('<!--[!-->');
+	}
+
+	$$renderer.push(`<!--]--><!></select>`);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/select-with-rich-content/index.svelte b/packages/svelte/tests/snapshot/samples/select-with-rich-content/index.svelte
new file mode 100644
index 0000000000..0363bf6a96
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/select-with-rich-content/index.svelte
@@ -0,0 +1,157 @@
+<script>
+	let items = [1, 2, 3];
+	let show = true;
+	let html = '<option>From HTML</option>';
+
+	import Option from './Option.svelte';
+</script>
+
+<!-- select with rich option (has span inside) - SHOULD use customizable_select_element -->
+<select>
+	<option><span>Rich</span></option>
+</select>
+
+<!-- select with each containing plain options - should NOT use customizable_select_element -->
+<select>
+	{#each items as item}
+		<option>{item}</option>
+	{/each}
+</select>
+
+<!-- select with if containing plain options - should NOT use customizable_select_element -->
+<select>
+	{#if show}
+		<option>Visible</option>
+	{/if}
+</select>
+
+<!-- select with key containing plain options - should NOT use customizable_select_element -->
+<select>
+	{#key items}
+		<option>Keyed</option>
+	{/key}
+</select>
+
+<!-- select with snippet defined at top level and rendered - should NOT use customizable_select_element -->
+{#snippet opt()}
+	<option>Snippet</option>
+{/snippet}
+<select>
+	{@render opt()}
+</select>
+
+<!-- select with const inside each (should be ignored) - should NOT use customizable_select_element -->
+<select>
+	{#each items as item}
+		{@const x = item * 2}
+		<option>{x}</option>
+	{/each}
+</select>
+
+<!-- optgroup with rich option - SHOULD use customizable_select_element -->
+<select>
+	<optgroup label="Group">
+		<option><strong>Bold</strong></option>
+	</optgroup>
+</select>
+
+<!-- optgroup with each containing plain options - should NOT use customizable_select_element -->
+<select>
+	<optgroup label="Group">
+		{#each items as item}
+			<option>{item}</option>
+		{/each}
+	</optgroup>
+</select>
+
+<!-- option with rich content (span) - SHOULD use customizable_select_element -->
+<select>
+	<option value="a"><em>Italic</em> text</option>
+</select>
+
+<!-- nested: select > each > option with rich content - SHOULD use customizable_select_element on option -->
+<select>
+	{#each items as item}
+		<option><span>{item}</span></option>
+	{/each}
+</select>
+
+<!-- nested: select > if > each > plain options - should NOT use customizable_select_element -->
+<select>
+	{#if show}
+		{#each items as item}
+			<option>{item}</option>
+		{/each}
+	{/if}
+</select>
+
+<!-- select with svelte:boundary containing plain options - should NOT use customizable_select_element -->
+<select>
+	<svelte:boundary>
+		<option>Boundary</option>
+	</svelte:boundary>
+</select>
+
+<!-- select with svelte:boundary containing rich options - SHOULD use customizable_select_element on option -->
+<select>
+	<svelte:boundary>
+		<option><span>Rich in boundary</span></option>
+	</svelte:boundary>
+</select>
+
+<!-- select with Component - SHOULD be treated as rich content -->
+<select>
+	<Option />
+</select>
+
+<!-- select with @render snippet - SHOULD be treated as rich content -->
+{#snippet option_snippet()}
+	<option>Rendered</option>
+{/snippet}
+<select>
+	{@render option_snippet()}
+</select>
+
+<!-- select with @html - SHOULD be treated as rich content -->
+<select>
+	{@html html}
+</select>
+
+<!-- optgroup with Component - SHOULD be treated as rich content -->
+<select>
+	<optgroup label="Group">
+		<Option />
+	</optgroup>
+</select>
+
+<!-- optgroup with @render - SHOULD be treated as rich content -->
+{#snippet option_snippet2()}
+	<option>Rendered in group</option>
+{/snippet}
+<select>
+	<optgroup label="Group">
+		{@render option_snippet2()}
+	</optgroup>
+</select>
+
+<!-- option with @html inside - SHOULD use customizable_select_element -->
+<select>
+	<option>{@html '<strong>Bold HTML</strong>'}</option>
+</select>
+
+<!-- each block inside select with Component - SHOULD be treated as rich -->
+<select>
+	{#each items as item}
+		<Option />
+	{/each}
+</select>
+
+<!-- if block inside select with @render - SHOULD be treated as rich -->
+{#snippet conditional_option()}
+	<option>Conditional</option>
+{/snippet}
+<select>
+	{#if show}
+		{@render conditional_option()}
+	{/if}
+</select>
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 463889dc4f..023ca920e9 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
@@ -14,3 +14,14 @@
 <button>Click me</button>
 <a href="/#">Link text</a>
 <a href="/#"><img src="./icon.svg" alt="Link text"></a>
+
+<select>
+	<!-- valid if button contains <selectedcontent> -->
+	<button>
+		<selectedcontent></selectedcontent>
+	</button>
+
+	<option>one</option>
+	<option>two</option>
+	<option>three</option>
+</select>

From 9cf60666eac77ab7dc5b092cbe59949e29696b4b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 18 Jan 2026 17:01:58 -0500
Subject: [PATCH 288/347] Version Packages (#17480)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/chubby-dingos-laugh.md |  5 -----
 .changeset/curly-cats-make.md     |  5 -----
 .changeset/little-aliens-pick.md  |  5 -----
 packages/svelte/CHANGELOG.md      | 12 ++++++++++++
 packages/svelte/package.json      |  2 +-
 packages/svelte/src/version.js    |  2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 .changeset/chubby-dingos-laugh.md
 delete mode 100644 .changeset/curly-cats-make.md
 delete mode 100644 .changeset/little-aliens-pick.md

diff --git a/.changeset/chubby-dingos-laugh.md b/.changeset/chubby-dingos-laugh.md
deleted file mode 100644
index cd7b990e50..0000000000
--- a/.changeset/chubby-dingos-laugh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': minor
----
-
-feat: customizable `<select>` elements
diff --git a/.changeset/curly-cats-make.md b/.changeset/curly-cats-make.md
deleted file mode 100644
index 393f8ec7e8..0000000000
--- a/.changeset/curly-cats-make.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: mark subtree of svelte boundary as dynamic
diff --git a/.changeset/little-aliens-pick.md b/.changeset/little-aliens-pick.md
deleted file mode 100644
index 1433625551..0000000000
--- a/.changeset/little-aliens-pick.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: don't reset static elements with debug/snippets
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index a767760641..e222997351 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.47.0
+
+### Minor Changes
+
+- feat: customizable `<select>` elements ([#17429](https://github.com/sveltejs/svelte/pull/17429))
+
+### Patch Changes
+
+- fix: mark subtree of svelte boundary as dynamic ([#17468](https://github.com/sveltejs/svelte/pull/17468))
+
+- fix: don't reset static elements with debug/snippets ([#17477](https://github.com/sveltejs/svelte/pull/17477))
+
 ## 5.46.4
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 1723e3d00a..19e37aaa93 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.46.4",
+  "version": "5.47.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 96c48a055c..38b2a77f4a 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.46.4';
+export const VERSION = '5.47.0';
 export const PUBLIC_VERSION = '5';

From 4ea7631bf583c8db67c10c2b04a4002eabe5747e Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Mon, 19 Jan 2026 19:15:47 +0100
Subject: [PATCH 289/347] fix: trigger selectedcontent reactivity (#17486)

* fix: trigger `selectedcontent` reactivity

* fix: comments

* fix: use `is_supported`

* fix: use `cloneNode` to preserve attributes

* fix: update `selectedcontent` variable after cloning

* Apply suggestions from code review

* Apply suggestions from code review

* remove unused code

* do everything in a single for-of loop

* early return

* shorten

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/social-foxes-pull.md               |  5 ++
 .../2-analyze/visitors/RegularElement.js      |  2 +-
 .../client/visitors/RegularElement.js         | 12 +++++
 .../dom/elements/customizable-select.js       | 47 +++++++++++++++++++
 packages/svelte/src/internal/client/index.js  |  2 +-
 5 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/social-foxes-pull.md

diff --git a/.changeset/social-foxes-pull.md b/.changeset/social-foxes-pull.md
new file mode 100644
index 0000000000..d164d43f7b
--- /dev/null
+++ b/.changeset/social-foxes-pull.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: trigger `selectedcontent` reactivity
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 1f3a93c67e..c7b40109a3 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/RegularElement.js
@@ -80,7 +80,7 @@ export function RegularElement(node, context) {
 
 	// Special case: <select>, <option> or <optgroup> with rich content needs special hydration handling
 	// We mark the subtree as dynamic so parent elements properly include the child init code
-	if (is_customizable_select_element(node)) {
+	if (is_customizable_select_element(node) || node.name === 'selectedcontent') {
 		// Mark the element's own fragment as dynamic so it's not treated as static
 		node.fragment.metadata.dynamic = true;
 		// Also mark ancestor fragments so parents properly include the child init code
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 3b3cf4c325..1faf44b902 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
@@ -457,6 +457,18 @@ export function RegularElement(node, context) {
 		context.state.after_update.push(...element_state.after_update);
 	}
 
+	if (node.name === 'selectedcontent') {
+		context.state.init.push(
+			b.stmt(
+				b.call(
+					'$.selectedcontent',
+					context.state.node,
+					b.arrow([b.id('$$element')], b.assignment('=', context.state.node, b.id('$$element')))
+				)
+			)
+		);
+	}
+
 	if (lookup.has('dir')) {
 		// This fixes an issue with Chromium where updates to text content within an element
 		// does not update the direction when set to auto. If we just re-assign the dir, this fixes it.
diff --git a/packages/svelte/src/internal/client/dom/elements/customizable-select.js b/packages/svelte/src/internal/client/dom/elements/customizable-select.js
index 5bf2144d1c..1858565d2a 100644
--- a/packages/svelte/src/internal/client/dom/elements/customizable-select.js
+++ b/packages/svelte/src/internal/client/dom/elements/customizable-select.js
@@ -1,5 +1,6 @@
 import { hydrating, reset, set_hydrate_node, set_hydrating } from '../hydration.js';
 import { create_comment } from '../operations.js';
+import { attach } from './attachments.js';
 
 /** @type {boolean | null} */
 let supported = null;
@@ -20,6 +21,52 @@ function is_supported() {
 	return supported;
 }
 
+/**
+ *
+ * @param {HTMLElement} element
+ * @param {(new_element: HTMLElement) => void} update_element
+ */
+export function selectedcontent(element, update_element) {
+	// if it's not supported no need for special logic
+	if (!is_supported()) return;
+
+	// we use the attach function directly just to make sure is executed when is mounted to the dom
+	attach(element, () => () => {
+		const select = element.closest('select');
+		if (!select) return;
+
+		const observer = new MutationObserver((entries) => {
+			var selected = false;
+
+			for (const entry of entries) {
+				if (entry.target === element) {
+					// the `<selectedcontent>` already changed, no need to replace it
+					return;
+				}
+
+				// if the changes doesn't include the selected `<option>` we don't need to do anything
+				selected ||= !!entry.target.parentElement?.closest('option')?.selected;
+			}
+
+			if (selected) {
+				// replace the `<selectedcontent>` with a clone
+				element.replaceWith((element = /** @type {HTMLElement} */ (element.cloneNode(true))));
+				update_element(element);
+			}
+		});
+
+		observer.observe(select, {
+			childList: true,
+			characterData: true,
+			subtree: true
+		});
+
+		return () => {
+			observer.disconnect();
+		};
+	});
+}
+
 /**
  * Handles rich HTML content inside `<option>`, `<optgroup>`, or `<select>` elements with browser-specific branching.
  * Modern browsers preserve HTML inside options, while older browsers strip it to text only.
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index 4792bc7230..0f20ce300d 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -42,7 +42,7 @@ export {
 export { set_class } from './dom/elements/class.js';
 export { apply, event, delegate, replay_events } from './dom/elements/events.js';
 export { autofocus, remove_textarea_child } from './dom/elements/misc.js';
-export { customizable_select } from './dom/elements/customizable-select.js';
+export { customizable_select, selectedcontent } from './dom/elements/customizable-select.js';
 export { set_style } from './dom/elements/style.js';
 export { animation, transition } from './dom/elements/transitions.js';
 export { bind_active_element } from './dom/elements/bindings/document.js';

From 16e9c70d1e97ef37800a67086b821e4bc77aa634 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Jan 2026 20:47:01 +0100
Subject: [PATCH 290/347] Version Packages (#17488)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/social-foxes-pull.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/social-foxes-pull.md

diff --git a/.changeset/social-foxes-pull.md b/.changeset/social-foxes-pull.md
deleted file mode 100644
index d164d43f7b..0000000000
--- a/.changeset/social-foxes-pull.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: trigger `selectedcontent` reactivity
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index e222997351..d019b7883f 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.47.1
+
+### Patch Changes
+
+- fix: trigger `selectedcontent` reactivity ([#17486](https://github.com/sveltejs/svelte/pull/17486))
+
 ## 5.47.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 19e37aaa93..38cac7b1cd 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.47.0",
+  "version": "5.47.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 38b2a77f4a..a5360f7195 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.47.0';
+export const VERSION = '5.47.1';
 export const PUBLIC_VERSION = '5';

From 2eb54f57ae9b2411a40f10266133356ab647d907 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 19 Jan 2026 18:26:51 -0500
Subject: [PATCH 291/347] chore: tidy up benchmark code (#17490)

* add create_test utility

* add missing import

* DRY

* DRY out

* mol (this affects benchmark times, because create_test uses 1e3 iterations whereas the old code used 1e4)

* move utils.js

* WIP

* DRY

* reduce indirection

* more

* tidy up

* tidy up

* colocate

* DRY out
---
 benchmarking/benchmarks/reactivity/index.js   |  46 +-
 .../reactivity/kairo/kairo_avoidable.js       |  91 ----
 .../reactivity/kairo/kairo_broad.js           |  97 ----
 .../benchmarks/reactivity/kairo/kairo_deep.js |  97 ----
 .../reactivity/kairo/kairo_diamond.js         | 101 ----
 .../benchmarks/reactivity/kairo/kairo_mux.js  |  94 ----
 .../reactivity/kairo/kairo_repeated.js        |  98 ----
 .../reactivity/kairo/kairo_triangle.js        | 111 -----
 .../reactivity/kairo/kairo_unstable.js        |  97 ----
 .../benchmarks/reactivity/kairo/util.js       |   6 -
 benchmarking/benchmarks/reactivity/sbench.js  | 469 ++++++------------
 .../reactivity/tests/kairo_avoidable.bench.js |  35 ++
 .../reactivity/tests/kairo_broad.bench.js     |  41 ++
 .../reactivity/tests/kairo_deep.bench.js      |  41 ++
 .../reactivity/tests/kairo_diamond.bench.js   |  45 ++
 .../reactivity/tests/kairo_mux.bench.js       |  38 ++
 .../reactivity/tests/kairo_repeated.bench.js  |  42 ++
 .../reactivity/tests/kairo_triangle.bench.js  |  55 ++
 .../reactivity/tests/kairo_unstable.bench.js  |  41 ++
 .../{mol_bench.js => tests/mol.bench.js}      |  62 +--
 benchmarking/benchmarks/reactivity/util.js    |  73 +++
 21 files changed, 577 insertions(+), 1203 deletions(-)
 delete mode 100644 benchmarking/benchmarks/reactivity/kairo/kairo_avoidable.js
 delete mode 100644 benchmarking/benchmarks/reactivity/kairo/kairo_broad.js
 delete mode 100644 benchmarking/benchmarks/reactivity/kairo/kairo_deep.js
 delete mode 100644 benchmarking/benchmarks/reactivity/kairo/kairo_diamond.js
 delete mode 100644 benchmarking/benchmarks/reactivity/kairo/kairo_mux.js
 delete mode 100644 benchmarking/benchmarks/reactivity/kairo/kairo_repeated.js
 delete mode 100644 benchmarking/benchmarks/reactivity/kairo/kairo_triangle.js
 delete mode 100644 benchmarking/benchmarks/reactivity/kairo/kairo_unstable.js
 delete mode 100644 benchmarking/benchmarks/reactivity/kairo/util.js
 create mode 100644 benchmarking/benchmarks/reactivity/tests/kairo_avoidable.bench.js
 create mode 100644 benchmarking/benchmarks/reactivity/tests/kairo_broad.bench.js
 create mode 100644 benchmarking/benchmarks/reactivity/tests/kairo_deep.bench.js
 create mode 100644 benchmarking/benchmarks/reactivity/tests/kairo_diamond.bench.js
 create mode 100644 benchmarking/benchmarks/reactivity/tests/kairo_mux.bench.js
 create mode 100644 benchmarking/benchmarks/reactivity/tests/kairo_repeated.bench.js
 create mode 100644 benchmarking/benchmarks/reactivity/tests/kairo_triangle.bench.js
 create mode 100644 benchmarking/benchmarks/reactivity/tests/kairo_unstable.bench.js
 rename benchmarking/benchmarks/reactivity/{mol_bench.js => tests/mol.bench.js} (56%)
 create mode 100644 benchmarking/benchmarks/reactivity/util.js

diff --git a/benchmarking/benchmarks/reactivity/index.js b/benchmarking/benchmarks/reactivity/index.js
index 58b3f5cb29..2b75b3dfc6 100644
--- a/benchmarking/benchmarks/reactivity/index.js
+++ b/benchmarking/benchmarks/reactivity/index.js
@@ -1,12 +1,5 @@
-import { kairo_avoidable_owned, kairo_avoidable_unowned } from './kairo/kairo_avoidable.js';
-import { kairo_broad_owned, kairo_broad_unowned } from './kairo/kairo_broad.js';
-import { kairo_deep_owned, kairo_deep_unowned } from './kairo/kairo_deep.js';
-import { kairo_diamond_owned, kairo_diamond_unowned } from './kairo/kairo_diamond.js';
-import { kairo_mux_unowned, kairo_mux_owned } from './kairo/kairo_mux.js';
-import { kairo_repeated_unowned, kairo_repeated_owned } from './kairo/kairo_repeated.js';
-import { kairo_triangle_owned, kairo_triangle_unowned } from './kairo/kairo_triangle.js';
-import { kairo_unstable_owned, kairo_unstable_unowned } from './kairo/kairo_unstable.js';
-import { mol_bench_owned, mol_bench_unowned } from './mol_bench.js';
+import fs from 'node:fs';
+import path from 'node:path';
 import {
 	sbench_create_0to1,
 	sbench_create_1000to1,
@@ -19,10 +12,14 @@ import {
 	sbench_create_4to1,
 	sbench_create_signals
 } from './sbench.js';
+import { fileURLToPath } from 'node:url';
+import { create_test } from './util.js';
 
 // This benchmark has been adapted from the js-reactivity-benchmark (https://github.com/milomg/js-reactivity-benchmark)
 // Not all tests are the same, and many parts have been tweaked to capture different data.
 
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+
 export const reactivity_benchmarks = [
 	sbench_create_signals,
 	sbench_create_0to1,
@@ -33,23 +30,16 @@ export const reactivity_benchmarks = [
 	sbench_create_1to2,
 	sbench_create_1to4,
 	sbench_create_1to8,
-	sbench_create_1to1000,
-	kairo_avoidable_owned,
-	kairo_avoidable_unowned,
-	kairo_broad_owned,
-	kairo_broad_unowned,
-	kairo_deep_owned,
-	kairo_deep_unowned,
-	kairo_diamond_owned,
-	kairo_diamond_unowned,
-	kairo_triangle_owned,
-	kairo_triangle_unowned,
-	kairo_mux_owned,
-	kairo_mux_unowned,
-	kairo_repeated_owned,
-	kairo_repeated_unowned,
-	kairo_unstable_owned,
-	kairo_unstable_unowned,
-	mol_bench_owned,
-	mol_bench_unowned
+	sbench_create_1to1000
 ];
+
+for (const file of fs.readdirSync(`${dirname}/tests`)) {
+	if (!file.includes('.bench.')) continue;
+
+	const name = file.replace('.bench.js', '');
+
+	const module = await import(`${dirname}/tests/${file}`);
+	const { owned, unowned } = create_test(name, module.default);
+
+	reactivity_benchmarks.push(owned, unowned);
+}
diff --git a/benchmarking/benchmarks/reactivity/kairo/kairo_avoidable.js b/benchmarking/benchmarks/reactivity/kairo/kairo_avoidable.js
deleted file mode 100644
index 9daea6de99..0000000000
--- a/benchmarking/benchmarks/reactivity/kairo/kairo_avoidable.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import { assert, fastest_test } from '../../../utils.js';
-import * as $ from 'svelte/internal/client';
-import { busy } from './util.js';
-
-function setup() {
-	let head = $.state(0);
-	let computed1 = $.derived(() => $.get(head));
-	let computed2 = $.derived(() => ($.get(computed1), 0));
-	let computed3 = $.derived(() => (busy(), $.get(computed2) + 1)); // heavy computation
-	let computed4 = $.derived(() => $.get(computed3) + 2);
-	let computed5 = $.derived(() => $.get(computed4) + 3);
-
-	const destroy = $.effect_root(() => {
-		$.render_effect(() => {
-			$.get(computed5);
-			busy(); // heavy side effect
-		});
-	});
-
-	return {
-		destroy,
-		run() {
-			$.flush(() => {
-				$.set(head, 1);
-			});
-			assert($.get(computed5) === 6);
-			for (let i = 0; i < 1000; i++) {
-				$.flush(() => {
-					$.set(head, i);
-				});
-				assert($.get(computed5) === 6);
-			}
-		}
-	};
-}
-
-export async function kairo_avoidable_unowned() {
-	// Do 10 loops to warm up JIT
-	for (let i = 0; i < 10; i++) {
-		const { run, destroy } = setup();
-		run();
-		destroy();
-	}
-
-	const { run, destroy } = setup();
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	destroy();
-
-	return {
-		benchmark: 'kairo_avoidable_unowned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function kairo_avoidable_owned() {
-	let run, destroy;
-
-	const destroy_owned = $.effect_root(() => {
-		// Do 10 loops to warm up JIT
-		for (let i = 0; i < 10; i++) {
-			const { run, destroy } = setup();
-			run();
-			destroy();
-		}
-
-		({ run, destroy } = setup());
-	});
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	// @ts-ignore
-	destroy();
-	destroy_owned();
-
-	return {
-		benchmark: 'kairo_avoidable_owned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
diff --git a/benchmarking/benchmarks/reactivity/kairo/kairo_broad.js b/benchmarking/benchmarks/reactivity/kairo/kairo_broad.js
deleted file mode 100644
index 8dc5710c87..0000000000
--- a/benchmarking/benchmarks/reactivity/kairo/kairo_broad.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import { assert, fastest_test } from '../../../utils.js';
-import * as $ from 'svelte/internal/client';
-
-function setup() {
-	let head = $.state(0);
-	let last = head;
-	let counter = 0;
-
-	const destroy = $.effect_root(() => {
-		for (let i = 0; i < 50; i++) {
-			let current = $.derived(() => {
-				return $.get(head) + i;
-			});
-			let current2 = $.derived(() => {
-				return $.get(current) + 1;
-			});
-			$.render_effect(() => {
-				$.get(current2);
-				counter++;
-			});
-			last = current2;
-		}
-	});
-
-	return {
-		destroy,
-		run() {
-			$.flush(() => {
-				$.set(head, 1);
-			});
-			counter = 0;
-			for (let i = 0; i < 50; i++) {
-				$.flush(() => {
-					$.set(head, i);
-				});
-				assert($.get(last) === i + 50);
-			}
-			assert(counter === 50 * 50);
-		}
-	};
-}
-
-export async function kairo_broad_unowned() {
-	// Do 10 loops to warm up JIT
-	for (let i = 0; i < 10; i++) {
-		const { run, destroy } = setup();
-		run();
-		destroy();
-	}
-
-	const { run, destroy } = setup();
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	destroy();
-
-	return {
-		benchmark: 'kairo_broad_unowned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function kairo_broad_owned() {
-	let run, destroy;
-
-	const destroy_owned = $.effect_root(() => {
-		// Do 10 loops to warm up JIT
-		for (let i = 0; i < 10; i++) {
-			const { run, destroy } = setup();
-			run();
-			destroy();
-		}
-
-		({ run, destroy } = setup());
-	});
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	// @ts-ignore
-	destroy();
-	destroy_owned();
-
-	return {
-		benchmark: 'kairo_broad_owned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
diff --git a/benchmarking/benchmarks/reactivity/kairo/kairo_deep.js b/benchmarking/benchmarks/reactivity/kairo/kairo_deep.js
deleted file mode 100644
index 8690c85f86..0000000000
--- a/benchmarking/benchmarks/reactivity/kairo/kairo_deep.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import { assert, fastest_test } from '../../../utils.js';
-import * as $ from 'svelte/internal/client';
-
-let len = 50;
-const iter = 50;
-
-function setup() {
-	let head = $.state(0);
-	let current = head;
-	for (let i = 0; i < len; i++) {
-		let c = current;
-		current = $.derived(() => {
-			return $.get(c) + 1;
-		});
-	}
-	let counter = 0;
-
-	const destroy = $.effect_root(() => {
-		$.render_effect(() => {
-			$.get(current);
-			counter++;
-		});
-	});
-
-	return {
-		destroy,
-		run() {
-			$.flush(() => {
-				$.set(head, 1);
-			});
-			counter = 0;
-			for (let i = 0; i < iter; i++) {
-				$.flush(() => {
-					$.set(head, i);
-				});
-				assert($.get(current) === len + i);
-			}
-			assert(counter === iter);
-		}
-	};
-}
-
-export async function kairo_deep_unowned() {
-	// Do 10 loops to warm up JIT
-	for (let i = 0; i < 10; i++) {
-		const { run, destroy } = setup();
-		run();
-		destroy();
-	}
-
-	const { run, destroy } = setup();
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	destroy();
-
-	return {
-		benchmark: 'kairo_deep_unowned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function kairo_deep_owned() {
-	let run, destroy;
-
-	const destroy_owned = $.effect_root(() => {
-		// Do 10 loops to warm up JIT
-		for (let i = 0; i < 10; i++) {
-			const { run, destroy } = setup();
-			run();
-			destroy();
-		}
-
-		({ run, destroy } = setup());
-	});
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	// @ts-ignore
-	destroy();
-	destroy_owned();
-
-	return {
-		benchmark: 'kairo_deep_owned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
diff --git a/benchmarking/benchmarks/reactivity/kairo/kairo_diamond.js b/benchmarking/benchmarks/reactivity/kairo/kairo_diamond.js
deleted file mode 100644
index bf4e07ee89..0000000000
--- a/benchmarking/benchmarks/reactivity/kairo/kairo_diamond.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import { assert, fastest_test } from '../../../utils.js';
-import * as $ from 'svelte/internal/client';
-
-let width = 5;
-
-function setup() {
-	let head = $.state(0);
-	let current = [];
-	for (let i = 0; i < width; i++) {
-		current.push(
-			$.derived(() => {
-				return $.get(head) + 1;
-			})
-		);
-	}
-	let sum = $.derived(() => {
-		return current.map((x) => $.get(x)).reduce((a, b) => a + b, 0);
-	});
-	let counter = 0;
-
-	const destroy = $.effect_root(() => {
-		$.render_effect(() => {
-			$.get(sum);
-			counter++;
-		});
-	});
-
-	return {
-		destroy,
-		run() {
-			$.flush(() => {
-				$.set(head, 1);
-			});
-			assert($.get(sum) === 2 * width);
-			counter = 0;
-			for (let i = 0; i < 500; i++) {
-				$.flush(() => {
-					$.set(head, i);
-				});
-				assert($.get(sum) === (i + 1) * width);
-			}
-			assert(counter === 500);
-		}
-	};
-}
-
-export async function kairo_diamond_unowned() {
-	// Do 10 loops to warm up JIT
-	for (let i = 0; i < 10; i++) {
-		const { run, destroy } = setup();
-		run();
-		destroy();
-	}
-
-	const { run, destroy } = setup();
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	destroy();
-
-	return {
-		benchmark: 'kairo_diamond_unowned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function kairo_diamond_owned() {
-	let run, destroy;
-
-	const destroy_owned = $.effect_root(() => {
-		// Do 10 loops to warm up JIT
-		for (let i = 0; i < 10; i++) {
-			const { run, destroy } = setup();
-			run();
-			destroy();
-		}
-
-		({ run, destroy } = setup());
-	});
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	// @ts-ignore
-	destroy();
-	destroy_owned();
-
-	return {
-		benchmark: 'kairo_diamond_owned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
diff --git a/benchmarking/benchmarks/reactivity/kairo/kairo_mux.js b/benchmarking/benchmarks/reactivity/kairo/kairo_mux.js
deleted file mode 100644
index fc252a27b5..0000000000
--- a/benchmarking/benchmarks/reactivity/kairo/kairo_mux.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import { assert, fastest_test } from '../../../utils.js';
-import * as $ from 'svelte/internal/client';
-
-function setup() {
-	let heads = new Array(100).fill(null).map((_) => $.state(0));
-	const mux = $.derived(() => {
-		return Object.fromEntries(heads.map((h) => $.get(h)).entries());
-	});
-	const splited = heads
-		.map((_, index) => $.derived(() => $.get(mux)[index]))
-		.map((x) => $.derived(() => $.get(x) + 1));
-
-	const destroy = $.effect_root(() => {
-		splited.forEach((x) => {
-			$.render_effect(() => {
-				$.get(x);
-			});
-		});
-	});
-
-	return {
-		destroy,
-		run() {
-			for (let i = 0; i < 10; i++) {
-				$.flush(() => {
-					$.set(heads[i], i);
-				});
-				assert($.get(splited[i]) === i + 1);
-			}
-			for (let i = 0; i < 10; i++) {
-				$.flush(() => {
-					$.set(heads[i], i * 2);
-				});
-				assert($.get(splited[i]) === i * 2 + 1);
-			}
-		}
-	};
-}
-
-export async function kairo_mux_unowned() {
-	// Do 10 loops to warm up JIT
-	for (let i = 0; i < 10; i++) {
-		const { run, destroy } = setup();
-		run();
-		destroy();
-	}
-
-	const { run, destroy } = setup();
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	destroy();
-
-	return {
-		benchmark: 'kairo_mux_unowned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function kairo_mux_owned() {
-	let run, destroy;
-
-	const destroy_owned = $.effect_root(() => {
-		// Do 10 loops to warm up JIT
-		for (let i = 0; i < 10; i++) {
-			const { run, destroy } = setup();
-			run();
-			destroy();
-		}
-
-		({ run, destroy } = setup());
-	});
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	// @ts-ignore
-	destroy();
-	destroy_owned();
-
-	return {
-		benchmark: 'kairo_mux_owned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
diff --git a/benchmarking/benchmarks/reactivity/kairo/kairo_repeated.js b/benchmarking/benchmarks/reactivity/kairo/kairo_repeated.js
deleted file mode 100644
index 3bee06ca0e..0000000000
--- a/benchmarking/benchmarks/reactivity/kairo/kairo_repeated.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import { assert, fastest_test } from '../../../utils.js';
-import * as $ from 'svelte/internal/client';
-
-let size = 30;
-
-function setup() {
-	let head = $.state(0);
-	let current = $.derived(() => {
-		let result = 0;
-		for (let i = 0; i < size; i++) {
-			result += $.get(head);
-		}
-		return result;
-	});
-
-	let counter = 0;
-
-	const destroy = $.effect_root(() => {
-		$.render_effect(() => {
-			$.get(current);
-			counter++;
-		});
-	});
-
-	return {
-		destroy,
-		run() {
-			$.flush(() => {
-				$.set(head, 1);
-			});
-			assert($.get(current) === size);
-			counter = 0;
-			for (let i = 0; i < 100; i++) {
-				$.flush(() => {
-					$.set(head, i);
-				});
-				assert($.get(current) === i * size);
-			}
-			assert(counter === 100);
-		}
-	};
-}
-
-export async function kairo_repeated_unowned() {
-	// Do 10 loops to warm up JIT
-	for (let i = 0; i < 10; i++) {
-		const { run, destroy } = setup();
-		run();
-		destroy();
-	}
-
-	const { run, destroy } = setup();
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	destroy();
-
-	return {
-		benchmark: 'kairo_repeated_unowned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function kairo_repeated_owned() {
-	let run, destroy;
-
-	const destroy_owned = $.effect_root(() => {
-		// Do 10 loops to warm up JIT
-		for (let i = 0; i < 10; i++) {
-			const { run, destroy } = setup();
-			run();
-			destroy();
-		}
-
-		({ run, destroy } = setup());
-	});
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	// @ts-ignore
-	destroy();
-	destroy_owned();
-
-	return {
-		benchmark: 'kairo_repeated_owned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
diff --git a/benchmarking/benchmarks/reactivity/kairo/kairo_triangle.js b/benchmarking/benchmarks/reactivity/kairo/kairo_triangle.js
deleted file mode 100644
index 11a419a52e..0000000000
--- a/benchmarking/benchmarks/reactivity/kairo/kairo_triangle.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import { assert, fastest_test } from '../../../utils.js';
-import * as $ from 'svelte/internal/client';
-
-let width = 10;
-
-function count(number) {
-	return new Array(number)
-		.fill(0)
-		.map((_, i) => i + 1)
-		.reduce((x, y) => x + y, 0);
-}
-
-function setup() {
-	let head = $.state(0);
-	let current = head;
-	let list = [];
-	for (let i = 0; i < width; i++) {
-		let c = current;
-		list.push(current);
-		current = $.derived(() => {
-			return $.get(c) + 1;
-		});
-	}
-	let sum = $.derived(() => {
-		return list.map((x) => $.get(x)).reduce((a, b) => a + b, 0);
-	});
-
-	let counter = 0;
-
-	const destroy = $.effect_root(() => {
-		$.render_effect(() => {
-			$.get(sum);
-			counter++;
-		});
-	});
-
-	return {
-		destroy,
-		run() {
-			const constant = count(width);
-			$.flush(() => {
-				$.set(head, 1);
-			});
-			assert($.get(sum) === constant);
-			counter = 0;
-			for (let i = 0; i < 100; i++) {
-				$.flush(() => {
-					$.set(head, i);
-				});
-				assert($.get(sum) === constant - width + i * width);
-			}
-			assert(counter === 100);
-		}
-	};
-}
-
-export async function kairo_triangle_unowned() {
-	// Do 10 loops to warm up JIT
-	for (let i = 0; i < 10; i++) {
-		const { run, destroy } = setup();
-		run();
-		destroy();
-	}
-
-	const { run, destroy } = setup();
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	destroy();
-
-	return {
-		benchmark: 'kairo_triangle_unowned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function kairo_triangle_owned() {
-	let run, destroy;
-
-	const destroy_owned = $.effect_root(() => {
-		// Do 10 loops to warm up JIT
-		for (let i = 0; i < 10; i++) {
-			const { run, destroy } = setup();
-			run();
-			destroy();
-		}
-
-		({ run, destroy } = setup());
-	});
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	// @ts-ignore
-	destroy();
-	destroy_owned();
-
-	return {
-		benchmark: 'kairo_triangle_owned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
diff --git a/benchmarking/benchmarks/reactivity/kairo/kairo_unstable.js b/benchmarking/benchmarks/reactivity/kairo/kairo_unstable.js
deleted file mode 100644
index 54eb732cb2..0000000000
--- a/benchmarking/benchmarks/reactivity/kairo/kairo_unstable.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import { assert, fastest_test } from '../../../utils.js';
-import * as $ from 'svelte/internal/client';
-
-function setup() {
-	let head = $.state(0);
-	const double = $.derived(() => $.get(head) * 2);
-	const inverse = $.derived(() => -$.get(head));
-	let current = $.derived(() => {
-		let result = 0;
-		for (let i = 0; i < 20; i++) {
-			result += $.get(head) % 2 ? $.get(double) : $.get(inverse);
-		}
-		return result;
-	});
-
-	let counter = 0;
-
-	const destroy = $.effect_root(() => {
-		$.render_effect(() => {
-			$.get(current);
-			counter++;
-		});
-	});
-
-	return {
-		destroy,
-		run() {
-			$.flush(() => {
-				$.set(head, 1);
-			});
-			assert($.get(current) === 40);
-			counter = 0;
-			for (let i = 0; i < 100; i++) {
-				$.flush(() => {
-					$.set(head, i);
-				});
-			}
-			assert(counter === 100);
-		}
-	};
-}
-
-export async function kairo_unstable_unowned() {
-	// Do 10 loops to warm up JIT
-	for (let i = 0; i < 10; i++) {
-		const { run, destroy } = setup();
-		run();
-		destroy();
-	}
-
-	const { run, destroy } = setup();
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	destroy();
-
-	return {
-		benchmark: 'kairo_unstable_unowned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function kairo_unstable_owned() {
-	let run, destroy;
-
-	const destroy_owned = $.effect_root(() => {
-		// Do 10 loops to warm up JIT
-		for (let i = 0; i < 10; i++) {
-			const { run, destroy } = setup();
-			run();
-			destroy();
-		}
-
-		({ run, destroy } = setup());
-	});
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1000; i++) {
-			run();
-		}
-	});
-
-	// @ts-ignore
-	destroy();
-	destroy_owned();
-
-	return {
-		benchmark: 'kairo_unstable_owned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
diff --git a/benchmarking/benchmarks/reactivity/kairo/util.js b/benchmarking/benchmarks/reactivity/kairo/util.js
deleted file mode 100644
index 75e3641ab9..0000000000
--- a/benchmarking/benchmarks/reactivity/kairo/util.js
+++ /dev/null
@@ -1,6 +0,0 @@
-export function busy() {
-	let a = 0;
-	for (let i = 0; i < 1_00; i++) {
-		a++;
-	}
-}
diff --git a/benchmarking/benchmarks/reactivity/sbench.js b/benchmarking/benchmarks/reactivity/sbench.js
index ddeaef2514..196c29dc8d 100644
--- a/benchmarking/benchmarks/reactivity/sbench.js
+++ b/benchmarking/benchmarks/reactivity/sbench.js
@@ -1,3 +1,4 @@
+/** @import { Source } from '../../../packages/svelte/src/internal/client/types.js' */
 import { fastest_test } from '../../utils.js';
 import * as $ from '../../../packages/svelte/src/internal/client/index.js';
 
@@ -7,360 +8,180 @@ const COUNT = 1e5;
  * @param {number} n
  * @param {any[]} sources
  */
-function create_data_signals(n, sources) {
+function create_sources(n, sources) {
 	for (let i = 0; i < n; i++) {
 		sources[i] = $.state(i);
 	}
+
 	return sources;
 }
 
 /**
- * @param {number} i
+ * @param {Source<number>} source
  */
-function create_computation_0(i) {
-	$.derived(() => i);
+function create_derived(source) {
+	$.derived(() => $.get(source));
 }
 
 /**
- * @param {any} s1
- */
-function create_computation_1(s1) {
-	$.derived(() => $.get(s1));
-}
-/**
- * @param {any} s1
- * @param {any} s2
+ *
+ * @param {string} label
+ * @param {(n: number, sources: Array<Source<number>>)} fn
+ * @param {number} count
+ * @param {number} num_sources
  */
-function create_computation_2(s1, s2) {
-	$.derived(() => $.get(s1) + $.get(s2));
-}
-
-function create_computation_1000(ss, offset) {
-	$.derived(() => {
-		let sum = 0;
-		for (let i = 0; i < 1000; i++) {
-			sum += $.get(ss[offset + i]);
+function create_sbench_test(label, count, num_sources, fn) {
+	return async () => {
+		// Do 3 loops to warm up JIT
+		for (let i = 0; i < 3; i++) {
+			fn(count, create_sources(num_sources, []));
 		}
-		return sum;
-	});
-}
 
-/**
- * @param {number} n
- */
-function create_computations_0to1(n) {
-	for (let i = 0; i < n; i++) {
-		create_computation_0(i);
-	}
-}
-
-/**
- * @param {number} n
- * @param {any[]} sources
- */
-function create_computations_1to1(n, sources) {
-	for (let i = 0; i < n; i++) {
-		const source = sources[i];
-		create_computation_1(source);
-	}
-}
+		const { timing } = await fastest_test(10, () => {
+			const destroy = $.effect_root(() => {
+				for (let i = 0; i < 10; i++) {
+					fn(count, create_sources(num_sources, []));
+				}
+			});
+			destroy();
+		});
 
-/**
- * @param {number} n
- * @param {any[]} sources
- */
-function create_computations_2to1(n, sources) {
-	for (let i = 0; i < n; i++) {
-		create_computation_2(sources[i * 2], sources[i * 2 + 1]);
-	}
+		return {
+			benchmark: label,
+			time: timing.time.toFixed(2),
+			gc_time: timing.gc_time.toFixed(2)
+		};
+	};
 }
 
-function create_computation_4(s1, s2, s3, s4) {
-	$.derived(() => $.get(s1) + $.get(s2) + $.get(s3) + $.get(s4));
-}
+export const sbench_create_signals = create_sbench_test(
+	'sbench_create_signals',
+	COUNT,
+	COUNT,
+	create_sources
+);
 
-function create_computations_1000to1(n, sources) {
+export const sbench_create_0to1 = create_sbench_test('sbench_create_0to1', COUNT, 0, (n) => {
 	for (let i = 0; i < n; i++) {
-		create_computation_1000(sources, i * 1000);
-	}
-}
-
-function create_computations_1to2(n, sources) {
-	for (let i = 0; i < n / 2; i++) {
-		const source = sources[i];
-		create_computation_1(source);
-		create_computation_1(source);
-	}
-}
-
-function create_computations_1to4(n, sources) {
-	for (let i = 0; i < n / 4; i++) {
-		const source = sources[i];
-		create_computation_1(source);
-		create_computation_1(source);
-		create_computation_1(source);
-		create_computation_1(source);
-	}
-}
-
-function create_computations_1to8(n, sources) {
-	for (let i = 0; i < n / 8; i++) {
-		const source = sources[i];
-		create_computation_1(source);
-		create_computation_1(source);
-		create_computation_1(source);
-		create_computation_1(source);
-		create_computation_1(source);
-		create_computation_1(source);
-		create_computation_1(source);
-		create_computation_1(source);
+		$.derived(() => i);
 	}
-}
+});
 
-function create_computations_1to1000(n, sources) {
-	for (let i = 0; i < n / 1000; i++) {
-		const source = sources[i];
-		for (let j = 0; j < 1000; j++) {
-			create_computation_1(source);
+export const sbench_create_1to1 = create_sbench_test(
+	'sbench_create_1to1',
+	COUNT,
+	COUNT,
+	(n, sources) => {
+		for (let i = 0; i < n; i++) {
+			create_derived(sources[i]);
 		}
 	}
-}
-
-function create_computations_4to1(n, sources) {
-	for (let i = 0; i < n; i++) {
-		create_computation_4(
-			sources[i * 4],
-			sources[i * 4 + 1],
-			sources[i * 4 + 2],
-			sources[i * 4 + 3]
-		);
-	}
-}
-
-/**
- * @param {any} fn
- * @param {number} count
- * @param {number} scount
- */
-function bench(fn, count, scount) {
-	let sources = create_data_signals(scount, []);
-
-	fn(count, sources);
-}
-
-export async function sbench_create_signals() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_data_signals, COUNT, COUNT);
-	}
+);
 
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 100; i++) {
-			bench(create_data_signals, COUNT, COUNT);
+export const sbench_create_2to1 = create_sbench_test(
+	'sbench_create_2to1',
+	COUNT / 2,
+	COUNT,
+	(n, sources) => {
+		for (let i = 0; i < n; i++) {
+			$.derived(() => $.get(sources[i * 2]) + $.get(sources[i * 2 + 1]));
 		}
-	});
-
-	return {
-		benchmark: 'sbench_create_signals',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function sbench_create_0to1() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_computations_0to1, COUNT, 0);
 	}
-
-	const { timing } = await fastest_test(10, () => {
-		const destroy = $.effect_root(() => {
-			for (let i = 0; i < 10; i++) {
-				bench(create_computations_0to1, COUNT, 0);
-			}
-		});
-		destroy();
-	});
-
-	return {
-		benchmark: 'sbench_create_0to1',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function sbench_create_1to1() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_computations_1to1, COUNT, COUNT);
-	}
-
-	const { timing } = await fastest_test(10, () => {
-		const destroy = $.effect_root(() => {
-			for (let i = 0; i < 10; i++) {
-				bench(create_computations_1to1, COUNT, COUNT);
-			}
-		});
-		destroy();
-	});
-
-	return {
-		benchmark: 'sbench_create_1to1',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function sbench_create_2to1() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_computations_2to1, COUNT / 2, COUNT);
-	}
-
-	const { timing } = await fastest_test(10, () => {
-		const destroy = $.effect_root(() => {
-			for (let i = 0; i < 10; i++) {
-				bench(create_computations_2to1, COUNT / 2, COUNT);
-			}
-		});
-		destroy();
-	});
-
-	return {
-		benchmark: 'sbench_create_2to1',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function sbench_create_4to1() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_computations_4to1, COUNT / 4, COUNT);
+);
+
+export const sbench_create_4to1 = create_sbench_test(
+	'sbench_create_4to1',
+	COUNT / 4,
+	COUNT,
+	(n, sources) => {
+		for (let i = 0; i < n; i++) {
+			$.derived(
+				() =>
+					$.get(sources[i * 4]) +
+					$.get(sources[i * 4 + 1]) +
+					$.get(sources[i * 4 + 2]) +
+					$.get(sources[i * 4 + 3])
+			);
+		}
 	}
-
-	const { timing } = await fastest_test(10, () => {
-		const destroy = $.effect_root(() => {
-			for (let i = 0; i < 10; i++) {
-				bench(create_computations_4to1, COUNT / 4, COUNT);
-			}
-		});
-		destroy();
-	});
-
-	return {
-		benchmark: 'sbench_create_4to1',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function sbench_create_1000to1() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_computations_1000to1, COUNT / 1000, COUNT);
+);
+
+export const sbench_create_1000to1 = create_sbench_test(
+	'sbench_create_1000to1',
+	COUNT / 1000,
+	COUNT,
+	(n, sources) => {
+		for (let i = 0; i < n; i++) {
+			const offset = i * 1000;
+
+			$.derived(() => {
+				let sum = 0;
+				for (let i = 0; i < 1000; i++) {
+					sum += $.get(sources[offset + i]);
+				}
+				return sum;
+			});
+		}
 	}
-
-	const { timing } = await fastest_test(10, () => {
-		const destroy = $.effect_root(() => {
-			for (let i = 0; i < 10; i++) {
-				bench(create_computations_1000to1, COUNT / 1000, COUNT);
-			}
-		});
-		destroy();
-	});
-
-	return {
-		benchmark: 'sbench_create_1000to1',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function sbench_create_1to2() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_computations_1to2, COUNT, COUNT / 2);
+);
+
+export const sbench_create_1to2 = create_sbench_test(
+	'sbench_create_1to2',
+	COUNT,
+	COUNT / 2,
+	(n, sources) => {
+		for (let i = 0; i < n / 2; i++) {
+			const source = sources[i];
+			create_derived(source);
+			create_derived(source);
+		}
 	}
-
-	const { timing } = await fastest_test(10, () => {
-		const destroy = $.effect_root(() => {
-			for (let i = 0; i < 10; i++) {
-				bench(create_computations_1to2, COUNT, COUNT / 2);
-			}
-		});
-		destroy();
-	});
-
-	return {
-		benchmark: 'sbench_create_1to2',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function sbench_create_1to4() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_computations_1to4, COUNT, COUNT / 4);
+);
+
+export const sbench_create_1to4 = create_sbench_test(
+	'sbench_create_1to4',
+	COUNT,
+	COUNT / 4,
+	(n, sources) => {
+		for (let i = 0; i < n / 4; i++) {
+			const source = sources[i];
+			create_derived(source);
+			create_derived(source);
+			create_derived(source);
+			create_derived(source);
+		}
 	}
-
-	const { timing } = await fastest_test(10, () => {
-		const destroy = $.effect_root(() => {
-			for (let i = 0; i < 10; i++) {
-				bench(create_computations_1to4, COUNT, COUNT / 4);
-			}
-		});
-		destroy();
-	});
-
-	return {
-		benchmark: 'sbench_create_1to4',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function sbench_create_1to8() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_computations_1to8, COUNT, COUNT / 8);
+);
+
+export const sbench_create_1to8 = create_sbench_test(
+	'sbench_create_1to8',
+	COUNT,
+	COUNT / 8,
+	(n, sources) => {
+		for (let i = 0; i < n / 8; i++) {
+			const source = sources[i];
+			create_derived(source);
+			create_derived(source);
+			create_derived(source);
+			create_derived(source);
+			create_derived(source);
+			create_derived(source);
+			create_derived(source);
+			create_derived(source);
+		}
 	}
-
-	const { timing } = await fastest_test(10, () => {
-		const destroy = $.effect_root(() => {
-			for (let i = 0; i < 10; i++) {
-				bench(create_computations_1to8, COUNT, COUNT / 8);
+);
+
+export const sbench_create_1to1000 = create_sbench_test(
+	'sbench_create_1to1000',
+	COUNT,
+	COUNT / 1000,
+	(n, sources) => {
+		for (let i = 0; i < n / 1000; i++) {
+			const source = sources[i];
+			for (let j = 0; j < 1000; j++) {
+				create_derived(source);
 			}
-		});
-		destroy();
-	});
-
-	return {
-		benchmark: 'sbench_create_1to8',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function sbench_create_1to1000() {
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		bench(create_computations_1to1000, COUNT, COUNT / 1000);
+		}
 	}
-
-	const { timing } = await fastest_test(10, () => {
-		const destroy = $.effect_root(() => {
-			for (let i = 0; i < 10; i++) {
-				bench(create_computations_1to1000, COUNT, COUNT / 1000);
-			}
-		});
-		destroy();
-	});
-
-	return {
-		benchmark: 'sbench_create_1to1000',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
+);
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_avoidable.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_avoidable.bench.js
new file mode 100644
index 0000000000..bb8c234f05
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_avoidable.bench.js
@@ -0,0 +1,35 @@
+import { assert } from '../../../utils.js';
+import * as $ from 'svelte/internal/client';
+import { busy } from '../util.js';
+
+export default () => {
+	let head = $.state(0);
+	let computed1 = $.derived(() => $.get(head));
+	let computed2 = $.derived(() => ($.get(computed1), 0));
+	let computed3 = $.derived(() => (busy(), $.get(computed2) + 1)); // heavy computation
+	let computed4 = $.derived(() => $.get(computed3) + 2);
+	let computed5 = $.derived(() => $.get(computed4) + 3);
+
+	const destroy = $.effect_root(() => {
+		$.render_effect(() => {
+			$.get(computed5);
+			busy(); // heavy side effect
+		});
+	});
+
+	return {
+		destroy,
+		run() {
+			$.flush(() => {
+				$.set(head, 1);
+			});
+			assert($.get(computed5) === 6);
+			for (let i = 0; i < 1000; i++) {
+				$.flush(() => {
+					$.set(head, i);
+				});
+				assert($.get(computed5) === 6);
+			}
+		}
+	};
+};
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_broad.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_broad.bench.js
new file mode 100644
index 0000000000..14e855566b
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_broad.bench.js
@@ -0,0 +1,41 @@
+import { assert } from '../../../utils.js';
+import * as $ from 'svelte/internal/client';
+
+export default () => {
+	let head = $.state(0);
+	let last = head;
+	let counter = 0;
+
+	const destroy = $.effect_root(() => {
+		for (let i = 0; i < 50; i++) {
+			let current = $.derived(() => {
+				return $.get(head) + i;
+			});
+			let current2 = $.derived(() => {
+				return $.get(current) + 1;
+			});
+			$.render_effect(() => {
+				$.get(current2);
+				counter++;
+			});
+			last = current2;
+		}
+	});
+
+	return {
+		destroy,
+		run() {
+			$.flush(() => {
+				$.set(head, 1);
+			});
+			counter = 0;
+			for (let i = 0; i < 50; i++) {
+				$.flush(() => {
+					$.set(head, i);
+				});
+				assert($.get(last) === i + 50);
+			}
+			assert(counter === 50 * 50);
+		}
+	};
+};
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_deep.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_deep.bench.js
new file mode 100644
index 0000000000..1051b0c1cf
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_deep.bench.js
@@ -0,0 +1,41 @@
+import { assert } from '../../../utils.js';
+import * as $ from 'svelte/internal/client';
+
+let len = 50;
+const iter = 50;
+
+export default () => {
+	let head = $.state(0);
+	let current = head;
+	for (let i = 0; i < len; i++) {
+		let c = current;
+		current = $.derived(() => {
+			return $.get(c) + 1;
+		});
+	}
+	let counter = 0;
+
+	const destroy = $.effect_root(() => {
+		$.render_effect(() => {
+			$.get(current);
+			counter++;
+		});
+	});
+
+	return {
+		destroy,
+		run() {
+			$.flush(() => {
+				$.set(head, 1);
+			});
+			counter = 0;
+			for (let i = 0; i < iter; i++) {
+				$.flush(() => {
+					$.set(head, i);
+				});
+				assert($.get(current) === len + i);
+			}
+			assert(counter === iter);
+		}
+	};
+};
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_diamond.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_diamond.bench.js
new file mode 100644
index 0000000000..cde53fa3eb
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_diamond.bench.js
@@ -0,0 +1,45 @@
+import { assert } from '../../../utils.js';
+import * as $ from 'svelte/internal/client';
+
+let width = 5;
+
+export default () => {
+	let head = $.state(0);
+	let current = [];
+	for (let i = 0; i < width; i++) {
+		current.push(
+			$.derived(() => {
+				return $.get(head) + 1;
+			})
+		);
+	}
+	let sum = $.derived(() => {
+		return current.map((x) => $.get(x)).reduce((a, b) => a + b, 0);
+	});
+	let counter = 0;
+
+	const destroy = $.effect_root(() => {
+		$.render_effect(() => {
+			$.get(sum);
+			counter++;
+		});
+	});
+
+	return {
+		destroy,
+		run() {
+			$.flush(() => {
+				$.set(head, 1);
+			});
+			assert($.get(sum) === 2 * width);
+			counter = 0;
+			for (let i = 0; i < 500; i++) {
+				$.flush(() => {
+					$.set(head, i);
+				});
+				assert($.get(sum) === (i + 1) * width);
+			}
+			assert(counter === 500);
+		}
+	};
+};
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_mux.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_mux.bench.js
new file mode 100644
index 0000000000..cfc7592c15
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_mux.bench.js
@@ -0,0 +1,38 @@
+import { assert } from '../../../utils.js';
+import * as $ from 'svelte/internal/client';
+
+export default () => {
+	let heads = new Array(100).fill(null).map((_) => $.state(0));
+	const mux = $.derived(() => {
+		return Object.fromEntries(heads.map((h) => $.get(h)).entries());
+	});
+	const splited = heads
+		.map((_, index) => $.derived(() => $.get(mux)[index]))
+		.map((x) => $.derived(() => $.get(x) + 1));
+
+	const destroy = $.effect_root(() => {
+		splited.forEach((x) => {
+			$.render_effect(() => {
+				$.get(x);
+			});
+		});
+	});
+
+	return {
+		destroy,
+		run() {
+			for (let i = 0; i < 10; i++) {
+				$.flush(() => {
+					$.set(heads[i], i);
+				});
+				assert($.get(splited[i]) === i + 1);
+			}
+			for (let i = 0; i < 10; i++) {
+				$.flush(() => {
+					$.set(heads[i], i * 2);
+				});
+				assert($.get(splited[i]) === i * 2 + 1);
+			}
+		}
+	};
+};
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_repeated.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_repeated.bench.js
new file mode 100644
index 0000000000..2887a39931
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_repeated.bench.js
@@ -0,0 +1,42 @@
+import { assert } from '../../../utils.js';
+import * as $ from 'svelte/internal/client';
+
+let size = 30;
+
+export default () => {
+	let head = $.state(0);
+	let current = $.derived(() => {
+		let result = 0;
+		for (let i = 0; i < size; i++) {
+			result += $.get(head);
+		}
+		return result;
+	});
+
+	let counter = 0;
+
+	const destroy = $.effect_root(() => {
+		$.render_effect(() => {
+			$.get(current);
+			counter++;
+		});
+	});
+
+	return {
+		destroy,
+		run() {
+			$.flush(() => {
+				$.set(head, 1);
+			});
+			assert($.get(current) === size);
+			counter = 0;
+			for (let i = 0; i < 100; i++) {
+				$.flush(() => {
+					$.set(head, i);
+				});
+				assert($.get(current) === i * size);
+			}
+			assert(counter === 100);
+		}
+	};
+};
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_triangle.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_triangle.bench.js
new file mode 100644
index 0000000000..0abdd1e13d
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_triangle.bench.js
@@ -0,0 +1,55 @@
+import { assert } from '../../../utils.js';
+import * as $ from 'svelte/internal/client';
+
+let width = 10;
+
+function count(number) {
+	return new Array(number)
+		.fill(0)
+		.map((_, i) => i + 1)
+		.reduce((x, y) => x + y, 0);
+}
+
+export default () => {
+	let head = $.state(0);
+	let current = head;
+	let list = [];
+	for (let i = 0; i < width; i++) {
+		let c = current;
+		list.push(current);
+		current = $.derived(() => {
+			return $.get(c) + 1;
+		});
+	}
+	let sum = $.derived(() => {
+		return list.map((x) => $.get(x)).reduce((a, b) => a + b, 0);
+	});
+
+	let counter = 0;
+
+	const destroy = $.effect_root(() => {
+		$.render_effect(() => {
+			$.get(sum);
+			counter++;
+		});
+	});
+
+	return {
+		destroy,
+		run() {
+			const constant = count(width);
+			$.flush(() => {
+				$.set(head, 1);
+			});
+			assert($.get(sum) === constant);
+			counter = 0;
+			for (let i = 0; i < 100; i++) {
+				$.flush(() => {
+					$.set(head, i);
+				});
+				assert($.get(sum) === constant - width + i * width);
+			}
+			assert(counter === 100);
+		}
+	};
+};
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_unstable.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_unstable.bench.js
new file mode 100644
index 0000000000..b09467326f
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_unstable.bench.js
@@ -0,0 +1,41 @@
+import { assert } from '../../../utils.js';
+import * as $ from 'svelte/internal/client';
+
+export default () => {
+	let head = $.state(0);
+	const double = $.derived(() => $.get(head) * 2);
+	const inverse = $.derived(() => -$.get(head));
+	let current = $.derived(() => {
+		let result = 0;
+		for (let i = 0; i < 20; i++) {
+			result += $.get(head) % 2 ? $.get(double) : $.get(inverse);
+		}
+		return result;
+	});
+
+	let counter = 0;
+
+	const destroy = $.effect_root(() => {
+		$.render_effect(() => {
+			$.get(current);
+			counter++;
+		});
+	});
+
+	return {
+		destroy,
+		run() {
+			$.flush(() => {
+				$.set(head, 1);
+			});
+			assert($.get(current) === 40);
+			counter = 0;
+			for (let i = 0; i < 100; i++) {
+				$.flush(() => {
+					$.set(head, i);
+				});
+			}
+			assert(counter === 100);
+		}
+	};
+};
diff --git a/benchmarking/benchmarks/reactivity/mol_bench.js b/benchmarking/benchmarks/reactivity/tests/mol.bench.js
similarity index 56%
rename from benchmarking/benchmarks/reactivity/mol_bench.js
rename to benchmarking/benchmarks/reactivity/tests/mol.bench.js
index 536b078d74..56b6dc8b28 100644
--- a/benchmarking/benchmarks/reactivity/mol_bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/mol.bench.js
@@ -1,4 +1,4 @@
-import { assert, fastest_test } from '../../utils.js';
+import { assert } from '../../../utils.js';
 import * as $ from 'svelte/internal/client';
 
 /**
@@ -18,7 +18,7 @@ function hard(n) {
 
 const numbers = Array.from({ length: 5 }, (_, i) => i);
 
-function setup() {
+export default () => {
 	let res = [];
 	const A = $.state(0);
 	const B = $.state(0);
@@ -62,60 +62,4 @@ function setup() {
 			assert(res[0] === 3198 && res[1] === 1601 && res[2] === 3195 && res[3] === 1598);
 		}
 	};
-}
-
-export async function mol_bench_owned() {
-	let run, destroy;
-
-	const destroy_owned = $.effect_root(() => {
-		// Do 10 loops to warm up JIT
-		for (let i = 0; i < 10; i++) {
-			const { run, destroy } = setup();
-			run(0);
-			destroy();
-		}
-
-		({ run, destroy } = setup());
-	});
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1e4; i++) {
-			run(i);
-		}
-	});
-
-	// @ts-ignore
-	destroy();
-	destroy_owned();
-
-	return {
-		benchmark: 'mol_bench_owned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
-
-export async function mol_bench_unowned() {
-	// Do 10 loops to warm up JIT
-	for (let i = 0; i < 10; i++) {
-		const { run, destroy } = setup();
-		run(0);
-		destroy();
-	}
-
-	const { run, destroy } = setup();
-
-	const { timing } = await fastest_test(10, () => {
-		for (let i = 0; i < 1e4; i++) {
-			run(i);
-		}
-	});
-
-	destroy();
-
-	return {
-		benchmark: 'mol_bench_unowned',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
-	};
-}
+};
diff --git a/benchmarking/benchmarks/reactivity/util.js b/benchmarking/benchmarks/reactivity/util.js
new file mode 100644
index 0000000000..18c4f556af
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/util.js
@@ -0,0 +1,73 @@
+import * as $ from 'svelte/internal/client';
+import { fastest_test } from '../../utils.js';
+
+export function busy() {
+	let a = 0;
+	for (let i = 0; i < 1_00; i++) {
+		a++;
+	}
+}
+
+/**
+ *
+ * @param {string} label
+ * @param {() => { run: (i?: number) => void, destroy: () => void }} setup
+ */
+export function create_test(label, setup) {
+	return {
+		unowned: async () => {
+			// Do 10 loops to warm up JIT
+			for (let i = 0; i < 10; i++) {
+				const { run, destroy } = setup();
+				run(0);
+				destroy();
+			}
+
+			const { run, destroy } = setup();
+
+			const { timing } = await fastest_test(10, () => {
+				for (let i = 0; i < 1000; i++) {
+					run(i);
+				}
+			});
+
+			destroy();
+
+			return {
+				benchmark: `${label}_unowned`,
+				time: timing.time.toFixed(2),
+				gc_time: timing.gc_time.toFixed(2)
+			};
+		},
+		owned: async () => {
+			let run, destroy;
+
+			const destroy_owned = $.effect_root(() => {
+				// Do 10 loops to warm up JIT
+				for (let i = 0; i < 10; i++) {
+					const { run, destroy } = setup();
+					run(0);
+					destroy();
+				}
+
+				({ run, destroy } = setup());
+			});
+
+			const { timing } = await fastest_test(10, () => {
+				for (let i = 0; i < 1000; i++) {
+					run(i);
+				}
+			});
+
+			// @ts-ignore
+			destroy();
+			destroy_owned();
+
+			return {
+				benchmark: `${label}_owned`,
+				time: timing.time.toFixed(2),
+				gc_time: timing.gc_time.toFixed(2)
+			};
+		}
+	};
+}

From 46c810ce71d14e165cab23fb5556e0ebfe3abf7d Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 21 Jan 2026 13:57:18 -0500
Subject: [PATCH 292/347] chore: tidy up the benchmarking code (#17504)

* chore: tidy up the benchmarking code

* use built-in assert

* fix find-replace fail
---
 benchmarking/benchmarks/reactivity/sbench.js  |   6 +-
 .../reactivity/tests/kairo_avoidable.bench.js |   6 +-
 .../reactivity/tests/kairo_broad.bench.js     |   6 +-
 .../reactivity/tests/kairo_deep.bench.js      |   6 +-
 .../reactivity/tests/kairo_diamond.bench.js   |   8 +-
 .../reactivity/tests/kairo_mux.bench.js       |   6 +-
 .../reactivity/tests/kairo_repeated.bench.js  |   8 +-
 .../reactivity/tests/kairo_triangle.bench.js  |   8 +-
 .../reactivity/tests/kairo_unstable.bench.js  |   6 +-
 .../benchmarks/reactivity/tests/mol.bench.js  |   7 +-
 benchmarking/benchmarks/reactivity/util.js    |  12 +-
 .../benchmarks/ssr/wrapper/wrapper_bench.js   |  33 ++++-
 benchmarking/utils.js                         | 114 +++---------------
 13 files changed, 88 insertions(+), 138 deletions(-)

diff --git a/benchmarking/benchmarks/reactivity/sbench.js b/benchmarking/benchmarks/reactivity/sbench.js
index 196c29dc8d..47ff4a621a 100644
--- a/benchmarking/benchmarks/reactivity/sbench.js
+++ b/benchmarking/benchmarks/reactivity/sbench.js
@@ -37,7 +37,7 @@ function create_sbench_test(label, count, num_sources, fn) {
 			fn(count, create_sources(num_sources, []));
 		}
 
-		const { timing } = await fastest_test(10, () => {
+		const { time, gc_time } = await fastest_test(10, () => {
 			const destroy = $.effect_root(() => {
 				for (let i = 0; i < 10; i++) {
 					fn(count, create_sources(num_sources, []));
@@ -48,8 +48,8 @@ function create_sbench_test(label, count, num_sources, fn) {
 
 		return {
 			benchmark: label,
-			time: timing.time.toFixed(2),
-			gc_time: timing.gc_time.toFixed(2)
+			time: time.toFixed(2),
+			gc_time: gc_time.toFixed(2)
 		};
 	};
 }
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_avoidable.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_avoidable.bench.js
index bb8c234f05..d4ba858824 100644
--- a/benchmarking/benchmarks/reactivity/tests/kairo_avoidable.bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_avoidable.bench.js
@@ -1,4 +1,4 @@
-import { assert } from '../../../utils.js';
+import assert from 'node:assert';
 import * as $ from 'svelte/internal/client';
 import { busy } from '../util.js';
 
@@ -23,12 +23,12 @@ export default () => {
 			$.flush(() => {
 				$.set(head, 1);
 			});
-			assert($.get(computed5) === 6);
+			assert.equal($.get(computed5), 6);
 			for (let i = 0; i < 1000; i++) {
 				$.flush(() => {
 					$.set(head, i);
 				});
-				assert($.get(computed5) === 6);
+				assert.equal($.get(computed5), 6);
 			}
 		}
 	};
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_broad.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_broad.bench.js
index 14e855566b..aebae7a898 100644
--- a/benchmarking/benchmarks/reactivity/tests/kairo_broad.bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_broad.bench.js
@@ -1,4 +1,4 @@
-import { assert } from '../../../utils.js';
+import assert from 'node:assert';
 import * as $ from 'svelte/internal/client';
 
 export default () => {
@@ -33,9 +33,9 @@ export default () => {
 				$.flush(() => {
 					$.set(head, i);
 				});
-				assert($.get(last) === i + 50);
+				assert.equal($.get(last), i + 50);
 			}
-			assert(counter === 50 * 50);
+			assert.equal(counter, 50 * 50);
 		}
 	};
 };
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_deep.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_deep.bench.js
index 1051b0c1cf..4a361e9bfc 100644
--- a/benchmarking/benchmarks/reactivity/tests/kairo_deep.bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_deep.bench.js
@@ -1,4 +1,4 @@
-import { assert } from '../../../utils.js';
+import assert from 'node:assert';
 import * as $ from 'svelte/internal/client';
 
 let len = 50;
@@ -33,9 +33,9 @@ export default () => {
 				$.flush(() => {
 					$.set(head, i);
 				});
-				assert($.get(current) === len + i);
+				assert.equal($.get(current), len + i);
 			}
-			assert(counter === iter);
+			assert.equal(counter, iter);
 		}
 	};
 };
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_diamond.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_diamond.bench.js
index cde53fa3eb..17d9bd85e5 100644
--- a/benchmarking/benchmarks/reactivity/tests/kairo_diamond.bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_diamond.bench.js
@@ -1,4 +1,4 @@
-import { assert } from '../../../utils.js';
+import assert from 'node:assert';
 import * as $ from 'svelte/internal/client';
 
 let width = 5;
@@ -31,15 +31,15 @@ export default () => {
 			$.flush(() => {
 				$.set(head, 1);
 			});
-			assert($.get(sum) === 2 * width);
+			assert.equal($.get(sum), 2 * width);
 			counter = 0;
 			for (let i = 0; i < 500; i++) {
 				$.flush(() => {
 					$.set(head, i);
 				});
-				assert($.get(sum) === (i + 1) * width);
+				assert.equal($.get(sum), (i + 1) * width);
 			}
-			assert(counter === 500);
+			assert.equal(counter, 500);
 		}
 	};
 };
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_mux.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_mux.bench.js
index cfc7592c15..4af6bf7873 100644
--- a/benchmarking/benchmarks/reactivity/tests/kairo_mux.bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_mux.bench.js
@@ -1,4 +1,4 @@
-import { assert } from '../../../utils.js';
+import assert from 'node:assert';
 import * as $ from 'svelte/internal/client';
 
 export default () => {
@@ -25,13 +25,13 @@ export default () => {
 				$.flush(() => {
 					$.set(heads[i], i);
 				});
-				assert($.get(splited[i]) === i + 1);
+				assert.equal($.get(splited[i]), i + 1);
 			}
 			for (let i = 0; i < 10; i++) {
 				$.flush(() => {
 					$.set(heads[i], i * 2);
 				});
-				assert($.get(splited[i]) === i * 2 + 1);
+				assert.equal($.get(splited[i]), i * 2 + 1);
 			}
 		}
 	};
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_repeated.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_repeated.bench.js
index 2887a39931..cab7689fea 100644
--- a/benchmarking/benchmarks/reactivity/tests/kairo_repeated.bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_repeated.bench.js
@@ -1,4 +1,4 @@
-import { assert } from '../../../utils.js';
+import assert from 'node:assert';
 import * as $ from 'svelte/internal/client';
 
 let size = 30;
@@ -28,15 +28,15 @@ export default () => {
 			$.flush(() => {
 				$.set(head, 1);
 			});
-			assert($.get(current) === size);
+			assert.equal($.get(current), size);
 			counter = 0;
 			for (let i = 0; i < 100; i++) {
 				$.flush(() => {
 					$.set(head, i);
 				});
-				assert($.get(current) === i * size);
+				assert.equal($.get(current), i * size);
 			}
-			assert(counter === 100);
+			assert.equal(counter, 100);
 		}
 	};
 };
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_triangle.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_triangle.bench.js
index 0abdd1e13d..b4b46c0209 100644
--- a/benchmarking/benchmarks/reactivity/tests/kairo_triangle.bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_triangle.bench.js
@@ -1,4 +1,4 @@
-import { assert } from '../../../utils.js';
+import assert from 'node:assert';
 import * as $ from 'svelte/internal/client';
 
 let width = 10;
@@ -41,15 +41,15 @@ export default () => {
 			$.flush(() => {
 				$.set(head, 1);
 			});
-			assert($.get(sum) === constant);
+			assert.equal($.get(sum), constant);
 			counter = 0;
 			for (let i = 0; i < 100; i++) {
 				$.flush(() => {
 					$.set(head, i);
 				});
-				assert($.get(sum) === constant - width + i * width);
+				assert.equal($.get(sum), constant - width + i * width);
 			}
-			assert(counter === 100);
+			assert.equal(counter, 100);
 		}
 	};
 };
diff --git a/benchmarking/benchmarks/reactivity/tests/kairo_unstable.bench.js b/benchmarking/benchmarks/reactivity/tests/kairo_unstable.bench.js
index b09467326f..e7723fae0d 100644
--- a/benchmarking/benchmarks/reactivity/tests/kairo_unstable.bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/kairo_unstable.bench.js
@@ -1,4 +1,4 @@
-import { assert } from '../../../utils.js';
+import assert from 'node:assert';
 import * as $ from 'svelte/internal/client';
 
 export default () => {
@@ -28,14 +28,14 @@ export default () => {
 			$.flush(() => {
 				$.set(head, 1);
 			});
-			assert($.get(current) === 40);
+			assert.equal($.get(current), 40);
 			counter = 0;
 			for (let i = 0; i < 100; i++) {
 				$.flush(() => {
 					$.set(head, i);
 				});
 			}
-			assert(counter === 100);
+			assert.equal(counter, 100);
 		}
 	};
 };
diff --git a/benchmarking/benchmarks/reactivity/tests/mol.bench.js b/benchmarking/benchmarks/reactivity/tests/mol.bench.js
index 56b6dc8b28..e66f0191d1 100644
--- a/benchmarking/benchmarks/reactivity/tests/mol.bench.js
+++ b/benchmarking/benchmarks/reactivity/tests/mol.bench.js
@@ -1,4 +1,4 @@
-import { assert } from '../../../utils.js';
+import assert from 'node:assert';
 import * as $ from 'svelte/internal/client';
 
 /**
@@ -59,7 +59,10 @@ export default () => {
 				$.set(A, 2 + i * 2);
 				$.set(B, 2);
 			});
-			assert(res[0] === 3198 && res[1] === 1601 && res[2] === 3195 && res[3] === 1598);
+			assert.equal(res[0], 3198);
+			assert.equal(res[1], 1601);
+			assert.equal(res[2], 3195);
+			assert.equal(res[3], 1598);
 		}
 	};
 };
diff --git a/benchmarking/benchmarks/reactivity/util.js b/benchmarking/benchmarks/reactivity/util.js
index 18c4f556af..ff0722d85e 100644
--- a/benchmarking/benchmarks/reactivity/util.js
+++ b/benchmarking/benchmarks/reactivity/util.js
@@ -25,7 +25,7 @@ export function create_test(label, setup) {
 
 			const { run, destroy } = setup();
 
-			const { timing } = await fastest_test(10, () => {
+			const { time, gc_time } = await fastest_test(10, () => {
 				for (let i = 0; i < 1000; i++) {
 					run(i);
 				}
@@ -35,8 +35,8 @@ export function create_test(label, setup) {
 
 			return {
 				benchmark: `${label}_unowned`,
-				time: timing.time.toFixed(2),
-				gc_time: timing.gc_time.toFixed(2)
+				time: time.toFixed(2),
+				gc_time: gc_time.toFixed(2)
 			};
 		},
 		owned: async () => {
@@ -53,7 +53,7 @@ export function create_test(label, setup) {
 				({ run, destroy } = setup());
 			});
 
-			const { timing } = await fastest_test(10, () => {
+			const { time, gc_time } = await fastest_test(10, () => {
 				for (let i = 0; i < 1000; i++) {
 					run(i);
 				}
@@ -65,8 +65,8 @@ export function create_test(label, setup) {
 
 			return {
 				benchmark: `${label}_owned`,
-				time: timing.time.toFixed(2),
-				gc_time: timing.gc_time.toFixed(2)
+				time: time.toFixed(2),
+				gc_time: gc_time.toFixed(2)
 			};
 		}
 	};
diff --git a/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js b/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js
index ba0457b80e..6fc992d4a2 100644
--- a/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js
+++ b/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js
@@ -1,13 +1,16 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
 import { render } from 'svelte/server';
-import { fastest_test, read_file, write } from '../../../utils.js';
+import { fastest_test } from '../../../utils.js';
 import { compile } from 'svelte/compiler';
 
 const dir = `${process.cwd()}/benchmarking/benchmarks/ssr/wrapper`;
 
 async function compile_svelte() {
-	const output = compile(read_file(`${dir}/App.svelte`), {
+	const output = compile(read(`${dir}/App.svelte`), {
 		generate: 'server'
 	});
+
 	write(`${dir}/output/App.js`, output.js.code);
 
 	const module = await import(`${dir}/output/App.js`);
@@ -17,12 +20,13 @@ async function compile_svelte() {
 
 export async function wrapper_bench() {
 	const App = await compile_svelte();
+
 	// Do 3 loops to warm up JIT
 	for (let i = 0; i < 3; i++) {
 		render(App);
 	}
 
-	const { timing } = await fastest_test(10, () => {
+	const { time, gc_time } = await fastest_test(10, () => {
 		for (let i = 0; i < 100; i++) {
 			render(App);
 		}
@@ -30,7 +34,26 @@ export async function wrapper_bench() {
 
 	return {
 		benchmark: 'wrapper_bench',
-		time: timing.time.toFixed(2),
-		gc_time: timing.gc_time.toFixed(2)
+		time: time.toFixed(2),
+		gc_time: gc_time.toFixed(2)
 	};
 }
+
+/**
+ * @param {string} file
+ */
+function read(file) {
+	return fs.readFileSync(file, 'utf-8').replace(/\r\n/g, '\n');
+}
+
+/**
+ * @param {string} file
+ * @param {string} contents
+ */
+function write(file, contents) {
+	try {
+		fs.mkdirSync(path.dirname(file), { recursive: true });
+	} catch {}
+
+	fs.writeFileSync(file, contents);
+}
diff --git a/benchmarking/utils.js b/benchmarking/utils.js
index 684d2ee02b..5581135e00 100644
--- a/benchmarking/utils.js
+++ b/benchmarking/utils.js
@@ -1,78 +1,30 @@
 import { performance, PerformanceObserver } from 'node:perf_hooks';
 import v8 from 'v8-natives';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
 
 // Credit to https://github.com/milomg/js-reactivity-benchmark for the logic for timing + GC tracking.
 
-class GarbageTrack {
-	track_id = 0;
-	observer = new PerformanceObserver((list) => this.perf_entries.push(...list.getEntries()));
-	perf_entries = [];
-	periods = [];
+async function track(fn) {
+	v8.collectGarbage();
 
-	watch(fn) {
-		this.track_id++;
-		const start = performance.now();
-		const result = fn();
-		const end = performance.now();
-		this.periods.push({ track_id: this.track_id, start, end });
+	/** @type {PerformanceEntry[]} */
+	const entries = [];
 
-		return { result, track_id: this.track_id };
-	}
+	const observer = new PerformanceObserver((list) => entries.push(...list.getEntries()));
+	observer.observe({ entryTypes: ['gc'] });
 
-	/**
-	 * @param {number} track_id
-	 */
-	async gcDuration(track_id) {
-		await promise_delay(10);
+	const start = performance.now();
+	fn();
+	const end = performance.now();
 
-		const period = this.periods.find((period) => period.track_id === track_id);
-		if (!period) {
-			// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
-			return Promise.reject('no period found');
-		}
+	await new Promise((f) => setTimeout(f, 10));
 
-		const entries = this.perf_entries.filter(
-			(e) => e.startTime >= period.start && e.startTime < period.end
-		);
-		return entries.reduce((t, e) => e.duration + t, 0);
-	}
+	const gc_time = entries
+		.filter((e) => e.startTime >= start && e.startTime < end)
+		.reduce((t, e) => e.duration + t, 0);
 
-	destroy() {
-		this.observer.disconnect();
-	}
+	observer.disconnect();
 
-	constructor() {
-		this.observer.observe({ entryTypes: ['gc'] });
-	}
-}
-
-function promise_delay(timeout = 0) {
-	return new Promise((resolve) => setTimeout(resolve, timeout));
-}
-
-/**
- * @param {{ (): void; (): any; }} fn
- */
-function run_timed(fn) {
-	const start = performance.now();
-	const result = fn();
-	const time = performance.now() - start;
-	return { result, time };
-}
-
-/**
- * @param {() => void} fn
- */
-async function run_tracked(fn) {
-	v8.collectGarbage();
-	const gc_track = new GarbageTrack();
-	const { result: wrappedResult, track_id } = gc_track.watch(() => run_timed(fn));
-	const gc_time = await gc_track.gcDuration(track_id);
-	const { result, time } = wrappedResult;
-	gc_track.destroy();
-	return { result, timing: { time, gc_time } };
+	return { time: end - start, gc_time };
 }
 
 /**
@@ -80,40 +32,12 @@ async function run_tracked(fn) {
  * @param {() => void} fn
  */
 export async function fastest_test(times, fn) {
+	/** @type {Array<{ time: number, gc_time: number }>} */
 	const results = [];
-	for (let i = 0; i < times; i++) {
-		const run = await run_tracked(fn);
-		results.push(run);
-	}
-	const fastest = results.reduce((a, b) => (a.timing.time < b.timing.time ? a : b));
 
-	return fastest;
-}
-
-/**
- * @param {boolean} a
- */
-export function assert(a) {
-	if (!a) {
-		throw new Error('Assertion failed');
+	for (let i = 0; i < times; i++) {
+		results.push(await track(fn));
 	}
-}
-
-/**
- * @param {string} file
- */
-export function read_file(file) {
-	return fs.readFileSync(file, 'utf-8').replace(/\r\n/g, '\n');
-}
-
-/**
- * @param {string} file
- * @param {string} contents
- */
-export function write(file, contents) {
-	try {
-		fs.mkdirSync(path.dirname(file), { recursive: true });
-	} catch {}
 
-	fs.writeFileSync(file, contents);
+	return results.reduce((a, b) => (a.time < b.time ? a : b));
 }

From c41fef1ef104f4797cca45051774d4a662156f9a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 21 Jan 2026 14:45:07 -0500
Subject: [PATCH 293/347] Nicer bench output (#17505)

* test

* dont coerce to string

* more readable output for pnpm bench

* oops

* fix
---
 benchmarking/benchmarks/reactivity/sbench.js  |  4 +-
 benchmarking/benchmarks/reactivity/util.js    |  8 +--
 .../benchmarks/ssr/wrapper/wrapper_bench.js   |  4 +-
 benchmarking/run.js                           | 64 +++++++++++--------
 package.json                                  |  2 +-
 5 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/benchmarking/benchmarks/reactivity/sbench.js b/benchmarking/benchmarks/reactivity/sbench.js
index 47ff4a621a..9c41f60746 100644
--- a/benchmarking/benchmarks/reactivity/sbench.js
+++ b/benchmarking/benchmarks/reactivity/sbench.js
@@ -48,8 +48,8 @@ function create_sbench_test(label, count, num_sources, fn) {
 
 		return {
 			benchmark: label,
-			time: time.toFixed(2),
-			gc_time: gc_time.toFixed(2)
+			time,
+			gc_time
 		};
 	};
 }
diff --git a/benchmarking/benchmarks/reactivity/util.js b/benchmarking/benchmarks/reactivity/util.js
index ff0722d85e..6a2e44f5ae 100644
--- a/benchmarking/benchmarks/reactivity/util.js
+++ b/benchmarking/benchmarks/reactivity/util.js
@@ -35,8 +35,8 @@ export function create_test(label, setup) {
 
 			return {
 				benchmark: `${label}_unowned`,
-				time: time.toFixed(2),
-				gc_time: gc_time.toFixed(2)
+				time,
+				gc_time
 			};
 		},
 		owned: async () => {
@@ -65,8 +65,8 @@ export function create_test(label, setup) {
 
 			return {
 				benchmark: `${label}_owned`,
-				time: time.toFixed(2),
-				gc_time: gc_time.toFixed(2)
+				time,
+				gc_time
 			};
 		}
 	};
diff --git a/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js b/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js
index 6fc992d4a2..6e790ee2b8 100644
--- a/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js
+++ b/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js
@@ -34,8 +34,8 @@ export async function wrapper_bench() {
 
 	return {
 		benchmark: 'wrapper_bench',
-		time: time.toFixed(2),
-		gc_time: gc_time.toFixed(2)
+		time,
+		gc_time
 	};
 }
 
diff --git a/benchmarking/run.js b/benchmarking/run.js
index bd96b9c2dc..f7b8128886 100644
--- a/benchmarking/run.js
+++ b/benchmarking/run.js
@@ -10,46 +10,60 @@ const suites = [
 	{ benchmarks: ssr_benchmarks, name: 'server-side rendering benchmarks' }
 ];
 
-// eslint-disable-next-line no-console
-console.log('\x1b[1m', '-- Benchmarking Started --', '\x1b[0m');
+const COLUMN_WIDTHS = [25, 9, 9];
+const TOTAL_WIDTH = COLUMN_WIDTHS.reduce((a, b) => a + b);
+
+const pad_right = (str, n) => str + ' '.repeat(n - str.length);
+const pad_left = (str, n) => ' '.repeat(n - str.length) + str;
+
 $.push({}, true);
+
 try {
 	for (const { benchmarks, name } of suites) {
 		let suite_time = 0;
 		let suite_gc_time = 0;
-		// eslint-disable-next-line no-console
+
 		console.log(`\nRunning ${name}...\n`);
+		console.log(
+			pad_right('Benchmark', COLUMN_WIDTHS[0]) +
+				pad_left('Time', COLUMN_WIDTHS[1]) +
+				pad_left('GC time', COLUMN_WIDTHS[2])
+		);
+		console.log('='.repeat(TOTAL_WIDTH));
 
 		for (const benchmark of benchmarks) {
 			const results = await benchmark();
-			// eslint-disable-next-line no-console
-			console.log(results);
-			total_time += Number(results.time);
-			total_gc_time += Number(results.gc_time);
-			suite_time += Number(results.time);
-			suite_gc_time += Number(results.gc_time);
+			console.log(
+				pad_right(results.benchmark, COLUMN_WIDTHS[0]) +
+					pad_left(results.time.toFixed(2), COLUMN_WIDTHS[1]) +
+					pad_left(results.gc_time.toFixed(2), COLUMN_WIDTHS[2])
+			);
+			total_time += results.time;
+			total_gc_time += results.gc_time;
+			suite_time += results.time;
+			suite_gc_time += results.gc_time;
 		}
 
-		console.log(`\nFinished ${name}.\n`);
-
-		// eslint-disable-next-line no-console
-		console.log({
-			suite_time: suite_time.toFixed(2),
-			suite_gc_time: suite_gc_time.toFixed(2)
-		});
+		console.log('='.repeat(TOTAL_WIDTH));
+		console.log(
+			pad_right('suite', COLUMN_WIDTHS[0]) +
+				pad_left(suite_time.toFixed(2), COLUMN_WIDTHS[1]) +
+				pad_left(suite_gc_time.toFixed(2), COLUMN_WIDTHS[2])
+		);
+		console.log('='.repeat(TOTAL_WIDTH));
 	}
 } catch (e) {
-	// eslint-disable-next-line no-console
-	console.log('\x1b[1m', '\n-- Benchmarking Failed --\n', '\x1b[0m');
 	// eslint-disable-next-line no-console
 	console.error(e);
 	process.exit(1);
 }
+
 $.pop();
-// eslint-disable-next-line no-console
-console.log('\x1b[1m', '\n-- Benchmarking Complete --\n', '\x1b[0m');
-// eslint-disable-next-line no-console
-console.log({
-	total_time: total_time.toFixed(2),
-	total_gc_time: total_gc_time.toFixed(2)
-});
+
+console.log('');
+
+console.log(
+	pad_right('total', COLUMN_WIDTHS[0]) +
+		pad_left(total_time.toFixed(2), COLUMN_WIDTHS[1]) +
+		pad_left(total_gc_time.toFixed(2), COLUMN_WIDTHS[2])
+);
diff --git a/package.json b/package.json
index 12e59a2665..aa9c8cafa3 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "test": "vitest run",
     "changeset:version": "changeset version && pnpm -r generate:version && git add --all",
     "changeset:publish": "changeset publish",
-    "bench": "node --allow-natives-syntax ./benchmarking/run.js",
+    "bench": "NODE_ENV=production node --allow-natives-syntax ./benchmarking/run.js",
     "bench:compare": "node --allow-natives-syntax ./benchmarking/compare/index.js",
     "bench:debug": "node --allow-natives-syntax --inspect-brk ./benchmarking/run.js"
   },

From 0025d42366fa3652216cac8bf3adc1389ae49a3d Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 21 Jan 2026 15:53:37 -0500
Subject: [PATCH 294/347] chore: skippable benchmarks (#17506)

* chore: add benchmark filtering mechanism

* tweak

* fix

* try this

* better logging for bench:compare

* fix
---
 benchmarking/benchmarks/reactivity/sbench.js  | 35 ++++----
 benchmarking/benchmarks/reactivity/util.js    | 84 +++++++++----------
 .../benchmarks/ssr/wrapper/wrapper_bench.js   | 29 +++----
 benchmarking/compare/runner.js                | 11 ++-
 benchmarking/run.js                           | 32 +++++--
 package.json                                  |  4 +-
 6 files changed, 104 insertions(+), 91 deletions(-)

diff --git a/benchmarking/benchmarks/reactivity/sbench.js b/benchmarking/benchmarks/reactivity/sbench.js
index 9c41f60746..e197f970c8 100644
--- a/benchmarking/benchmarks/reactivity/sbench.js
+++ b/benchmarking/benchmarks/reactivity/sbench.js
@@ -26,31 +26,28 @@ function create_derived(source) {
 /**
  *
  * @param {string} label
- * @param {(n: number, sources: Array<Source<number>>)} fn
+ * @param {(n: number, sources: Array<Source<number>>) => void} fn
  * @param {number} count
  * @param {number} num_sources
  */
 function create_sbench_test(label, count, num_sources, fn) {
-	return async () => {
-		// Do 3 loops to warm up JIT
-		for (let i = 0; i < 3; i++) {
-			fn(count, create_sources(num_sources, []));
-		}
+	return {
+		label,
+		fn: async () => {
+			// Do 3 loops to warm up JIT
+			for (let i = 0; i < 3; i++) {
+				fn(count, create_sources(num_sources, []));
+			}
 
-		const { time, gc_time } = await fastest_test(10, () => {
-			const destroy = $.effect_root(() => {
-				for (let i = 0; i < 10; i++) {
-					fn(count, create_sources(num_sources, []));
-				}
+			return await fastest_test(10, () => {
+				const destroy = $.effect_root(() => {
+					for (let i = 0; i < 10; i++) {
+						fn(count, create_sources(num_sources, []));
+					}
+				});
+				destroy();
 			});
-			destroy();
-		});
-
-		return {
-			benchmark: label,
-			time,
-			gc_time
-		};
+		}
 	};
 }
 
diff --git a/benchmarking/benchmarks/reactivity/util.js b/benchmarking/benchmarks/reactivity/util.js
index 6a2e44f5ae..da5e5c51f5 100644
--- a/benchmarking/benchmarks/reactivity/util.js
+++ b/benchmarking/benchmarks/reactivity/util.js
@@ -15,34 +15,9 @@ export function busy() {
  */
 export function create_test(label, setup) {
 	return {
-		unowned: async () => {
-			// Do 10 loops to warm up JIT
-			for (let i = 0; i < 10; i++) {
-				const { run, destroy } = setup();
-				run(0);
-				destroy();
-			}
-
-			const { run, destroy } = setup();
-
-			const { time, gc_time } = await fastest_test(10, () => {
-				for (let i = 0; i < 1000; i++) {
-					run(i);
-				}
-			});
-
-			destroy();
-
-			return {
-				benchmark: `${label}_unowned`,
-				time,
-				gc_time
-			};
-		},
-		owned: async () => {
-			let run, destroy;
-
-			const destroy_owned = $.effect_root(() => {
+		unowned: {
+			label: `${label}_unowned`,
+			fn: async () => {
 				// Do 10 loops to warm up JIT
 				for (let i = 0; i < 10; i++) {
 					const { run, destroy } = setup();
@@ -50,24 +25,47 @@ export function create_test(label, setup) {
 					destroy();
 				}
 
-				({ run, destroy } = setup());
-			});
+				const { run, destroy } = setup();
+
+				const result = await fastest_test(10, () => {
+					for (let i = 0; i < 1000; i++) {
+						run(i);
+					}
+				});
 
-			const { time, gc_time } = await fastest_test(10, () => {
-				for (let i = 0; i < 1000; i++) {
-					run(i);
-				}
-			});
+				destroy();
+
+				return result;
+			}
+		},
+		owned: {
+			label: `${label}_owned`,
+			fn: async () => {
+				let run, destroy;
 
-			// @ts-ignore
-			destroy();
-			destroy_owned();
+				const destroy_owned = $.effect_root(() => {
+					// Do 10 loops to warm up JIT
+					for (let i = 0; i < 10; i++) {
+						const { run, destroy } = setup();
+						run(0);
+						destroy();
+					}
 
-			return {
-				benchmark: `${label}_owned`,
-				time,
-				gc_time
-			};
+					({ run, destroy } = setup());
+				});
+
+				const result = await fastest_test(10, () => {
+					for (let i = 0; i < 1000; i++) {
+						run(i);
+					}
+				});
+
+				// @ts-ignore
+				destroy();
+				destroy_owned();
+
+				return result;
+			}
 		}
 	};
 }
diff --git a/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js b/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js
index 6e790ee2b8..9a8dda617d 100644
--- a/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js
+++ b/benchmarking/benchmarks/ssr/wrapper/wrapper_bench.js
@@ -18,26 +18,23 @@ async function compile_svelte() {
 	return module.default;
 }
 
-export async function wrapper_bench() {
-	const App = await compile_svelte();
+export const wrapper_bench = {
+	label: 'wrapper_bench',
+	fn: async () => {
+		const App = await compile_svelte();
 
-	// Do 3 loops to warm up JIT
-	for (let i = 0; i < 3; i++) {
-		render(App);
-	}
-
-	const { time, gc_time } = await fastest_test(10, () => {
-		for (let i = 0; i < 100; i++) {
+		// Do 3 loops to warm up JIT
+		for (let i = 0; i < 3; i++) {
 			render(App);
 		}
-	});
 
-	return {
-		benchmark: 'wrapper_bench',
-		time,
-		gc_time
-	};
-}
+		return await fastest_test(10, () => {
+			for (let i = 0; i < 100; i++) {
+				render(App);
+			}
+		});
+	}
+};
 
 /**
  * @param {string} file
diff --git a/benchmarking/compare/runner.js b/benchmarking/compare/runner.js
index a2e8646379..11e40ed983 100644
--- a/benchmarking/compare/runner.js
+++ b/benchmarking/compare/runner.js
@@ -1,10 +1,13 @@
 import { reactivity_benchmarks } from '../benchmarks/reactivity/index.js';
 
 const results = [];
-for (const benchmark of reactivity_benchmarks) {
-	const result = await benchmark();
-	console.error(result.benchmark);
-	results.push(result);
+
+for (let i = 0; i < reactivity_benchmarks.length; i += 1) {
+	const benchmark = reactivity_benchmarks[i];
+
+	process.stderr.write(`Running ${i + 1}/${reactivity_benchmarks.length} ${benchmark.label} `);
+	results.push({ benchmark: benchmark.label, ...(await benchmark.fn()) });
+	process.stderr.write('\x1b[2K\r');
 }
 
 process.send(results);
diff --git a/benchmarking/run.js b/benchmarking/run.js
index f7b8128886..2b09f7c592 100644
--- a/benchmarking/run.js
+++ b/benchmarking/run.js
@@ -2,13 +2,28 @@ import * as $ from '../packages/svelte/src/internal/client/index.js';
 import { reactivity_benchmarks } from './benchmarks/reactivity/index.js';
 import { ssr_benchmarks } from './benchmarks/ssr/index.js';
 
-let total_time = 0;
-let total_gc_time = 0;
+// e.g. `pnpm bench kairo` to only run the kairo benchmarks
+const filters = process.argv.slice(2);
 
 const suites = [
-	{ benchmarks: reactivity_benchmarks, name: 'reactivity benchmarks' },
-	{ benchmarks: ssr_benchmarks, name: 'server-side rendering benchmarks' }
-];
+	{
+		benchmarks: reactivity_benchmarks.filter(
+			(b) => filters.length === 0 || filters.some((f) => b.label.includes(f))
+		),
+		name: 'reactivity benchmarks'
+	},
+	{
+		benchmarks: ssr_benchmarks.filter(
+			(b) => filters.length === 0 || filters.some((f) => b.label.includes(f))
+		),
+		name: 'server-side rendering benchmarks'
+	}
+].filter((suite) => suite.benchmarks.length > 0);
+
+if (suites.length === 0) {
+	console.log('No benchmarks matched provided filters');
+	process.exit(1);
+}
 
 const COLUMN_WIDTHS = [25, 9, 9];
 const TOTAL_WIDTH = COLUMN_WIDTHS.reduce((a, b) => a + b);
@@ -16,6 +31,9 @@ const TOTAL_WIDTH = COLUMN_WIDTHS.reduce((a, b) => a + b);
 const pad_right = (str, n) => str + ' '.repeat(n - str.length);
 const pad_left = (str, n) => ' '.repeat(n - str.length) + str;
 
+let total_time = 0;
+let total_gc_time = 0;
+
 $.push({}, true);
 
 try {
@@ -32,9 +50,9 @@ try {
 		console.log('='.repeat(TOTAL_WIDTH));
 
 		for (const benchmark of benchmarks) {
-			const results = await benchmark();
+			const results = await benchmark.fn();
 			console.log(
-				pad_right(results.benchmark, COLUMN_WIDTHS[0]) +
+				pad_right(benchmark.label, COLUMN_WIDTHS[0]) +
 					pad_left(results.time.toFixed(2), COLUMN_WIDTHS[1]) +
 					pad_left(results.gc_time.toFixed(2), COLUMN_WIDTHS[2])
 			);
diff --git a/package.json b/package.json
index aa9c8cafa3..24be8bd2bc 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
     "changeset:version": "changeset version && pnpm -r generate:version && git add --all",
     "changeset:publish": "changeset publish",
     "bench": "NODE_ENV=production node --allow-natives-syntax ./benchmarking/run.js",
-    "bench:compare": "node --allow-natives-syntax ./benchmarking/compare/index.js",
-    "bench:debug": "node --allow-natives-syntax --inspect-brk ./benchmarking/run.js"
+    "bench:compare": "NODE_ENV=production node --allow-natives-syntax ./benchmarking/compare/index.js",
+    "bench:debug": "NODE_ENV=production node --allow-natives-syntax --inspect-brk ./benchmarking/run.js"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8",

From 5ce61868893b5d78cc139fbd76be3ef33f4ec124 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 21 Jan 2026 16:05:37 -0500
Subject: [PATCH 295/347] fix (#17507)

---
 .../reactivity/tests/repeated_deps.bench.js   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 benchmarking/benchmarks/reactivity/tests/repeated_deps.bench.js

diff --git a/benchmarking/benchmarks/reactivity/tests/repeated_deps.bench.js b/benchmarking/benchmarks/reactivity/tests/repeated_deps.bench.js
new file mode 100644
index 0000000000..a8fbcfdbd6
--- /dev/null
+++ b/benchmarking/benchmarks/reactivity/tests/repeated_deps.bench.js
@@ -0,0 +1,35 @@
+import assert from 'node:assert';
+import * as $ from 'svelte/internal/client';
+
+const ARRAY_SIZE = 1000;
+
+export default () => {
+	const signals = Array.from({ length: ARRAY_SIZE }, (_, i) => $.state(i));
+	const order = $.state(0);
+
+	// break skipped_deps fast path by changing order of reads
+	const total = $.derived(() => {
+		const ord = $.get(order);
+		let sum = 0;
+		for (let i = 0; i < ARRAY_SIZE; i++) {
+			sum += /** @type {number} */ ($.get(signals[(i + ord) % ARRAY_SIZE]));
+		}
+		return sum;
+	});
+
+	const destroy = $.effect_root(() => {
+		$.render_effect(() => {
+			$.get(total);
+		});
+	});
+
+	return {
+		destroy,
+		run() {
+			for (let i = 0; i < 5; i++) {
+				$.flush(() => $.set(order, i));
+				assert.equal($.get(total), (ARRAY_SIZE * (ARRAY_SIZE - 1)) / 2); // sum of 0..999
+			}
+		}
+	};
+};

From c9ebd6a88553a3041d68c6063ec095fdd601f4b7 Mon Sep 17 00:00:00 2001
From: Elliott Johnson <sejohnson@torchcloudconsulting.com>
Date: Wed, 21 Jan 2026 14:09:30 -0700
Subject: [PATCH 296/347] feat: export `parseCss` from `svelte/compiler`
 (#17496)

* feat: export  from

* changeset

* fix: Errors

* set_source, so state is correct if an error occurs

* simplify

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/loud-buses-guess.md                |   5 +
 packages/svelte/src/compiler/index.js         |  26 +++-
 .../src/compiler/phases/1-parse/index.js      |  14 ++
 .../src/compiler/phases/1-parse/read/style.js |  30 ++--
 packages/svelte/tests/css-parse.test.ts       | 138 ++++++++++++++++++
 packages/svelte/types/index.d.ts              |   6 +
 6 files changed, 205 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/loud-buses-guess.md
 create mode 100644 packages/svelte/tests/css-parse.test.ts

diff --git a/.changeset/loud-buses-guess.md b/.changeset/loud-buses-guess.md
new file mode 100644
index 0000000000..d6c7c3d5a4
--- /dev/null
+++ b/.changeset/loud-buses-guess.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: export `parseCss` from `svelte/compiler`
diff --git a/packages/svelte/src/compiler/index.js b/packages/svelte/src/compiler/index.js
index 9095a2a2f2..acfef6a320 100644
--- a/packages/svelte/src/compiler/index.js
+++ b/packages/svelte/src/compiler/index.js
@@ -3,8 +3,9 @@
 /** @import { AST } from './public.js' */
 import { walk as zimmerframe_walk } from 'zimmerframe';
 import { convert } from './legacy.js';
-import { parse as _parse } from './phases/1-parse/index.js';
+import { parse as _parse, Parser } from './phases/1-parse/index.js';
 import { remove_typescript_nodes } from './phases/1-parse/remove_typescript_nodes.js';
+import { parse_stylesheet } from './phases/1-parse/read/style.js';
 import { analyze_component, analyze_module } from './phases/2-analyze/index.js';
 import { transform_component, transform_module } from './phases/3-transform/index.js';
 import { validate_component_options, validate_module_options } from './validate-options.js';
@@ -118,6 +119,29 @@ export function parse(source, { modern, loose } = {}) {
 	return to_public_ast(source, ast, modern);
 }
 
+/**
+ * The parseCss function parses a CSS stylesheet, returning its abstract syntax tree.
+ *
+ * @param {string} source The CSS source code
+ * @returns {Omit<AST.CSS.StyleSheet, 'attributes' | 'content'>}
+ */
+export function parseCss(source) {
+	source = remove_bom(source);
+	state.reset({ warning: () => false, filename: undefined });
+
+	state.set_source(source);
+
+	const parser = Parser.forCss(source);
+	const children = parse_stylesheet(parser);
+
+	return {
+		type: 'StyleSheet',
+		start: 0,
+		end: source.length,
+		children
+	};
+}
+
 /**
  * @param {string} source
  * @param {AST.Root} ast
diff --git a/packages/svelte/src/compiler/phases/1-parse/index.js b/packages/svelte/src/compiler/phases/1-parse/index.js
index 3b5f83d58f..88b4352e8a 100644
--- a/packages/svelte/src/compiler/phases/1-parse/index.js
+++ b/packages/svelte/src/compiler/phases/1-parse/index.js
@@ -34,6 +34,20 @@ export class Parser {
 	/** */
 	index = 0;
 
+	/**
+	 * Creates a minimal parser instance for CSS-only parsing.
+	 * Skips Svelte component parsing setup.
+	 * @param {string} source
+	 * @returns {Parser}
+	 */
+	static forCss(source) {
+		const parser = Object.create(Parser.prototype);
+		parser.template = source;
+		parser.index = 0;
+		parser.loose = false;
+		return parser;
+	}
+
 	/** Whether we're parsing in TypeScript mode */
 	ts = false;
 
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/style.js b/packages/svelte/src/compiler/phases/1-parse/read/style.js
index 80ab234d92..c88a3707c1 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/style.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/style.js
@@ -24,10 +24,11 @@ const REGEX_HTML_COMMENT_CLOSE = /-->/;
  */
 export default function read_style(parser, start, attributes) {
 	const content_start = parser.index;
-	const children = read_body(parser, '</style');
+	const children = read_body(parser, (p) => p.match('</style') || p.index >= p.template.length);
 	const content_end = parser.index;
 
-	parser.read(/^<\/style\s*>/);
+	parser.eat('</style', true);
+	parser.read(/^\s*>/);
 
 	return {
 		type: 'StyleSheet',
@@ -46,20 +47,14 @@ export default function read_style(parser, start, attributes) {
 
 /**
  * @param {Parser} parser
- * @param {string} close
- * @returns {any[]}
+ * @param {(parser: Parser) => boolean} finished
+ * @returns {Array<AST.CSS.Rule | AST.CSS.Atrule>}
  */
-function read_body(parser, close) {
+function read_body(parser, finished) {
 	/** @type {Array<AST.CSS.Rule | AST.CSS.Atrule>} */
 	const children = [];
 
-	while (parser.index < parser.template.length) {
-		allow_comment_or_whitespace(parser);
-
-		if (parser.match(close)) {
-			return children;
-		}
-
+	while ((allow_comment_or_whitespace(parser), !finished(parser))) {
 		if (parser.match('@')) {
 			children.push(read_at_rule(parser));
 		} else {
@@ -67,7 +62,7 @@ function read_body(parser, close) {
 		}
 	}
 
-	e.expected_token(parser.template.length, close);
+	return children;
 }
 
 /**
@@ -627,3 +622,12 @@ function allow_comment_or_whitespace(parser) {
 		parser.allow_whitespace();
 	}
 }
+
+/**
+ * Parse standalone CSS content (not wrapped in `<style>`).
+ * @param {Parser} parser
+ * @returns {Array<AST.CSS.Rule | AST.CSS.Atrule>}
+ */
+export function parse_stylesheet(parser) {
+	return read_body(parser, (p) => p.index >= p.template.length);
+}
diff --git a/packages/svelte/tests/css-parse.test.ts b/packages/svelte/tests/css-parse.test.ts
new file mode 100644
index 0000000000..fcb9bdc010
--- /dev/null
+++ b/packages/svelte/tests/css-parse.test.ts
@@ -0,0 +1,138 @@
+import { assert, describe, it } from 'vitest';
+import { parseCss } from 'svelte/compiler';
+
+describe('parseCss', () => {
+	it('parses a simple rule', () => {
+		const ast = parseCss('div { color: red; }');
+		assert.equal(ast.type, 'StyleSheet');
+		assert.equal(ast.children.length, 1);
+		assert.equal(ast.children[0].type, 'Rule');
+	});
+
+	it('parses at-rules', () => {
+		const ast = parseCss('@media (min-width: 800px) { div { color: red; } }');
+		assert.equal(ast.children.length, 1);
+		assert.equal(ast.children[0].type, 'Atrule');
+		if (ast.children[0].type === 'Atrule') {
+			assert.equal(ast.children[0].name, 'media');
+		}
+	});
+
+	it('parses @import', () => {
+		const ast = parseCss("@import 'foo.css';");
+		assert.equal(ast.children.length, 1);
+		assert.equal(ast.children[0].type, 'Atrule');
+		if (ast.children[0].type === 'Atrule') {
+			assert.equal(ast.children[0].name, 'import');
+			assert.equal(ast.children[0].block, null);
+		}
+	});
+
+	it('parses multiple rules', () => {
+		const ast = parseCss('div { color: red; } span { color: blue; }');
+		assert.equal(ast.children.length, 2);
+	});
+
+	it('has correct start/end positions', () => {
+		const ast = parseCss('div { color: red; }');
+		assert.equal(ast.start, 0);
+		assert.equal(ast.end, 19);
+	});
+
+	it('strips BOM', () => {
+		const ast = parseCss('\uFEFFdiv { color: red; }');
+		assert.equal(ast.start, 0);
+		assert.equal(ast.end, 19);
+	});
+
+	it('parses nested rules', () => {
+		const ast = parseCss('div { color: red; span { color: blue; } }');
+		assert.equal(ast.children.length, 1);
+		const rule = ast.children[0];
+		assert.equal(rule.type, 'Rule');
+		if (rule.type === 'Rule') {
+			assert.equal(rule.block.children.length, 2); // declaration + nested rule
+		}
+	});
+
+	it('parses empty stylesheet', () => {
+		const ast = parseCss('');
+		assert.equal(ast.type, 'StyleSheet');
+		assert.equal(ast.children.length, 0);
+		assert.equal(ast.start, 0);
+		assert.equal(ast.end, 0);
+	});
+
+	it('parses whitespace-only stylesheet', () => {
+		const ast = parseCss('   \n\t  ');
+		assert.equal(ast.children.length, 0);
+	});
+
+	it('parses comments', () => {
+		const ast = parseCss('/* comment */ div { color: red; }');
+		assert.equal(ast.children.length, 1);
+		assert.equal(ast.children[0].type, 'Rule');
+	});
+
+	it('parses complex selectors', () => {
+		const ast = parseCss('div > span + p ~ a { color: red; }');
+		assert.equal(ast.children.length, 1);
+		const rule = ast.children[0];
+		if (rule.type === 'Rule') {
+			assert.equal(rule.prelude.type, 'SelectorList');
+			assert.equal(rule.prelude.children.length, 1);
+			// div > span + p ~ a has 4 relative selectors
+			assert.equal(rule.prelude.children[0].children.length, 4);
+		}
+	});
+
+	it('parses pseudo-classes and pseudo-elements', () => {
+		const ast = parseCss('div:hover::before { color: red; }');
+		assert.equal(ast.children.length, 1);
+		const rule = ast.children[0];
+		if (rule.type === 'Rule') {
+			const selectors = rule.prelude.children[0].children[0].selectors;
+			assert.equal(selectors.length, 3); // div, :hover, ::before
+			assert.equal(selectors[0].type, 'TypeSelector');
+			assert.equal(selectors[1].type, 'PseudoClassSelector');
+			assert.equal(selectors[2].type, 'PseudoElementSelector');
+		}
+	});
+
+	it('parses @keyframes', () => {
+		const ast = parseCss('@keyframes fade { from { opacity: 0; } to { opacity: 1; } }');
+		assert.equal(ast.children.length, 1);
+		assert.equal(ast.children[0].type, 'Atrule');
+		if (ast.children[0].type === 'Atrule') {
+			assert.equal(ast.children[0].name, 'keyframes');
+			assert.notEqual(ast.children[0].block, null);
+		}
+	});
+
+	it('parses class and id selectors', () => {
+		const ast = parseCss('.foo#bar { color: red; }');
+		assert.equal(ast.children.length, 1);
+		const rule = ast.children[0];
+		if (rule.type === 'Rule') {
+			const selectors = rule.prelude.children[0].children[0].selectors;
+			assert.equal(selectors.length, 2);
+			assert.equal(selectors[0].type, 'ClassSelector');
+			assert.equal(selectors[1].type, 'IdSelector');
+		}
+	});
+
+	it('parses attribute selectors', () => {
+		const ast = parseCss('[data-foo="bar"] { color: red; }');
+		assert.equal(ast.children.length, 1);
+		const rule = ast.children[0];
+		if (rule.type === 'Rule') {
+			const selectors = rule.prelude.children[0].children[0].selectors;
+			assert.equal(selectors.length, 1);
+			assert.equal(selectors[0].type, 'AttributeSelector');
+			if (selectors[0].type === 'AttributeSelector') {
+				assert.equal(selectors[0].name, 'data-foo');
+				assert.equal(selectors[0].value, 'bar');
+			}
+		}
+	});
+});
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index c0b89d8736..9e569126bb 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -884,6 +884,12 @@ declare module 'svelte/compiler' {
 		modern?: false;
 		loose?: boolean;
 	} | undefined): Record<string, any>;
+	/**
+	 * The parseCss function parses a CSS stylesheet, returning its abstract syntax tree.
+	 *
+	 * @param source The CSS source code
+	 * */
+	export function parseCss(source: string): Omit<AST.CSS.StyleSheet, "attributes" | "content">;
 	/**
 	 * @deprecated Replace this with `import { walk } from 'estree-walker'`
 	 * */

From d3776c1723c17736198e0bc96c2fb75c69b0756f Mon Sep 17 00:00:00 2001
From: Tensorworker <178221229+tensorworkerr@users.noreply.github.com>
Date: Wed, 21 Jan 2026 18:40:08 -0500
Subject: [PATCH 297/347] fix: handle non-string values in svelte:element this
 attribute (#17499)

* fix: handle non-string values in svelte:element this attribute

* chore: add changeset

* fix(review): throw error in DEV for invalid svelte:element tag, ignore in PROD

* chore: remove unused expected.html from test

* fix(review): refine validate.js logic

* fix(review): use else if (string) logic in server/index.js

* fix(review): swap validation order in compiler, revert runtime changes

* test: move reproduction to runtime-legacy per review

* Apply suggestion from @7nik

---------

Co-authored-by: tensorworker <tensorworker@proton.me>
Co-authored-by: 7nik <kfiiranet@gmail.com>
---
 .changeset/clever-cats-dance.md                 |  5 +++++
 .../client/visitors/SvelteElement.js            |  2 +-
 .../server/visitors/SvelteElement.js            |  2 +-
 .../_config.js                                  | 17 +++++++++++++++++
 .../main.svelte                                 |  5 +++++
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/clever-cats-dance.md
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this-content/_config.js
 create mode 100644 packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this-content/main.svelte

diff --git a/.changeset/clever-cats-dance.md b/.changeset/clever-cats-dance.md
new file mode 100644
index 0000000000..3322608095
--- /dev/null
+++ b/.changeset/clever-cats-dance.md
@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: handle non-string values in `svelte:element` `this` attribute
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js
index cfa79b73ca..c8192cf00a 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteElement.js
@@ -117,10 +117,10 @@ export function SvelteElement(node, context) {
 	);
 
 	if (dev) {
+		statements.push(b.stmt(b.call('$.validate_dynamic_element_tag', get_tag)));
 		if (node.fragment.nodes.length > 0) {
 			statements.push(b.stmt(b.call('$.validate_void_dynamic_element', get_tag)));
 		}
-		statements.push(b.stmt(b.call('$.validate_dynamic_element_tag', get_tag)));
 	}
 
 	const location = dev && locator(node.start);
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 6fc1ca5dfc..1ac15893f2 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
@@ -29,10 +29,10 @@ export function SvelteElement(node, context) {
 			tag = b.id(tag_id);
 		}
 
+		context.state.init.push(b.stmt(b.call('$.validate_dynamic_element_tag', b.thunk(tag))));
 		if (node.fragment.nodes.length > 0) {
 			context.state.init.push(b.stmt(b.call('$.validate_void_dynamic_element', b.thunk(tag))));
 		}
-		context.state.init.push(b.stmt(b.call('$.validate_dynamic_element_tag', b.thunk(tag))));
 	}
 
 	const state = {
diff --git a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this-content/_config.js b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this-content/_config.js
new file mode 100644
index 0000000000..b0dcaa8fdc
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this-content/_config.js
@@ -0,0 +1,17 @@
+import { test } from '../../test';
+
+export default test({
+	mode: ['client', 'server'],
+
+	compileOptions: {
+		dev: true
+	},
+
+	get props() {
+		return { tag: true };
+	},
+
+	error:
+		'svelte_element_invalid_this_value\n' +
+		'The `this` prop on `<svelte:element>` must be a string, if defined'
+});
diff --git a/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this-content/main.svelte b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this-content/main.svelte
new file mode 100644
index 0000000000..cc6736a497
--- /dev/null
+++ b/packages/svelte/tests/runtime-legacy/samples/dynamic-element-invalid-this-content/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let tag;
+</script>
+
+<svelte:element this={tag}>content</svelte:element>

From f679259232307b5e39ee6a6cc4d39bbd475ea1be Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 21 Jan 2026 19:30:36 -0500
Subject: [PATCH 298/347] fix: prevent duplicate dependencies without using
 array.includes (#17503)

* fix: prevent duplicate dependencies without using array.includes

* changeset
---
 .changeset/gold-coats-change.md                |  5 +++++
 packages/svelte/src/internal/client/runtime.js | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/gold-coats-change.md

diff --git a/.changeset/gold-coats-change.md b/.changeset/gold-coats-change.md
new file mode 100644
index 0000000000..0415de9e7c
--- /dev/null
+++ b/.changeset/gold-coats-change.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: faster deduplication of dependencies
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 0e12324d72..6988c6247a 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -309,6 +309,20 @@ export function update_reaction(reaction) {
 		if (previous_reaction !== null && previous_reaction !== reaction) {
 			read_version++;
 
+			// update the `rv` of the previous reaction's deps — both existing and new —
+			// so that they are not added again
+			if (previous_reaction.deps !== null) {
+				for (let i = 0; i < previous_skipped_deps; i += 1) {
+					previous_reaction.deps[i].rv = read_version;
+				}
+			}
+
+			if (previous_deps !== null) {
+				for (const dep of previous_deps) {
+					dep.rv = read_version;
+				}
+			}
+
 			if (untracked_writes !== null) {
 				if (previous_untracked_writes === null) {
 					previous_untracked_writes = untracked_writes;
@@ -526,7 +540,7 @@ export function get(signal) {
 						skipped_deps++;
 					} else if (new_deps === null) {
 						new_deps = [signal];
-					} else if (!new_deps.includes(signal)) {
+					} else {
 						new_deps.push(signal);
 					}
 				}

From 0ce2313e35ae680ebd60f4632a593759a9462629 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 21 Jan 2026 19:31:23 -0500
Subject: [PATCH 299/347] chore: squelch hydration warnings (#17509)

* chore: squelch some hydration warnings

* squelch another warning
---
 .../hydration/samples/no-reset-debug/_config.js    | 14 +++++++++++++-
 packages/svelte/tests/hydration/test.ts            |  4 ++--
 .../hydratable-clobbering-complicated/main.svelte  | 11 ++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/svelte/tests/hydration/samples/no-reset-debug/_config.js b/packages/svelte/tests/hydration/samples/no-reset-debug/_config.js
index f47bee71df..2bdb29e436 100644
--- a/packages/svelte/tests/hydration/samples/no-reset-debug/_config.js
+++ b/packages/svelte/tests/hydration/samples/no-reset-debug/_config.js
@@ -1,3 +1,15 @@
 import { test } from '../../test';
 
-export default test({});
+/** @type {typeof console.log} */
+let log;
+
+export default test({
+	before_test() {
+		log = console.log;
+		console.log = () => {};
+	},
+
+	after_test() {
+		console.log = log;
+	}
+});
diff --git a/packages/svelte/tests/hydration/test.ts b/packages/svelte/tests/hydration/test.ts
index d7257c71d3..16e4070303 100644
--- a/packages/svelte/tests/hydration/test.ts
+++ b/packages/svelte/tests/hydration/test.ts
@@ -53,6 +53,8 @@ const { test, run } = suite<HydrationTest>(async (config, cwd) => {
 		await compile_directory(cwd, 'server', config.compileOptions);
 	}
 
+	config.before_test?.();
+
 	const target = window.document.body;
 	const head = window.document.head;
 
@@ -72,8 +74,6 @@ const { test, run } = suite<HydrationTest>(async (config, cwd) => {
 		head.innerHTML = override_head ?? rendered.head;
 	}
 
-	config.before_test?.();
-
 	try {
 		const snapshot = config.snapshot ? config.snapshot(target) : {};
 
diff --git a/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/main.svelte b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/main.svelte
index 358488c3ac..64d30b2a7f 100644
--- a/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/main.svelte
+++ b/packages/svelte/tests/server-side-rendering/samples/hydratable-clobbering-complicated/main.svelte
@@ -1,16 +1,21 @@
 <script lang="ts">
     import { hydratable } from 'svelte';
 
-    hydratable('key', () => Promise.resolve({
+    const a = await hydratable('key', () => Promise.resolve({
         nested: Promise.resolve({
             one: Promise.resolve(1),
         }),
         two: Promise.resolve(2),
     }));
-    hydratable('key', () => Promise.resolve({
+    const b = await hydratable('key', () => Promise.resolve({
         nested: Promise.resolve({
             one: Promise.resolve(2),
         }),
         two: Promise.resolve(2),
     }));
-</script>
\ No newline at end of file
+</script>
+
+<p>{await (await (a.nested)).one}</p>
+<p>{await a.two}</p>
+<p>{await (await (b.nested)).one}</p>
+<p>{await b.two}</p>

From c1fab8caae8334ebc1db7fb37d618ca204e461ab Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 21 Jan 2026 22:03:34 -0500
Subject: [PATCH 300/347] Version Packages (#17508)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/clever-cats-dance.md |  5 -----
 .changeset/gold-coats-change.md |  5 -----
 .changeset/loud-buses-guess.md  |  5 -----
 packages/svelte/CHANGELOG.md    | 12 ++++++++++++
 packages/svelte/package.json    |  2 +-
 packages/svelte/src/version.js  |  2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 .changeset/clever-cats-dance.md
 delete mode 100644 .changeset/gold-coats-change.md
 delete mode 100644 .changeset/loud-buses-guess.md

diff --git a/.changeset/clever-cats-dance.md b/.changeset/clever-cats-dance.md
deleted file mode 100644
index 3322608095..0000000000
--- a/.changeset/clever-cats-dance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"svelte": patch
----
-
-fix: handle non-string values in `svelte:element` `this` attribute
diff --git a/.changeset/gold-coats-change.md b/.changeset/gold-coats-change.md
deleted file mode 100644
index 0415de9e7c..0000000000
--- a/.changeset/gold-coats-change.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: faster deduplication of dependencies
diff --git a/.changeset/loud-buses-guess.md b/.changeset/loud-buses-guess.md
deleted file mode 100644
index d6c7c3d5a4..0000000000
--- a/.changeset/loud-buses-guess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': minor
----
-
-feat: export `parseCss` from `svelte/compiler`
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index d019b7883f..21cbb4ee66 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,17 @@
 # svelte
 
+## 5.48.0
+
+### Minor Changes
+
+- feat: export `parseCss` from `svelte/compiler` ([#17496](https://github.com/sveltejs/svelte/pull/17496))
+
+### Patch Changes
+
+- fix: handle non-string values in `svelte:element` `this` attribute ([#17499](https://github.com/sveltejs/svelte/pull/17499))
+
+- fix: faster deduplication of dependencies ([#17503](https://github.com/sveltejs/svelte/pull/17503))
+
 ## 5.47.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 38cac7b1cd..bbb519f8e8 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.47.1",
+  "version": "5.48.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index a5360f7195..c1ced8dad3 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.47.1';
+export const VERSION = '5.48.0';
 export const PUBLIC_VERSION = '5';

From d95887deb6e1f6222b6aadef6c4493f43755fae3 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Thu, 22 Jan 2026 19:30:44 +0100
Subject: [PATCH 301/347] fix: hoist snippets above const in same block
 (#17516)

* fix: hoist snippets above const in same block

* fix: type error
---
 .changeset/blue-parts-double.md                            | 5 +++++
 .../compiler/phases/3-transform/client/transform-client.js | 1 +
 .../src/compiler/phases/3-transform/client/types.d.ts      | 2 ++
 .../phases/3-transform/client/visitors/Fragment.js         | 7 ++++---
 .../phases/3-transform/client/visitors/RegularElement.js   | 3 ++-
 .../phases/3-transform/client/visitors/SnippetBlock.js     | 2 +-
 .../phases/3-transform/client/visitors/SvelteBoundary.js   | 2 +-
 .../phases/3-transform/client/visitors/shared/component.js | 2 +-
 .../samples/snippet-const-same-block/_config.js            | 5 +++++
 .../samples/snippet-const-same-block/main.svelte           | 4 ++++
 10 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/blue-parts-double.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/snippet-const-same-block/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/snippet-const-same-block/main.svelte

diff --git a/.changeset/blue-parts-double.md b/.changeset/blue-parts-double.md
new file mode 100644
index 0000000000..223e51fdae
--- /dev/null
+++ b/.changeset/blue-parts-double.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: hoist snippets above const in same block
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 5c00aa591f..fc202f1bc2 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
@@ -170,6 +170,7 @@ export function client_component(analysis, options) {
 		// these are set inside the `Fragment` visitor, and cannot be used until then
 		init: /** @type {any} */ (null),
 		consts: /** @type {any} */ (null),
+		snippets: /** @type {any} */ (null),
 		let_directives: /** @type {any} */ (null),
 		update: /** @type {any} */ (null),
 		after_update: /** @type {any} */ (null),
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 d64b1d4126..4438ec015b 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
@@ -49,6 +49,8 @@ export interface ComponentClientTransformState extends ClientTransformState {
 	readonly update: Statement[];
 	/** Stuff that happens after the render effect (control blocks, dynamic elements, bindings, actions, etc) */
 	readonly after_update: Statement[];
+	/** Transformed `{#snippets }` declarations */
+	readonly snippets: Statement[];
 	/** Transformed `{@const }` declarations */
 	readonly consts: Statement[];
 	/** Transformed async `{@const }` declarations (if any) and those coming after them */
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
index 18017ea557..79a443967c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Fragment.js
@@ -1,13 +1,13 @@
 /** @import { Expression, Statement } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentClientTransformState, ComponentContext } from '../types' */
-import { TEMPLATE_FRAGMENT, TEMPLATE_USE_IMPORT_NODE } from '../../../../../constants.js';
 import * as b from '#compiler/builders';
+import { TEMPLATE_FRAGMENT, TEMPLATE_USE_IMPORT_NODE } from '../../../../../constants.js';
 import { clean_nodes, infer_namespace } from '../../utils.js';
 import { transform_template } from '../transform-template/index.js';
+import { Template } from '../transform-template/template.js';
 import { process_children } from './shared/fragment.js';
 import { build_render_statement, Memoizer } from './shared/utils.js';
-import { Template } from '../transform-template/template.js';
 
 /**
  * @param {AST.Fragment} node
@@ -60,6 +60,7 @@ export function Fragment(node, context) {
 	const state = {
 		...context.state,
 		init: [],
+		snippets: [],
 		consts: [],
 		let_directives: [],
 		update: [],
@@ -150,7 +151,7 @@ export function Fragment(node, context) {
 		}
 	}
 
-	body.push(...state.let_directives, ...state.consts);
+	body.push(...state.snippets, ...state.let_directives, ...state.consts);
 
 	if (state.async_consts && state.async_consts.thunks.length > 0) {
 		body.push(b.var(state.async_consts.id, b.call('$.run', b.array(state.async_consts.thunks))));
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 1faf44b902..720522beaf 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
@@ -329,7 +329,7 @@ export function RegularElement(node, context) {
 	);
 
 	/** @type {typeof state} */
-	const child_state = { ...state, init: [], update: [], after_update: [] };
+	const child_state = { ...state, init: [], update: [], after_update: [], snippets: [] };
 
 	for (const node of hoisted) {
 		context.visit(node, child_state);
@@ -441,6 +441,7 @@ export function RegularElement(node, context) {
 		// Wrap children in `{...}` to avoid declaration conflicts
 		context.state.init.push(
 			b.block([
+				...child_state.snippets,
 				...child_state.init,
 				...element_state.init,
 				child_state.update.length > 0 ? build_render_statement(child_state) : b.empty,
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SnippetBlock.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SnippetBlock.js
index 1af737f05b..6c3a48c5ea 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SnippetBlock.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SnippetBlock.js
@@ -89,6 +89,6 @@ export function SnippetBlock(node, context) {
 			context.state.instance_level_snippets.push(declaration);
 		}
 	} else {
-		context.state.init.push(declaration);
+		context.state.snippets.push(declaration);
 	}
 }
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js
index d64fcda2e8..f929a3bc47 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/SvelteBoundary.js
@@ -77,7 +77,7 @@ export function SvelteBoundary(node, context) {
 				/** @type {Statement[]} */
 				const statements = [];
 
-				context.visit(child, { ...context.state, init: statements });
+				context.visit(child, { ...context.state, snippets: statements });
 
 				const snippet = /** @type {VariableDeclaration} */ (statements[0]);
 
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 4651f6f733..bb72794af8 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
@@ -333,7 +333,7 @@ export function build_component(node, component_name, loc, context) {
 			// can be used as props without creating conflicts
 			context.visit(child, {
 				...context.state,
-				init: snippet_declarations
+				snippets: snippet_declarations
 			});
 
 			push_prop(b.prop('init', child.expression, child.expression));
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-const-same-block/_config.js b/packages/svelte/tests/runtime-runes/samples/snippet-const-same-block/_config.js
new file mode 100644
index 0000000000..27f013d6d1
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/snippet-const-same-block/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	test() {}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/snippet-const-same-block/main.svelte b/packages/svelte/tests/runtime-runes/samples/snippet-const-same-block/main.svelte
new file mode 100644
index 0000000000..70c7d64f18
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/snippet-const-same-block/main.svelte
@@ -0,0 +1,4 @@
+{#if true}
+	{@const xx = test}
+	{#snippet test()}{/snippet}
+{/if}

From f9cc2d25b9b348fb6c1c2b6b6f973804e6a5ed8c Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 22 Jan 2026 16:05:26 -0500
Subject: [PATCH 302/347] fix: better code generation for const tags with async
 dependencies (#17518)

---
 .changeset/witty-streets-carry.md             |  5 +++
 .../3-transform/client/visitors/ConstTag.js   | 16 ++++++---
 .../3-transform/server/visitors/ConstTag.js   |  6 ++--
 .../snapshot/samples/async-const/_config.js   |  3 ++
 .../_expected/client/index.svelte.js          | 35 +++++++++++++++++++
 .../_expected/server/index.svelte.js          | 33 +++++++++++++++++
 .../snapshot/samples/async-const/index.svelte |  6 ++++
 7 files changed, 97 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/witty-streets-carry.md
 create mode 100644 packages/svelte/tests/snapshot/samples/async-const/_config.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-const/_expected/client/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-const/_expected/server/index.svelte.js
 create mode 100644 packages/svelte/tests/snapshot/samples/async-const/index.svelte

diff --git a/.changeset/witty-streets-carry.md b/.changeset/witty-streets-carry.md
new file mode 100644
index 0000000000..f02d998409
--- /dev/null
+++ b/.changeset/witty-streets-carry.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: better code generation for const tags with async dependencies
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 a9f922623e..ffeffe6ea4 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
@@ -1,4 +1,4 @@
-/** @import { Pattern } from 'estree' */
+/** @import { Expression, Identifier, Pattern } from 'estree' */
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types' */
 /** @import { ExpressionMetadata } from '../../../nodes.js' */
@@ -88,8 +88,8 @@ export function ConstTag(node, context) {
 
 /**
  * @param {ComponentContext['state']} state
- * @param {import('estree').Identifier} id
- * @param {import('estree').Expression} expression
+ * @param {Identifier} id
+ * @param {Expression} expression
  * @param {ExpressionMetadata} metadata
  * @param {import('#compiler').Binding[]} bindings
  */
@@ -99,7 +99,9 @@ function add_const_declaration(state, id, expression, metadata, bindings) {
 	const after = dev ? [b.stmt(b.call('$.get', id))] : [];
 
 	const has_await = metadata.has_await;
-	const blockers = [...metadata.dependencies].map((dep) => dep.blocker).filter((b) => b !== null);
+	const blockers = [...metadata.dependencies]
+		.map((dep) => dep.blocker)
+		.filter((b) => b !== null && b.object !== state.async_consts?.id);
 
 	if (has_await || state.async_consts || blockers.length > 0) {
 		const run = (state.async_consts ??= {
@@ -112,7 +114,11 @@ function add_const_declaration(state, id, expression, metadata, bindings) {
 		const assignment = b.assignment('=', id, expression);
 		const body = after.length === 0 ? assignment : b.block([b.stmt(assignment), ...after]);
 
-		if (blockers.length > 0) run.thunks.push(b.thunk(b.call('Promise.all', b.array(blockers))));
+		if (blockers.length === 1) {
+			run.thunks.push(b.thunk(/** @type {Expression} */ (blockers[0])));
+		} else if (blockers.length > 0) {
+			run.thunks.push(b.thunk(b.call('Promise.all', b.array(blockers))));
+		}
 
 		run.thunks.push(b.thunk(body, has_await));
 
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js
index fdc31e5238..d2ff9a10b4 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/ConstTag.js
@@ -15,7 +15,7 @@ export function ConstTag(node, context) {
 	const has_await = node.metadata.expression.has_await;
 	const blockers = [...node.metadata.expression.dependencies]
 		.map((dep) => dep.blocker)
-		.filter((b) => b !== null);
+		.filter((b) => b !== null && b.object !== context.state.async_consts?.id);
 
 	if (has_await || context.state.async_consts || blockers.length > 0) {
 		const run = (context.state.async_consts ??= {
@@ -30,7 +30,9 @@ export function ConstTag(node, context) {
 			context.state.init.push(b.let(identifier.name));
 		}
 
-		if (blockers.length > 0) {
+		if (blockers.length === 1) {
+			run.thunks.push(b.thunk(/** @type {Expression} */ (blockers[0])));
+		} else if (blockers.length > 0) {
 			run.thunks.push(b.thunk(b.call('Promise.all', b.array(blockers))));
 		}
 
diff --git a/packages/svelte/tests/snapshot/samples/async-const/_config.js b/packages/svelte/tests/snapshot/samples/async-const/_config.js
new file mode 100644
index 0000000000..2e30bbeb16
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-const/_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-const/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-const/_expected/client/index.svelte.js
new file mode 100644
index 0000000000..8bd7e97780
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-const/_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';
+
+var root_1 = $.from_html(`<p> </p>`);
+
+export default function Async_const($$anchor) {
+	var fragment = $.comment();
+	var node = $.first_child(fragment);
+
+	{
+		var consequent = ($$anchor) => {
+			let a;
+			let b;
+
+			var promises = $.run([
+				async () => a = (await $.save($.async_derived(async () => (await $.save(1))())))(),
+				() => b = $.derived(() => $.get(a) + 1)
+			]);
+
+			var p = root_1();
+			var text = $.child(p, true);
+
+			$.reset(p);
+			$.template_effect(() => $.set_text(text, $.get(b)), void 0, void 0, [promises[1]]);
+			$.append($$anchor, p);
+		};
+
+		$.if(node, ($$render) => {
+			if (true) $$render(consequent);
+		});
+	}
+
+	$.append($$anchor, fragment);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-const/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-const/_expected/server/index.svelte.js
new file mode 100644
index 0000000000..a726b903bc
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-const/_expected/server/index.svelte.js
@@ -0,0 +1,33 @@
+import 'svelte/internal/flags/async';
+import * as $ from 'svelte/internal/server';
+
+export default function Async_const($$renderer) {
+	if (true) {
+		$$renderer.push('<!--[-->');
+
+		let a;
+		let b;
+
+		var promises = $$renderer.run([
+			async () => {
+				a = (await $.save(1))();
+			},
+
+			() => {
+				b = a + 1;
+			}
+		]);
+
+		$$renderer.push(`<p>`);
+
+		$$renderer.async([promises[1]], ($$renderer) => {
+			$$renderer.push(() => $.escape(b));
+		});
+
+		$$renderer.push(`</p>`);
+	} else {
+		$$renderer.push('<!--[!-->');
+	}
+
+	$$renderer.push(`<!--]-->`);
+}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/async-const/index.svelte b/packages/svelte/tests/snapshot/samples/async-const/index.svelte
new file mode 100644
index 0000000000..cf1bb40d88
--- /dev/null
+++ b/packages/svelte/tests/snapshot/samples/async-const/index.svelte
@@ -0,0 +1,6 @@
+{#if true}
+	{@const a = await 1}
+	{@const b = a + 1}
+
+	<p>{b}</p>
+{/if}

From 7719d0312ca27b9347a04290e94a6a9097fefe94 Mon Sep 17 00:00:00 2001
From: David <david@hmnd.io>
Date: Thu, 22 Jan 2026 14:34:56 -0800
Subject: [PATCH 303/347] fix: perf regression with async mode (#17461)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: use Set for new_deps to avoid O(n) includes check

* fix: only call revive() when batch is no longer deferred

* fix: avoid unnecessary async tracking when blockers are already settled

* add changeset

* only record promises as settled after cleanup is complete

* don't flush when already flushing

* skip settled blockers more aggressively

* batch decrement and pending count updates to reduce flush pressure

* extract new_deps changes to a separate PR

* remove changeset that applies to the other branch

* mark promises as settled as they settle — at the end is too late to do any good

* remove unnecessary microtask

* extract batch changes to separate PR

* this too

* avoid assigning to parameter

* wrong promise added to settled_promises due to reassignment

* WIP

* WIP

* fix

* unused

* oops

* bad import

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/ten-horses-cross.md                |   5 +
 .../3-transform/client/visitors/ConstTag.js   |   4 +-
 .../src/internal/client/dom/blocks/async.js   |   9 +-
 .../client/dom/elements/attributes.js         |   4 +-
 .../src/internal/client/reactivity/async.js   | 105 +++++++++++-------
 .../src/internal/client/reactivity/effects.js |   6 +-
 .../src/internal/client/reactivity/types.d.ts |   5 +
 .../svelte/src/internal/client/validate.js    |   3 +-
 8 files changed, 91 insertions(+), 50 deletions(-)
 create mode 100644 .changeset/ten-horses-cross.md

diff --git a/.changeset/ten-horses-cross.md b/.changeset/ten-horses-cross.md
new file mode 100644
index 0000000000..5502c5887b
--- /dev/null
+++ b/.changeset/ten-horses-cross.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: avoid async overhead for already settled promises
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 ffeffe6ea4..d2bd3c10dc 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
@@ -115,9 +115,9 @@ function add_const_declaration(state, id, expression, metadata, bindings) {
 		const body = after.length === 0 ? assignment : b.block([b.stmt(assignment), ...after]);
 
 		if (blockers.length === 1) {
-			run.thunks.push(b.thunk(/** @type {Expression} */ (blockers[0])));
+			run.thunks.push(b.thunk(b.member(/** @type {Expression} */ (blockers[0]), 'promise')));
 		} else if (blockers.length > 0) {
-			run.thunks.push(b.thunk(b.call('Promise.all', b.array(blockers))));
+			run.thunks.push(b.thunk(b.call('$.wait', b.array(blockers))));
 		}
 
 		run.thunks.push(b.thunk(body, has_await));
diff --git a/packages/svelte/src/internal/client/dom/blocks/async.js b/packages/svelte/src/internal/client/dom/blocks/async.js
index 3bc1eecba7..c2ae07fd17 100644
--- a/packages/svelte/src/internal/client/dom/blocks/async.js
+++ b/packages/svelte/src/internal/client/dom/blocks/async.js
@@ -1,4 +1,4 @@
-/** @import { TemplateNode, Value } from '#client' */
+/** @import { Blocker, TemplateNode, Value } from '#client' */
 import { flatten } from '../../reactivity/async.js';
 import { Batch, current_batch } from '../../reactivity/batch.js';
 import { get } from '../../runtime.js';
@@ -14,11 +14,16 @@ import { get_boundary } from './boundary.js';
 
 /**
  * @param {TemplateNode} node
- * @param {Array<Promise<void>>} blockers
+ * @param {Blocker[]} blockers
  * @param {Array<() => Promise<any>>} expressions
  * @param {(anchor: TemplateNode, ...deriveds: Value[]) => void} fn
  */
 export function async(node, blockers = [], expressions = [], fn) {
+	if (expressions.length === 0 && blockers.every((b) => b.settled)) {
+		fn(node);
+		return;
+	}
+
 	var boundary = get_boundary();
 	var batch = /** @type {Batch} */ (current_batch);
 	var blocking = boundary.is_rendered();
diff --git a/packages/svelte/src/internal/client/dom/elements/attributes.js b/packages/svelte/src/internal/client/dom/elements/attributes.js
index c1ab97dc61..6f1fa7391e 100644
--- a/packages/svelte/src/internal/client/dom/elements/attributes.js
+++ b/packages/svelte/src/internal/client/dom/elements/attributes.js
@@ -1,4 +1,4 @@
-/** @import { Effect } from '#client' */
+/** @import { Blocker, Effect } from '#client' */
 import { DEV } from 'esm-env';
 import { hydrating, set_hydrating } from '../hydration.js';
 import { get_descriptors, get_prototype_of } from '../../../shared/utils.js';
@@ -483,7 +483,7 @@ function set_attributes(
  * @param {(...expressions: any) => Record<string | symbol, any>} fn
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
- * @param {Array<Promise<void>>} blockers
+ * @param {Blocker[]} blockers
  * @param {string} [css_hash]
  * @param {boolean} [should_remove_defaults]
  * @param {boolean} [skip_warning]
diff --git a/packages/svelte/src/internal/client/reactivity/async.js b/packages/svelte/src/internal/client/reactivity/async.js
index 334bf8f145..b6eba3bf8a 100644
--- a/packages/svelte/src/internal/client/reactivity/async.js
+++ b/packages/svelte/src/internal/client/reactivity/async.js
@@ -1,4 +1,4 @@
-/** @import { Effect, TemplateNode, Value } from '#client' */
+/** @import { Blocker, Effect, Value } from '#client' */
 import { DESTROYED, STALE_REACTION } from '#client/constants';
 import { DEV } from 'esm-env';
 import {
@@ -27,7 +27,7 @@ import {
 import { aborted } from './effects.js';
 
 /**
- * @param {Array<Promise<void>>} blockers
+ * @param {Blocker[]} blockers
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
  * @param {(values: Value[]) => any} fn
@@ -35,7 +35,10 @@ import { aborted } from './effects.js';
 export function flatten(blockers, sync, async, fn) {
 	const d = is_runes() ? derived : derived_safe_equal;
 
-	if (async.length === 0 && blockers.length === 0) {
+	// Filter out already-settled blockers - no need to wait for them
+	var pending = blockers.filter((b) => !b.settled);
+
+	if (async.length === 0 && pending.length === 0) {
 		fn(sync.map(d));
 		return;
 	}
@@ -44,47 +47,52 @@ export function flatten(blockers, sync, async, fn) {
 	var parent = /** @type {Effect} */ (active_effect);
 
 	var restore = capture();
+	var blocker_promise =
+		pending.length === 1
+			? pending[0].promise
+			: pending.length > 1
+				? Promise.all(pending.map((b) => b.promise))
+				: null;
+
+	/** @param {Value[]} values */
+	function finish(values) {
+		restore();
 
-	function run() {
-		Promise.all(async.map((expression) => async_derived(expression)))
-			.then((result) => {
-				restore();
+		try {
+			fn(values);
+		} catch (error) {
+			if ((parent.f & DESTROYED) === 0) {
+				invoke_error_boundary(error, parent);
+			}
+		}
 
-				try {
-					fn([...sync.map(d), ...result]);
-				} catch (error) {
-					// ignore errors in blocks that have already been destroyed
-					if ((parent.f & DESTROYED) === 0) {
-						invoke_error_boundary(error, parent);
-					}
-				}
+		batch?.deactivate();
+		unset_context();
+	}
 
-				batch?.deactivate();
-				unset_context();
-			})
-			.catch((error) => {
-				invoke_error_boundary(error, parent);
-			});
+	// Fast path: blockers but no async expressions
+	if (async.length === 0) {
+		/** @type {Promise<any>} */ (blocker_promise).then(() => finish(sync.map(d)));
+		return;
 	}
 
-	if (blockers.length > 0) {
-		Promise.all(blockers).then(() => {
-			restore();
+	// Full path: has async expressions
+	function run() {
+		restore();
+		Promise.all(async.map((expression) => async_derived(expression)))
+			.then((result) => finish([...sync.map(d), ...result]))
+			.catch((error) => invoke_error_boundary(error, parent));
+	}
 
-			try {
-				return run();
-			} finally {
-				batch?.deactivate();
-				unset_context();
-			}
-		});
+	if (blocker_promise) {
+		blocker_promise.then(run);
 	} else {
 		run();
 	}
 }
 
 /**
- * @param {Array<Promise<void>>} blockers
+ * @param {Blocker[]} blockers
  * @param {(values: Value[]) => any} fn
  */
 export function run_after_blockers(blockers, fn) {
@@ -239,7 +247,13 @@ export function run(thunks) {
 
 	var promise = Promise.resolve(thunks[0]()).catch(handle_error);
 
-	var promises = [promise];
+	/** @type {Blocker} */
+	var blocker = { promise, settled: false };
+	var blockers = [blocker];
+
+	promise.finally(() => {
+		blocker.settled = true;
+	});
 
 	for (const fn of thunks.slice(1)) {
 		promise = promise
@@ -255,13 +269,17 @@ export function run(thunks) {
 				restore();
 				return fn();
 			})
-			.catch(handle_error)
-			.finally(() => {
-				unset_context();
-				current_batch?.deactivate();
-			});
+			.catch(handle_error);
+
+		const blocker = { promise, settled: false };
+		blockers.push(blocker);
 
-		promises.push(promise);
+		promise.finally(() => {
+			blocker.settled = true;
+
+			unset_context();
+			current_batch?.deactivate();
+		});
 	}
 
 	promise
@@ -273,5 +291,12 @@ export function run(thunks) {
 			batch.decrement(blocking);
 		});
 
-	return promises;
+	return blockers;
+}
+
+/**
+ * @param {Blocker[]} blockers
+ */
+export function wait(blockers) {
+	return Promise.all(blockers.map((b) => b.promise));
 }
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 4cba446afc..5b8dee07b9 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -1,4 +1,4 @@
-/** @import { ComponentContext, ComponentContextLegacy, Derived, Effect, TemplateNode, TransitionManager } from '#client' */
+/** @import { Blocker, ComponentContext, ComponentContextLegacy, Derived, Effect, TemplateNode, TransitionManager } from '#client' */
 import {
 	is_dirty,
 	active_effect,
@@ -361,7 +361,7 @@ export function render_effect(fn, flags = 0) {
  * @param {(...expressions: any) => void | (() => void)} fn
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
- * @param {Array<Promise<void>>} blockers
+ * @param {Blocker[]} blockers
  */
 export function template_effect(fn, sync = [], async = [], blockers = []) {
 	flatten(blockers, sync, async, (values) => {
@@ -374,7 +374,7 @@ export function template_effect(fn, sync = [], async = [], blockers = []) {
  * @param {(...expressions: any) => void | (() => void)} fn
  * @param {Array<() => any>} sync
  * @param {Array<() => Promise<any>>} async
- * @param {Array<Promise<void>>} blockers
+ * @param {Blocker[]} blockers
  */
 export function deferred_template_effect(fn, sync = [], async = [], blockers = []) {
 	var batch = /** @type {Batch} */ (current_batch);
diff --git a/packages/svelte/src/internal/client/reactivity/types.d.ts b/packages/svelte/src/internal/client/reactivity/types.d.ts
index 908576922f..8477917991 100644
--- a/packages/svelte/src/internal/client/reactivity/types.d.ts
+++ b/packages/svelte/src/internal/client/reactivity/types.d.ts
@@ -103,3 +103,8 @@ export interface Effect extends Reaction {
 export type Source<V = unknown> = Value<V>;
 
 export type MaybeSource<T = unknown> = T | Source<T>;
+
+export interface Blocker {
+	promise: Promise<any>;
+	settled: boolean;
+}
diff --git a/packages/svelte/src/internal/client/validate.js b/packages/svelte/src/internal/client/validate.js
index 0daecdb480..48a44db304 100644
--- a/packages/svelte/src/internal/client/validate.js
+++ b/packages/svelte/src/internal/client/validate.js
@@ -1,3 +1,4 @@
+/** @import { Blocker } from '#client' */
 import { dev_current_component_function } from './context.js';
 import { is_array } from '../shared/utils.js';
 import * as e from './errors.js';
@@ -41,7 +42,7 @@ export function validate_each_keys(collection, key_fn) {
 
 /**
  * @param {string} binding
- * @param {Array<Promise<void>>} blockers
+ * @param {Blocker[]} blockers
  * @param {() => Record<string, any>} get_object
  * @param {() => string} get_property
  * @param {number} line

From 1ed458edc7a24a2366008130326d87dcbb416321 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 22 Jan 2026 21:30:02 -0500
Subject: [PATCH 304/347] chore: remove `set_is_updating_effect` (#17459)

---
 .../src/internal/client/reactivity/batch.js   |  5 ----
 .../src/internal/client/reactivity/sources.js | 28 ++++++-------------
 .../svelte/src/internal/client/runtime.js     | 15 ++--------
 3 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 4c50781817..5a041f9703 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -27,8 +27,6 @@ import {
 	get,
 	increment_write_version,
 	is_dirty,
-	is_updating_effect,
-	set_is_updating_effect,
 	update_effect
 } from '../runtime.js';
 import * as e from '../errors.js';
@@ -561,14 +559,12 @@ export function flushSync(fn) {
 }
 
 function flush_effects() {
-	var was_updating_effect = is_updating_effect;
 	is_flushing = true;
 
 	var source_stacks = DEV ? new Set() : null;
 
 	try {
 		var flush_count = 0;
-		set_is_updating_effect(true);
 
 		while (queued_root_effects.length > 0) {
 			var batch = Batch.ensure();
@@ -612,7 +608,6 @@ function flush_effects() {
 		}
 	} finally {
 		is_flushing = false;
-		set_is_updating_effect(was_updating_effect);
 
 		last_scheduled_effect = null;
 
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 6333962f41..7604c9e90b 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -13,9 +13,7 @@ import {
 	is_dirty,
 	untracking,
 	is_destroying_effect,
-	push_reaction_value,
-	set_is_updating_effect,
-	is_updating_effect
+	push_reaction_value
 } from '../runtime.js';
 import { equals, safe_equals } from './equality.js';
 import {
@@ -261,25 +259,17 @@ export function internal_set(source, value) {
 
 export function flush_eager_effects() {
 	eager_effects_deferred = false;
-	var prev_is_updating_effect = is_updating_effect;
-	set_is_updating_effect(true);
 
-	const inspects = Array.from(eager_effects);
-
-	try {
-		for (const effect of inspects) {
-			// Mark clean inspect-effects as maybe dirty and then check their dirtiness
-			// instead of just updating the effects - this way we avoid overfiring.
-			if ((effect.f & CLEAN) !== 0) {
-				set_signal_status(effect, MAYBE_DIRTY);
-			}
+	for (const effect of eager_effects) {
+		// Mark clean inspect-effects as maybe dirty and then check their dirtiness
+		// instead of just updating the effects - this way we avoid overfiring.
+		if ((effect.f & CLEAN) !== 0) {
+			set_signal_status(effect, MAYBE_DIRTY);
+		}
 
-			if (is_dirty(effect)) {
-				update_effect(effect);
-			}
+		if (is_dirty(effect)) {
+			update_effect(effect);
 		}
-	} finally {
-		set_is_updating_effect(prev_is_updating_effect);
 	}
 
 	eager_effects.clear();
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 6988c6247a..19b98d0c0f 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -43,25 +43,14 @@ import {
 	set_dev_current_component_function,
 	set_dev_stack
 } from './context.js';
-import {
-	Batch,
-	batch_values,
-	current_batch,
-	flushSync,
-	schedule_effect
-} from './reactivity/batch.js';
+import { Batch, batch_values, flushSync, schedule_effect } from './reactivity/batch.js';
 import { handle_error } from './error-handling.js';
 import { UNINITIALIZED } from '../../constants.js';
 import { captured_signals } from './legacy.js';
 import { without_reactive_context } from './dom/elements/bindings/shared.js';
 import { set_signal_status, update_derived_status } from './reactivity/status.js';
 
-export let is_updating_effect = false;
-
-/** @param {boolean} value */
-export function set_is_updating_effect(value) {
-	is_updating_effect = value;
-}
+let is_updating_effect = false;
 
 export let is_destroying_effect = false;
 

From ac03d27d6872501fa2db836d9a92a47c3b5bbed6 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Thu, 22 Jan 2026 22:13:06 -0500
Subject: [PATCH 305/347] chore: reduce indirection, simplify logic in
 batch.process(...) (#17521)

* chore: reduce indirection, simplify logic in batch.process(...)

* this is unnecessary, previous_batch is only read in specific effects that run later
---
 .../src/internal/client/reactivity/batch.js   | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 5a041f9703..3c510f81d4 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -149,8 +149,6 @@ export class Batch {
 	process(root_effects) {
 		queued_root_effects = [];
 
-		previous_batch = null;
-
 		this.apply();
 
 		/** @type {Effect[]} */
@@ -168,14 +166,18 @@ export class Batch {
 			// log_inconsistent_branches(root);
 		}
 
-		if (!this.is_fork) {
-			this.#resolve();
-		}
-
 		if (this.is_deferred()) {
 			this.#defer_effects(render_effects);
 			this.#defer_effects(effects);
 		} else {
+			// append/remove branches
+			for (const fn of this.#commit_callbacks) fn();
+			this.#commit_callbacks.clear();
+
+			if (this.#pending === 0) {
+				this.#commit();
+			}
+
 			// 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 = this;
@@ -328,18 +330,6 @@ export class Batch {
 		this.#discard_callbacks.clear();
 	}
 
-	#resolve() {
-		if (this.#blocking_pending === 0) {
-			// append/remove branches
-			for (const fn of this.#commit_callbacks) fn();
-			this.#commit_callbacks.clear();
-		}
-
-		if (this.#pending === 0) {
-			this.#commit();
-		}
-	}
-
 	#commit() {
 		// If there are other pending batches, they now need to be 'rebased' —
 		// in other words, we re-run block/async effects with the newly

From 1ff7dd6123e4a8d79e0f8336a24cc2db53aaa79c Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 23 Jan 2026 15:10:54 -0500
Subject: [PATCH 306/347] fix: batch resolution of async work (#17511)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: batch resolution of async work

Co-authored-by: David Roizenman <hmnd@users.noreply.github.com>

* fix

* drive-by tidy up — Batch.enqueue is (apparently?) a useless wrapper around queue_micro_task

* 99% sure it's impossible for is_flushing to be true inside a queued task

* add some comments

* return early, reduce indentation

---------

Co-authored-by: David Roizenman <hmnd@users.noreply.github.com>
---
 .changeset/four-signs-listen.md               |  5 ++++
 .../internal/client/dom/blocks/boundary.js    | 20 +++++++++-----
 .../src/internal/client/reactivity/batch.js   | 26 ++++++++++++++-----
 3 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/four-signs-listen.md

diff --git a/.changeset/four-signs-listen.md b/.changeset/four-signs-listen.md
new file mode 100644
index 0000000000..b9e089fd12
--- /dev/null
+++ b/.changeset/four-signs-listen.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: batch resolution of async work
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 61262a6576..90a695551a 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -102,6 +102,7 @@ export class Boundary {
 
 	#local_pending_count = 0;
 	#pending_count = 0;
+	#pending_count_update_queued = false;
 
 	#is_creating_fallback = false;
 
@@ -202,12 +203,11 @@ export class Boundary {
 
 	#hydrate_pending_content() {
 		const pending = this.#props.pending;
-		if (!pending) {
-			return;
-		}
+		if (!pending) return;
+
 		this.#pending_effect = branch(() => pending(this.#anchor));
 
-		Batch.enqueue(() => {
+		queue_micro_task(() => {
 			var anchor = this.#get_anchor();
 
 			this.#main_effect = this.#run(() => {
@@ -359,9 +359,15 @@ export class Boundary {
 
 		this.#local_pending_count += d;
 
-		if (this.#effect_pending) {
-			internal_set(this.#effect_pending, this.#local_pending_count);
-		}
+		if (!this.#effect_pending || this.#pending_count_update_queued) return;
+		this.#pending_count_update_queued = true;
+
+		queue_micro_task(() => {
+			this.#pending_count_update_queued = false;
+			if (this.#effect_pending) {
+				internal_set(this.#effect_pending, this.#local_pending_count);
+			}
+		});
 	}
 
 	get_effect_pending() {
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 3c510f81d4..c4caf8a20b 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -138,6 +138,8 @@ export class Batch {
 
 	is_fork = false;
 
+	#decrement_queued = false;
+
 	is_deferred() {
 		return this.is_fork || this.#blocking_pending > 0;
 	}
@@ -426,7 +428,22 @@ export class Batch {
 		this.#pending -= 1;
 		if (blocking) this.#blocking_pending -= 1;
 
-		this.revive();
+		if (this.#decrement_queued) return;
+		this.#decrement_queued = true;
+
+		queue_micro_task(() => {
+			this.#decrement_queued = false;
+
+			if (!this.is_deferred()) {
+				// we only reschedule previously-deferred effects if we expect
+				// to be able to run them after processing the batch
+				this.revive();
+			} else if (queued_root_effects.length > 0) {
+				// if other effects are scheduled, process the batch _without_
+				// rescheduling the previously-deferred effects
+				this.flush();
+			}
+		});
 	}
 
 	revive() {
@@ -464,7 +481,7 @@ export class Batch {
 			batches.add(current_batch);
 
 			if (!is_flushing_sync) {
-				Batch.enqueue(() => {
+				queue_micro_task(() => {
 					if (current_batch !== batch) {
 						// a flushSync happened in the meantime
 						return;
@@ -478,11 +495,6 @@ export class Batch {
 		return current_batch;
 	}
 
-	/** @param {() => void} task */
-	static enqueue(task) {
-		queue_micro_task(task);
-	}
-
 	apply() {
 		if (!async_mode_flag || (!this.is_fork && batches.size === 1)) return;
 

From 917ea2d4aea9e6a9da9cf0c5b4affa837097b4b5 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Fri, 23 Jan 2026 22:43:31 +0100
Subject: [PATCH 307/347] fix: account for empty statements when visiting in
 transform async (#17524)

---
 .changeset/kind-dolls-cry.md                  |  5 ++++
 .../3-transform/shared/transform-async.js     | 27 ++++++++++---------
 .../_config.js                                |  5 ++++
 .../main.svelte                               |  6 +++++
 4 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/kind-dolls-cry.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-transform-empty-statements/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-transform-empty-statements/main.svelte

diff --git a/.changeset/kind-dolls-cry.md b/.changeset/kind-dolls-cry.md
new file mode 100644
index 0000000000..c6653d2f7f
--- /dev/null
+++ b/.changeset/kind-dolls-cry.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: account for empty statements when visiting in transform async
diff --git a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
index 8d3a6b2769..95b9f585d3 100644
--- a/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
+++ b/packages/svelte/src/compiler/phases/3-transform/shared/transform-async.js
@@ -49,22 +49,25 @@ export function transform_body(instance_body, runner, transform) {
 	if (instance_body.async.length > 0) {
 		const thunks = instance_body.async.map((s) => {
 			if (s.node.type === 'VariableDeclarator') {
-				const visited = /** @type {ESTree.VariableDeclaration} */ (
+				const visited = /** @type {ESTree.VariableDeclaration | ESTree.EmptyStatement} */ (
 					transform(b.var(s.node.id, s.node.init))
 				);
 
-				const statements = visited.declarations.map((node) => {
-					if (
-						node.id.type === 'Identifier' &&
-						(node.id.name.startsWith('$$d') || node.id.name.startsWith('$$array'))
-					) {
-						// this is an intermediate declaration created in VariableDeclaration.js;
-						// subsequent statements depend on it
-						return b.var(node.id, node.init);
-					}
+				const statements =
+					visited.type === 'VariableDeclaration'
+						? visited.declarations.map((node) => {
+								if (
+									node.id.type === 'Identifier' &&
+									(node.id.name.startsWith('$$d') || node.id.name.startsWith('$$array'))
+								) {
+									// this is an intermediate declaration created in VariableDeclaration.js;
+									// subsequent statements depend on it
+									return b.var(node.id, node.init);
+								}
 
-					return b.stmt(b.assignment('=', node.id, node.init ?? b.void0));
-				});
+								return b.stmt(b.assignment('=', node.id, node.init ?? b.void0));
+							})
+						: [];
 
 				if (statements.length === 1) {
 					const statement = /** @type {ESTree.ExpressionStatement} */ (statements[0]);
diff --git a/packages/svelte/tests/runtime-runes/samples/async-transform-empty-statements/_config.js b/packages/svelte/tests/runtime-runes/samples/async-transform-empty-statements/_config.js
new file mode 100644
index 0000000000..2e4a27cf09
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-transform-empty-statements/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	async test() {}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-transform-empty-statements/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-transform-empty-statements/main.svelte
new file mode 100644
index 0000000000..03c4ada55a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-transform-empty-statements/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	await Promise.resolve(42);
+	const { name } = $props();
+</script>
+
+{name}
\ No newline at end of file

From 319ceae20eb5655adde754daad5b4272952fbd0d Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Fri, 23 Jan 2026 23:05:07 +0100
Subject: [PATCH 308/347] chore: robustify some scripts (#17491)

* chore: robustify some scripts

- make it possible to call them with any cwd
- add ability to create test while downloading playground

* use parseArgs

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 playgrounds/sandbox/scripts/create-test.js | 22 ++++--
 playgrounds/sandbox/scripts/download.js    | 78 ++++++++++++++++++++--
 2 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/playgrounds/sandbox/scripts/create-test.js b/playgrounds/sandbox/scripts/create-test.js
index c733f19419..d183098b22 100644
--- a/playgrounds/sandbox/scripts/create-test.js
+++ b/playgrounds/sandbox/scripts/create-test.js
@@ -1,6 +1,16 @@
-// Creates a test from the existing playground. cwd needs to be playground/sandbox
+// Creates a test from the existing playground. Can be called from anywhere.
 import fs from 'fs';
 import path from 'path';
+import { fileURLToPath } from 'url';
+
+// Get the directory where this script is located
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Base paths relative to this script's location
+const sandbox_dir = path.resolve(__dirname, '..');
+const src_dir = path.join(sandbox_dir, 'src');
+const tests_dir = path.resolve(__dirname, '../../../packages/svelte/tests');
 
 // Get target folder from command line arguments
 let target_folder = process.argv[2];
@@ -20,7 +30,7 @@ if (!target_folder.startsWith('runtime-')) {
 	process.exit(1);
 }
 target_folder = path.join(
-	path.resolve('../../packages/svelte/tests', target_folder.split('/')[0]),
+	path.resolve(tests_dir, target_folder.split('/')[0]),
 	'samples',
 	target_folder.split('/')[1]
 );
@@ -56,8 +66,8 @@ if (exists) {
 	const files = fs.readdirSync(target_folder);
 	for (const file of files) {
 		if (file !== '_config.js') {
-			const filePath = path.join(target_folder, file);
-			fs.rmSync(filePath, { recursive: true, force: true });
+			const file_path = path.join(target_folder, file);
+			fs.rmSync(file_path, { recursive: true, force: true });
 		}
 	}
 } else {
@@ -65,7 +75,7 @@ if (exists) {
 }
 
 // Starting file
-const app_svelte_path = path.resolve('./src/App.svelte');
+const app_svelte_path = path.join(src_dir, 'App.svelte');
 const collected_files = new Set();
 const processed_files = new Set();
 
@@ -117,7 +127,7 @@ collect_imports(app_svelte_path);
 
 // Copy collected files to target folder
 for (const file_path of collected_files) {
-	const relative_path = path.relative(path.resolve('./src'), file_path);
+	const relative_path = path.relative(src_dir, file_path);
 	let target_path = path.join(target_folder, relative_path);
 
 	// Rename App.svelte to main.svelte
diff --git a/playgrounds/sandbox/scripts/download.js b/playgrounds/sandbox/scripts/download.js
index 5678f69ee3..b5eaeaa8f5 100644
--- a/playgrounds/sandbox/scripts/download.js
+++ b/playgrounds/sandbox/scripts/download.js
@@ -1,19 +1,36 @@
 import fs from 'node:fs';
+import path from 'node:path';
+import { parseArgs } from 'node:util';
 
-const arg = process.argv[2];
+const { values, positionals } = parseArgs({
+	options: {
+		'create-test': {
+			type: 'string'
+		}
+	},
+	allowPositionals: true
+});
+
+const create_test_name = values['create-test'] ?? null;
+const url_arg = positionals[0];
+
+if (!url_arg) {
+	console.error(`Missing URL argument`);
+	process.exit(1);
+}
 
 /** @type {URL} */
 let url;
 
 try {
-	url = new URL(arg);
+	url = new URL(url_arg);
 } catch (e) {
-	console.error(`${arg} is not a URL`);
+	console.error(`${url_arg} is not a URL`);
 	process.exit(1);
 }
 
 if (url.origin !== 'https://svelte.dev' || !url.pathname.startsWith('/playground/')) {
-	console.error(`${arg} is not a Svelte playground URL`);
+	console.error(`${url_arg} is not a Svelte playground URL`);
 	process.exit(1);
 }
 
@@ -47,6 +64,55 @@ if (url.hash.length > 1) {
 	});
 }
 
-for (const file of files) {
-	fs.writeFileSync(`src/${file.name}`, file.contents);
+const base_dir = import.meta.dirname;
+
+if (create_test_name) {
+	const test_parts = create_test_name.split('/').filter(Boolean);
+
+	if (test_parts.length > 2) {
+		console.error(
+			`Invalid test name "${create_test_name}". Expected e.g. "hello-world" or "runtime-legacy/hello-world"`
+		);
+		process.exit(1);
+	}
+
+	const suite_name = test_parts.length === 2 ? test_parts[0] : 'runtime-runes';
+	const test_name = test_parts[test_parts.length - 1];
+
+	const output_dir = path.join(
+		base_dir,
+		'../../..',
+		'packages/svelte/tests',
+		suite_name,
+		'samples',
+		test_name
+	);
+	if (fs.existsSync(output_dir)) {
+		console.warn(`Test folder "${output_dir}" already exists, overriding its contents`);
+		fs.rmSync(output_dir, { recursive: true, force: true });
+	}
+	fs.mkdirSync(output_dir, { recursive: true });
+
+	for (const file of files) {
+		const output_name = file.name === 'App.svelte' ? 'main.svelte' : file.name;
+		const output_path = path.join(output_dir, output_name);
+
+		fs.mkdirSync(path.dirname(output_path), { recursive: true });
+		fs.writeFileSync(output_path, file.contents);
+	}
+
+	fs.writeFileSync(
+		path.join(output_dir, '_config.js'),
+		`import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+	}
+});
+`
+	);
+} else {
+	for (const file of files) {
+		fs.writeFileSync(path.join(base_dir, '..', 'src', file.name), file.contents);
+	}
 }

From 7ab62a5878b5452fbc222a1f1a6adc9c424501d0 Mon Sep 17 00:00:00 2001
From: Pooh <thanadolps@gmail.com>
Date: Sat, 24 Jan 2026 05:05:30 +0700
Subject: [PATCH 309/347] docs: fix <svelte:boundary> tag in
 const_tag_invalid_placement message (#17501)

Co-authored-by: Thanadol Chitthamlerd <tchitthamlerd@smartertravel.com>
---
 documentation/docs/98-reference/.generated/compile-errors.md  | 2 +-
 packages/svelte/messages/compile-errors/template.md           | 2 +-
 packages/svelte/src/compiler/errors.js                        | 4 ++--
 .../tests/validator/samples/const-tag-placement-1/errors.json | 2 +-
 .../tests/validator/samples/const-tag-placement-2/errors.json | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/documentation/docs/98-reference/.generated/compile-errors.md b/documentation/docs/98-reference/.generated/compile-errors.md
index 8a8a10c80b..ff452cc674 100644
--- a/documentation/docs/98-reference/.generated/compile-errors.md
+++ b/documentation/docs/98-reference/.generated/compile-errors.md
@@ -193,7 +193,7 @@ Cyclical dependency detected: %cycle%
 ### const_tag_invalid_placement
 
 ```
-`{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary` or `<Component>`
+`{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary>` or `<Component>`
 ```
 
 ### const_tag_invalid_reference
diff --git a/packages/svelte/messages/compile-errors/template.md b/packages/svelte/messages/compile-errors/template.md
index db23a2eaa8..086b9e8b25 100644
--- a/packages/svelte/messages/compile-errors/template.md
+++ b/packages/svelte/messages/compile-errors/template.md
@@ -122,7 +122,7 @@
 
 ## const_tag_invalid_placement
 
-> `{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary` or `<Component>`
+> `{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary>` or `<Component>`
 
 ## const_tag_invalid_reference
 
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index d6c2efdfdc..990b643e68 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -977,12 +977,12 @@ export function const_tag_invalid_expression(node) {
 }
 
 /**
- * `{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary` or `<Component>`
+ * `{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary>` or `<Component>`
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
 export function const_tag_invalid_placement(node) {
-	e(node, 'const_tag_invalid_placement', `\`{@const}\` must be the immediate child of \`{#snippet}\`, \`{#if}\`, \`{:else if}\`, \`{:else}\`, \`{#each}\`, \`{:then}\`, \`{:catch}\`, \`<svelte:fragment>\`, \`<svelte:boundary\` or \`<Component>\`\nhttps://svelte.dev/e/const_tag_invalid_placement`);
+	e(node, 'const_tag_invalid_placement', `\`{@const}\` must be the immediate child of \`{#snippet}\`, \`{#if}\`, \`{:else if}\`, \`{:else}\`, \`{#each}\`, \`{:then}\`, \`{:catch}\`, \`<svelte:fragment>\`, \`<svelte:boundary>\` or \`<Component>\`\nhttps://svelte.dev/e/const_tag_invalid_placement`);
 }
 
 /**
diff --git a/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json b/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json
index 514e5d0561..f7f5803e74 100644
--- a/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-placement-1/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "const_tag_invalid_placement",
-		"message": "`{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary` or `<Component>`",
+		"message": "`{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary>` or `<Component>`",
 		"start": {
 			"line": 5,
 			"column": 0
diff --git a/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json b/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json
index 6b968f7eda..d008c6ce4c 100644
--- a/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json
+++ b/packages/svelte/tests/validator/samples/const-tag-placement-2/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "const_tag_invalid_placement",
-		"message": "`{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary` or `<Component>`",
+		"message": "`{@const}` must be the immediate child of `{#snippet}`, `{#if}`, `{:else if}`, `{:else}`, `{#each}`, `{:then}`, `{:catch}`, `<svelte:fragment>`, `<svelte:boundary>` or `<Component>`",
 		"start": {
 			"line": 7,
 			"column": 4

From 9b6539a8ef2483d9090e48d5ce0f33ae01b82cfd Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 23 Jan 2026 17:08:09 -0500
Subject: [PATCH 310/347] fix: properly hydrate await in `{@html}`
 (alternative) (#17528)

* fix: properly hydrate await in `{@html}`

* fix: skip no async

* revert runtime changes

* wrap html blocks in hydration comments

* prettier

---------

Co-authored-by: paoloricciuti <ricciutipaolo@gmail.com>
---
 .changeset/bright-pants-send.md                      |  5 +++++
 .../phases/3-transform/server/visitors/HtmlTag.js    | 12 +++++++++++-
 .../samples/await-html-hydration/_config.js          |  7 +++++++
 .../samples/await-html-hydration/main.svelte         |  1 +
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/bright-pants-send.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/await-html-hydration/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/await-html-hydration/main.svelte

diff --git a/.changeset/bright-pants-send.md b/.changeset/bright-pants-send.md
new file mode 100644
index 0000000000..8a877961ec
--- /dev/null
+++ b/.changeset/bright-pants-send.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: properly hydrate await in `{@html}`
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 08fd2133ee..3f423fa60d 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
@@ -2,7 +2,7 @@
 /** @import { AST } from '#compiler' */
 /** @import { ComponentContext } from '../types.js' */
 import * as b from '#compiler/builders';
-import { create_push } from './shared/utils.js';
+import { block_close, block_open, create_push } from './shared/utils.js';
 
 /**
  * @param {AST.HtmlTag} node
@@ -12,5 +12,15 @@ export function HtmlTag(node, context) {
 	const expression = /** @type {Expression} */ (context.visit(node.expression));
 	const call = b.call('$.html', expression);
 
+	const has_await = node.metadata.expression.has_await;
+
+	if (has_await) {
+		context.state.template.push(block_open);
+	}
+
 	context.state.template.push(create_push(call, node.metadata.expression, true));
+
+	if (has_await) {
+		context.state.template.push(block_close);
+	}
 }
diff --git a/packages/svelte/tests/runtime-runes/samples/await-html-hydration/_config.js b/packages/svelte/tests/runtime-runes/samples/await-html-hydration/_config.js
new file mode 100644
index 0000000000..e7983a3de9
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/await-html-hydration/_config.js
@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	mode: ['hydrate'],
+	async test() {}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/await-html-hydration/main.svelte b/packages/svelte/tests/runtime-runes/samples/await-html-hydration/main.svelte
new file mode 100644
index 0000000000..3b9ce94e61
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/await-html-hydration/main.svelte
@@ -0,0 +1 @@
+<div>{@html await Promise.resolve(`<span>Foo</span>`)}</div>
\ No newline at end of file

From 0f68a00c3c3203062bb5f99bc5362beeb816dcff Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 23 Jan 2026 17:09:12 -0500
Subject: [PATCH 311/347] chore: defense-in-depth against script escapes
 (#17479)

* chore: defense-in-depth against script escapes

* Update packages/svelte/src/internal/server/dev.js
---
 packages/svelte/src/internal/server/dev.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/svelte/src/internal/server/dev.js b/packages/svelte/src/internal/server/dev.js
index 4a6cdb8cf6..e953bac6ce 100644
--- a/packages/svelte/src/internal/server/dev.js
+++ b/packages/svelte/src/internal/server/dev.js
@@ -40,7 +40,12 @@ function print_error(renderer, message) {
 
 	// eslint-disable-next-line no-console
 	console.error(message);
-	renderer.head((r) => r.push(`<script>console.error(${JSON.stringify(message)})</script>`));
+	renderer.head((r) =>
+		r.push(
+			// ensure that `</script>` can't leak in to the script contents
+			`<script>console.error(${JSON.stringify(message).replaceAll('</', '<\\u002f')})</script>`
+		)
+	);
 }
 
 /**

From 9108404450cb75da65e8588fdc4f29743979bc02 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 23 Jan 2026 23:53:00 -0500
Subject: [PATCH 312/347] Version Packages (#17517)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/blue-parts-double.md   |  5 -----
 .changeset/bright-pants-send.md   |  5 -----
 .changeset/four-signs-listen.md   |  5 -----
 .changeset/kind-dolls-cry.md      |  5 -----
 .changeset/ten-horses-cross.md    |  5 -----
 .changeset/witty-streets-carry.md |  5 -----
 packages/svelte/CHANGELOG.md      | 16 ++++++++++++++++
 packages/svelte/package.json      |  2 +-
 packages/svelte/src/version.js    |  2 +-
 9 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 .changeset/blue-parts-double.md
 delete mode 100644 .changeset/bright-pants-send.md
 delete mode 100644 .changeset/four-signs-listen.md
 delete mode 100644 .changeset/kind-dolls-cry.md
 delete mode 100644 .changeset/ten-horses-cross.md
 delete mode 100644 .changeset/witty-streets-carry.md

diff --git a/.changeset/blue-parts-double.md b/.changeset/blue-parts-double.md
deleted file mode 100644
index 223e51fdae..0000000000
--- a/.changeset/blue-parts-double.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: hoist snippets above const in same block
diff --git a/.changeset/bright-pants-send.md b/.changeset/bright-pants-send.md
deleted file mode 100644
index 8a877961ec..0000000000
--- a/.changeset/bright-pants-send.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: properly hydrate await in `{@html}`
diff --git a/.changeset/four-signs-listen.md b/.changeset/four-signs-listen.md
deleted file mode 100644
index b9e089fd12..0000000000
--- a/.changeset/four-signs-listen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: batch resolution of async work
diff --git a/.changeset/kind-dolls-cry.md b/.changeset/kind-dolls-cry.md
deleted file mode 100644
index c6653d2f7f..0000000000
--- a/.changeset/kind-dolls-cry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: account for empty statements when visiting in transform async
diff --git a/.changeset/ten-horses-cross.md b/.changeset/ten-horses-cross.md
deleted file mode 100644
index 5502c5887b..0000000000
--- a/.changeset/ten-horses-cross.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: avoid async overhead for already settled promises
diff --git a/.changeset/witty-streets-carry.md b/.changeset/witty-streets-carry.md
deleted file mode 100644
index f02d998409..0000000000
--- a/.changeset/witty-streets-carry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: better code generation for const tags with async dependencies
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 21cbb4ee66..d9b67e08a3 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,21 @@
 # svelte
 
+## 5.48.1
+
+### Patch Changes
+
+- fix: hoist snippets above const in same block ([#17516](https://github.com/sveltejs/svelte/pull/17516))
+
+- fix: properly hydrate await in `{@html}` ([#17528](https://github.com/sveltejs/svelte/pull/17528))
+
+- fix: batch resolution of async work ([#17511](https://github.com/sveltejs/svelte/pull/17511))
+
+- fix: account for empty statements when visiting in transform async ([#17524](https://github.com/sveltejs/svelte/pull/17524))
+
+- fix: avoid async overhead for already settled promises ([#17461](https://github.com/sveltejs/svelte/pull/17461))
+
+- fix: better code generation for const tags with async dependencies ([#17518](https://github.com/sveltejs/svelte/pull/17518))
+
 ## 5.48.0
 
 ### Minor Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index bbb519f8e8..d4d7aef12b 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.48.0",
+  "version": "5.48.1",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index c1ced8dad3..88ffc1f497 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.48.0';
+export const VERSION = '5.48.1';
 export const PUBLIC_VERSION = '5';

From 6046bbb4564cc3cc44332313a6293cf06f148227 Mon Sep 17 00:00:00 2001
From: Benjamin Tamasi <half2me@users.noreply.github.com>
Date: Sat, 24 Jan 2026 15:37:04 +0100
Subject: [PATCH 313/347] fix: export `wait` function from internal client
 index (#17530)

PR #17461 added the `wait` function to `reactivity/async.js` and modified the compiler to generate `$.wait()` calls, but forgot to export it from `index.js`.

This causes a runtime error when using `await` inside `$derived()` with `experimental.async: true`:

```
TypeError: $.wait is not a function
```

Fixes #17529
---
 .changeset/fix-wait-export.md                  |  5 +++++
 packages/svelte/src/internal/client/index.js   |  3 ++-
 .../samples/async-const-wait/_config.js        | 18 ++++++++++++++++++
 .../samples/async-const-wait/main.svelte       | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fix-wait-export.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-const-wait/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-const-wait/main.svelte

diff --git a/.changeset/fix-wait-export.md b/.changeset/fix-wait-export.md
new file mode 100644
index 0000000000..e0ab97207c
--- /dev/null
+++ b/.changeset/fix-wait-export.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: export `wait` function from internal client index
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index 0f20ce300d..1d9f7dfff7 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -103,7 +103,8 @@ export {
 	run,
 	save,
 	track_reactivity_loss,
-	run_after_blockers
+	run_after_blockers,
+	wait
 } from './reactivity/async.js';
 export { eager, flushSync as flush } from './reactivity/batch.js';
 export {
diff --git a/packages/svelte/tests/runtime-runes/samples/async-const-wait/_config.js b/packages/svelte/tests/runtime-runes/samples/async-const-wait/_config.js
new file mode 100644
index 0000000000..fe85c0393a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-const-wait/_config.js
@@ -0,0 +1,18 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client'],
+
+	props: {
+		a_promise: Promise.resolve(10),
+		b_promise: Promise.resolve(20)
+	},
+
+	async test({ assert, target }) {
+		await tick();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, `<p>30</p>`);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-const-wait/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-const-wait/main.svelte
new file mode 100644
index 0000000000..b5e6d90f7c
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-const-wait/main.svelte
@@ -0,0 +1,16 @@
+<script>
+	let { a_promise, b_promise } = $props();
+</script>
+
+<svelte:boundary>
+	{@const a = await a_promise}
+	{#if true}
+		<svelte:boundary>
+			{@const b = await b_promise}
+			{#if true}
+				{@const sum = a + b}
+				<p>{sum}</p>
+			{/if}
+		</svelte:boundary>
+	{/if}
+</svelte:boundary>

From e1427aa0c8b5abe88aea972ea397ea499cb8f2db Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 24 Jan 2026 15:43:54 +0100
Subject: [PATCH 314/347] Version Packages (#17531)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/fix-wait-export.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/fix-wait-export.md

diff --git a/.changeset/fix-wait-export.md b/.changeset/fix-wait-export.md
deleted file mode 100644
index e0ab97207c..0000000000
--- a/.changeset/fix-wait-export.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: export `wait` function from internal client index
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index d9b67e08a3..e619f55654 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.48.2
+
+### Patch Changes
+
+- fix: export `wait` function from internal client index ([#17530](https://github.com/sveltejs/svelte/pull/17530))
+
 ## 5.48.1
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index d4d7aef12b..7763aba87e 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.48.1",
+  "version": "5.48.2",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 88ffc1f497..2b30052317 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.48.1';
+export const VERSION = '5.48.2';
 export const PUBLIC_VERSION = '5';

From fe12ffc2a3ebfb4fcf43f283fccb984363c1ea84 Mon Sep 17 00:00:00 2001
From: David <david@hmnd.io>
Date: Sun, 25 Jan 2026 07:16:45 -0800
Subject: [PATCH 315/347] fix: avoid unnecessary block effect re-runs after
 async work completes (#17535)

* add samples for async readable freeze

* test updating without changing reference too

* fix: treat block effects as maybe dirty in revive()

* even simpler - put block effects in maybe_dirty_effects

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/wise-emus-hunt.md                  |  5 +++
 .../src/internal/client/reactivity/batch.js   |  2 +-
 .../async-await-store-mutate/_config.js       | 24 ++++++++++++++
 .../async-await-store-mutate/main.svelte      | 26 +++++++++++++++
 .../async-each-await-store-update/_config.js  | 32 +++++++++++++++++++
 .../async-each-await-store-update/main.svelte | 31 ++++++++++++++++++
 6 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/wise-emus-hunt.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-await-store-mutate/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-await-store-mutate/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-each-await-store-update/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-each-await-store-update/main.svelte

diff --git a/.changeset/wise-emus-hunt.md b/.changeset/wise-emus-hunt.md
new file mode 100644
index 0000000000..c8b3f93de8
--- /dev/null
+++ b/.changeset/wise-emus-hunt.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: avoid unnecessary block effect re-runs after async work completes
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index c4caf8a20b..5647c08ba5 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -243,7 +243,7 @@ export class Batch {
 				} else if (async_mode_flag && (flags & (RENDER_EFFECT | MANAGED_EFFECT)) !== 0) {
 					render_effects.push(effect);
 				} else if (is_dirty(effect)) {
-					if ((flags & BLOCK_EFFECT) !== 0) this.#dirty_effects.add(effect);
+					if ((flags & BLOCK_EFFECT) !== 0) this.#maybe_dirty_effects.add(effect);
 					update_effect(effect);
 				}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/async-await-store-mutate/_config.js b/packages/svelte/tests/runtime-runes/samples/async-await-store-mutate/_config.js
new file mode 100644
index 0000000000..e89065865f
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-await-store-mutate/_config.js
@@ -0,0 +1,24 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+// ensure in-place object mutations stay reactive in async
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const button = /** @type {HTMLElement} */ (target.querySelector('button'));
+
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, `<p>count: 1, computed: 10</p><button>mutate</button>`);
+
+		button.click();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, `<p>count: 2, computed: 20</p><button>mutate</button>`);
+
+		button.click();
+		await tick();
+
+		assert.htmlEqual(target.innerHTML, `<p>count: 3, computed: 30</p><button>mutate</button>`);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-await-store-mutate/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-await-store-mutate/main.svelte
new file mode 100644
index 0000000000..327c775d6e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-await-store-mutate/main.svelte
@@ -0,0 +1,26 @@
+<script>
+	import { writable } from 'svelte/store';
+
+	const data = writable({ count: 1 });
+
+	function mutate_count() {
+		data.update(d => {
+			d.count++;
+			return d;
+		});
+	}
+
+	async function compute(d) {
+		return Promise.resolve(d.count * 10);
+	}
+</script>
+
+<svelte:boundary>
+	<p>count: {$data.count}, computed: {await compute($data)}</p>
+
+	{#snippet pending()}
+		<p>pending</p>
+	{/snippet}
+</svelte:boundary>
+
+<button onclick={mutate_count}>mutate</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/async-each-await-store-update/_config.js b/packages/svelte/tests/runtime-runes/samples/async-each-await-store-update/_config.js
new file mode 100644
index 0000000000..165577af96
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-each-await-store-update/_config.js
@@ -0,0 +1,32 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const button = /** @type {HTMLElement} */ (target.querySelector('button'));
+
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`<ul><li data-item="1"><span>10</span><span>20</span></li></ul><button>add</button>`
+		);
+
+		button.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`<ul><li data-item="1"><span>10</span><span>20</span></li><li data-item="2"><span>20</span><span>40</span></li></ul><button>add</button>`
+		);
+
+		button.click();
+		await tick();
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`<ul><li data-item="1"><span>10</span><span>20</span></li><li data-item="2"><span>20</span><span>40</span></li><li data-item="3"><span>30</span><span>60</span></li></ul><button>add</button>`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-each-await-store-update/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-each-await-store-update/main.svelte
new file mode 100644
index 0000000000..41982b767d
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-each-await-store-update/main.svelte
@@ -0,0 +1,31 @@
+<script>
+	import { writable } from 'svelte/store';
+
+	const items = writable([{ id: 1 }]);
+
+	function add_item() {
+		items.update(arr => [...arr, { id: arr.length + 1 }]);
+	}
+
+	function query(item) {
+		return Promise.resolve([item.id * 10, item.id * 20]);
+	}
+</script>
+
+<svelte:boundary>
+	<ul>
+		{#each $items as item (item.id)}
+			<li data-item={item.id}>
+				{#each await query(item) as value}
+					<span>{value}</span>
+				{/each}
+			</li>
+		{/each}
+	</ul>
+	
+	{#snippet pending()}
+		<p>pending</p>
+	{/snippet}
+</svelte:boundary>
+
+<button onclick={add_item}>add</button>

From c041d122ba229695a77e4ac750d006ece1350347 Mon Sep 17 00:00:00 2001
From: Gokul <116172293+duraisamy-gokul@users.noreply.github.com>
Date: Sun, 25 Jan 2026 21:25:47 +0530
Subject: [PATCH 316/347] docs: add note about typing children as Snippet in
 $props (#17534)

* docs: add note about typing children as Snippet in \$props

* Apply suggestion from @Rich-Harris

* Apply suggestion from @Rich-Harris

---------

Co-authored-by: gokul.d <gokul.d@juspay.in>
Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 documentation/docs/02-runes/05-$props.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/docs/02-runes/05-$props.md b/documentation/docs/02-runes/05-$props.md
index 222b4831b6..bd5ae16853 100644
--- a/documentation/docs/02-runes/05-$props.md
+++ b/documentation/docs/02-runes/05-$props.md
@@ -198,6 +198,8 @@ You can, of course, separate the type declaration from the annotation:
 
 > [!NOTE] Interfaces for native DOM elements are provided in the `svelte/elements` module (see [Typing wrapper components](typescript#Typing-wrapper-components))
 
+If your component exposes [snippet](snippet) props like `children`, these should be typed using the `Snippet` interface imported from `'svelte'` — see [Typing snippets](snippet#Typing-snippets) for examples.
+
 Adding types is recommended, as it ensures that people using your component can easily discover which props they should provide.
 
 

From bec90d4801d81bd0b013540676d31ae0b90283f4 Mon Sep 17 00:00:00 2001
From: David <david@hmnd.io>
Date: Sun, 25 Jan 2026 07:56:14 -0800
Subject: [PATCH 317/347] fix: avoid using dev-mode array.includes wrapper on
 internal array checks (#17536)

* fix: avoid using dev-mode array.includes wrapper on internal array checks

* use includes rather than index_of

* unused imports

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/yellow-bobcats-hope.md                      |  5 +++++
 .../svelte/src/internal/client/reactivity/batch.js     |  4 ++--
 .../svelte/src/internal/client/reactivity/deriveds.js  |  4 ++--
 .../svelte/src/internal/client/reactivity/sources.js   |  3 ++-
 packages/svelte/src/internal/client/runtime.js         | 10 +++++-----
 packages/svelte/src/internal/shared/utils.js           |  1 +
 6 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/yellow-bobcats-hope.md

diff --git a/.changeset/yellow-bobcats-hope.md b/.changeset/yellow-bobcats-hope.md
new file mode 100644
index 0000000000..dffeea3177
--- /dev/null
+++ b/.changeset/yellow-bobcats-hope.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: avoid using dev-mode array.includes wrapper on internal array checks
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 5647c08ba5..134ebe53a2 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -21,7 +21,7 @@ import {
 	MANAGED_EFFECT
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
-import { deferred, define_property } from '../../shared/utils.js';
+import { deferred, define_property, includes } from '../../shared/utils.js';
 import {
 	active_effect,
 	get,
@@ -775,7 +775,7 @@ function depends_on(reaction, sources, checked) {
 
 	if (reaction.deps !== null) {
 		for (const dep of reaction.deps) {
-			if (sources.includes(dep)) {
+			if (includes.call(sources, dep)) {
 				return true;
 			}
 
diff --git a/packages/svelte/src/internal/client/reactivity/deriveds.js b/packages/svelte/src/internal/client/reactivity/deriveds.js
index 59fb0f15aa..bb732bdd1e 100644
--- a/packages/svelte/src/internal/client/reactivity/deriveds.js
+++ b/packages/svelte/src/internal/client/reactivity/deriveds.js
@@ -33,7 +33,7 @@ import { component_context } from '../context.js';
 import { UNINITIALIZED } from '../../../constants.js';
 import { batch_values, current_batch } from './batch.js';
 import { unset_context } from './async.js';
-import { deferred } from '../../shared/utils.js';
+import { deferred, includes } from '../../shared/utils.js';
 import { set_signal_status, update_derived_status } from './status.js';
 
 /** @type {Effect | null} */
@@ -322,7 +322,7 @@ export function execute_derived(derived) {
 		let prev_eager_effects = eager_effects;
 		set_eager_effects(new Set());
 		try {
-			if (stack.includes(derived)) {
+			if (includes.call(stack, derived)) {
 				e.derived_references_self();
 			}
 
diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js
index 7604c9e90b..3ef08588c4 100644
--- a/packages/svelte/src/internal/client/reactivity/sources.js
+++ b/packages/svelte/src/internal/client/reactivity/sources.js
@@ -31,6 +31,7 @@ import {
 } from '#client/constants';
 import * as e from '../errors.js';
 import { legacy_mode_flag, tracing_mode_flag } from '../../flags/index.js';
+import { includes } from '../../shared/utils.js';
 import { tag_proxy } from '../dev/tracing.js';
 import { get_error } from '../../shared/dev.js';
 import { component_context, is_runes } from '../context.js';
@@ -150,7 +151,7 @@ export function set(source, value, should_proxy = false) {
 		(!untracking || (active_reaction.f & EAGER_EFFECT) !== 0) &&
 		is_runes() &&
 		(active_reaction.f & (DERIVED | BLOCK_EFFECT | ASYNC | EAGER_EFFECT)) !== 0 &&
-		!current_sources?.includes(source)
+		(current_sources === null || !includes.call(current_sources, source))
 	) {
 		e.state_unsafe_mutation();
 	}
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 19b98d0c0f..2075081f96 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -1,6 +1,6 @@
 /** @import { Derived, Effect, Reaction, Source, Value } from '#client' */
 import { DEV } from 'esm-env';
-import { get_descriptors, get_prototype_of, index_of } from '../shared/utils.js';
+import { get_descriptors, get_prototype_of, includes, index_of } from '../shared/utils.js';
 import {
 	destroy_block_effect_children,
 	destroy_effect_children,
@@ -192,7 +192,7 @@ function schedule_possible_effect_self_invalidation(signal, effect, root = true)
 	var reactions = signal.reactions;
 	if (reactions === null) return;
 
-	if (!async_mode_flag && current_sources?.includes(signal)) {
+	if (!async_mode_flag && current_sources !== null && includes.call(current_sources, signal)) {
 		return;
 	}
 
@@ -371,7 +371,7 @@ function remove_reaction(signal, dependency) {
 		// Destroying a child effect while updating a parent effect can cause a dependency to appear
 		// to be unused, when in fact it is used by the currently-updating parent. Checking `new_deps`
 		// allows us to skip the expensive work of disconnecting and immediately reconnecting it
-		(new_deps === null || !new_deps.includes(dependency))
+		(new_deps === null || !includes.call(new_deps, dependency))
 	) {
 		var derived = /** @type {Derived} */ (dependency);
 
@@ -514,7 +514,7 @@ export function get(signal) {
 		// we don't add the dependency, because that would create a memory leak
 		var destroyed = active_effect !== null && (active_effect.f & DESTROYED) !== 0;
 
-		if (!destroyed && !current_sources?.includes(signal)) {
+		if (!destroyed && (current_sources === null || !includes.call(current_sources, signal))) {
 			var deps = active_reaction.deps;
 
 			if ((active_reaction.f & REACTION_IS_UPDATING) !== 0) {
@@ -542,7 +542,7 @@ export function get(signal) {
 
 				if (reactions === null) {
 					signal.reactions = [active_reaction];
-				} else if (!reactions.includes(active_reaction)) {
+				} else if (!includes.call(reactions, active_reaction)) {
 					reactions.push(active_reaction);
 				}
 			}
diff --git a/packages/svelte/src/internal/shared/utils.js b/packages/svelte/src/internal/shared/utils.js
index 659cd10040..771f6b345c 100644
--- a/packages/svelte/src/internal/shared/utils.js
+++ b/packages/svelte/src/internal/shared/utils.js
@@ -2,6 +2,7 @@
 // to de-opt (this occurs often when using popular extensions).
 export var is_array = Array.isArray;
 export var index_of = Array.prototype.indexOf;
+export var includes = Array.prototype.includes;
 export var array_from = Array.from;
 export var object_keys = Object.keys;
 export var define_property = Object.defineProperty;

From 6e4820dcf6a2f0bd6bfbd255ae86c7fe1da11705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draic=20Slattery?= <pgoslatara@gmail.com>
Date: Sun, 25 Jan 2026 17:14:28 +0100
Subject: [PATCH 318/347] chore: Update outdated GitHub Actions versions
 (#17487)

---
 .github/workflows/ci.yml                 | 20 ++++++++++----------
 .github/workflows/pkg.pr.new-comment.yml |  4 ++--
 .github/workflows/pkg.pr.new.yml         |  8 ++++----
 .github/workflows/release.yml            |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51408fc8cc..8dcf1e45dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,9 +32,9 @@ jobs:
             os: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
           cache: pnpm
@@ -48,9 +48,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 22
           cache: pnpm
@@ -65,9 +65,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 24
           cache: pnpm
@@ -82,9 +82,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 18
           cache: pnpm
@@ -103,9 +103,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 18
           cache: pnpm
diff --git a/.github/workflows/pkg.pr.new-comment.yml b/.github/workflows/pkg.pr.new-comment.yml
index 8bf13bb8f1..64495cc5c8 100644
--- a/.github/workflows/pkg.pr.new-comment.yml
+++ b/.github/workflows/pkg.pr.new-comment.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: output
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -23,7 +23,7 @@ jobs:
 
       - run: ls -R .
       - name: 'Post or update comment'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/pkg.pr.new.yml b/.github/workflows/pkg.pr.new.yml
index 49303f1684..252cbed769 100644
--- a/.github/workflows/pkg.pr.new.yml
+++ b/.github/workflows/pkg.pr.new.yml
@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 22.x
           cache: pnpm
@@ -25,7 +25,7 @@ jobs:
 
       - run: pnpx pkg-pr-new publish --comment=off --json output.json --compact --no-template './packages/svelte'
       - name: Add metadata to output
-        uses: actions/github-script@v6
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -36,7 +36,7 @@ jobs:
             output.ref = context.ref;
             fs.writeFileSync('output.json', JSON.stringify(output), 'utf8');
       - name: Upload output
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: output
           path: ./output.json
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 80d2ad1f8e..aa32e3c5cd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,13 +23,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
           fetch-depth: 0
       - uses: pnpm/action-setup@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 24.x
           cache: pnpm

From c3fcc15cfa5db621d1ac808a1885748377edd7da Mon Sep 17 00:00:00 2001
From: dive2tech <phivesyard@gmail.com>
Date: Mon, 26 Jan 2026 09:11:01 -0500
Subject: [PATCH 319/347] feat: improve text/binary file detection in hash.js
 (#17543)

* Improve text/binary file detection in hash.js

Replace hardcoded text: true with proper detection logic that:
- Checks for null bytes to identify binary files
- Validates UTF-8 encoding with round-trip verification
- Handles binary files by encoding them as base64

This fixes the TODO comment and makes the script more robust.

* tweak

* snake_case

---------

Co-authored-by: Gittensor Miner <miner@gittensor.io>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 playgrounds/sandbox/scripts/hash.js | 32 +++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/playgrounds/sandbox/scripts/hash.js b/playgrounds/sandbox/scripts/hash.js
index e70dfc471a..fdfe2d1aa7 100644
--- a/playgrounds/sandbox/scripts/hash.js
+++ b/playgrounds/sandbox/scripts/hash.js
@@ -1,16 +1,44 @@
 import fs from 'node:fs';
 
+/**
+ * Detects if a file is text or binary by checking for null bytes
+ * and validating UTF-8 encoding
+ * @param {string} filepath - Path to the file
+ * @returns {boolean} - true if file is text, false if binary
+ */
+function is_text_file(filepath) {
+	const buffer = fs.readFileSync(filepath);
+	// Check for null bytes which indicate binary files
+	for (let i = 0; i < buffer.length; i++) {
+		if (buffer[i] === 0) {
+			return false;
+		}
+	}
+	// Validate UTF-8 encoding
+	try {
+		const text = buffer.toString('utf-8');
+		// Verify round-trip encoding to ensure valid UTF-8
+		const encoded = Buffer.from(text, 'utf-8');
+		return buffer.equals(encoded);
+	} catch {
+		return false;
+	}
+}
+
 const files = [];
 
 for (const basename of fs.readdirSync('src')) {
 	if (fs.statSync(`src/${basename}`).isDirectory()) continue;
 
+	const filepath = `src/${basename}`;
+	const text = is_text_file(filepath);
+
 	files.push({
 		type: 'file',
 		name: basename,
 		basename,
-		contents: fs.readFileSync(`src/${basename}`, 'utf-8'),
-		text: true // TODO might not be
+		contents: fs.readFileSync(filepath, text ? 'utf-8' : 'base64'),
+		text
 	});
 }
 

From efcb7353bb4526a64d8d69e2d43ce8314d8ceb8c Mon Sep 17 00:00:00 2001
From: ai-man-codes <aimansingh00@gmail.com>
Date: Mon, 26 Jan 2026 20:59:12 +0530
Subject: [PATCH 320/347] fix: handle falsy dynamic components in SSR (#17542)

* fix: handle falsy dynamic components in SSR

Closes #17408

Adds a dynamic check for the component in the SSR.

Changes:
- Modified server-side component renderer to use b.maybe_call for dynamic components
- Added SSR test case for falsy component values

* fix types

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/purple-guests-punch.md                    |  5 +++++
 .../3-transform/server/visitors/shared/component.js  | 12 ++++--------
 .../samples/falsy-dynamic-component/_expected.html   |  1 +
 .../samples/falsy-dynamic-component/main.svelte      |  6 ++++++
 4 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/purple-guests-punch.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/falsy-dynamic-component/_expected.html
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/falsy-dynamic-component/main.svelte

diff --git a/.changeset/purple-guests-punch.md b/.changeset/purple-guests-punch.md
new file mode 100644
index 0000000000..f18a1962d6
--- /dev/null
+++ b/.changeset/purple-guests-punch.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: handle false dynamic components in SSR
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 a90b5e41df..cfd9a27d7b 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
@@ -295,22 +295,18 @@ export function build_inline_component(node, expression, context) {
 					b.array(props_and_spreads.map((p) => (Array.isArray(p) ? b.object(p) : p)))
 				);
 
+	const dynamic =
+		node.type === 'SvelteComponent' || (node.type === 'Component' && node.metadata.dynamic);
+
 	/** @type {Statement} */
 	let statement = b.stmt(
-		(node.type === 'SvelteComponent' ? b.maybe_call : b.call)(
-			expression,
-			b.id('$$renderer'),
-			props_expression
-		)
+		(dynamic ? b.maybe_call : b.call)(expression, b.id('$$renderer'), props_expression)
 	);
 
 	if (snippet_declarations.length > 0) {
 		statement = b.block([...snippet_declarations, statement]);
 	}
 
-	const dynamic =
-		node.type === 'SvelteComponent' || (node.type === 'Component' && node.metadata.dynamic);
-
 	if (custom_css_props.length > 0) {
 		statement = b.stmt(
 			b.call(
diff --git a/packages/svelte/tests/server-side-rendering/samples/falsy-dynamic-component/_expected.html b/packages/svelte/tests/server-side-rendering/samples/falsy-dynamic-component/_expected.html
new file mode 100644
index 0000000000..d87d3602f8
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/falsy-dynamic-component/_expected.html
@@ -0,0 +1 @@
+<h1>Test</h1>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/falsy-dynamic-component/main.svelte b/packages/svelte/tests/server-side-rendering/samples/falsy-dynamic-component/main.svelte
new file mode 100644
index 0000000000..ee6dabc9aa
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/falsy-dynamic-component/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	let Component = $state();
+</script>
+
+<h1>Test</h1>
+<Component />
\ No newline at end of file

From 5e0d18d2102c05c14ba71a52a222f4f126215f31 Mon Sep 17 00:00:00 2001
From: David <david@hmnd.io>
Date: Mon, 26 Jan 2026 14:26:16 -0800
Subject: [PATCH 321/347] fix: advance hydration before skipping settled async
 blocks (#17539)

* fix: advance hydration before skipping settled async blocks

* add test sample

* simplify
---
 .changeset/common-parrots-do.md                    |  5 +++++
 .../svelte/src/internal/client/dom/blocks/async.js | 10 ++++++----
 .../async-settled-blockers-hydration/_config.js    | 14 ++++++++++++++
 .../async-settled-blockers-hydration/main.svelte   | 13 +++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/common-parrots-do.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-settled-blockers-hydration/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-settled-blockers-hydration/main.svelte

diff --git a/.changeset/common-parrots-do.md b/.changeset/common-parrots-do.md
new file mode 100644
index 0000000000..d40260f8d1
--- /dev/null
+++ b/.changeset/common-parrots-do.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: hydration failing with settled async blocks
diff --git a/packages/svelte/src/internal/client/dom/blocks/async.js b/packages/svelte/src/internal/client/dom/blocks/async.js
index c2ae07fd17..0e3ab33dda 100644
--- a/packages/svelte/src/internal/client/dom/blocks/async.js
+++ b/packages/svelte/src/internal/client/dom/blocks/async.js
@@ -19,6 +19,12 @@ import { get_boundary } from './boundary.js';
  * @param {(anchor: TemplateNode, ...deriveds: Value[]) => void} fn
  */
 export function async(node, blockers = [], expressions = [], fn) {
+	var was_hydrating = hydrating;
+
+	if (was_hydrating) {
+		hydrate_next();
+	}
+
 	if (expressions.length === 0 && blockers.every((b) => b.settled)) {
 		fn(node);
 		return;
@@ -31,11 +37,7 @@ export function async(node, blockers = [], expressions = [], fn) {
 	boundary.update_pending_count(1);
 	batch.increment(blocking);
 
-	var was_hydrating = hydrating;
-
 	if (was_hydrating) {
-		hydrate_next();
-
 		var previous_hydrate_node = hydrate_node;
 		var end = skip_nodes(false);
 		set_hydrate_node(end);
diff --git a/packages/svelte/tests/runtime-runes/samples/async-settled-blockers-hydration/_config.js b/packages/svelte/tests/runtime-runes/samples/async-settled-blockers-hydration/_config.js
new file mode 100644
index 0000000000..f6f6c81350
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-settled-blockers-hydration/_config.js
@@ -0,0 +1,14 @@
+import { tick } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_mode: ['server'],
+	skip_no_async: true,
+
+	ssrHtml: `<div>1</div><p>after</p>`,
+
+	async test({ assert, target }) {
+		await tick();
+		assert.htmlEqual(target.innerHTML, '<div>1</div><p>after</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-settled-blockers-hydration/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-settled-blockers-hydration/main.svelte
new file mode 100644
index 0000000000..1b1dc17242
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-settled-blockers-hydration/main.svelte
@@ -0,0 +1,13 @@
+<script>
+	const n = $derived(await Promise.resolve(1));
+</script>
+
+{#snippet child(n)}
+	<div>{n}</div>
+{/snippet}
+
+{#if n}
+	{@render child(n)}
+{/if}
+
+<p>after</p>

From 5872b89fb8e6e01dac9c9c9d4fdc3e9ae416014c Mon Sep 17 00:00:00 2001
From: Richman018 <239411042+Richman018@users.noreply.github.com>
Date: Tue, 27 Jan 2026 07:00:12 +0800
Subject: [PATCH 322/347] fix: add pointer and touch events to
 a11y_no_static_element_interactions warning (#17548)

* fix: add pointer and touch events to a11y_no_static_element_interactions warning

Fixes #17527

The a11y_no_static_element_interactions warning now triggers for pointer
and touch events (onpointerdown, onpointerenter, ontouchstart, etc.)
in addition to mouse and drag events.

This ensures accessibility warnings are consistent across all pointer
input methods.

* fix test

---------

Co-authored-by: Daniel <daniel@example.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .../visitors/shared/a11y/constants.js         | 16 ++++++++-
 .../input.svelte                              |  3 ++
 .../warnings.json                             | 36 +++++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/a11y/constants.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/a11y/constants.js
index a1b70f2207..684ea92094 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/a11y/constants.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/shared/a11y/constants.js
@@ -67,7 +67,21 @@ export const a11y_interactive_handlers = [
 	'mousemove',
 	'mouseout',
 	'mouseover',
-	'mouseup'
+	'mouseup',
+	// Pointer events
+	'pointerdown',
+	'pointerup',
+	'pointermove',
+	'pointerenter',
+	'pointerleave',
+	'pointerover',
+	'pointerout',
+	'pointercancel',
+	// Touch events
+	'touchstart',
+	'touchend',
+	'touchmove',
+	'touchcancel'
 ];
 
 export const a11y_recommended_interactive_handlers = [
diff --git a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/input.svelte b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/input.svelte
index ee7ed4f084..8829d784c8 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/input.svelte
+++ b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/input.svelte
@@ -17,3 +17,6 @@
 <div on:keydown={() => {}}></div>
 <!-- svelte-ignore a11y_missing_attribute -->
 <a on:mousedown={() => {}} on:mouseup={() => {}} on:copy={() => {}}>link</a>
+<div on:pointerdown={() => {}}></div>
+<div on:pointerenter={() => {}}></div>
+<div on:touchstart={() => {}}></div>
diff --git a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json
index ab4b58a839..41325a8756 100644
--- a/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json
+++ b/packages/svelte/tests/validator/samples/a11y-no-static-element-interactions/warnings.json
@@ -22,5 +22,41 @@
 			"column": 0,
 			"line": 19
 		}
+	},
+	{
+		"code": "a11y_no_static_element_interactions",
+		"end": {
+			"column": 37,
+			"line": 20
+		},
+		"message": "`<div>` with a pointerdown handler must have an ARIA role",
+		"start": {
+			"column": 0,
+			"line": 20
+		}
+	},
+	{
+		"code": "a11y_no_static_element_interactions",
+		"end": {
+			"column": 38,
+			"line": 21
+		},
+		"message": "`<div>` with a pointerenter handler must have an ARIA role",
+		"start": {
+			"column": 0,
+			"line": 21
+		}
+	},
+	{
+		"code": "a11y_no_static_element_interactions",
+		"end": {
+			"column": 36,
+			"line": 22
+		},
+		"message": "`<div>` with a touchstart handler must have an ARIA role",
+		"start": {
+			"column": 0,
+			"line": 22
+		}
 	}
 ]

From 97684d32a01b8592931987036986ba44ccd85bad Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 26 Jan 2026 18:07:14 -0500
Subject: [PATCH 323/347] add missing changeset for #17548 (#17551)

---
 .changeset/public-streets-turn.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/public-streets-turn.md

diff --git a/.changeset/public-streets-turn.md b/.changeset/public-streets-turn.md
new file mode 100644
index 0000000000..ed9ad14241
--- /dev/null
+++ b/.changeset/public-streets-turn.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: add pointer and touch events to a11y_no_static_element_interactions warning

From 9662010a135937b7a920eaf93933be7b8b0c9c9e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 18:35:21 -0500
Subject: [PATCH 324/347] Version Packages (#17537)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/common-parrots-do.md   |  5 -----
 .changeset/public-streets-turn.md |  5 -----
 .changeset/purple-guests-punch.md |  5 -----
 .changeset/wise-emus-hunt.md      |  5 -----
 .changeset/yellow-bobcats-hope.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/common-parrots-do.md
 delete mode 100644 .changeset/public-streets-turn.md
 delete mode 100644 .changeset/purple-guests-punch.md
 delete mode 100644 .changeset/wise-emus-hunt.md
 delete mode 100644 .changeset/yellow-bobcats-hope.md

diff --git a/.changeset/common-parrots-do.md b/.changeset/common-parrots-do.md
deleted file mode 100644
index d40260f8d1..0000000000
--- a/.changeset/common-parrots-do.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: hydration failing with settled async blocks
diff --git a/.changeset/public-streets-turn.md b/.changeset/public-streets-turn.md
deleted file mode 100644
index ed9ad14241..0000000000
--- a/.changeset/public-streets-turn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: add pointer and touch events to a11y_no_static_element_interactions warning
diff --git a/.changeset/purple-guests-punch.md b/.changeset/purple-guests-punch.md
deleted file mode 100644
index f18a1962d6..0000000000
--- a/.changeset/purple-guests-punch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: handle false dynamic components in SSR
diff --git a/.changeset/wise-emus-hunt.md b/.changeset/wise-emus-hunt.md
deleted file mode 100644
index c8b3f93de8..0000000000
--- a/.changeset/wise-emus-hunt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: avoid unnecessary block effect re-runs after async work completes
diff --git a/.changeset/yellow-bobcats-hope.md b/.changeset/yellow-bobcats-hope.md
deleted file mode 100644
index dffeea3177..0000000000
--- a/.changeset/yellow-bobcats-hope.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: avoid using dev-mode array.includes wrapper on internal array checks
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index e619f55654..762d8721ff 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,19 @@
 # svelte
 
+## 5.48.3
+
+### Patch Changes
+
+- fix: hydration failing with settled async blocks ([#17539](https://github.com/sveltejs/svelte/pull/17539))
+
+- fix: add pointer and touch events to a11y_no_static_element_interactions warning ([#17551](https://github.com/sveltejs/svelte/pull/17551))
+
+- fix: handle false dynamic components in SSR ([#17542](https://github.com/sveltejs/svelte/pull/17542))
+
+- fix: avoid unnecessary block effect re-runs after async work completes ([#17535](https://github.com/sveltejs/svelte/pull/17535))
+
+- fix: avoid using dev-mode array.includes wrapper on internal array checks ([#17536](https://github.com/sveltejs/svelte/pull/17536))
+
 ## 5.48.2
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 7763aba87e..5aa7c92c4e 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.48.2",
+  "version": "5.48.3",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 2b30052317..c9c4c3fc9c 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.48.2';
+export const VERSION = '5.48.3';
 export const PUBLIC_VERSION = '5';

From 83eb9dac64109eb43c906dd5ea73d7b2bdc076a3 Mon Sep 17 00:00:00 2001
From: Tee Ming <chewteeming01@gmail.com>
Date: Tue, 27 Jan 2026 23:50:32 +0800
Subject: [PATCH 325/347] fix: avoid duplicating escaped characters when
 parsing styles (#17554)

* fix and test

* changeset

* format

* increment index and escape early instead
---
 .changeset/true-berries-behave.md                 |  5 +++++
 .../src/compiler/phases/1-parse/read/style.js     |  4 ++++
 packages/svelte/tests/css-parse.test.ts           | 15 +++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 .changeset/true-berries-behave.md

diff --git a/.changeset/true-berries-behave.md b/.changeset/true-berries-behave.md
new file mode 100644
index 0000000000..0b9df87c4f
--- /dev/null
+++ b/.changeset/true-berries-behave.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: avoid duplicating escaped characters in CSS AST
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/style.js b/packages/svelte/src/compiler/phases/1-parse/read/style.js
index c88a3707c1..55647b2c94 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/style.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/style.js
@@ -508,8 +508,12 @@ function read_value(parser) {
 		if (escaped) {
 			value += '\\' + char;
 			escaped = false;
+			parser.index++;
+			continue;
 		} else if (char === '\\') {
 			escaped = true;
+			parser.index++;
+			continue;
 		} else if (char === quote_mark) {
 			quote_mark = null;
 		} else if (char === ')') {
diff --git a/packages/svelte/tests/css-parse.test.ts b/packages/svelte/tests/css-parse.test.ts
index fcb9bdc010..4d8ef8601b 100644
--- a/packages/svelte/tests/css-parse.test.ts
+++ b/packages/svelte/tests/css-parse.test.ts
@@ -135,4 +135,19 @@ describe('parseCss', () => {
 			}
 		}
 	});
+
+	it('parses escaped characters', () => {
+		const ast = parseCss("div { background: url('./example.png?\\''); }");
+		assert.equal(ast.type, 'StyleSheet');
+		assert.equal(ast.children.length, 1);
+		const rule = ast.children[0];
+		assert.equal(rule.type, 'Rule');
+		if (rule.type === 'Rule') {
+			const declaration = rule.block.children[0];
+			assert.equal(declaration.type, 'Declaration');
+			if (declaration.type === 'Declaration') {
+				assert.equal(declaration.value, "url('./example.png?\\'')");
+			}
+		}
+	});
 });

From e9d580ed405ed20315b272ef89efc83d8854be95 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Jan 2026 13:18:43 -0500
Subject: [PATCH 326/347] Version Packages (#17555)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/true-berries-behave.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/true-berries-behave.md

diff --git a/.changeset/true-berries-behave.md b/.changeset/true-berries-behave.md
deleted file mode 100644
index 0b9df87c4f..0000000000
--- a/.changeset/true-berries-behave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: avoid duplicating escaped characters in CSS AST
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 762d8721ff..486e688b5c 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte
 
+## 5.48.4
+
+### Patch Changes
+
+- fix: avoid duplicating escaped characters in CSS AST ([#17554](https://github.com/sveltejs/svelte/pull/17554))
+
 ## 5.48.3
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 5aa7c92c4e..7ca1b569f6 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.48.3",
+  "version": "5.48.4",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index c9c4c3fc9c..fe300a4a43 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.48.3';
+export const VERSION = '5.48.4';
 export const PUBLIC_VERSION = '5';

From 02b5d94b3a692bb12db2054c00a549cd982b0e5a Mon Sep 17 00:00:00 2001
From: David <david@hmnd.io>
Date: Tue, 27 Jan 2026 14:47:47 -0800
Subject: [PATCH 327/347] fix: each block breaking with effects interspersed
 among items (#17550)

* fix: each block breaking with effects interspersed among items

* test sample with interspersed non-branch effects

* Apply suggestion from @Rich-Harris

* use $effect.pre in sample instead

---------

Co-authored-by: Rich Harris <hello@rich-harris.dev>
---
 .changeset/thirty-carpets-attack.md           |  5 +++
 .../src/internal/client/dom/blocks/each.js    | 24 ++++++++---
 .../each-non-branch-effects/_config.js        | 43 +++++++++++++++++++
 .../each-non-branch-effects/main.svelte       | 30 +++++++++++++
 4 files changed, 96 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/thirty-carpets-attack.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-non-branch-effects/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-non-branch-effects/main.svelte

diff --git a/.changeset/thirty-carpets-attack.md b/.changeset/thirty-carpets-attack.md
new file mode 100644
index 0000000000..6b3949989a
--- /dev/null
+++ b/.changeset/thirty-carpets-attack.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: each block breaking with effects interspersed among items
diff --git a/packages/svelte/src/internal/client/dom/blocks/each.js b/packages/svelte/src/internal/client/dom/blocks/each.js
index f7c9faf2b1..232656ec11 100644
--- a/packages/svelte/src/internal/client/dom/blocks/each.js
+++ b/packages/svelte/src/internal/client/dom/blocks/each.js
@@ -34,7 +34,7 @@ import {
 } from '../../reactivity/effects.js';
 import { source, mutable_source, internal_set } from '../../reactivity/sources.js';
 import { array_from, is_array } from '../../../shared/utils.js';
-import { COMMENT_NODE, EFFECT_OFFSCREEN, INERT } from '#client/constants';
+import { BRANCH_EFFECT, COMMENT_NODE, EFFECT_OFFSCREEN, INERT } from '#client/constants';
 import { queue_micro_task } from '../task.js';
 import { get } from '../../runtime.js';
 import { DEV } from 'esm-env';
@@ -336,6 +336,18 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
 	}
 }
 
+/**
+ * Skip past any non-branch effects (which could be created with `createSubscriber`, for example) to find the next branch effect
+ * @param {Effect | null} effect
+ * @returns {Effect | null}
+ */
+function skip_to_branch(effect) {
+	while (effect !== null && (effect.f & BRANCH_EFFECT) === 0) {
+		effect = effect.next;
+	}
+	return effect;
+}
+
 /**
  * Add, remove, or reorder items output by an each block as its input changes
  * @template V
@@ -351,7 +363,7 @@ function reconcile(state, array, anchor, flags, get_key) {
 
 	var length = array.length;
 	var items = state.items;
-	var current = state.effect.first;
+	var current = skip_to_branch(state.effect.first);
 
 	/** @type {undefined | Set<Effect>} */
 	var seen;
@@ -431,7 +443,7 @@ function reconcile(state, array, anchor, flags, get_key) {
 				matched = [];
 				stashed = [];
 
-				current = prev.next;
+				current = skip_to_branch(prev.next);
 				continue;
 			}
 		}
@@ -495,7 +507,7 @@ function reconcile(state, array, anchor, flags, get_key) {
 			while (current !== null && current !== effect) {
 				(seen ??= new Set()).add(current);
 				stashed.push(current);
-				current = current.next;
+				current = skip_to_branch(current.next);
 			}
 
 			if (current === null) {
@@ -508,7 +520,7 @@ function reconcile(state, array, anchor, flags, get_key) {
 		}
 
 		prev = effect;
-		current = effect.next;
+		current = skip_to_branch(effect.next);
 	}
 
 	if (state.outrogroups !== null) {
@@ -542,7 +554,7 @@ function reconcile(state, array, anchor, flags, get_key) {
 				to_destroy.push(current);
 			}
 
-			current = current.next;
+			current = skip_to_branch(current.next);
 		}
 
 		var destroy_length = to_destroy.length;
diff --git a/packages/svelte/tests/runtime-runes/samples/each-non-branch-effects/_config.js b/packages/svelte/tests/runtime-runes/samples/each-non-branch-effects/_config.js
new file mode 100644
index 0000000000..acf84f6809
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-non-branch-effects/_config.js
@@ -0,0 +1,43 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target }) {
+		const addBtn = /** @type {HTMLElement} */ (target.querySelector('button.add'));
+		const removeBtn = /** @type {HTMLElement} */ (target.querySelector('button.remove'));
+
+		const btnHtml = '<button class="add">add</button><button class="remove">remove</button>';
+
+		assert.htmlEqual(target.innerHTML, btnHtml);
+
+		addBtn.click();
+		flushSync();
+
+		assert.htmlEqual(target.innerHTML, `<span>1</span>${btnHtml}`);
+
+		addBtn.click();
+		flushSync();
+
+		assert.htmlEqual(target.innerHTML, `<span>1</span><span>2</span>${btnHtml}`);
+
+		addBtn.click();
+		flushSync();
+
+		assert.htmlEqual(target.innerHTML, `<span>1</span><span>2</span><span>3</span>${btnHtml}`);
+
+		removeBtn.click();
+		flushSync();
+
+		assert.htmlEqual(target.innerHTML, `<span>1</span><span>2</span>${btnHtml}`);
+
+		removeBtn.click();
+		flushSync();
+
+		assert.htmlEqual(target.innerHTML, `<span>1</span>${btnHtml}`);
+
+		addBtn.click();
+		flushSync();
+
+		assert.htmlEqual(target.innerHTML, `<span>1</span><span>2</span>${btnHtml}`);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/each-non-branch-effects/main.svelte b/packages/svelte/tests/runtime-runes/samples/each-non-branch-effects/main.svelte
new file mode 100644
index 0000000000..7869d095dd
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-non-branch-effects/main.svelte
@@ -0,0 +1,30 @@
+<script>
+	let items = $state([]);
+
+	const proxy = new Proxy(items, {
+		get: (target, prop) => {
+			try {
+				$effect.pre(() => {
+					return () => {};
+				});
+			} catch {}
+
+			return Reflect.get(target, prop);
+		}
+	});
+
+	function add() {
+		items.push(items.length + 1);
+	}
+
+	function remove() {
+		items.pop();
+	}
+</script>
+
+{#each proxy as item}
+	<span>{item}</span>
+{/each}
+
+<button class="add" onclick={add}>add</button>
+<button class="remove" onclick={remove}>remove</button>

From 8c8a22add47693e9e2c9b1e7bfedd4dd4cf56469 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 27 Jan 2026 19:06:24 -0500
Subject: [PATCH 328/347] fix: prevent unintended exports from namespaces
 (#17562)

---
 .changeset/stale-words-count.md  |  5 +++++
 packages/svelte/src/ambient.d.ts | 21 +++++++++++++++++++++
 packages/svelte/types/index.d.ts | 21 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 .changeset/stale-words-count.md

diff --git a/.changeset/stale-words-count.md b/.changeset/stale-words-count.md
new file mode 100644
index 0000000000..d8d8c3102e
--- /dev/null
+++ b/.changeset/stale-words-count.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: prevent unintended exports from namespaces
diff --git a/packages/svelte/src/ambient.d.ts b/packages/svelte/src/ambient.d.ts
index 823dbde9a4..ec5b799470 100644
--- a/packages/svelte/src/ambient.d.ts
+++ b/packages/svelte/src/ambient.d.ts
@@ -173,6 +173,9 @@ declare namespace $state {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -230,6 +233,9 @@ declare namespace $derived {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -346,6 +352,9 @@ declare namespace $effect {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -389,6 +398,9 @@ declare namespace $props {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -423,6 +435,9 @@ declare namespace $bindable {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -485,6 +500,9 @@ declare namespace $inspect {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -529,4 +547,7 @@ declare namespace $host {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 9e569126bb..128de134ed 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -3345,6 +3345,9 @@ declare namespace $state {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -3402,6 +3405,9 @@ declare namespace $derived {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -3518,6 +3524,9 @@ declare namespace $effect {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -3561,6 +3570,9 @@ declare namespace $props {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -3595,6 +3607,9 @@ declare namespace $bindable {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -3657,6 +3672,9 @@ declare namespace $inspect {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 /**
@@ -3701,6 +3719,9 @@ declare namespace $host {
 	export const prototype: never;
 	/** @deprecated */
 	export const toString: never;
+
+	// needed to keep private stuff private
+	export {};
 }
 
 //# sourceMappingURL=index.d.ts.map

From 30cea1f9a0cbf41f466083f9761a8f4d544d700a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 27 Jan 2026 19:16:59 -0500
Subject: [PATCH 329/347] fix: run boundary `onerror` callbacks in a microtask,
 in case they result in the boundary's destruction (#17561)

* fix: mark parent effect as dirty on error boundary initialization

This change ensures that if an error occurs while a parent effect is still initializing, the parent effect is marked as dirty and scheduled to re-run. This addresses scenarios where state updates in the onerror handler do not trigger a re-evaluation of the condition, improving error handling in Svelte components.

* chore: add changeset for #17553

* fix: run boundary  callbacks in a microtask, in case they result in the boundary's destruction

---------

Co-authored-by: frozenflux2 <snowflake30518@gmail.com>
---
 .changeset/fix-if-block-boundary-onerror.md   |  5 ++++
 .../internal/client/dom/blocks/boundary.js    | 28 ++++++++-----------
 .../samples/error-boundary-24/Child.svelte    |  5 ++++
 .../samples/error-boundary-24/_config.js      | 13 +++++++++
 .../samples/error-boundary-24/main.svelte     | 19 +++++++++++++
 .../samples/error-boundary-25/Child.svelte    |  8 ++++++
 .../samples/error-boundary-25/_config.js      | 13 +++++++++
 .../samples/error-boundary-25/main.svelte     | 19 +++++++++++++
 8 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/fix-if-block-boundary-onerror.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/error-boundary-24/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/error-boundary-24/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/error-boundary-24/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/error-boundary-25/Child.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/error-boundary-25/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/error-boundary-25/main.svelte

diff --git a/.changeset/fix-if-block-boundary-onerror.md b/.changeset/fix-if-block-boundary-onerror.md
new file mode 100644
index 0000000000..608dce6814
--- /dev/null
+++ b/.changeset/fix-if-block-boundary-onerror.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: run boundary `onerror` callbacks in a microtask, in case they result in the boundary's destruction
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 90a695551a..ef5f0e116d 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -1,5 +1,6 @@
 /** @import { Effect, Source, TemplateNode, } from '#client' */
 import {
+	BLOCK_EFFECT,
 	BOUNDARY_EFFECT,
 	COMMENT_NODE,
 	DIRTY,
@@ -449,21 +450,16 @@ export class Boundary {
 			}
 		};
 
-		var previous_reaction = active_reaction;
-
-		try {
-			set_active_reaction(null);
-			calling_on_error = true;
-			onerror?.(error, reset);
-			calling_on_error = false;
-		} catch (error) {
-			invoke_error_boundary(error, this.#effect && this.#effect.parent);
-		} finally {
-			set_active_reaction(previous_reaction);
-		}
+		queue_micro_task(() => {
+			try {
+				calling_on_error = true;
+				onerror?.(error, reset);
+				calling_on_error = false;
+			} catch (error) {
+				invoke_error_boundary(error, this.#effect && this.#effect.parent);
+			}
 
-		if (failed) {
-			queue_micro_task(() => {
+			if (failed) {
 				this.#failed_effect = this.#run(() => {
 					Batch.ensure();
 					this.#is_creating_fallback = true;
@@ -483,8 +479,8 @@ export class Boundary {
 						this.#is_creating_fallback = false;
 					}
 				});
-			});
-		}
+			}
+		});
 	}
 }
 
diff --git a/packages/svelte/tests/runtime-runes/samples/error-boundary-24/Child.svelte b/packages/svelte/tests/runtime-runes/samples/error-boundary-24/Child.svelte
new file mode 100644
index 0000000000..cd25ece1b5
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/error-boundary-24/Child.svelte
@@ -0,0 +1,5 @@
+<script>
+	throw new Error('child error');
+</script>
+
+<p>Child content</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/error-boundary-24/_config.js b/packages/svelte/tests/runtime-runes/samples/error-boundary-24/_config.js
new file mode 100644
index 0000000000..b5b5f296d8
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/error-boundary-24/_config.js
@@ -0,0 +1,13 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client'],
+	test({ assert, target }) {
+		flushSync();
+
+		// When exception is set by onerror, the {#if !exception} block should hide
+		// and only the {#if exception} block should be visible
+		assert.htmlEqual(target.innerHTML, '<p>caught error: child error</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/error-boundary-24/main.svelte b/packages/svelte/tests/runtime-runes/samples/error-boundary-24/main.svelte
new file mode 100644
index 0000000000..5116580003
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/error-boundary-24/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	import Child from './Child.svelte';
+
+	let exception = $state();
+	const onerror = (e) => {
+		exception = e;
+	};
+</script>
+
+{#if !exception}
+	<p>condition is {String(!exception)}</p>
+	<svelte:boundary {onerror}>
+		<Child />
+	</svelte:boundary>
+{/if}
+
+{#if exception}
+	<p>caught error: {exception.message}</p>
+{/if}
diff --git a/packages/svelte/tests/runtime-runes/samples/error-boundary-25/Child.svelte b/packages/svelte/tests/runtime-runes/samples/error-boundary-25/Child.svelte
new file mode 100644
index 0000000000..3d5770fc61
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/error-boundary-25/Child.svelte
@@ -0,0 +1,8 @@
+<script>
+	// it's important for the test that this isn't an `Error`
+	throw 'child error'
+</script>
+
+<p>
+	boom
+</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/error-boundary-25/_config.js b/packages/svelte/tests/runtime-runes/samples/error-boundary-25/_config.js
new file mode 100644
index 0000000000..b5b5f296d8
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/error-boundary-25/_config.js
@@ -0,0 +1,13 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	mode: ['client'],
+	test({ assert, target }) {
+		flushSync();
+
+		// When exception is set by onerror, the {#if !exception} block should hide
+		// and only the {#if exception} block should be visible
+		assert.htmlEqual(target.innerHTML, '<p>caught error: child error</p>');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/error-boundary-25/main.svelte b/packages/svelte/tests/runtime-runes/samples/error-boundary-25/main.svelte
new file mode 100644
index 0000000000..243d10cf3a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/error-boundary-25/main.svelte
@@ -0,0 +1,19 @@
+<script>
+	import Child from './Child.svelte';
+
+	let exception = $state();
+	const onerror = (e) => {
+		exception = e;
+	};
+</script>
+
+{#if !exception}
+	<p>condition is {String(!exception)}</p>
+	<svelte:boundary {onerror}>
+		<Child />
+	</svelte:boundary>
+{/if}
+
+{#if exception}
+	<p>caught error: {exception}</p>
+{/if}

From 3d285f0ee4771ff3e0476cdb1de8b1ab6a41c473 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 Jan 2026 19:25:42 -0500
Subject: [PATCH 330/347] Version Packages (#17560)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/fix-if-block-boundary-onerror.md |  5 -----
 .changeset/stale-words-count.md             |  5 -----
 .changeset/thirty-carpets-attack.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/fix-if-block-boundary-onerror.md
 delete mode 100644 .changeset/stale-words-count.md
 delete mode 100644 .changeset/thirty-carpets-attack.md

diff --git a/.changeset/fix-if-block-boundary-onerror.md b/.changeset/fix-if-block-boundary-onerror.md
deleted file mode 100644
index 608dce6814..0000000000
--- a/.changeset/fix-if-block-boundary-onerror.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: run boundary `onerror` callbacks in a microtask, in case they result in the boundary's destruction
diff --git a/.changeset/stale-words-count.md b/.changeset/stale-words-count.md
deleted file mode 100644
index d8d8c3102e..0000000000
--- a/.changeset/stale-words-count.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: prevent unintended exports from namespaces
diff --git a/.changeset/thirty-carpets-attack.md b/.changeset/thirty-carpets-attack.md
deleted file mode 100644
index 6b3949989a..0000000000
--- a/.changeset/thirty-carpets-attack.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: each block breaking with effects interspersed among items
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index 486e688b5c..af503dbb20 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,15 @@
 # svelte
 
+## 5.48.5
+
+### Patch Changes
+
+- fix: run boundary `onerror` callbacks in a microtask, in case they result in the boundary's destruction ([#17561](https://github.com/sveltejs/svelte/pull/17561))
+
+- fix: prevent unintended exports from namespaces ([#17562](https://github.com/sveltejs/svelte/pull/17562))
+
+- fix: each block breaking with effects interspersed among items ([#17550](https://github.com/sveltejs/svelte/pull/17550))
+
 ## 5.48.4
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 7ca1b569f6..ace4c9bd08 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.48.4",
+  "version": "5.48.5",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index fe300a4a43..4338ba83ae 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.48.4';
+export const VERSION = '5.48.5';
 export const PUBLIC_VERSION = '5';

From 0cbf718aefd458953c84b8a9210c6fd1d2774d28 Mon Sep 17 00:00:00 2001
From: Bladesheng <keadr23@gmail.com>
Date: Wed, 28 Jan 2026 01:37:26 +0100
Subject: [PATCH 331/347] feat: allow passing `ShadowRootInit` to custom
 element `shadow` options (#17088)

* feat: allow passing ShadowRootInit to custom element shadow options

* tests

* add changeset

* update docs

* allow passing functions

* remove newline

* update docs

* fix test

* update docs

* simplify options reading

* remove the option to pass function to `shadow`

* fix whitespace

* fix whitespace

* fix generated types

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/loose-sloths-guess.md              |  5 +++++
 .../docs/07-misc/04-custom-elements.md        | 11 ++++++++--
 .../98-reference/.generated/compile-errors.md |  6 ++++--
 packages/svelte/elements.d.ts                 |  2 +-
 .../messages/compile-errors/template.md       |  6 ++++--
 packages/svelte/src/compiler/errors.js        |  8 +++----
 .../compiler/phases/1-parse/read/options.js   | 10 +++++----
 .../3-transform/client/transform-client.js    | 13 ++++++++++--
 .../svelte/src/compiler/types/template.d.ts   |  2 +-
 .../client/dom/elements/custom-element.js     | 21 ++++++++++++-------
 .../closed-shadow-dom/_config.js              | 13 ++++++++++++
 .../closed-shadow-dom/main.svelte             |  3 +++
 .../shadow-root-init-options/_config.js       | 18 ++++++++++++++++
 .../shadow-root-init-options/main.svelte      | 14 +++++++++++++
 .../samples/tag-non-string/errors.json        |  2 +-
 packages/svelte/types/index.d.ts              |  2 +-
 16 files changed, 108 insertions(+), 28 deletions(-)
 create mode 100644 .changeset/loose-sloths-guess.md
 create mode 100644 packages/svelte/tests/runtime-browser/custom-elements-samples/closed-shadow-dom/_config.js
 create mode 100644 packages/svelte/tests/runtime-browser/custom-elements-samples/closed-shadow-dom/main.svelte
 create mode 100644 packages/svelte/tests/runtime-browser/custom-elements-samples/shadow-root-init-options/_config.js
 create mode 100644 packages/svelte/tests/runtime-browser/custom-elements-samples/shadow-root-init-options/main.svelte

diff --git a/.changeset/loose-sloths-guess.md b/.changeset/loose-sloths-guess.md
new file mode 100644
index 0000000000..450040349d
--- /dev/null
+++ b/.changeset/loose-sloths-guess.md
@@ -0,0 +1,5 @@
+---
+'svelte': minor
+---
+
+feat: allow passing `ShadowRootInit` object to custom element `shadow` option
diff --git a/documentation/docs/07-misc/04-custom-elements.md b/documentation/docs/07-misc/04-custom-elements.md
index 4e5afff7d2..4c2cb3aca3 100644
--- a/documentation/docs/07-misc/04-custom-elements.md
+++ b/documentation/docs/07-misc/04-custom-elements.md
@@ -66,7 +66,10 @@ The inner Svelte component is destroyed in the next tick after the `disconnected
 When constructing a custom element, you can tailor several aspects by defining `customElement` as an object within `<svelte:options>` since Svelte 4. This object may contain the following properties:
 
 - `tag: string`: an optional `tag` property for the custom element's name. If set, a custom element with this tag name will be defined with the document's `customElements` registry upon importing this component.
-- `shadow`: an optional property that can be set to `"none"` to forgo shadow root creation. Note that styles are then no longer encapsulated, and you can't use slots
+- `shadow`: an optional property to modify shadow root properties. It accepts the following values:
+  - `"none"`: No shadow root is created. Note that styles are then no longer encapsulated, and you can't use slots.
+  - `"open"`: Shadow root is created with the `mode: "open"` option.
+  - [`ShadowRootInit`](https://developer.mozilla.org/en-US/docs/Web/API/Element/attachShadow#options): You can pass a settings object that will be passed to `attachShadow()` when shadow root is created.
 - `props`: an optional property to modify certain details and behaviors of your component's properties. It offers the following settings:
   - `attribute: string`: To update a custom element's prop, you have two alternatives: either set the property on the custom element's reference as illustrated above or use an HTML attribute. For the latter, the default attribute name is the lowercase property name. Modify this by assigning `attribute: "<desired name>"`.
   - `reflect: boolean`: By default, updated prop values do not reflect back to the DOM. To enable this behavior, set `reflect: true`.
@@ -78,7 +81,11 @@ When constructing a custom element, you can tailor several aspects by defining `
 <svelte:options
 	customElement={{
 		tag: 'custom-element',
-		shadow: 'none',
+		shadow: {
+			mode: import.meta.env.DEV ? 'open' : 'closed',
+			clonable: true,
+			// ...
+		},
 		props: {
 			name: { reflect: true, type: 'Number', attribute: 'element-index' }
 		},
diff --git a/documentation/docs/98-reference/.generated/compile-errors.md b/documentation/docs/98-reference/.generated/compile-errors.md
index ff452cc674..079b1d2a0a 100644
--- a/documentation/docs/98-reference/.generated/compile-errors.md
+++ b/documentation/docs/98-reference/.generated/compile-errors.md
@@ -1102,7 +1102,7 @@ Value must be %list%, if specified
 ### svelte_options_invalid_customelement
 
 ```
-"customElement" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
+"customElement" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: "open" | "none" | `ShadowRootInit`; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
 ```
 
 ### svelte_options_invalid_customelement_props
@@ -1114,9 +1114,11 @@ Value must be %list%, if specified
 ### svelte_options_invalid_customelement_shadow
 
 ```
-"shadow" must be either "open" or "none"
+"shadow" must be either "open", "none" or `ShadowRootInit` object.
 ```
 
+See https://developer.mozilla.org/en-US/docs/Web/API/Element/attachShadow#options for more information on valid shadow root constructor options
+
 ### svelte_options_invalid_tagname
 
 ```
diff --git a/packages/svelte/elements.d.ts b/packages/svelte/elements.d.ts
index 4dba2c5c32..fa74124472 100644
--- a/packages/svelte/elements.d.ts
+++ b/packages/svelte/elements.d.ts
@@ -2062,7 +2062,7 @@ export interface SvelteHTMLElements {
 			| undefined
 			| {
 					tag?: string;
-					shadow?: 'open' | 'none' | undefined;
+					shadow?: 'open' | 'none' | ShadowRootInit | undefined;
 					props?:
 						| Record<
 								string,
diff --git a/packages/svelte/messages/compile-errors/template.md b/packages/svelte/messages/compile-errors/template.md
index 086b9e8b25..bd07955bc3 100644
--- a/packages/svelte/messages/compile-errors/template.md
+++ b/packages/svelte/messages/compile-errors/template.md
@@ -411,7 +411,7 @@ HTML restricts where certain elements can appear. In case of a violation the bro
 
 ## svelte_options_invalid_customelement
 
-> "customElement" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
+> "customElement" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: "open" | "none" | `ShadowRootInit`; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
 
 ## svelte_options_invalid_customelement_props
 
@@ -419,7 +419,9 @@ HTML restricts where certain elements can appear. In case of a violation the bro
 
 ## svelte_options_invalid_customelement_shadow
 
-> "shadow" must be either "open" or "none"
+> "shadow" must be either "open", "none" or `ShadowRootInit` object.
+
+See https://developer.mozilla.org/en-US/docs/Web/API/Element/attachShadow#options for more information on valid shadow root constructor options
 
 ## svelte_options_invalid_tagname
 
diff --git a/packages/svelte/src/compiler/errors.js b/packages/svelte/src/compiler/errors.js
index 990b643e68..3997dbec32 100644
--- a/packages/svelte/src/compiler/errors.js
+++ b/packages/svelte/src/compiler/errors.js
@@ -1550,12 +1550,12 @@ export function svelte_options_invalid_attribute_value(node, list) {
 }
 
 /**
- * "customElement" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
+ * "customElement" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: "open" | "none" | `ShadowRootInit`; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
 export function svelte_options_invalid_customelement(node) {
-	e(node, 'svelte_options_invalid_customelement', `"customElement" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: "open" | "none"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }\nhttps://svelte.dev/e/svelte_options_invalid_customelement`);
+	e(node, 'svelte_options_invalid_customelement', `"customElement" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: "open" | "none" | \`ShadowRootInit\`; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }\nhttps://svelte.dev/e/svelte_options_invalid_customelement`);
 }
 
 /**
@@ -1568,12 +1568,12 @@ export function svelte_options_invalid_customelement_props(node) {
 }
 
 /**
- * "shadow" must be either "open" or "none"
+ * "shadow" must be either "open", "none" or `ShadowRootInit` object.
  * @param {null | number | NodeLike} node
  * @returns {never}
  */
 export function svelte_options_invalid_customelement_shadow(node) {
-	e(node, 'svelte_options_invalid_customelement_shadow', `"shadow" must be either "open" or "none"\nhttps://svelte.dev/e/svelte_options_invalid_customelement_shadow`);
+	e(node, 'svelte_options_invalid_customelement_shadow', `"shadow" must be either "open", "none" or \`ShadowRootInit\` object.\nhttps://svelte.dev/e/svelte_options_invalid_customelement_shadow`);
 }
 
 /**
diff --git a/packages/svelte/src/compiler/phases/1-parse/read/options.js b/packages/svelte/src/compiler/phases/1-parse/read/options.js
index a36e101468..2677fb3b61 100644
--- a/packages/svelte/src/compiler/phases/1-parse/read/options.js
+++ b/packages/svelte/src/compiler/phases/1-parse/read/options.js
@@ -133,11 +133,13 @@ export default function read_options(node) {
 
 				const shadow = properties.find(([name]) => name === 'shadow')?.[1];
 				if (shadow) {
-					const shadowdom = shadow?.value;
-					if (shadowdom !== 'open' && shadowdom !== 'none') {
-						e.svelte_options_invalid_customelement_shadow(shadow);
+					if (shadow.type === 'Literal' && (shadow.value === 'open' || shadow.value === 'none')) {
+						ce.shadow = shadow.value;
+					} else if (shadow.type === 'ObjectExpression') {
+						ce.shadow = shadow;
+					} else {
+						e.svelte_options_invalid_customelement_shadow(attribute);
 					}
-					ce.shadow = shadowdom;
 				}
 
 				const extend = properties.find(([name]) => name === 'extend')?.[1];
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 fc202f1bc2..d5ce3caaa9 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
@@ -638,7 +638,16 @@ export function client_component(analysis, options) {
 		const accessors_str = b.array(
 			analysis.exports.map(({ name, alias }) => b.literal(alias ?? name))
 		);
-		const use_shadow_dom = typeof ce === 'boolean' || ce.shadow !== 'none' ? true : false;
+
+		/** @type {ESTree.ObjectExpression | undefined} */
+		let shadow_root_init;
+		if (typeof ce === 'boolean' || ce.shadow === 'open' || ce.shadow === undefined) {
+			shadow_root_init = b.object([b.init('mode', b.literal('open'))]);
+		} else if (ce.shadow === 'none') {
+			shadow_root_init = undefined;
+		} else {
+			shadow_root_init = ce.shadow;
+		}
 
 		const create_ce = b.call(
 			'$.create_custom_element',
@@ -646,7 +655,7 @@ export function client_component(analysis, options) {
 			b.object(props_str),
 			slots_str,
 			accessors_str,
-			b.literal(use_shadow_dom),
+			shadow_root_init,
 			/** @type {any} */ (typeof ce !== 'boolean' ? ce.extend : undefined)
 		);
 
diff --git a/packages/svelte/src/compiler/types/template.d.ts b/packages/svelte/src/compiler/types/template.d.ts
index b529a2dda9..b924406d0f 100644
--- a/packages/svelte/src/compiler/types/template.d.ts
+++ b/packages/svelte/src/compiler/types/template.d.ts
@@ -87,7 +87,7 @@ export namespace AST {
 		css?: 'injected';
 		customElement?: {
 			tag?: string;
-			shadow?: 'open' | 'none';
+			shadow?: 'open' | 'none' | ObjectExpression | undefined;
 			props?: Record<
 				string,
 				{
diff --git a/packages/svelte/src/internal/client/dom/elements/custom-element.js b/packages/svelte/src/internal/client/dom/elements/custom-element.js
index 2d118bfab3..40d3d68ec0 100644
--- a/packages/svelte/src/internal/client/dom/elements/custom-element.js
+++ b/packages/svelte/src/internal/client/dom/elements/custom-element.js
@@ -35,18 +35,23 @@ if (typeof HTMLElement === 'function') {
 		$$l_u = new Map();
 		/** @type {any} The managed render effect for reflecting attributes */
 		$$me;
+		/** @type {ShadowRoot | null} The ShadowRoot of the custom element */
+		$$shadowRoot = null;
 
 		/**
 		 * @param {*} $$componentCtor
 		 * @param {*} $$slots
-		 * @param {*} use_shadow_dom
+		 * @param {ShadowRootInit | undefined} shadow_root_init
 		 */
-		constructor($$componentCtor, $$slots, use_shadow_dom) {
+		constructor($$componentCtor, $$slots, shadow_root_init) {
 			super();
 			this.$$ctor = $$componentCtor;
 			this.$$s = $$slots;
-			if (use_shadow_dom) {
-				this.attachShadow({ mode: 'open' });
+
+			if (shadow_root_init) {
+				// We need to store the reference to shadow root, because `closed` shadow root cannot be
+				// accessed with `this.shadowRoot`.
+				this.$$shadowRoot = this.attachShadow(shadow_root_init);
 			}
 		}
 
@@ -136,7 +141,7 @@ if (typeof HTMLElement === 'function') {
 				}
 				this.$$c = createClassComponent({
 					component: this.$$ctor,
-					target: this.shadowRoot || this,
+					target: this.$$shadowRoot || this,
 					props: {
 						...this.$$d,
 						$$slots,
@@ -277,7 +282,7 @@ function get_custom_elements_slots(element) {
  * @param {Record<string, CustomElementPropDefinition>} props_definition  The props to observe
  * @param {string[]} slots  The slots to create
  * @param {string[]} exports  Explicitly exported values, other than props
- * @param {boolean} use_shadow_dom  Whether to use shadow DOM
+ * @param {ShadowRootInit | undefined} shadow_root_init  Options passed to shadow DOM constructor
  * @param {(ce: new () => HTMLElement) => new () => HTMLElement} [extend]
  */
 export function create_custom_element(
@@ -285,12 +290,12 @@ export function create_custom_element(
 	props_definition,
 	slots,
 	exports,
-	use_shadow_dom,
+	shadow_root_init,
 	extend
 ) {
 	let Class = class extends SvelteElement {
 		constructor() {
-			super(Component, slots, use_shadow_dom);
+			super(Component, slots, shadow_root_init);
 			this.$$p_d = props_definition;
 		}
 		static get observedAttributes() {
diff --git a/packages/svelte/tests/runtime-browser/custom-elements-samples/closed-shadow-dom/_config.js b/packages/svelte/tests/runtime-browser/custom-elements-samples/closed-shadow-dom/_config.js
new file mode 100644
index 0000000000..9e09967dab
--- /dev/null
+++ b/packages/svelte/tests/runtime-browser/custom-elements-samples/closed-shadow-dom/_config.js
@@ -0,0 +1,13 @@
+import { test } from '../../assert';
+const tick = () => Promise.resolve();
+
+export default test({
+	async test({ assert, target }) {
+		target.innerHTML = '<custom-element></custom-element>';
+		await tick();
+
+		const el = target.querySelector('custom-element');
+
+		assert.equal(el.shadowRoot, null);
+	}
+});
diff --git a/packages/svelte/tests/runtime-browser/custom-elements-samples/closed-shadow-dom/main.svelte b/packages/svelte/tests/runtime-browser/custom-elements-samples/closed-shadow-dom/main.svelte
new file mode 100644
index 0000000000..93744481b3
--- /dev/null
+++ b/packages/svelte/tests/runtime-browser/custom-elements-samples/closed-shadow-dom/main.svelte
@@ -0,0 +1,3 @@
+<svelte:options customElement={{ tag: "custom-element", shadow: { mode: 'closed' } }} />
+
+<h1>Hello world!</h1>
diff --git a/packages/svelte/tests/runtime-browser/custom-elements-samples/shadow-root-init-options/_config.js b/packages/svelte/tests/runtime-browser/custom-elements-samples/shadow-root-init-options/_config.js
new file mode 100644
index 0000000000..106d27929e
--- /dev/null
+++ b/packages/svelte/tests/runtime-browser/custom-elements-samples/shadow-root-init-options/_config.js
@@ -0,0 +1,18 @@
+import { test } from '../../assert';
+const tick = () => Promise.resolve();
+
+export default test({
+	async test({ assert, target }) {
+		target.innerHTML = '<custom-element></custom-element>';
+		await tick();
+
+		/** @type {ShadowRoot} */
+		const shadowRoot = target.querySelector('custom-element').shadowRoot;
+
+		assert.equal(shadowRoot.mode, 'open');
+		assert.equal(shadowRoot.clonable, true);
+		assert.equal(shadowRoot.delegatesFocus, true);
+		assert.equal(shadowRoot.serializable, true);
+		assert.equal(shadowRoot.slotAssignment, 'manual');
+	}
+});
diff --git a/packages/svelte/tests/runtime-browser/custom-elements-samples/shadow-root-init-options/main.svelte b/packages/svelte/tests/runtime-browser/custom-elements-samples/shadow-root-init-options/main.svelte
new file mode 100644
index 0000000000..25d69d7ef9
--- /dev/null
+++ b/packages/svelte/tests/runtime-browser/custom-elements-samples/shadow-root-init-options/main.svelte
@@ -0,0 +1,14 @@
+<svelte:options
+	customElement={{
+		tag: 'custom-element',
+		shadow: {
+			mode: 'open',
+			clonable: true,
+			delegatesFocus: true,
+			serializable: true,
+			slotAssignment: 'manual',
+		},
+	}}
+/>
+
+<h1>Hello world!</h1>
diff --git a/packages/svelte/tests/validator/samples/tag-non-string/errors.json b/packages/svelte/tests/validator/samples/tag-non-string/errors.json
index 71f8df4d00..5473e18b7d 100644
--- a/packages/svelte/tests/validator/samples/tag-non-string/errors.json
+++ b/packages/svelte/tests/validator/samples/tag-non-string/errors.json
@@ -1,7 +1,7 @@
 [
 	{
 		"code": "svelte_options_invalid_customelement",
-		"message": "\"customElement\" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: \"open\" | \"none\"; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }",
+		"message": "\"customElement\" must be a string literal defining a valid custom element name or an object of the form { tag?: string; shadow?: \"open\" | \"none\" | `ShadowRootInit`; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }",
 		"start": {
 			"line": 1,
 			"column": 16
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
index 128de134ed..730e0ff655 100644
--- a/packages/svelte/types/index.d.ts
+++ b/packages/svelte/types/index.d.ts
@@ -1234,7 +1234,7 @@ declare module 'svelte/compiler' {
 			css?: 'injected';
 			customElement?: {
 				tag?: string;
-				shadow?: 'open' | 'none';
+				shadow?: 'open' | 'none' | ObjectExpression | undefined;
 				props?: Record<
 					string,
 					{

From 975a5ec60a8541bcc02197d38cd2b5e4765c6b07 Mon Sep 17 00:00:00 2001
From: "Dominik G." <dominik.goepel@gmx.de>
Date: Wed, 28 Jan 2026 01:38:24 +0100
Subject: [PATCH 332/347] fix invalid negative values in sourcemap column
 indexes (#17167)

* add check for negative idx to sourcemaps test

* fix: format

* Update packages/svelte/tests/sourcemaps/test.ts

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 packages/svelte/tests/sourcemaps/test.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/svelte/tests/sourcemaps/test.ts b/packages/svelte/tests/sourcemaps/test.ts
index c654258b34..0ac0e6f905 100644
--- a/packages/svelte/tests/sourcemaps/test.ts
+++ b/packages/svelte/tests/sourcemaps/test.ts
@@ -96,6 +96,20 @@ const { test, run } = suite<SourcemapTest>(async (config, cwd) => {
 
 		const decoded = decode(map.mappings);
 
+		/*
+		Decoded sourcemap mappings contain absolute line/column numbers.
+		Negative values are invalid and can cause errors in downstream processing
+		*/
+		for (let l = 0; l < decoded.length; l++) {
+			for (let m of decoded[l]) {
+				if (m.some((i) => i < 0)) {
+					throw new Error(
+						`Invalid mapping with negative value ${JSON.stringify(m)} at line ${l} of the decoded mappings of ${info} sourcemap\n${JSON.stringify(map)}`
+					);
+				}
+			}
+		}
+
 		try {
 			for (let entry of entries) {
 				entry = typeof entry === 'string' ? { str: entry } : entry;

From 123c48d38d1a0cab292a5c98da048fb886a6005b Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Wed, 28 Jan 2026 03:15:42 +0100
Subject: [PATCH 333/347] chore: give download.js script ability to download
 from stackblitz/github (#17549)

* chore: give download.js script ability to download from stackblitz/github

...including a very simple SvelteKit-detection + transformation to simple Svelte (or error if not possible)

* format
---
 playgrounds/sandbox/scripts/download.js | 666 ++++++++++++++++++++++--
 1 file changed, 630 insertions(+), 36 deletions(-)

diff --git a/playgrounds/sandbox/scripts/download.js b/playgrounds/sandbox/scripts/download.js
index b5eaeaa8f5..b0bad54e73 100644
--- a/playgrounds/sandbox/scripts/download.js
+++ b/playgrounds/sandbox/scripts/download.js
@@ -1,6 +1,8 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { parseArgs } from 'node:util';
+import { execSync } from 'node:child_process';
+import { chromium } from 'playwright';
 
 const { values, positionals } = parseArgs({
 	options: {
@@ -19,53 +21,639 @@ if (!url_arg) {
 	process.exit(1);
 }
 
-/** @type {URL} */
-let url;
+const base_dir = import.meta.dirname;
 
-try {
-	url = new URL(url_arg);
-} catch (e) {
-	console.error(`${url_arg} is not a URL`);
-	process.exit(1);
+/**
+ * Check if the argument is a local directory path
+ * @param {string} arg
+ * @returns {boolean}
+ */
+function is_local_directory(arg) {
+	try {
+		return fs.existsSync(arg) && fs.statSync(arg).isDirectory();
+	} catch {
+		return false;
+	}
 }
 
-if (url.origin !== 'https://svelte.dev' || !url.pathname.startsWith('/playground/')) {
-	console.error(`${url_arg} is not a Svelte playground URL`);
-	process.exit(1);
+// Check if it's a local directory first (before URL parsing)
+const is_local = is_local_directory(url_arg);
+
+/** @type {URL | null} */
+let url = null;
+
+if (!is_local) {
+	try {
+		url = new URL(url_arg);
+	} catch (e) {
+		console.error(`${url_arg} is not a valid URL or local directory`);
+		process.exit(1);
+	}
 }
 
-let files;
+/**
+ * Check if URL is a GitHub repository URL
+ * @param {URL} url
+ * @returns {boolean}
+ */
+function is_github_url(url) {
+	return url.hostname === 'github.com' && url.pathname.split('/').filter(Boolean).length >= 2;
+}
+
+/**
+ * Check if URL is a StackBlitz GitHub project URL
+ * @param {URL} url
+ * @returns {boolean}
+ */
+function is_stackblitz_github_url(url) {
+	return url.hostname === 'stackblitz.com' && url.pathname.startsWith('/github/');
+}
+
+/**
+ * Check if URL is a StackBlitz edit project URL (non-GitHub)
+ * @param {URL} url
+ * @returns {boolean}
+ */
+function is_stackblitz_edit_url(url) {
+	return url.hostname === 'stackblitz.com' && url.pathname.startsWith('/edit/');
+}
+
+/**
+ * Extract GitHub repo info from a StackBlitz GitHub URL
+ * @param {URL} url
+ * @returns {{ owner: string, repo: string, path?: string }}
+ */
+function extract_stackblitz_github_info(url) {
+	// URL format: /github/owner/repo or /github/owner/repo/tree/branch/path
+	const parts = url.pathname.split('/').filter(Boolean);
+	// parts[0] = 'github', parts[1] = owner, parts[2] = repo
+	return {
+		owner: parts[1],
+		repo: parts[2],
+		path: parts.length > 3 ? parts.slice(3).join('/') : undefined
+	};
+}
+
+/**
+ * Clone a GitHub repository to a temporary directory
+ * @param {URL} url
+ * @param {string} target_dir
+ */
+function clone_github_repo(url, target_dir) {
+	// Extract repo URL (handle both https://github.com/owner/repo and https://github.com/owner/repo/tree/branch/path)
+	const parts = url.pathname.split('/').filter(Boolean);
+	const owner = parts[0];
+	const repo = parts[1];
+	const repo_url = `https://github.com/${owner}/${repo}.git`;
+
+	console.log(`Cloning ${repo_url}...`);
+	execSync(`git clone --depth 1 ${repo_url} "${target_dir}"`, { stdio: 'inherit' });
+}
+
+/**
+ * Clone a StackBlitz GitHub project to a temporary directory
+ * (Converts to regular GitHub clone)
+ * @param {URL} url
+ * @param {string} target_dir
+ */
+function clone_stackblitz_github_project(url, target_dir) {
+	const info = extract_stackblitz_github_info(url);
+	const repo_url = `https://github.com/${info.owner}/${info.repo}.git`;
 
-if (url.hash.length > 1) {
-	const decoded = atob(url.hash.slice(1).replaceAll('-', '+').replaceAll('_', '/'));
-	// putting it directly into the blob gives a corrupted file
-	const u8 = new Uint8Array(decoded.length);
-	for (let i = 0; i < decoded.length; i++) {
-		u8[i] = decoded.charCodeAt(i);
+	console.log(`StackBlitz GitHub project detected, cloning from ${repo_url}...`);
+
+	execSync(`git clone --depth 1 ${repo_url} "${target_dir}"`, { stdio: 'inherit' });
+}
+
+/**
+ * Download a StackBlitz project using browser automation
+ * @param {URL} url
+ * @param {string} target_dir
+ */
+async function download_stackblitz_project(url, target_dir) {
+	console.log(`Downloading StackBlitz project via browser automation...`);
+	console.log(`URL: ${url.href}`);
+
+	const browser = await chromium.launch({ headless: true });
+	const context = await browser.newContext({ acceptDownloads: true });
+	const page = await context.newPage();
+
+	try {
+		// Navigate to the StackBlitz project
+		console.log('Loading StackBlitz project (this may take a moment)...');
+		await page.goto(url.href, { waitUntil: 'domcontentloaded', timeout: 20000 });
+
+		// Set up download handler
+		const downloadPromise = page.waitForEvent('download', { timeout: 30000 });
+		await page.locator('button[aria-label*="Download Project" i]', { timeout: 30000 }).click();
+		console.log('Triggering download...');
+
+		// Wait for the download to start
+		const download = await downloadPromise;
+
+		// Save the downloaded file
+		const zip_path = path.join(target_dir, 'project.zip');
+		await download.saveAs(zip_path);
+
+		console.log('Download complete, extracting...');
+
+		// Extract the zip file
+		if (process.platform === 'win32') {
+			execSync(
+				`powershell -Command "Expand-Archive -Path '${zip_path}' -DestinationPath '${target_dir}' -Force"`,
+				{ stdio: 'inherit' }
+			);
+		} else {
+			execSync(`unzip -o "${zip_path}" -d "${target_dir}"`, { stdio: 'inherit' });
+		}
+
+		// Remove the zip file
+		fs.unlinkSync(zip_path);
+
+		// Check if files were extracted into a subdirectory
+		const entries = fs.readdirSync(target_dir);
+		if (entries.length === 1) {
+			const subdir = path.join(target_dir, entries[0]);
+			if (fs.statSync(subdir).isDirectory()) {
+				// Move files from subdirectory to target_dir
+				const subentries = fs.readdirSync(subdir);
+				for (const entry of subentries) {
+					fs.renameSync(path.join(subdir, entry), path.join(target_dir, entry));
+				}
+				fs.rmdirSync(subdir);
+			}
+		}
+
+		console.log('StackBlitz project downloaded successfully');
+	} finally {
+		await browser.close();
 	}
-	const stream = new Blob([u8]).stream().pipeThrough(new DecompressionStream('gzip'));
-	const json = await new Response(stream).text();
+}
 
-	files = JSON.parse(json).files;
-} else {
-	const id = url.pathname.split('/')[2];
-	const response = await fetch(`https://svelte.dev/playground/api/${id}.json`);
-
-	files = (await response.json()).components.map((data) => {
-		const basename = `${data.name}.${data.type}`;
-
-		return {
-			type: 'file',
-			name: basename,
-			basename,
-			contents: data.source,
-			text: true
-		};
+/**
+ * Recursively get all files in a directory
+ * @param {string} dir
+ * @param {string} base
+ * @returns {Array<{path: string, name: string, contents: string}>}
+ */
+function get_all_files(dir, base = '') {
+	/** @type {Array<{path: string, name: string, contents: string}>} */
+	const results = [];
+
+	if (!fs.existsSync(dir)) return results;
+
+	const entries = fs.readdirSync(dir, { withFileTypes: true });
+
+	for (const entry of entries) {
+		const full_path = path.join(dir, entry.name);
+		const relative_path = base ? `${base}/${entry.name}` : entry.name;
+
+		if (entry.isDirectory()) {
+			// Skip node_modules, .git, etc.
+			if (['node_modules', '.git', '.svelte-kit', 'build', 'dist'].includes(entry.name)) {
+				continue;
+			}
+			results.push(...get_all_files(full_path, relative_path));
+		} else if (
+			entry.name.endsWith('.svelte') ||
+			entry.name.endsWith('.js') ||
+			entry.name.endsWith('.ts')
+		) {
+			results.push({
+				path: relative_path,
+				name: entry.name,
+				contents: fs.readFileSync(full_path, 'utf-8')
+			});
+		}
+	}
+
+	return results;
+}
+
+/**
+ * Detect project type from files
+ * @param {Array<{path: string, name: string, contents: string}>} files
+ * @returns {{ type: 'sveltekit' | 'vite', has_app_imports: boolean, has_page_svelte: boolean }}
+ */
+function detect_project_type(files) {
+	let has_app_imports = false;
+	let has_page_svelte = false;
+
+	for (const file of files) {
+		// Check for $app/* imports
+		if (/from\s+['"](\$app\/[^'"]+)['"]/.test(file.contents)) {
+			has_app_imports = true;
+		}
+		// Check for +page.svelte or +layout.svelte
+		if (file.name === '+page.svelte' || file.name === '+layout.svelte') {
+			has_page_svelte = true;
+		}
+	}
+
+	return {
+		type: has_page_svelte ? 'sveltekit' : 'vite',
+		has_app_imports,
+		has_page_svelte
+	};
+}
+
+/**
+ * Convert a route path to a PascalCase component name
+ * @param {string} route_path - e.g., "about", "blog/post"
+ * @returns {string} - e.g., "About", "BlogPost"
+ */
+function route_to_component_name(route_path) {
+	if (!route_path || route_path === '') return 'Page';
+
+	return route_path
+		.split('/')
+		.map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+		.join('');
+}
+
+/**
+ * Transform $lib/* imports to relative imports (flattened)
+ * @param {string} content
+ * @returns {string}
+ */
+function transform_lib_imports(content) {
+	// Replace $lib/ imports with relative paths to flattened files
+	return content.replace(/from\s+['"](\$lib\/[^'"]+)['"]/g, (match, import_path) => {
+		// Get just the filename from the lib path
+		const lib_path = import_path.replace('$lib/', '');
+		const filename = path.basename(lib_path);
+		return `from './${filename}'`;
 	});
 }
 
-const base_dir = import.meta.dirname;
+/**
+ * Build the route tree from SvelteKit files
+ * @param {Array<{path: string, name: string, contents: string}>} files
+ * @param {string} routes_prefix - e.g., "src/routes"
+ * @returns {Map<string, {layout?: {path: string, contents: string}, page?: {path: string, contents: string}}>}
+ */
+function build_route_tree(files, routes_prefix) {
+	/** @type {Map<string, {layout?: {path: string, contents: string}, page?: {path: string, contents: string}}>} */
+	const routes = new Map();
 
+	for (const file of files) {
+		if (!file.path.startsWith(routes_prefix)) continue;
+
+		const relative_to_routes = file.path.slice(routes_prefix.length + 1); // +1 for the slash
+		const dir = path.dirname(relative_to_routes);
+		const route_key = dir === '.' ? '' : dir;
+
+		if (!routes.has(route_key)) {
+			routes.set(route_key, {});
+		}
+
+		const route = routes.get(route_key);
+		if (file.name === '+layout.svelte') {
+			route.layout = { path: file.path, contents: file.contents };
+		} else if (file.name === '+page.svelte') {
+			route.page = { path: file.path, contents: file.contents };
+		}
+	}
+
+	return routes;
+}
+
+/**
+ * Get child routes of a given route
+ * @param {Map<string, any>} routes
+ * @param {string} parent_route
+ * @returns {string[]}
+ */
+function get_child_routes(routes, parent_route) {
+	const children = [];
+	for (const route of routes.keys()) {
+		if (route === parent_route) continue;
+
+		const parent_prefix = parent_route === '' ? '' : parent_route + '/';
+		if (
+			parent_route === ''
+				? !route.includes('/')
+				: route.startsWith(parent_prefix) && !route.slice(parent_prefix.length).includes('/')
+		) {
+			children.push(route);
+		}
+	}
+	return children;
+}
+
+/**
+ * Transform a layout file's content to replace {@render children()} with a component
+ * @param {string} content
+ * @param {string} child_component_name
+ * @returns {string}
+ */
+function transform_layout_content(content, child_component_name) {
+	// Add import for the child component at the top of the script
+	const import_statement = `import ${child_component_name} from './${child_component_name}.svelte';`;
+
+	// Check if there's already a script tag
+	if (/<script[^>]*>/.test(content)) {
+		// Add import after the opening script tag
+		content = content.replace(/(<script[^>]*>)/, `$1\n\t${import_statement}`);
+	} else {
+		// Add a new script block at the beginning
+		content = `<script>\n\t${import_statement}\n</script>\n\n${content}`;
+	}
+
+	// Replace {@render children()} or {@render children?.()} with the component
+	content = content.replace(/\{@render\s+children\?\.\(\)\}/g, `<${child_component_name} />`);
+	content = content.replace(/\{@render\s+children\(\)\}/g, `<${child_component_name} />`);
+
+	return content;
+}
+
+/**
+ * Convert a SvelteKit project to plain Svelte components
+ * @param {string} repo_dir
+ * @returns {Array<{name: string, contents: string}>}
+ */
+function convert_sveltekit_project(repo_dir) {
+	const all_files = get_all_files(repo_dir);
+	/** @type {Array<{name: string, contents: string}>} */
+	const output_files = [];
+
+	// Find the routes directory
+	let routes_prefix = '';
+	for (const file of all_files) {
+		if (file.path.includes('src/routes/')) {
+			routes_prefix = 'src/routes';
+			break;
+		}
+	}
+
+	if (!routes_prefix) {
+		console.error('Could not find src/routes directory');
+		process.exit(1);
+	}
+
+	// Build route tree
+	const routes = build_route_tree(all_files, routes_prefix);
+
+	// Process lib files - flatten them to root level
+	const lib_files = all_files.filter((f) => f.path.startsWith('src/lib/'));
+	for (const file of lib_files) {
+		// Flatten to just the filename
+		const new_path = path.basename(file.path);
+		let contents = file.contents;
+		contents = transform_lib_imports(contents);
+		output_files.push({
+			name: new_path,
+			contents
+		});
+	}
+
+	// Sort routes by depth (deepest first) so we can process children before parents
+	const sorted_routes = [...routes.keys()].sort((a, b) => {
+		const depth_a = a === '' ? 0 : a.split('/').length;
+		const depth_b = b === '' ? 0 : b.split('/').length;
+		return depth_b - depth_a;
+	});
+
+	// Map to store what component each route renders
+	/** @type {Map<string, string>} */
+	const route_component_map = new Map();
+
+	// First pass: convert all pages
+	for (const route_key of sorted_routes) {
+		const route = routes.get(route_key);
+		if (route?.page) {
+			const component_name = route_to_component_name(route_key);
+			let contents = route.page.contents;
+			contents = transform_lib_imports(contents);
+			output_files.push({
+				name: `${component_name}.svelte`,
+				contents
+			});
+			// If no layout, this is what the route renders
+			if (!route.layout) {
+				route_component_map.set(route_key, component_name);
+			}
+		}
+	}
+
+	// Second pass: convert layouts (from deepest to root)
+	for (const route_key of sorted_routes) {
+		const route = routes.get(route_key);
+		if (route?.layout) {
+			const is_root = route_key === '';
+			const component_name = is_root ? 'App' : route_to_component_name(route_key) + 'Layout';
+
+			// Determine what child component this layout should render
+			let child_component = '';
+
+			// Check if there's a page at this route level
+			if (route.page) {
+				child_component = route_to_component_name(route_key);
+			} else {
+				// Find child routes that have content
+				const children = get_child_routes(routes, route_key);
+				if (children.length > 0) {
+					// Use the first child's component (or its layout if it has one)
+					const first_child = children[0];
+					child_component =
+						route_component_map.get(first_child) || route_to_component_name(first_child);
+				}
+			}
+
+			let contents = route.layout.contents;
+			contents = transform_lib_imports(contents);
+
+			if (child_component) {
+				contents = transform_layout_content(contents, child_component);
+			} else {
+				// No child, just remove {@render children()} or {@render children?.()}
+				contents = contents.replace(/\{@render\s+children\?\.\(\)\}/g, '<!-- no child content -->');
+				contents = contents.replace(/\{@render\s+children\(\)\}/g, '<!-- no child content -->');
+			}
+
+			output_files.push({
+				name: `${component_name}.svelte`,
+				contents
+			});
+
+			// This route now renders the layout
+			route_component_map.set(route_key, component_name);
+		}
+	}
+
+	// If there's no root layout but there's a root page, rename it to App.svelte
+	if (!routes.get('')?.layout && routes.get('')?.page) {
+		const page_index = output_files.findIndex((f) => f.name === 'Page.svelte');
+		if (page_index !== -1) {
+			output_files[page_index].name = 'App.svelte';
+		}
+	}
+
+	// If there's no App.svelte yet, create one that imports the first available component
+	if (!output_files.some((f) => f.name === 'App.svelte')) {
+		const first_component = output_files.find(
+			(f) => f.name.endsWith('.svelte') && !f.name.includes('/')
+		);
+		if (first_component) {
+			const comp_name = first_component.name.replace('.svelte', '');
+			output_files.push({
+				name: 'App.svelte',
+				contents: `<script>\n\timport ${comp_name} from './${first_component.name}';\n</script>\n\n<${comp_name} />\n`
+			});
+		}
+	}
+
+	return output_files;
+}
+
+/**
+ * Convert a regular Vite+Svelte project
+ * @param {string} repo_dir
+ * @returns {Array<{name: string, contents: string}>}
+ */
+function convert_vite_project(repo_dir) {
+	const all_files = get_all_files(repo_dir);
+	/** @type {Array<{name: string, contents: string}>} */
+	const output_files = [];
+
+	// Find src directory
+	const src_files = all_files.filter(
+		(f) =>
+			f.path.startsWith('src/') &&
+			(f.name.endsWith('.svelte') || f.name.endsWith('.js') || f.name.endsWith('.ts'))
+	);
+
+	for (const file of src_files) {
+		// Flatten all files to root level (just the filename)
+		const new_path = path.basename(file.path);
+
+		let contents = file.contents;
+		contents = transform_lib_imports(contents);
+
+		output_files.push({
+			name: new_path,
+			contents
+		});
+	}
+
+	return output_files;
+}
+
+/**
+ * Process a local or cloned directory
+ * @param {string} dir_path
+ * @returns {Array<{name: string, contents: string}>}
+ */
+function process_directory(dir_path) {
+	const all_files = get_all_files(dir_path);
+	const project_info = detect_project_type(all_files);
+
+	console.log(`Detected project type: ${project_info.type}`);
+
+	// Check for $app/* imports
+	if (project_info.has_app_imports) {
+		console.error('Error: This SvelteKit project uses $app/* imports which cannot be converted.');
+		console.error('The playground does not support SvelteKit runtime features.');
+		process.exit(1);
+	}
+
+	// Convert based on project type
+	if (project_info.type === 'sveltekit') {
+		console.log('Converting SvelteKit project to plain Svelte...');
+		return convert_sveltekit_project(dir_path);
+	} else {
+		console.log('Processing Vite+Svelte project...');
+		return convert_vite_project(dir_path);
+	}
+}
+
+/**
+ * Reset a directory so it exists and is empty
+ * @param {string} dir_path
+ */
+/**
+ * Create a temporary directory, run an action, and always clean up
+ * @param {string} base_dir
+ * @param {(dir: string) => void | Promise<void>} action
+ */
+async function with_tmp_dir(base_dir, action) {
+	const tmp_dir = path.join(base_dir, '.tmp-repo');
+
+	try {
+		if (fs.existsSync(tmp_dir)) {
+			fs.rmSync(tmp_dir, { recursive: true, force: true });
+		}
+		fs.mkdirSync(tmp_dir, { recursive: true });
+		await action(tmp_dir);
+	} finally {
+		if (fs.existsSync(tmp_dir)) {
+			fs.rmSync(tmp_dir, { recursive: true, force: true });
+		}
+	}
+}
+
+// Main logic
+let files;
+
+// Check if it's a local directory first (before URL parsing)
+if (is_local) {
+	console.log(`Processing local directory: ${url_arg}`);
+	files = process_directory(url_arg);
+} else if (url && is_github_url(url)) {
+	// GitHub repository handling
+	await with_tmp_dir(base_dir, (tmp_dir) => {
+		clone_github_repo(url, tmp_dir);
+		files = process_directory(tmp_dir);
+	});
+} else if (url && is_stackblitz_github_url(url)) {
+	// StackBlitz GitHub project handling (redirect to GitHub clone)
+	await with_tmp_dir(base_dir, (tmp_dir) => {
+		clone_stackblitz_github_project(url, tmp_dir);
+		files = process_directory(tmp_dir);
+	});
+} else if (url && is_stackblitz_edit_url(url)) {
+	// StackBlitz edit URLs - use browser automation to download
+	await with_tmp_dir(base_dir, async (tmp_dir) => {
+		await download_stackblitz_project(url, tmp_dir);
+		files = process_directory(tmp_dir);
+	});
+} else if (url && url.origin === 'https://svelte.dev' && url.pathname.startsWith('/playground/')) {
+	// Svelte playground URL handling (existing logic)
+	if (url.hash.length > 1) {
+		const decoded = atob(url.hash.slice(1).replaceAll('-', '+').replaceAll('_', '/'));
+		// putting it directly into the blob gives a corrupted file
+		const u8 = new Uint8Array(decoded.length);
+		for (let i = 0; i < decoded.length; i++) {
+			u8[i] = decoded.charCodeAt(i);
+		}
+		const stream = new Blob([u8]).stream().pipeThrough(new DecompressionStream('gzip'));
+		const json = await new Response(stream).text();
+
+		files = JSON.parse(json).files;
+	} else {
+		const id = url.pathname.split('/')[2];
+		const response = await fetch(`https://svelte.dev/playground/api/${id}.json`);
+
+		files = (await response.json()).components.map((data) => {
+			const basename = `${data.name}.${data.type}`;
+
+			return {
+				type: 'file',
+				name: basename,
+				basename,
+				contents: data.source,
+				text: true
+			};
+		});
+	}
+} else {
+	console.error(
+		`${url_arg} is not a supported URL (Svelte playground, GitHub repository, or StackBlitz project)`
+	);
+	process.exit(1);
+}
+
+// Output files
 if (create_test_name) {
 	const test_parts = create_test_name.split('/').filter(Boolean);
 
@@ -111,8 +699,14 @@ export default test({
 });
 `
 	);
+
+	console.log(`Test created at ${output_dir}`);
 } else {
 	for (const file of files) {
-		fs.writeFileSync(path.join(base_dir, '..', 'src', file.name), file.contents);
+		const output_path = path.join(base_dir, '..', 'src', file.name);
+		fs.mkdirSync(path.dirname(output_path), { recursive: true });
+		fs.writeFileSync(output_path, file.contents);
 	}
+
+	console.log(`Files written to ${path.join(base_dir, '..', 'src')}`);
 }

From a66f453b56400f0b687e02d0dace150d148d0ec8 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 27 Jan 2026 22:16:53 -0500
Subject: [PATCH 334/347] docs: tweaking getting started instructions (#17566)

---
 documentation/docs/01-introduction/02-getting-started.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/docs/01-introduction/02-getting-started.md b/documentation/docs/01-introduction/02-getting-started.md
index 519959a0b1..ecb1055443 100644
--- a/documentation/docs/01-introduction/02-getting-started.md
+++ b/documentation/docs/01-introduction/02-getting-started.md
@@ -15,7 +15,7 @@ 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](/packages#routing) as well.
+You can also use Svelte directly with Vite via [vite-plugin-svelte](https://github.com/sveltejs/vite-plugin-svelte) by running `npm create vite@latest` and selecting the `svelte` option (or, if working with an existing project, adding the plugin to your `vite.config.js` file). With this, `npm run build` will generate HTML, JS, and CSS files inside the `dist` directory. 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).
 
@@ -25,7 +25,7 @@ There are also [plugins for other bundlers](/packages#bundler-plugins), but we r
 
 The Svelte team maintains a [VS Code extension](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode), and there are integrations with various other [editors](https://sveltesociety.dev/collection/editor-support-c85c080efc292a34) and tools as well.
 
-You can also check your code from the command line using [`sv check`](https://github.com/sveltejs/cli).
+You can also check your code from the command line using [`npx sv check`](https://svelte.dev/docs/cli/sv-check).
 
 
 ## Getting help

From 06e6ef83b801a3ca014af4629abad76ac2d35eef Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Tue, 27 Jan 2026 22:44:26 -0500
Subject: [PATCH 335/347] failing test (#12791)

---
 .../tests/hydration/samples/safari-borking-2/Child.svelte   | 6 ++++++
 .../tests/hydration/samples/safari-borking-2/_config.js     | 5 +++++
 .../tests/hydration/samples/safari-borking-2/_override.html | 1 +
 .../tests/hydration/samples/safari-borking-2/main.svelte    | 6 ++++++
 4 files changed, 18 insertions(+)
 create mode 100644 packages/svelte/tests/hydration/samples/safari-borking-2/Child.svelte
 create mode 100644 packages/svelte/tests/hydration/samples/safari-borking-2/_config.js
 create mode 100644 packages/svelte/tests/hydration/samples/safari-borking-2/_override.html
 create mode 100644 packages/svelte/tests/hydration/samples/safari-borking-2/main.svelte

diff --git a/packages/svelte/tests/hydration/samples/safari-borking-2/Child.svelte b/packages/svelte/tests/hydration/samples/safari-borking-2/Child.svelte
new file mode 100644
index 0000000000..a62bd4ec90
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/safari-borking-2/Child.svelte
@@ -0,0 +1,6 @@
+<script>
+	const message = `call +636-555-3226 now`;
+</script>
+
+<hr />
+{message}
diff --git a/packages/svelte/tests/hydration/samples/safari-borking-2/_config.js b/packages/svelte/tests/hydration/samples/safari-borking-2/_config.js
new file mode 100644
index 0000000000..cf22ff2c85
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/safari-borking-2/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	expect_hydration_error: true
+});
diff --git a/packages/svelte/tests/hydration/samples/safari-borking-2/_override.html b/packages/svelte/tests/hydration/samples/safari-borking-2/_override.html
new file mode 100644
index 0000000000..17ec01970a
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/safari-borking-2/_override.html
@@ -0,0 +1 @@
+<!--[--><hr> call <a href="tel:+636-555-3226">+636-555-3226</a> now<!----> <p>42</p><!--]-->
diff --git a/packages/svelte/tests/hydration/samples/safari-borking-2/main.svelte b/packages/svelte/tests/hydration/samples/safari-borking-2/main.svelte
new file mode 100644
index 0000000000..daa25067ec
--- /dev/null
+++ b/packages/svelte/tests/hydration/samples/safari-borking-2/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	import Child from './Child.svelte';
+</script>
+
+<Child />
+<p>{40 + 2}</p>

From 16fec7207a39d6f913e1ec32fbe5b2a6f2db838f Mon Sep 17 00:00:00 2001
From: PandaMan <joewartson757@gmail.com>
Date: Thu, 29 Jan 2026 00:17:38 +0800
Subject: [PATCH 336/347] fix: make onintrostart respect delay parameter
 (#17567)

* fix: make onintrostart respect delay parameter

Fixes #14009

The onintrostart event now fires after the delay period completes,
rather than immediately when the transition is initiated. This ensures
that the event accurately reflects when the intro animation actually
starts.

Changes:
- Added on_start callback parameter to animate() function
- Dispatch introstart event after delay animation finishes
- Handle edge case where duration is 0 but delay > 0

* fix: format code with prettier

* add (failing) tests

* fix

* changeset

* missed a spot

* fix

---------

Co-authored-by: Miner <miner@example.com>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/sweet-rings-watch.md               |  5 +++
 .../client/dom/elements/transitions.js        |  9 +++---
 .../transition-delayed-events-css/_config.js  | 32 +++++++++++++++++++
 .../transition-delayed-events-css/main.svelte | 23 +++++++++++++
 .../transition-delayed-events-js/_config.js   | 32 +++++++++++++++++++
 .../transition-delayed-events-js/main.svelte  | 23 +++++++++++++
 6 files changed, 119 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/sweet-rings-watch.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/transition-delayed-events-css/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/transition-delayed-events-css/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/transition-delayed-events-js/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/transition-delayed-events-js/main.svelte

diff --git a/.changeset/sweet-rings-watch.md b/.changeset/sweet-rings-watch.md
new file mode 100644
index 0000000000..8ce11b2672
--- /dev/null
+++ b/.changeset/sweet-rings-watch.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: fire introstart/outrostart events after delay, if specified
diff --git a/packages/svelte/src/internal/client/dom/elements/transitions.js b/packages/svelte/src/internal/client/dom/elements/transitions.js
index e9f0953df7..170b40780a 100644
--- a/packages/svelte/src/internal/client/dom/elements/transitions.js
+++ b/packages/svelte/src/internal/client/dom/elements/transitions.js
@@ -239,8 +239,6 @@ export function transition(flags, element, get_fn, get_params) {
 				intro?.abort();
 			}
 
-			dispatch_event(element, 'introstart');
-
 			intro = animate(element, get_options(), outro, 1, () => {
 				dispatch_event(element, 'introend');
 
@@ -260,8 +258,6 @@ export function transition(flags, element, get_fn, get_params) {
 
 			element.inert = true;
 
-			dispatch_event(element, 'outrostart');
-
 			outro = animate(element, get_options(), intro, 0, () => {
 				dispatch_event(element, 'outroend');
 				fn?.();
@@ -345,7 +341,8 @@ function animate(element, options, counterpart, t2, on_finish) {
 
 	counterpart?.deactivate();
 
-	if (!options?.duration) {
+	if (!options?.duration && !options?.delay) {
+		dispatch_event(element, is_intro ? 'introstart' : 'outrostart');
 		on_finish();
 
 		return {
@@ -385,6 +382,8 @@ function animate(element, options, counterpart, t2, on_finish) {
 		// remove dummy animation from the stack to prevent conflict with main animation
 		animation.cancel();
 
+		dispatch_event(element, is_intro ? 'introstart' : 'outrostart');
+
 		// for bidirectional transitions, we start from the current position,
 		// rather than doing a full intro/outro
 		var t1 = counterpart?.t() ?? 1 - t2;
diff --git a/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-css/_config.js b/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-css/_config.js
new file mode 100644
index 0000000000..36daefa3b7
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-css/_config.js
@@ -0,0 +1,32 @@
+import { flushSync } from '../../../../src/index-client.js';
+import { test } from '../../test';
+
+export default test({
+	test({ assert, raf, target, logs }) {
+		const [btn] = target.querySelectorAll('button');
+
+		// in
+		flushSync(() => btn.click());
+		assert.deepEqual(logs, []);
+		raf.tick(1);
+		assert.deepEqual(logs, []);
+
+		raf.tick(100);
+		assert.deepEqual(logs, ['introstart']);
+
+		raf.tick(200);
+		assert.deepEqual(logs, ['introstart', 'introend']);
+
+		// out
+		flushSync(() => btn.click());
+		assert.deepEqual(logs, ['introstart', 'introend']);
+		raf.tick(201);
+		assert.deepEqual(logs, ['introstart', 'introend']);
+
+		raf.tick(300);
+		assert.deepEqual(logs, ['introstart', 'introend', 'outrostart']);
+
+		raf.tick(400);
+		assert.deepEqual(logs, ['introstart', 'introend', 'outrostart', 'outroend']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-css/main.svelte b/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-css/main.svelte
new file mode 100644
index 0000000000..cd91790c17
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-css/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	function fade(_) {
+		return {
+			delay: 100,
+			duration: 100,
+			css: (t) => `opacity: ${t}`
+		};
+	}
+
+	let visible = $state(false);
+</script>
+
+<button onclick={() => (visible = !visible)}>toggle</button>
+
+{#if visible}
+	<p
+		transition:fade
+		onintrostart={() => console.log('introstart')}
+		onintroend={() => console.log('introend')}
+		onoutrostart={() => console.log('outrostart')}
+		onoutroend={() => console.log('outroend')}
+	>delayed fade</p>
+{/if}
diff --git a/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-js/_config.js b/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-js/_config.js
new file mode 100644
index 0000000000..36daefa3b7
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-js/_config.js
@@ -0,0 +1,32 @@
+import { flushSync } from '../../../../src/index-client.js';
+import { test } from '../../test';
+
+export default test({
+	test({ assert, raf, target, logs }) {
+		const [btn] = target.querySelectorAll('button');
+
+		// in
+		flushSync(() => btn.click());
+		assert.deepEqual(logs, []);
+		raf.tick(1);
+		assert.deepEqual(logs, []);
+
+		raf.tick(100);
+		assert.deepEqual(logs, ['introstart']);
+
+		raf.tick(200);
+		assert.deepEqual(logs, ['introstart', 'introend']);
+
+		// out
+		flushSync(() => btn.click());
+		assert.deepEqual(logs, ['introstart', 'introend']);
+		raf.tick(201);
+		assert.deepEqual(logs, ['introstart', 'introend']);
+
+		raf.tick(300);
+		assert.deepEqual(logs, ['introstart', 'introend', 'outrostart']);
+
+		raf.tick(400);
+		assert.deepEqual(logs, ['introstart', 'introend', 'outrostart', 'outroend']);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-js/main.svelte b/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-js/main.svelte
new file mode 100644
index 0000000000..c7167aa8c7
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/transition-delayed-events-js/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	function fade(node) {
+		return {
+			delay: 100,
+			duration: 100,
+			tick: (t) => node.style.opacity = t
+		};
+	}
+
+	let visible = $state(false);
+</script>
+
+<button onclick={() => (visible = !visible)}>toggle</button>
+
+{#if visible}
+	<p
+		transition:fade
+		onintrostart={() => console.log('introstart')}
+		onintroend={() => console.log('introend')}
+		onoutrostart={() => console.log('outrostart')}
+		onoutroend={() => console.log('outroend')}
+	>delayed fade</p>
+{/if}

From 08448c501b97a4617171ee9db69c60aa3bd0bbcc Mon Sep 17 00:00:00 2001
From: GiantDragon9090 <102870250+GiantDragon9090@users.noreply.github.com>
Date: Wed, 28 Jan 2026 09:55:32 -0800
Subject: [PATCH 337/347] docs: update FAQ to mention SvelteKit hash-based
 routing support (#17546)

Fixes #14919

Co-authored-by: Gittensor Miner <miner@gittensor.io>
---
 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 4c1d19a262..035629e5ae 100644
--- a/documentation/docs/07-misc/99-faq.md
+++ b/documentation/docs/07-misc/99-faq.md
@@ -91,7 +91,7 @@ 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 and Nuxt.js for Vue.
+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. SvelteKit also supports hash-based routing for client-side applications.
 
 However, you can use any router library. A sampling of available routers are highlighted [on the packages page](/packages#routing).
 

From 3256a75b547d9ee440be0c2b51865b31cb6d9c88 Mon Sep 17 00:00:00 2001
From: Razin Shafayet <sumonislamk29@gmail.com>
Date: Wed, 28 Jan 2026 23:56:17 +0600
Subject: [PATCH 338/347] fix: ignore popover elements in
 a11y_consider_explicit_label check (#17367)

* fix: ignore popover elements in a11y_consider_explicit_label check

* chore: add changeset

* Apply suggestions from code review

* Apply suggestions from code review

* fix

---------

Co-authored-by: Rich Harris <hello@rich-harris.dev>
Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/shaggy-phones-laugh.md                  |  5 +++++
 .../phases/2-analyze/visitors/shared/a11y/index.js |  4 ++++
 .../samples/a11y-popover-label/input.svelte        |  3 +++
 .../samples/a11y-popover-label/warnings.json       | 14 ++++++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 .changeset/shaggy-phones-laugh.md
 create mode 100644 packages/svelte/tests/validator/samples/a11y-popover-label/input.svelte
 create mode 100644 packages/svelte/tests/validator/samples/a11y-popover-label/warnings.json

diff --git a/.changeset/shaggy-phones-laugh.md b/.changeset/shaggy-phones-laugh.md
new file mode 100644
index 0000000000..8cb711491b
--- /dev/null
+++ b/.changeset/shaggy-phones-laugh.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: disregard `popover` elements when determining whether an element has content
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 50b107d068..f5f4982ed2 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
@@ -824,6 +824,10 @@ function has_content(element) {
 		}
 
 		if (node.type === 'RegularElement' || node.type === 'SvelteElement') {
+			if (node.attributes.some((a) => a.type === 'Attribute' && a.name === 'popover')) {
+				continue;
+			}
+
 			if (
 				node.name === 'img' &&
 				node.attributes.some((node) => node.type === 'Attribute' && node.name === 'alt')
diff --git a/packages/svelte/tests/validator/samples/a11y-popover-label/input.svelte b/packages/svelte/tests/validator/samples/a11y-popover-label/input.svelte
new file mode 100644
index 0000000000..6fafa0a10c
--- /dev/null
+++ b/packages/svelte/tests/validator/samples/a11y-popover-label/input.svelte
@@ -0,0 +1,3 @@
+<button interestfor="my-hint">
+	<div id="my-hint" popover="hint">hello</div>
+</button>
\ No newline at end of file
diff --git a/packages/svelte/tests/validator/samples/a11y-popover-label/warnings.json b/packages/svelte/tests/validator/samples/a11y-popover-label/warnings.json
new file mode 100644
index 0000000000..f5fd09c89d
--- /dev/null
+++ b/packages/svelte/tests/validator/samples/a11y-popover-label/warnings.json
@@ -0,0 +1,14 @@
+[
+	{
+		"code": "a11y_consider_explicit_label",
+		"message": "Buttons and links should either contain text or have an `aria-label`, `aria-labelledby` or `title` attribute",
+		"start": {
+			"line": 1,
+			"column": 0
+		},
+		"end": {
+			"line": 3,
+			"column": 9
+		}
+	}
+]

From 2b4253f33271dbe8024cfb3946964e4cd6df0315 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 28 Jan 2026 13:40:10 -0500
Subject: [PATCH 339/347] chore: allow sandbox to 'download' from tests
 (#17576)

---
 playgrounds/sandbox/scripts/download.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/playgrounds/sandbox/scripts/download.js b/playgrounds/sandbox/scripts/download.js
index b0bad54e73..e3c862cb61 100644
--- a/playgrounds/sandbox/scripts/download.js
+++ b/playgrounds/sandbox/scripts/download.js
@@ -39,10 +39,14 @@ function is_local_directory(arg) {
 // Check if it's a local directory first (before URL parsing)
 const is_local = is_local_directory(url_arg);
 
+const resolved_test_path = ['runtime-runes', 'runtime-legacy']
+	.map((d) => path.resolve(`${base_dir}/../../../packages/svelte/tests/${d}/samples/${url_arg}`))
+	.find(fs.existsSync);
+
 /** @type {URL | null} */
 let url = null;
 
-if (!is_local) {
+if (!is_local && !resolved_test_path) {
 	try {
 		url = new URL(url_arg);
 	} catch (e) {
@@ -599,6 +603,17 @@ let files;
 if (is_local) {
 	console.log(`Processing local directory: ${url_arg}`);
 	files = process_directory(url_arg);
+} else if (resolved_test_path) {
+	// Copy files from test
+	console.log(`Processing test ${url_arg}`);
+	files = get_all_files(resolved_test_path)
+		.filter((file) => !file.path.includes('_'))
+		.map((file) => {
+			return {
+				name: file.name === 'main.svelte' ? 'App.svelte' : file.name,
+				contents: file.contents
+			};
+		});
 } else if (url && is_github_url(url)) {
 	// GitHub repository handling
 	await with_tmp_dir(base_dir, (tmp_dir) => {

From 37cd40d2e5d1868810b87705287eedd4f0370bdd Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 28 Jan 2026 14:23:27 -0500
Subject: [PATCH 340/347] fix: more conservative assignment_value_stale
 warnings (#17574)

---
 .changeset/plain-dancers-double.md            |  5 ++++
 .../client/visitors/AssignmentExpression.js   |  5 +++-
 packages/svelte/src/compiler/phases/scope.js  |  8 ++++++
 .../svelte/src/internal/client/dev/assign.js  |  3 ++-
 .../_config.js                                | 25 ++++++++-----------
 .../main.svelte                               | 11 ++++++++
 6 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 .changeset/plain-dancers-double.md

diff --git a/.changeset/plain-dancers-double.md b/.changeset/plain-dancers-double.md
new file mode 100644
index 0000000000..ab47b8e4c7
--- /dev/null
+++ b/.changeset/plain-dancers-double.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: more conservative assignment_value_stale warnings
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js
index 731569aaae..0f6a619357 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AssignmentExpression.js
@@ -162,7 +162,10 @@ function build_assignment(operator, left, right, context) {
 	// will be pushed to. we do this by transforming it to something like
 	// `$.assign_nullish(object, 'items', [])`
 	let should_transform =
-		dev && path.at(-1) !== 'ExpressionStatement' && is_non_coercive_operator(operator);
+		dev &&
+		path.at(-1) !== 'ExpressionStatement' &&
+		is_non_coercive_operator(operator) &&
+		!context.state.scope.evaluate(right).is_primitive;
 
 	// special case — ignore `onclick={() => (...)}`
 	if (
diff --git a/packages/svelte/src/compiler/phases/scope.js b/packages/svelte/src/compiler/phases/scope.js
index 2a0c76f756..52efd93210 100644
--- a/packages/svelte/src/compiler/phases/scope.js
+++ b/packages/svelte/src/compiler/phases/scope.js
@@ -228,6 +228,13 @@ class Evaluation {
 	 */
 	is_number = true;
 
+	/**
+	 * True if the value is known to be a primitive
+	 * @readonly
+	 * @type {boolean}
+	 */
+	is_primitive = true;
+
 	/**
 	 * True if the value is known to be a function
 	 * @readonly
@@ -577,6 +584,7 @@ class Evaluation {
 
 			if (value === UNKNOWN) {
 				this.has_unknown = true;
+				this.is_primitive = false;
 			}
 		}
 
diff --git a/packages/svelte/src/internal/client/dev/assign.js b/packages/svelte/src/internal/client/dev/assign.js
index d9ef7497d5..3b48e736b5 100644
--- a/packages/svelte/src/internal/client/dev/assign.js
+++ b/packages/svelte/src/internal/client/dev/assign.js
@@ -1,3 +1,4 @@
+import { STATE_SYMBOL } from '#client/constants';
 import { sanitize_location } from '../../../utils.js';
 import { untrack } from '../runtime.js';
 import * as w from '../warnings.js';
@@ -10,7 +11,7 @@ import * as w from '../warnings.js';
  * @param {string} location
  */
 function compare(a, b, property, location) {
-	if (a !== b) {
+	if (a !== b && typeof b === 'object' && STATE_SYMBOL in b) {
 		w.assignment_value_stale(property, /** @type {string} */ (sanitize_location(location)));
 	}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/proxy-coercive-assignment-warning/_config.js b/packages/svelte/tests/runtime-runes/samples/proxy-coercive-assignment-warning/_config.js
index 4462f492fa..2ff2634822 100644
--- a/packages/svelte/tests/runtime-runes/samples/proxy-coercive-assignment-warning/_config.js
+++ b/packages/svelte/tests/runtime-runes/samples/proxy-coercive-assignment-warning/_config.js
@@ -6,31 +6,26 @@ export default test({
 		dev: true
 	},
 
-	html: `<button>items: null</button> <div>x</div> <input type="checkbox" value="1"><input type="checkbox" value="2"><input>`,
-
 	test({ assert, target, warnings }) {
-		const btn = target.querySelector('button');
-		ok(btn);
+		const [button1, button2, button3] = target.querySelectorAll('button');
+		ok(button1);
 
-		flushSync(() => btn.click());
-		assert.htmlEqual(
-			target.innerHTML,
-			`<button>items: []</button> <div>x</div> <input type="checkbox" value="1"><input type="checkbox" value="2"><input>`
-		);
+		flushSync(() => button1.click());
+		assert.htmlEqual(button1.innerHTML, `items: []`);
 
-		flushSync(() => btn.click());
-		assert.htmlEqual(
-			target.innerHTML,
-			`<button>items: [0]</button> <div>x</div> <input type="checkbox" value="1"><input type="checkbox" value="2"><input>`
-		);
+		flushSync(() => button1.click());
+		assert.htmlEqual(button1.innerHTML, `items: [0]`);
 
 		const input = target.querySelector('input');
 		ok(input);
 		input.checked = true;
 		flushSync(() => input.dispatchEvent(new Event('change', { bubbles: true })));
 
+		flushSync(() => button2.click());
+		flushSync(() => button3.click());
+
 		assert.deepEqual(warnings, [
-			'Assignment to `items` property (main.svelte:9:24) will evaluate to the right-hand side, not the value of `items` following the assignment. This may result in unexpected behaviour.'
+			'Assignment to `items` property (main.svelte:17:24) will evaluate to the right-hand side, not the value of `items` following the assignment. This may result in unexpected behaviour.'
 		]);
 	}
 });
diff --git a/packages/svelte/tests/runtime-runes/samples/proxy-coercive-assignment-warning/main.svelte b/packages/svelte/tests/runtime-runes/samples/proxy-coercive-assignment-warning/main.svelte
index a79fe873b7..02320a3128 100644
--- a/packages/svelte/tests/runtime-runes/samples/proxy-coercive-assignment-warning/main.svelte
+++ b/packages/svelte/tests/runtime-runes/samples/proxy-coercive-assignment-warning/main.svelte
@@ -1,9 +1,17 @@
  <script>
 	import Test from './Test.svelte';
 
+	let { opacity = 0.5 } = $props();
+
 	let entries = $state([]);
 	let object = $state({ items: null, group: [] });
 	let elementFunBind = $state();
+
+	// should omit $.assign via static analysis
+	const fixed = (node) => node.style.opacity = 0.5;
+
+	// should use $.assign, but it should not warn
+	const unknown = (node) => node.style.opacity = opacity;
 </script>
 
 <button onclick={() => (object.items ??= []).push(object.items.length)}>
@@ -23,3 +31,6 @@
 	<input bind:this={() => {}, (e) => (context.element = e)} />
 {/snippet}
 {@render funBind({ set element(e) { elementFunBind = e } })}
+
+<button onclick={(e) => (fixed(e.currentTarget))}>change opacity (fixed)</button>
+<button onclick={(e) => (unknown(e.currentTarget))}>change opacity (unknown)</button>

From ece2e83eb9d0e2a97d7db50d41f68ce2edfb697d Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 28 Jan 2026 16:09:32 -0500
Subject: [PATCH 341/347] fix: increment signal versions when discarding forks
 (#17577)

* fix: always update an UNINITIALIZED derived on read

Co-authored-by: David Roizenman <hmnd@users.noreply.github.com>

* obsolete comments

* rename test

* add tests, fix

* revert

* Update .changeset/vast-hornets-draw.md

---------

Co-authored-by: David Roizenman <hmnd@users.noreply.github.com>
---
 .changeset/vast-hornets-draw.md               |  5 +++
 .../src/internal/client/reactivity/batch.js   |  7 ++++
 .../fork-derived-uncached-1/_config.js        | 40 +++++++++++++++++++
 .../fork-derived-uncached-1/main.svelte       | 23 +++++++++++
 .../fork-derived-uncached-2/_config.js        | 38 ++++++++++++++++++
 .../fork-derived-uncached-2/main.svelte       | 23 +++++++++++
 .../fork-derived-uncached-3/_config.js        | 32 +++++++++++++++
 .../fork-derived-uncached-3/main.svelte       | 23 +++++++++++
 8 files changed, 191 insertions(+)
 create mode 100644 .changeset/vast-hornets-draw.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-1/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-1/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-2/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-2/main.svelte
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-3/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-3/main.svelte

diff --git a/.changeset/vast-hornets-draw.md b/.changeset/vast-hornets-draw.md
new file mode 100644
index 0000000000..256439e9da
--- /dev/null
+++ b/.changeset/vast-hornets-draw.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: increment signal versions when discarding forks
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 134ebe53a2..d82f965541 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -972,6 +972,13 @@ export function fork(fn) {
 			await settled;
 		},
 		discard: () => {
+			// cause any MAYBE_DIRTY deriveds to update
+			// if they depend on things thath changed
+			// inside the discarded fork
+			for (var source of batch.current.keys()) {
+				source.wv = increment_write_version();
+			}
+
 			if (!committed && batches.has(batch)) {
 				batches.delete(batch);
 				batch.discard();
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-1/_config.js b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-1/_config.js
new file mode 100644
index 0000000000..fb50ceb9b1
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-1/_config.js
@@ -0,0 +1,40 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const [fork, toggle, increment] = target.querySelectorAll('button');
+
+		// derived is first evaluated in block effect, then discarded
+		flushSync(() => fork.click());
+
+		// should not throw "Cannot convert a Symbol value to a string" due to cached UNINITIALIZED from first fork
+		flushSync(() => fork.click());
+
+		// should not reflect the temporary change to `clicks` inside the fork
+		flushSync(() => toggle.click());
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>fork</button>
+				<button>toggle</button>
+				<button>clicks: 0</button>
+				<p>0</p>
+			`
+		);
+
+		flushSync(() => increment.click());
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>fork</button>
+				<button>toggle</button>
+				<button>clicks: 1</button>
+				<p>2</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-1/main.svelte b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-1/main.svelte
new file mode 100644
index 0000000000..08ebaba25a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-1/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	import { fork } from "svelte";
+
+	let clicks = $state(0);
+	let show = $state(false);
+	const derived = $derived(clicks * 2);
+</script>
+
+<button onclick={() => {
+	fork(() => {
+		clicks += 1;
+		show = true;
+	}).discard();
+}}>fork</button>
+
+<button onclick={() => show = !show}>toggle</button>
+
+<button onclick={() => clicks++}>clicks: {clicks}</button>
+
+{#if show}
+	<p>{derived}</p>
+{/if}
+
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-2/_config.js b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-2/_config.js
new file mode 100644
index 0000000000..21ab140fc0
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-2/_config.js
@@ -0,0 +1,38 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const [fork, toggle, increment] = target.querySelectorAll('button');
+
+		// derived is first evaluated in block effect, then discarded
+		flushSync(() => fork.click());
+
+		// should not reflect the temporary change to `clicks` inside the fork
+		// or throw "Cannot convert a Symbol value to a string" due to cached UNINITIALIZED
+		flushSync(() => toggle.click());
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>fork</button>
+				<button>toggle</button>
+				<button>clicks: 0</button>
+				<p>0</p>
+			`
+		);
+
+		flushSync(() => increment.click());
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>fork</button>
+				<button>toggle</button>
+				<button>clicks: 1</button>
+				<p>2</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-2/main.svelte b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-2/main.svelte
new file mode 100644
index 0000000000..08ebaba25a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-2/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	import { fork } from "svelte";
+
+	let clicks = $state(0);
+	let show = $state(false);
+	const derived = $derived(clicks * 2);
+</script>
+
+<button onclick={() => {
+	fork(() => {
+		clicks += 1;
+		show = true;
+	}).discard();
+}}>fork</button>
+
+<button onclick={() => show = !show}>toggle</button>
+
+<button onclick={() => clicks++}>clicks: {clicks}</button>
+
+{#if show}
+	<p>{derived}</p>
+{/if}
+
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-3/_config.js b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-3/_config.js
new file mode 100644
index 0000000000..4827aa99f3
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-3/_config.js
@@ -0,0 +1,32 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const [fork, toggle, increment] = target.querySelectorAll('button');
+
+		// initialize derived by showing it
+		flushSync(() => toggle.click());
+		flushSync(() => toggle.click());
+
+		// increment clicks
+		flushSync(() => increment.click());
+
+		// update derived, but without writing to `derived.v`
+		flushSync(() => fork.click());
+
+		// show derived
+		flushSync(() => toggle.click());
+
+		assert.htmlEqual(
+			target.innerHTML,
+			`
+				<button>fork</button>
+				<button>toggle</button>
+				<button>clicks: 1</button>
+				<p>2</p>
+			`
+		);
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-3/main.svelte b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-3/main.svelte
new file mode 100644
index 0000000000..08ebaba25a
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-uncached-3/main.svelte
@@ -0,0 +1,23 @@
+<script>
+	import { fork } from "svelte";
+
+	let clicks = $state(0);
+	let show = $state(false);
+	const derived = $derived(clicks * 2);
+</script>
+
+<button onclick={() => {
+	fork(() => {
+		clicks += 1;
+		show = true;
+	}).discard();
+}}>fork</button>
+
+<button onclick={() => show = !show}>toggle</button>
+
+<button onclick={() => clicks++}>clicks: {clicks}</button>
+
+{#if show}
+	<p>{derived}</p>
+{/if}
+

From 3608b3c8691cf855ec2cdeb623b904d2b95eddcc Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 28 Jan 2026 16:59:40 -0500
Subject: [PATCH 342/347] fix: preserve old dependencies when updating reaction
 inside fork (#17579)

Co-authored-by: David Roizenman <hmnd@users.noreply.github.com>
---
 .changeset/fuzzy-spies-love.md                |  5 ++++
 .../svelte/src/internal/client/runtime.js     | 18 ++++++++++---
 .../_config.js                                | 25 +++++++++++++++++
 .../main.svelte                               | 27 +++++++++++++++++++
 4 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/fuzzy-spies-love.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-dependency-rollback/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/fork-derived-dependency-rollback/main.svelte

diff --git a/.changeset/fuzzy-spies-love.md b/.changeset/fuzzy-spies-love.md
new file mode 100644
index 0000000000..9129d986bc
--- /dev/null
+++ b/.changeset/fuzzy-spies-love.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: preserve old dependencies when updating reaction inside fork
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 2075081f96..70eeabb789 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -43,7 +43,13 @@ import {
 	set_dev_current_component_function,
 	set_dev_stack
 } from './context.js';
-import { Batch, batch_values, flushSync, schedule_effect } from './reactivity/batch.js';
+import {
+	Batch,
+	batch_values,
+	current_batch,
+	flushSync,
+	schedule_effect
+} from './reactivity/batch.js';
 import { handle_error } from './error-handling.js';
 import { UNINITIALIZED } from '../../constants.js';
 import { captured_signals } from './legacy.js';
@@ -249,10 +255,16 @@ export function update_reaction(reaction) {
 		var result = fn();
 		var deps = reaction.deps;
 
+		// Don't remove reactions during fork;
+		// they must remain for when fork is discarded
+		var is_fork = current_batch?.is_fork;
+
 		if (new_deps !== null) {
 			var i;
 
-			remove_reactions(reaction, skipped_deps);
+			if (!is_fork) {
+				remove_reactions(reaction, skipped_deps);
+			}
 
 			if (deps !== null && skipped_deps > 0) {
 				deps.length = skipped_deps + new_deps.length;
@@ -268,7 +280,7 @@ export function update_reaction(reaction) {
 					(deps[i].reactions ??= []).push(reaction);
 				}
 			}
-		} else if (deps !== null && skipped_deps < deps.length) {
+		} else if (!is_fork && deps !== null && skipped_deps < deps.length) {
 			remove_reactions(reaction, skipped_deps);
 			deps.length = skipped_deps;
 		}
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-dependency-rollback/_config.js b/packages/svelte/tests/runtime-runes/samples/fork-derived-dependency-rollback/_config.js
new file mode 100644
index 0000000000..c5db69f7d4
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-dependency-rollback/_config.js
@@ -0,0 +1,25 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const [fork_btn, _toggle_btn, inc_count_1_btn] = target.querySelectorAll('button');
+		const p = /** @type {HTMLElement} */ (target.querySelector('p'));
+
+		assert.equal(p.textContent, '0');
+
+		// Trigger derived to re-evaluate during fork and switch to tracking count_2
+		flushSync(() => {
+			fork_btn.click();
+		});
+
+		assert.equal(p.textContent, '0');
+
+		flushSync(() => {
+			inc_count_1_btn.click();
+		});
+
+		assert.equal(p.textContent, '1');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/fork-derived-dependency-rollback/main.svelte b/packages/svelte/tests/runtime-runes/samples/fork-derived-dependency-rollback/main.svelte
new file mode 100644
index 0000000000..800c82b56b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/fork-derived-dependency-rollback/main.svelte
@@ -0,0 +1,27 @@
+<script>
+	import { fork } from 'svelte';
+
+	let show_count_1 = $state(true);
+	let count_1 = $state(0);
+	let count_2 = $state(0);
+
+	const count = $derived(show_count_1 ? count_1 : count_2);
+</script>
+
+<!-- This if block causes the derived to execute during the fork, switching its dependency
+     away from count_1 and over to count_2. After discard, count_1 should still be tracked. -->
+{#if count}
+{/if}
+
+<button onclick={() => {
+	const f = fork(() => {
+		show_count_1 = !show_count_1;
+	});
+	f.discard();
+}}>fork toggle</button>
+
+<button onclick={() => show_count_1 = !show_count_1}>toggle</button>
+<button onclick={() => count_1++}>increment count 1</button>
+<button onclick={() => count_2++}>increment count 2</button>
+
+<p>{count}</p>

From 1c131f11ca6a49d1ffba07d3d02bb895c668ef00 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 28 Jan 2026 19:00:13 -0500
Subject: [PATCH 343/347] fix: reset effects inside skipped branches (#17581)

* fix: prevent reactivity loss during fork

fixes #17197, fixes #17304, fixes #17301, fixes #17309

* add samples

* add changeset

* fix var casing in tests

* don't remove reactions during fork

* add sample for derived dep tracking in fork

* fix sample type check error

* set derived.v on first eval in fork

* add sample for derived.v remaining UNINITIALIZED

* lost current_batch import in runtime.js

* Delete how

* Update packages/svelte/src/internal/client/reactivity/deriveds.js

* delete test in favour of #17577

* extract runtime.js changes into separate PR

* alternative approach

* revert

* clear skipped branches when deferring

* fix

* fix

* changeset

* rename test

* update test

* unused test

---------

Co-authored-by: David Roizenman <david@hmnd.io>
Co-authored-by: Paolo Ricciuti <ricciutipaolo@gmail.com>
Co-authored-by: Tee Ming <chewteeming01@gmail.com>
---
 .changeset/common-boats-travel.md             |  5 ++++
 .../src/internal/client/reactivity/batch.js   | 24 +++++++++++++++++++
 .../samples/async-skipped-branch/_config.js   | 21 ++++++++++++++++
 .../samples/async-skipped-branch/main.svelte  | 22 +++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 .changeset/common-boats-travel.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-skipped-branch/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/async-skipped-branch/main.svelte

diff --git a/.changeset/common-boats-travel.md b/.changeset/common-boats-travel.md
new file mode 100644
index 0000000000..bd3012bbf2
--- /dev/null
+++ b/.changeset/common-boats-travel.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: reset effects inside skipped branches
diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index d82f965541..2b6e84889b 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -171,6 +171,10 @@ export class Batch {
 		if (this.is_deferred()) {
 			this.#defer_effects(render_effects);
 			this.#defer_effects(effects);
+
+			for (const e of this.skipped_effects) {
+				reset_branch(e);
+			}
 		} else {
 			// append/remove branches
 			for (const fn of this.#commit_callbacks) fn();
@@ -881,6 +885,26 @@ export function eager(fn) {
 	return value;
 }
 
+/**
+ * Mark all the effects inside a skipped branch CLEAN, so that
+ * they can be correctly rescheduled later
+ * @param {Effect} effect
+ */
+function reset_branch(effect) {
+	// clean branch = nothing dirty inside, no need to traverse further
+	if ((effect.f & BRANCH_EFFECT) !== 0 && (effect.f & CLEAN) !== 0) {
+		return;
+	}
+
+	set_signal_status(effect, CLEAN);
+
+	var e = effect.first;
+	while (e !== null) {
+		reset_branch(e);
+		e = e.next;
+	}
+}
+
 /**
  * Creates a 'fork', in which state changes are evaluated but not applied to the DOM.
  * This is useful for speculatively loading data (for example) when you suspect that
diff --git a/packages/svelte/tests/runtime-runes/samples/async-skipped-branch/_config.js b/packages/svelte/tests/runtime-runes/samples/async-skipped-branch/_config.js
new file mode 100644
index 0000000000..9741b1e836
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-skipped-branch/_config.js
@@ -0,0 +1,21 @@
+import { flushSync } from 'svelte';
+import { test } from '../../test';
+
+export default test({
+	skip_no_async: true,
+	async test({ assert, target }) {
+		const [fork_btn, counter_btn] = target.querySelectorAll('button');
+
+		flushSync(() => {
+			fork_btn.click();
+		});
+
+		assert.equal(counter_btn.textContent, '0');
+
+		flushSync(() => {
+			counter_btn.click();
+		});
+
+		assert.equal(counter_btn.textContent, '1');
+	}
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/async-skipped-branch/main.svelte b/packages/svelte/tests/runtime-runes/samples/async-skipped-branch/main.svelte
new file mode 100644
index 0000000000..163609ac58
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/async-skipped-branch/main.svelte
@@ -0,0 +1,22 @@
+<script>
+	let show = $state(false);
+	let show_async = $state(false);
+	let count = $state(0);
+</script>
+
+<button onclick={() => {
+	show = true;
+	show_async = true;
+}}>show</button>
+
+{#if show}
+	hi
+{:else}
+	{#if show || !show}
+		<button onclick={() => count++}>{count}</button>
+	{/if}
+{/if}
+
+{#if show_async}
+	{await new Promise(() => {})}
+{/if}

From 2d62ffee9c2396c05f65c677c9b298a7fcfb4020 Mon Sep 17 00:00:00 2001
From: Paolo Ricciuti <ricciutipaolo@gmail.com>
Date: Thu, 29 Jan 2026 01:28:39 +0100
Subject: [PATCH 344/347] fix: throw for unset `createContext` get on the
 server (#17580)

* fix: throw for unset `createContext` get on the server

* smol tweak

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/better-groups-swim.md                     |  5 +++++
 packages/svelte/src/internal/server/context.js       | 12 +++++++++++-
 .../samples/context-not-set-throws/_config.js        |  5 +++++
 .../samples/context-not-set-throws/main.svelte       |  9 +++++++++
 packages/svelte/tests/server-side-rendering/test.ts  |  8 ++++++--
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/better-groups-swim.md
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/context-not-set-throws/_config.js
 create mode 100644 packages/svelte/tests/server-side-rendering/samples/context-not-set-throws/main.svelte

diff --git a/.changeset/better-groups-swim.md b/.changeset/better-groups-swim.md
new file mode 100644
index 0000000000..0287bb142f
--- /dev/null
+++ b/.changeset/better-groups-swim.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: throw for unset `createContext` get on the server
diff --git a/packages/svelte/src/internal/server/context.js b/packages/svelte/src/internal/server/context.js
index 7779da4c1d..6a7dc1f883 100644
--- a/packages/svelte/src/internal/server/context.js
+++ b/packages/svelte/src/internal/server/context.js
@@ -17,7 +17,17 @@ export function set_ssr_context(v) {
  */
 export function createContext() {
 	const key = {};
-	return [() => getContext(key), (context) => setContext(key, context)];
+
+	return [
+		() => {
+			if (!hasContext(key)) {
+				e.missing_context();
+			}
+
+			return getContext(key);
+		},
+		(context) => setContext(key, context)
+	];
 }
 
 /**
diff --git a/packages/svelte/tests/server-side-rendering/samples/context-not-set-throws/_config.js b/packages/svelte/tests/server-side-rendering/samples/context-not-set-throws/_config.js
new file mode 100644
index 0000000000..575844faf6
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/context-not-set-throws/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	error: 'missing_context'
+});
diff --git a/packages/svelte/tests/server-side-rendering/samples/context-not-set-throws/main.svelte b/packages/svelte/tests/server-side-rendering/samples/context-not-set-throws/main.svelte
new file mode 100644
index 0000000000..c52ad927c7
--- /dev/null
+++ b/packages/svelte/tests/server-side-rendering/samples/context-not-set-throws/main.svelte
@@ -0,0 +1,9 @@
+<script module>
+	import { createContext } from 'svelte';
+
+	const [get] = createContext();
+</script>
+
+<script>
+	get();
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/test.ts b/packages/svelte/tests/server-side-rendering/test.ts
index 2bfc84c7a1..ca98fdd9aa 100644
--- a/packages/svelte/tests/server-side-rendering/test.ts
+++ b/packages/svelte/tests/server-side-rendering/test.ts
@@ -12,6 +12,7 @@ import { assert_html_equal_with_options } from '../html_equal.js';
 import { suite_with_variants, type BaseTest } from '../suite.js';
 import type { CompileOptions } from '#compiler';
 import { seen } from '../../src/internal/server/dev.js';
+import type { SyncRenderOutput } from '#server';
 
 interface SSRTest extends BaseTest {
 	mode?: ('sync' | 'async')[];
@@ -76,6 +77,9 @@ const { test, run } = suite_with_variants<SSRTest, 'sync' | 'async', CompileOpti
 
 		let rendered;
 		let errored = false;
+		let body: SyncRenderOutput['body'];
+		let head: SyncRenderOutput['head'];
+		let hashes: SyncRenderOutput['hashes'];
 		try {
 			const render_result = render(Component, {
 				props: config.props || {},
@@ -83,6 +87,8 @@ const { test, run } = suite_with_variants<SSRTest, 'sync' | 'async', CompileOpti
 				csp: config.csp
 			});
 			rendered = is_async ? await render_result : render_result;
+			// we need to access these inside the try-catch otherwise errors in the script tag are not caught
+			({ body, head, hashes } = rendered);
 		} catch (error) {
 			errored = true;
 			if (config.error) {
@@ -97,8 +103,6 @@ const { test, run } = suite_with_variants<SSRTest, 'sync' | 'async', CompileOpti
 			assert.fail('Expected an error to be thrown, but rendering succeeded.');
 		}
 
-		const { body, head, hashes } = rendered;
-
 		fs.writeFileSync(
 			`${test_dir}/_output/${is_async ? 'async_rendered.html' : 'rendered.html'}`,
 			body

From 9d1dd2e1999e84082acff22def7bec1ba26a6680 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 28 Jan 2026 20:53:28 -0500
Subject: [PATCH 345/347] Version Packages (#17564)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .changeset/better-groups-swim.md   |  5 -----
 .changeset/common-boats-travel.md  |  5 -----
 .changeset/fuzzy-spies-love.md     |  5 -----
 .changeset/loose-sloths-guess.md   |  5 -----
 .changeset/plain-dancers-double.md |  5 -----
 .changeset/shaggy-phones-laugh.md  |  5 -----
 .changeset/sweet-rings-watch.md    |  5 -----
 .changeset/vast-hornets-draw.md    |  5 -----
 packages/svelte/CHANGELOG.md       | 22 ++++++++++++++++++++++
 packages/svelte/package.json       |  2 +-
 packages/svelte/src/version.js     |  2 +-
 11 files changed, 24 insertions(+), 42 deletions(-)
 delete mode 100644 .changeset/better-groups-swim.md
 delete mode 100644 .changeset/common-boats-travel.md
 delete mode 100644 .changeset/fuzzy-spies-love.md
 delete mode 100644 .changeset/loose-sloths-guess.md
 delete mode 100644 .changeset/plain-dancers-double.md
 delete mode 100644 .changeset/shaggy-phones-laugh.md
 delete mode 100644 .changeset/sweet-rings-watch.md
 delete mode 100644 .changeset/vast-hornets-draw.md

diff --git a/.changeset/better-groups-swim.md b/.changeset/better-groups-swim.md
deleted file mode 100644
index 0287bb142f..0000000000
--- a/.changeset/better-groups-swim.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: throw for unset `createContext` get on the server
diff --git a/.changeset/common-boats-travel.md b/.changeset/common-boats-travel.md
deleted file mode 100644
index bd3012bbf2..0000000000
--- a/.changeset/common-boats-travel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: reset effects inside skipped branches
diff --git a/.changeset/fuzzy-spies-love.md b/.changeset/fuzzy-spies-love.md
deleted file mode 100644
index 9129d986bc..0000000000
--- a/.changeset/fuzzy-spies-love.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: preserve old dependencies when updating reaction inside fork
diff --git a/.changeset/loose-sloths-guess.md b/.changeset/loose-sloths-guess.md
deleted file mode 100644
index 450040349d..0000000000
--- a/.changeset/loose-sloths-guess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': minor
----
-
-feat: allow passing `ShadowRootInit` object to custom element `shadow` option
diff --git a/.changeset/plain-dancers-double.md b/.changeset/plain-dancers-double.md
deleted file mode 100644
index ab47b8e4c7..0000000000
--- a/.changeset/plain-dancers-double.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: more conservative assignment_value_stale warnings
diff --git a/.changeset/shaggy-phones-laugh.md b/.changeset/shaggy-phones-laugh.md
deleted file mode 100644
index 8cb711491b..0000000000
--- a/.changeset/shaggy-phones-laugh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: disregard `popover` elements when determining whether an element has content
diff --git a/.changeset/sweet-rings-watch.md b/.changeset/sweet-rings-watch.md
deleted file mode 100644
index 8ce11b2672..0000000000
--- a/.changeset/sweet-rings-watch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: fire introstart/outrostart events after delay, if specified
diff --git a/.changeset/vast-hornets-draw.md b/.changeset/vast-hornets-draw.md
deleted file mode 100644
index 256439e9da..0000000000
--- a/.changeset/vast-hornets-draw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: increment signal versions when discarding forks
diff --git a/packages/svelte/CHANGELOG.md b/packages/svelte/CHANGELOG.md
index af503dbb20..7abc4fb302 100644
--- a/packages/svelte/CHANGELOG.md
+++ b/packages/svelte/CHANGELOG.md
@@ -1,5 +1,27 @@
 # svelte
 
+## 5.49.0
+
+### Minor Changes
+
+- feat: allow passing `ShadowRootInit` object to custom element `shadow` option ([#17088](https://github.com/sveltejs/svelte/pull/17088))
+
+### Patch Changes
+
+- fix: throw for unset `createContext` get on the server ([#17580](https://github.com/sveltejs/svelte/pull/17580))
+
+- fix: reset effects inside skipped branches ([#17581](https://github.com/sveltejs/svelte/pull/17581))
+
+- fix: preserve old dependencies when updating reaction inside fork ([#17579](https://github.com/sveltejs/svelte/pull/17579))
+
+- fix: more conservative assignment_value_stale warnings ([#17574](https://github.com/sveltejs/svelte/pull/17574))
+
+- fix: disregard `popover` elements when determining whether an element has content ([#17367](https://github.com/sveltejs/svelte/pull/17367))
+
+- fix: fire introstart/outrostart events after delay, if specified ([#17567](https://github.com/sveltejs/svelte/pull/17567))
+
+- fix: increment signal versions when discarding forks ([#17577](https://github.com/sveltejs/svelte/pull/17577))
+
 ## 5.48.5
 
 ### Patch Changes
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index ace4c9bd08..699473ecc6 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.48.5",
+  "version": "5.49.0",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {
diff --git a/packages/svelte/src/version.js b/packages/svelte/src/version.js
index 4338ba83ae..9be1ccff87 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.48.5';
+export const VERSION = '5.49.0';
 export const PUBLIC_VERSION = '5';

From 82fde88780647ac9699d9dec4108580f1865e55b Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Thu, 29 Jan 2026 03:54:29 +0100
Subject: [PATCH 346/347] fix: `print()` multiline behaviour (#17319)

* way cleaner new line handling for base_elements

* fix

* more fixes

* use esrap preview

* changeset

* bump `esrap`

* update snapshot

* update more snapshots

* Update .changeset/rich-zoos-walk.md

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
---
 .changeset/rich-zoos-walk.md                  |  5 ++
 packages/svelte/package.json                  |  2 +-
 packages/svelte/src/compiler/print/index.js   | 64 ++++---------------
 .../output.svelte                             |  2 +-
 .../output.svelte                             |  2 +-
 .../output.svelte                             |  2 +-
 .../print/samples/formatting/input.svelte     |  9 ++-
 .../print/samples/formatting/output.svelte    | 34 +++++++++-
 .../print/samples/html-document/output.svelte |  4 ++
 .../samples/style-directive/output.svelte     |  5 +-
 .../samples/svelte-fragment/output.svelte     |  1 +
 .../print/samples/svelte-head/output.svelte   |  1 +
 .../_expected/client/index.svelte.js          |  2 -
 .../_expected/server/index.svelte.js          |  1 -
 .../_expected/client/index.svelte.js          |  2 -
 .../_expected/server/index.svelte.js          |  2 -
 .../_expected/client/index.svelte.js          |  1 -
 pnpm-lock.yaml                                | 10 +--
 18 files changed, 75 insertions(+), 74 deletions(-)
 create mode 100644 .changeset/rich-zoos-walk.md

diff --git a/.changeset/rich-zoos-walk.md b/.changeset/rich-zoos-walk.md
new file mode 100644
index 0000000000..fc540d7123
--- /dev/null
+++ b/.changeset/rich-zoos-walk.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: properly separate multiline html blocks from each other in `print()`
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 699473ecc6..d7dc67d528 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -176,7 +176,7 @@
     "clsx": "^2.1.1",
     "devalue": "^5.6.2",
     "esm-env": "^1.2.1",
-    "esrap": "^2.2.1",
+    "esrap": "^2.2.2",
     "is-reference": "^3.0.3",
     "locate-character": "^3.0.0",
     "magic-string": "^0.30.11",
diff --git a/packages/svelte/src/compiler/print/index.js b/packages/svelte/src/compiler/print/index.js
index 4aed743dba..094c578b83 100644
--- a/packages/svelte/src/compiler/print/index.js
+++ b/packages/svelte/src/compiler/print/index.js
@@ -115,57 +115,17 @@ function base_element(node, context) {
 	const is_doctype_node = node.name.toLowerCase() === '!doctype';
 	const is_self_closing =
 		is_void(node.name) || (node.type === 'Component' && node.fragment.nodes.length === 0);
-	let multiline_content = false;
 
 	if (is_doctype_node) child_context.write(`>`);
 	else if (is_self_closing) {
 		child_context.write(`${multiline_attributes ? '' : ' '}/>`);
 	} else {
 		child_context.write('>');
-
-		// Process the element's content in a separate context for measurement
-		const content_context = child_context.new();
-		const allow_inline_content = child_context.measure() < LINE_BREAK_THRESHOLD;
-		block(content_context, node.fragment, allow_inline_content);
-
-		// Determine if content should be formatted on multiple lines
-		multiline_content = content_context.measure() > LINE_BREAK_THRESHOLD;
-
-		if (multiline_content) {
-			child_context.newline();
-
-			// Only indent if attributes are inline and content itself isn't already multiline
-			const should_indent = !multiline_attributes && !content_context.multiline;
-			if (should_indent) {
-				child_context.indent();
-			}
-
-			child_context.append(content_context);
-
-			if (should_indent) {
-				child_context.dedent();
-			}
-
-			child_context.newline();
-		} else {
-			child_context.append(content_context);
-		}
-
+		block(child_context, node.fragment, true);
 		child_context.write(`</${node.name}>`);
 	}
 
-	const break_line_after = child_context.measure() > LINE_BREAK_THRESHOLD;
-
-	if ((multiline_content || multiline_attributes) && !context.empty()) {
-		context.newline();
-	}
-
 	context.append(child_context);
-
-	if (is_self_closing) return;
-	if (multiline_content || multiline_attributes || break_line_after) {
-		context.newline();
-	}
 }
 
 /** @type {Visitors<AST.SvelteNode>} */
@@ -412,6 +372,8 @@ const svelte_visitors = {
 				}
 			} else {
 				sequence.push(child_node);
+
+				if (child_node.type === 'RegularElement') flush();
 			}
 		}
 
@@ -420,18 +382,20 @@ const svelte_visitors = {
 		let multiline = false;
 		let width = 0;
 
-		const child_contexts = items.map((sequence) => {
-			const child_context = context.new();
+		const child_contexts = items
+			.filter((x) => x.length > 0)
+			.map((sequence) => {
+				const child_context = context.new();
 
-			for (const node of sequence) {
-				child_context.visit(node);
-				multiline ||= child_context.multiline;
-			}
+				for (const node of sequence) {
+					child_context.visit(node);
+					multiline ||= child_context.multiline;
+				}
 
-			width += child_context.measure();
+				width += child_context.measure();
 
-			return child_context;
-		});
+				return child_context;
+			});
 
 		multiline ||= width > LINE_BREAK_THRESHOLD;
 
diff --git a/packages/svelte/tests/migrate/samples/impossible-migrate-$derived-derived-var-3/output.svelte b/packages/svelte/tests/migrate/samples/impossible-migrate-$derived-derived-var-3/output.svelte
index 26012e1115..90d2e2e036 100644
--- a/packages/svelte/tests/migrate/samples/impossible-migrate-$derived-derived-var-3/output.svelte
+++ b/packages/svelte/tests/migrate/samples/impossible-migrate-$derived-derived-var-3/output.svelte
@@ -4,4 +4,4 @@
 </script>
 <Component>
 	<slot name="derived" slot="derived" />
-</Component>
+</Component>
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/impossible-migrate-slot-change-name/output.svelte b/packages/svelte/tests/migrate/samples/impossible-migrate-slot-change-name/output.svelte
index 328966b63b..20e41646b3 100644
--- a/packages/svelte/tests/migrate/samples/impossible-migrate-slot-change-name/output.svelte
+++ b/packages/svelte/tests/migrate/samples/impossible-migrate-slot-change-name/output.svelte
@@ -3,4 +3,4 @@
 	let body;
 </script>
 
-<slot name="body"></slot>
+<slot name="body"></slot>
\ No newline at end of file
diff --git a/packages/svelte/tests/migrate/samples/impossible-migrate-slot-non-identifier/output.svelte b/packages/svelte/tests/migrate/samples/impossible-migrate-slot-non-identifier/output.svelte
index 1e763577df..49e9462768 100644
--- a/packages/svelte/tests/migrate/samples/impossible-migrate-slot-non-identifier/output.svelte
+++ b/packages/svelte/tests/migrate/samples/impossible-migrate-slot-non-identifier/output.svelte
@@ -1,2 +1,2 @@
 <!-- @migration-task Error while migrating Svelte code: This migration would change the name of a slot (dashed-name to dashed_name) making the component unusable -->
-<slot name="dashed-name"></slot>
+<slot name="dashed-name"></slot>
\ No newline at end of file
diff --git a/packages/svelte/tests/print/samples/formatting/input.svelte b/packages/svelte/tests/print/samples/formatting/input.svelte
index 9b1898e9c8..43c3b363cb 100644
--- a/packages/svelte/tests/print/samples/formatting/input.svelte
+++ b/packages/svelte/tests/print/samples/formatting/input.svelte
@@ -1 +1,8 @@
-<script>import { setLocale } from '$lib/paraglide/runtime';import { m } from '$lib/paraglide/messages.js';</script><h1>{m.hello_world({ name: 'SvelteKit User' })}</h1><div><button onclick={() => setLocale('en')}>en</button><button	onclick={() => setLocale('es')}>es</button></div><p>If you use VSCode, install the <a href="https://marketplace.visualstudio.com/items?itemName=inlang.vs-code-extension" target="_blank">Sherlock i18n extension</a>for a better i18n experience.</p>
+<script>import { setLocale } from '$lib/paraglide/runtime';import { m } from '$lib/paraglide/messages.js';</script>
+
+<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1><div><button onclick={() => setLocale('en')}>en</button><button	onclick={() => setLocale('es')}>es</button></div><p>If you use VSCode, install the <a href="https://marketplace.visualstudio.com/items?itemName=inlang.vs-code-extension" target="_blank">Sherlock i18n extension</a>for a better i18n experience.</p>
+
+<Component><div><button>Hello, this is a test</button><button>Hello, this is a test</button></div></Component>
+<Component><button>Hello, this is a test</button><button>Hello, this is a test</button></Component>
+<button class="foo bar" aria-label="click" onclick={() => console.log("clicked")}>Click me!</button>
+<button class="foo bar" aria-label="click" onclick={() => console.log("clicked")}><span>some fancy looking</span><span>really long button text</span></button>
diff --git a/packages/svelte/tests/print/samples/formatting/output.svelte b/packages/svelte/tests/print/samples/formatting/output.svelte
index 7b40642580..ba871c66a5 100644
--- a/packages/svelte/tests/print/samples/formatting/output.svelte
+++ b/packages/svelte/tests/print/samples/formatting/output.svelte
@@ -4,18 +4,46 @@
 </script>
 
 <h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>
+
 <div>
 	<button onclick={() => setLocale('en')}>en</button>
 	<button onclick={() => setLocale('es')}>es</button>
 </div>
+
 <p>
 	If you use VSCode, install the 
 
 	<a
 		href="https://marketplace.visualstudio.com/items?itemName=inlang.vs-code-extension"
 		target="_blank"
-	>
-		Sherlock i18n extension
-	</a>
+	>Sherlock i18n extension</a>
+
 	for a better i18n experience.
 </p>
+
+<Component>
+	<div>
+		<button>Hello, this is a test</button>
+		<button>Hello, this is a test</button>
+	</div>
+</Component>
+
+<Component>
+	<button>Hello, this is a test</button>
+	<button>Hello, this is a test</button>
+</Component>
+
+<button
+	class="foo bar"
+	aria-label="click"
+	onclick={() => console.log("clicked")}
+>Click me!</button>
+
+<button
+	class="foo bar"
+	aria-label="click"
+	onclick={() => console.log("clicked")}
+>
+	<span>some fancy looking</span>
+	<span>really long button text</span>
+</button>
diff --git a/packages/svelte/tests/print/samples/html-document/output.svelte b/packages/svelte/tests/print/samples/html-document/output.svelte
index 765f9ca84b..94ef78d0a3 100644
--- a/packages/svelte/tests/print/samples/html-document/output.svelte
+++ b/packages/svelte/tests/print/samples/html-document/output.svelte
@@ -1,12 +1,16 @@
 <!doctype html>
+
 <html>
 	<head>
 		<meta charset="utf-8" />
+
 		<meta
 			name="viewport"
 			content="width=device-width, initial-scale=1.0"
 		/>
+
 		<title>Svelte App</title>
 	</head>
+
 	<body><div>Hello World</div></body>
 </html>
diff --git a/packages/svelte/tests/print/samples/style-directive/output.svelte b/packages/svelte/tests/print/samples/style-directive/output.svelte
index 5aa3a6dcdb..27c12c5d47 100644
--- a/packages/svelte/tests/print/samples/style-directive/output.svelte
+++ b/packages/svelte/tests/print/samples/style-directive/output.svelte
@@ -1,8 +1,7 @@
 <div style:color="red">...</div>
+
 <div
 	style:color
 	style:width="12rem"
 	style:background-color={darkMode ? 'black' : 'white'}
->
-	...
-</div>
+>...</div>
diff --git a/packages/svelte/tests/print/samples/svelte-fragment/output.svelte b/packages/svelte/tests/print/samples/svelte-fragment/output.svelte
index eb80023626..73a4451ed8 100644
--- a/packages/svelte/tests/print/samples/svelte-fragment/output.svelte
+++ b/packages/svelte/tests/print/samples/svelte-fragment/output.svelte
@@ -4,6 +4,7 @@
 
 <Widget>
 	<h1 slot="header">Hello</h1>
+
 	<svelte:fragment slot="footer">
 		<p>All rights reserved.</p>
 		<p>Copyright (c) 2019 Svelte Industries</p>
diff --git a/packages/svelte/tests/print/samples/svelte-head/output.svelte b/packages/svelte/tests/print/samples/svelte-head/output.svelte
index 68d352260e..da4345d731 100644
--- a/packages/svelte/tests/print/samples/svelte-head/output.svelte
+++ b/packages/svelte/tests/print/samples/svelte-head/output.svelte
@@ -1,5 +1,6 @@
 <svelte:head>
 	<title>Hello world!</title>
+
 	<meta
 		name="description"
 		content="This is where the description goes for SEO"
diff --git a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
index 7d1fe4ec67..a8b1a43495 100644
--- a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/client/index.svelte.js
@@ -10,7 +10,6 @@ export default function Async_in_derived($$anchor, $$props) {
 	var $$promises = $.run([
 		async () => yes1 = await $.async_derived(() => 1),
 		async () => yes2 = await $.async_derived(async () => foo(await 1)),
-
 		() => no1 = $.derived(async () => {
 			return await 1;
 		}),
@@ -33,7 +32,6 @@ export default function Async_in_derived($$anchor, $$props) {
 			var promises = $.run([
 				async () => yes1 = (await $.save($.async_derived(async () => (await $.save(1))())))(),
 				async () => yes2 = (await $.save($.async_derived(async () => foo((await $.save(1))()))))(),
-
 				() => no1 = $.derived(() => (async () => {
 					return await 1;
 				})()),
diff --git a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
index 1fd184fa79..58358b3ded 100644
--- a/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/async-in-derived/_expected/server/index.svelte.js
@@ -8,7 +8,6 @@ export default function Async_in_derived($$renderer, $$props) {
 		var $$promises = $$renderer.run([
 			async () => yes1 = await 1,
 			async () => yes2 = foo(await 1),
-
 			() => no1 = (async () => {
 				return await 1;
 			})(),
diff --git a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
index 218951b836..762a23754c 100644
--- a/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js
@@ -14,7 +14,6 @@ export default function Function_prop_no_getter($$anchor) {
 		onmousedown: () => $.set(count, $.get(count) + 1),
 		onmouseup,
 		onmouseenter: () => $.set(count, plusOne($.get(count)), true),
-
 		children: ($$anchor, $$slotProps) => {
 			$.next();
 
@@ -23,7 +22,6 @@ export default function Function_prop_no_getter($$anchor) {
 			$.template_effect(() => $.set_text(text, `clicks: ${$.get(count) ?? ''}`));
 			$.append($$anchor, text);
 		},
-
 		$$slots: { default: true }
 	});
 }
\ 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 855ae30d21..e2936b7f6e 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
@@ -13,11 +13,9 @@ export default function Function_prop_no_getter($$renderer) {
 		onmousedown: () => count += 1,
 		onmouseup,
 		onmouseenter: () => count = plusOne(count),
-
 		children: ($$renderer) => {
 			$$renderer.push(`<!---->clicks: ${$.escape(count)}`);
 		},
-
 		$$slots: { default: true }
 	});
 }
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/client/index.svelte.js b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/client/index.svelte.js
index d4034dc55d..792d5421e1 100644
--- a/packages/svelte/tests/snapshot/samples/functional-templating/_expected/client/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/functional-templating/_expected/client/index.svelte.js
@@ -6,7 +6,6 @@ var root = $.from_tree(
 	[
 		['h1', null, 'hello'],
 		' ',
-
 		[
 			'div',
 			{ class: 'potato' },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b616fc0577..b14dc104ba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -96,8 +96,8 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1
       esrap:
-        specifier: ^2.2.1
-        version: 2.2.1
+        specifier: ^2.2.2
+        version: 2.2.2
       is-reference:
         specifier: ^3.0.3
         version: 3.0.3
@@ -1356,8 +1356,8 @@ packages:
     resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
     engines: {node: '>=0.10'}
 
-  esrap@2.2.1:
-    resolution: {integrity: sha512-GiYWG34AN/4CUyaWAgunGt0Rxvr1PTMlGC0vvEov/uOQYWne2bpN03Um+k8jT+q3op33mKouP2zeJ6OlM+qeUg==}
+  esrap@2.2.2:
+    resolution: {integrity: sha512-zA6497ha+qKvoWIK+WM9NAh5ni17sKZKhbS5B3PoYbBvaYHZWoS33zmFybmyqpn07RLUxSmn+RCls2/XF+d0oQ==}
 
   esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
@@ -3720,7 +3720,7 @@ snapshots:
     dependencies:
       estraverse: 5.3.0
 
-  esrap@2.2.1:
+  esrap@2.2.2:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 

From ffd65e90febc29feaca48e142126a4087fcaca9f Mon Sep 17 00:00:00 2001
From: 7nik <kifiranet@gmail.com>
Date: Thu, 29 Jan 2026 04:56:05 +0200
Subject: [PATCH 347/347] chore: allow testing in production env (#16840)

* allow testing in production env

* oops
---
 .../samples/production/_config.js             |  5 ++
 .../samples/production/main.svelte            |  7 ++
 packages/svelte/tests/suite.ts                | 66 +++++++++++++++++--
 3 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 packages/svelte/tests/runtime-runes/samples/production/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/production/main.svelte

diff --git a/packages/svelte/tests/runtime-runes/samples/production/_config.js b/packages/svelte/tests/runtime-runes/samples/production/_config.js
new file mode 100644
index 0000000000..ce36c9d95b
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/production/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	production: true
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/production/main.svelte b/packages/svelte/tests/runtime-runes/samples/production/main.svelte
new file mode 100644
index 0000000000..d9cff745d1
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/production/main.svelte
@@ -0,0 +1,7 @@
+<script>
+    import { DEV } from "esm-env";
+
+    if (DEV) {
+        throw new Error("Dev-only code must not run");
+    }
+</script>
\ No newline at end of file
diff --git a/packages/svelte/tests/suite.ts b/packages/svelte/tests/suite.ts
index bbd252b8e1..72c40f526b 100644
--- a/packages/svelte/tests/suite.ts
+++ b/packages/svelte/tests/suite.ts
@@ -1,9 +1,11 @@
 import fs from 'node:fs';
-import { it } from 'vitest';
+import { it, vi } from 'vitest';
 
 export interface BaseTest {
 	skip?: boolean;
 	solo?: boolean;
+	/** Set `DEV` to `false` */
+	production?: boolean;
 }
 
 /**
@@ -27,11 +29,31 @@ export function suite<Test extends BaseTest>(fn: (config: Test, test_dir: string
 	return {
 		test: (config: Test) => config,
 		run: async (cwd: string, samples_dir = 'samples') => {
+			const production_tests: Array<[Function, string, Function]> = [];
+
 			await for_each_dir<Test>(cwd, samples_dir, (config, dir) => {
 				let it_fn = config.skip ? it.skip : config.solo ? it.only : it;
 
-				it_fn(dir, () => fn(config, `${cwd}/${samples_dir}/${dir}`));
+				if (config.production) {
+					production_tests.push([it_fn, dir, () => fn(config, `${cwd}/${samples_dir}/${dir}`)]);
+				} else {
+					it_fn(dir, () => fn(config, `${cwd}/${samples_dir}/${dir}`));
+				}
 			});
+
+			let mocked = false;
+			for (const [it, name, test] of production_tests) {
+				it(name, () => {
+					if (!mocked) {
+						vi.doMock('esm-env', async (importEnv) => ({
+							...(await importEnv()),
+							DEV: false
+						}));
+						mocked = true;
+					}
+					return test();
+				});
+			}
 		}
 	};
 }
@@ -45,6 +67,8 @@ export function suite_with_variants<Test extends BaseTest, Variants extends stri
 	return {
 		test: (config: Test) => config,
 		run: async (cwd: string, samples_dir = 'samples') => {
+			const production_tests: Array<[Function, string, Function]> = [];
+
 			await for_each_dir<Test>(cwd, samples_dir, (config, dir) => {
 				let called_common = false;
 				let common: any = undefined;
@@ -57,15 +81,35 @@ export function suite_with_variants<Test extends BaseTest, Variants extends stri
 					const solo = config.solo;
 					let it_fn = skip ? it.skip : solo ? it.only : it;
 
-					it_fn(`${dir} (${variant})`, async () => {
+					const test = async () => {
 						if (!called_common) {
 							called_common = true;
 							common = await common_setup(config, `${cwd}/${samples_dir}/${dir}`);
 						}
 						return fn(config, `${cwd}/${samples_dir}/${dir}`, variant, common);
-					});
+					};
+
+					if (config.production) {
+						production_tests.push([it_fn, `${dir} (${variant})`, test]);
+					} else {
+						it_fn(`${dir} (${variant})`, test);
+					}
 				}
 			});
+
+			let mocked = false;
+			for (const [it, name, test] of production_tests) {
+				it(name, () => {
+					if (!mocked) {
+						vi.doMock('esm-env', async (importEnv) => ({
+							...(await importEnv()),
+							DEV: false
+						}));
+						mocked = true;
+					}
+					return test();
+				});
+			}
 		}
 	};
 }
@@ -108,3 +152,17 @@ export function assert_ok(value: any): asserts value {
 		throw new Error(`Expected truthy value, got ${value}`);
 	}
 }
+
+function run_in_production(fn: (...args: any[]) => void | Promise<void>) {
+	return async (...args: any[]) => {
+		vi.doMock('esm-env', async (importEnv) => ({
+			...(await importEnv()),
+			DEV: false
+		}));
+		try {
+			await fn(...args);
+		} finally {
+			vi.doUnmock('esm-env');
+		}
+	};
+}