WIP

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

@@ -1,6 +1,11 @@
 /** @import { Effect, Source } from '#client' */
-import { DIRTY } from '#client/constants';
+import { CLEAN, DIRTY } from '#client/constants';
-import { schedule_effect, set_signal_status, update_effect } from '../runtime.js';
+import {
+	flush_queued_effects,
+	schedule_effect,
+	set_signal_status,
+	update_effect
+} from '../runtime.js';
 import { raf } from '../timing.js';
 import { internal_set, mark_reactions, pending } from './sources.js';
 
@@ -44,9 +49,6 @@ export class Batch {
 	/** @type {Effect[]} */
 	effects = [];
 
-	/** @type {Effect[]} */
-	combined_effects = [];
-
 	/** @type {Set<Effect>} */
 	skipped_effects = new Set();
 
@@ -70,8 +72,6 @@ export class Batch {
 			schedule_effect(e);
 		}
 
-		this.combined_effects = [];
-
 		for (const batch of batches) {
 			if (batch === this) continue;
 
@@ -87,6 +87,21 @@ export class Batch {
 		this.effects = [];
 
 		return () => {
+			if (this.async_effects.length === 0 && this.settled()) {
+				var render_effects = this.render_effects;
+				var effects = this.effects;
+
+				this.render_effects = [];
+				this.effects = [];
+
+				this.commit();
+				flush_queued_effects(render_effects);
+				flush_queued_effects(effects);
+			} else {
+				for (const e of this.render_effects) set_signal_status(e, CLEAN);
+				for (const e of this.effects) set_signal_status(e, CLEAN);
+			}
+
 			for (const [source, value] of current_values) {
 				source.v = value;
 			}

packages/svelte/src/internal/client/runtime.js

@@ -704,30 +704,6 @@ function flush_queued_root_effects() {
 				process_effects(batch, root);
 			}
 
-			if (batch.async_effects.length === 0 && batch.settled()) {
-				var render_effects = batch.render_effects;
-				var effects = batch.effects;
-
-				batch.render_effects = [];
-				batch.effects = [];
-
-				batch.commit();
-				flush_queued_effects(render_effects);
-				flush_queued_effects(effects);
-			} else {
-				// store the effects on the batch so that they run next time,
-				// even if they don't get re-dirtied
-				for (const e of batch.render_effects) {
-					set_signal_status(e, CLEAN);
-				}
-
-				for (const e of batch.effects) {
-					set_signal_status(e, CLEAN);
-				}
-
-				batch.combined_effects.push(...batch.render_effects, ...batch.effects);
-			}
-
 			revert();
 
 			old_values.clear();
@@ -747,7 +723,7 @@ function flush_queued_root_effects() {
  * @param {Array<Effect>} effects
  * @returns {void}
  */
-function flush_queued_effects(effects) {
+export function flush_queued_effects(effects) {
 	var length = effects.length;
 	if (length === 0) return;