Merge remote-tracking branch 'origin/main' into 1000-reading-derived-effects

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

@@ -194,6 +194,8 @@ 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) {
+			this.#commit();
+
 			var render_effects = this.#render_effects;
 			var effects = this.#effects;
 
@@ -201,8 +203,6 @@ export class Batch {
 			this.#effects = [];
 			this.#block_effects = [];
 
-			this.#commit();
-
 			flush_queued_effects(render_effects);
 			flush_queued_effects(effects);
 
@@ -540,11 +540,12 @@ function flush_queued_effects(effects) {
 	var length = effects.length;
 	if (length === 0) return;
 
-	for (var i = 0; i < length; i++) {
+	var i = 0;
-		var effect = effects[i];
+
+	while (i < length) {
+		var effect = effects[i++];
 
-		if ((effect.f & (DESTROYED | INERT)) === 0) {
+		if ((effect.f & (DESTROYED | INERT)) === 0 && is_dirty(effect)) {
-			if (is_dirty(effect)) {
 			var wv = write_version;
 
 			// updating a derived for also increase the write version but that doesn't mean
@@ -579,10 +580,9 @@ function flush_queued_effects(effects) {
 			}
 		}
 	}
-	}
 
-	for (; i < length; i += 1) {
+	while (i < length) {
-		schedule_effect(effects[i]);
+		schedule_effect(effects[i++]);
 	}
 }
 

packages/svelte/tests/runtime-runes/samples/effect-order-7/_config.js

@@ -2,14 +2,18 @@ import { flushSync } from 'svelte';
 import { test } from '../../test';
 
 export default test({
-	skip: true,
+	// For this to work in non-async mode, we would need to abort
+	// inside `#traverse_effect_tree`, which would be very
+	// complicated and annoying. Since this hasn't been
+	// a real issue (AFAICT), we ignore it
+	skip_no_async: true,
 
-	async test({ assert, target, logs }) {
+	async test({ target }) {
 		const [open, close] = target.querySelectorAll('button');
 
 		flushSync(() => open.click());
-		flushSync(() => close.click());
 
-		assert.deepEqual(logs, [true]);
+		// if the effect queue isn't aborted after the state change, this will throw
+		flushSync(() => close.click());
 	}
 });