From 60c273eb76b087014b96deab6ec04a7056e8a5c9 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Wed, 15 Nov 2023 23:52:52 +0000
Subject: [PATCH] Revert "fix: address bug in before/after update" (#9480)

* Revert "fix: address bug in before/after update (#9448)"

This reverts commit 9eb969ddd4b41275a8f3bbb9a4662482d2d9bcd6.

* add changeset
---
 .changeset/brown-spoons-boil.md               |  5 +++++
 .changeset/nasty-clocks-exercise.md           |  5 -----
 .../svelte/src/internal/client/runtime.js     | 14 +++---------
 .../runes-before-after-update/Child.svelte    |  7 ------
 .../runes-before-after-update/_config.js      | 15 -------------
 .../runes-before-after-update/main.svelte     | 22 -------------------
 6 files changed, 8 insertions(+), 60 deletions(-)
 create mode 100644 .changeset/brown-spoons-boil.md
 delete mode 100644 .changeset/nasty-clocks-exercise.md
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/runes-before-after-update/Child.svelte
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/runes-before-after-update/_config.js
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/runes-before-after-update/main.svelte

diff --git a/.changeset/brown-spoons-boil.md b/.changeset/brown-spoons-boil.md
new file mode 100644
index 0000000000..ba681e7d05
--- /dev/null
+++ b/.changeset/brown-spoons-boil.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+revert: address bug in before/after update
diff --git a/.changeset/nasty-clocks-exercise.md b/.changeset/nasty-clocks-exercise.md
deleted file mode 100644
index 7362f8c0b2..0000000000
--- a/.changeset/nasty-clocks-exercise.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'svelte': patch
----
-
-fix: corrects a beforeUpdate/afterUpdate bug
diff --git a/packages/svelte/src/internal/client/runtime.js b/packages/svelte/src/internal/client/runtime.js
index 30807a317a..a67f300b21 100644
--- a/packages/svelte/src/internal/client/runtime.js
+++ b/packages/svelte/src/internal/client/runtime.js
@@ -960,18 +960,10 @@ export function set_signal_value(signal, value) {
 			schedule_effect(current_effect, false);
 		}
 		mark_signal_consumers(signal, DIRTY, true);
-		// This logic checks if there are any render effects queued after the above marking
-		// of consumers. If there are render effects that have the same component context as
-		// the source signal we're writing to, then we can bail-out of this logic as there
-		// will be a render effect in the queue that hopefully takes case of triggering the
-		// beforeUpdate/afterUpdate logic (doing it again here would duplicate them). However,
-		// if the render effects scheduled in the queue are unrelated to the component context,
-		// then we need to trigger the beforeUpdate/afterUpdate logic here instead.
+		// If we have afterUpdates locally on the component, but we're within a render effect
+		// then we will need to manually invoke the beforeUpdate/afterUpdate logic.
 		// TODO: should we put this being a is_runes check and only run it in non-runes mode?
-		if (
-			current_effect === null &&
-			current_queued_pre_and_render_effects.every((e) => e.context !== component_context)
-		) {
+		if (current_effect === null && current_queued_pre_and_render_effects.length === 0) {
 			const update_callbacks = component_context?.update_callbacks;
 			if (update_callbacks != null) {
 				update_callbacks.before.forEach(/** @param {any} c */ (c) => c());
diff --git a/packages/svelte/tests/runtime-runes/samples/runes-before-after-update/Child.svelte b/packages/svelte/tests/runtime-runes/samples/runes-before-after-update/Child.svelte
deleted file mode 100644
index 5f27f07c9d..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/runes-before-after-update/Child.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-	const {count, increment} = $props();
-</script>
-
-<button onclick={increment}>
-	{count}
-</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/runes-before-after-update/_config.js b/packages/svelte/tests/runtime-runes/samples/runes-before-after-update/_config.js
deleted file mode 100644
index 5a357f88c4..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/runes-before-after-update/_config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { flushSync } from 'svelte';
-import { test } from '../../test';
-
-export default test({
-	html: '<button>0</button>',
-
-	async test({ assert, target, component }) {
-		const [btn] = target.querySelectorAll('button');
-		flushSync(() => {
-			btn.click();
-		});
-		assert.deepEqual(component.log, ['beforeUpdate', 'afterUpdate']);
-		assert.htmlEqual(target.innerHTML, `<button>1</button>`);
-	}
-});
diff --git a/packages/svelte/tests/runtime-runes/samples/runes-before-after-update/main.svelte b/packages/svelte/tests/runtime-runes/samples/runes-before-after-update/main.svelte
deleted file mode 100644
index b3e6f583fd..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/runes-before-after-update/main.svelte
+++ /dev/null
@@ -1,22 +0,0 @@
-<script>
-	import Child from './Child.svelte'
-	import {afterUpdate, beforeUpdate} from 'svelte';
-
-	const {log = []} = $props();
-
-	let count = $state(0);
-
-	const increment = () => {
-		count++;
-	}
-
-	beforeUpdate(() => {
-		log.push('beforeUpdate');
-	});
-
-	afterUpdate(() => {
-		log.push('afterUpdate');
-	});
-</script>
-
-<Child count={count} increment={increment} />