From 7a43163fff4d2674d59b5f21d85d2ca38b12ce70 Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Fri, 11 Jul 2025 11:42:22 -0400
Subject: [PATCH] bail out of secondary flushes

---
 .../svelte/src/internal/client/reactivity/batch.js    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/svelte/src/internal/client/reactivity/batch.js b/packages/svelte/src/internal/client/reactivity/batch.js
index 59edfda5f9..3a9a434b54 100644
--- a/packages/svelte/src/internal/client/reactivity/batch.js
+++ b/packages/svelte/src/internal/client/reactivity/batch.js
@@ -1,5 +1,6 @@
 /** @import { Derived, Effect, Source } from '#client' */
 import {
+	BLOCK_EFFECT,
 	BRANCH_EFFECT,
 	CLEAN,
 	DESTROYED,
@@ -53,6 +54,8 @@ let queued_root_effects = [];
 /** @type {Effect | null} */
 let last_scheduled_effect = null;
 
+let is_flushing = false;
+
 export class Batch {
 	/**
 	 * The current values of any sources that are updated in this batch
@@ -310,6 +313,7 @@ export class Batch {
 
 	flush_effects() {
 		var was_updating_effect = is_updating_effect;
+		is_flushing = true;
 
 		try {
 			var flush_count = 0;
@@ -324,6 +328,7 @@ export class Batch {
 				old_values.clear();
 			}
 		} finally {
+			is_flushing = false;
 			set_is_updating_effect(was_updating_effect);
 
 			last_scheduled_effect = null;
@@ -541,6 +546,12 @@ export function schedule_effect(signal) {
 		effect = effect.parent;
 		var flags = effect.f;
 
+		// 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) {
+			return;
+		}
+
 		if ((flags & (ROOT_EFFECT | BRANCH_EFFECT)) !== 0) {
 			if ((flags & CLEAN) === 0) return;
 			effect.f ^= CLEAN;