more

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

@@ -277,7 +277,6 @@ export class Batch {
 	 * discarded along with the fork. Committing writes the fork's sources
 	 * through, after which deriveds recompute in the real world.
 	 * `null` unless this batch is (or was) a fork.
-	 * Lazily initialised for perf reasons
 	 * @type {Map<Value, any> | null}
 	 */
 	fork_values = null;
@@ -1139,9 +1138,11 @@ export class Batch {
 		for (var fork = first_batch; fork !== null; fork = fork.#next) {
 			if (!fork.is_fork || fork.fork_effects === null) continue;
 
-			for (const signal of this.current.keys()) {
-				fork.current.delete(signal);
-				fork.previous.delete(signal);
+			if (fork.id < this.id) {
+				for (const signal of this.current.keys()) {
+					fork.current.delete(signal);
+					fork.previous.delete(signal);
+				}
 			}
 
 			if (fork.current.size === 0) {

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

@@ -741,7 +741,7 @@ export function get(signal) {
 			var override_owner = override[1];
 
 			if (override_owner !== null && active_reaction !== null && !untracking) {
-				while (override_owner.merged_into !== null) override_owner = override_owner.merged_into;
+				override_owner = override_owner.resolved();
 				(override_owner.stale_readers ??= new Set()).add(active_reaction);
 			}