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 1/2] 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 2/2] 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;