From 80b713a85e8cd759ef8c17976a51176c83c6d33a Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Mon, 3 Feb 2025 09:00:54 -0500
Subject: [PATCH] abort component if already destroyed

---
 .../compiler/phases/3-transform/client/transform-client.js | 7 +++++--
 packages/svelte/src/internal/client/index.js               | 1 +
 packages/svelte/src/internal/client/reactivity/effects.js  | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
index 869604364a..ed837b2b6f 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
@@ -363,8 +363,7 @@ export function client_component(analysis, options) {
 		.../** @type {ESTree.Statement[]} */ (instance.body),
 		analysis.runes || !analysis.needs_context
 			? b.empty
-			: b.stmt(b.call('$.init', analysis.immutable ? b.true : undefined)),
-		.../** @type {ESTree.Statement[]} */ (template.body)
+			: b.stmt(b.call('$.init', analysis.immutable ? b.true : undefined))
 	]);
 
 	if (analysis.instance.is_async) {
@@ -374,6 +373,8 @@ export function client_component(analysis, options) {
 			b.block([
 				b.var('$$unsuspend', b.call('$.suspend')),
 				...component_block.body,
+				b.if(b.call('$.aborted'), b.return()),
+				.../** @type {ESTree.Statement[]} */ (template.body),
 				b.stmt(b.call('$$unsuspend'))
 			])
 		);
@@ -387,6 +388,8 @@ export function client_component(analysis, options) {
 			b.stmt(b.call(body.id, b.id('node'), b.id('$$props'))),
 			b.stmt(b.call('$.append', b.id('$$anchor'), b.id('fragment')))
 		]);
+	} else {
+		component_block.body.push(.../** @type {ESTree.Statement[]} */ (template.body));
 	}
 
 	if (!analysis.runes) {
diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js
index 12ef0b3658..9035e50e4f 100644
--- a/packages/svelte/src/internal/client/index.js
+++ b/packages/svelte/src/internal/client/index.js
@@ -101,6 +101,7 @@ export {
 } from './dom/template.js';
 export { async_derived, derived, derived_safe_equal } from './reactivity/deriveds.js';
 export {
+	aborted,
 	effect_tracking,
 	effect_root,
 	legacy_pre_effect,
diff --git a/packages/svelte/src/internal/client/reactivity/effects.js b/packages/svelte/src/internal/client/reactivity/effects.js
index 4e9ef51726..84d64faa0e 100644
--- a/packages/svelte/src/internal/client/reactivity/effects.js
+++ b/packages/svelte/src/internal/client/reactivity/effects.js
@@ -659,3 +659,8 @@ function resume_children(effect, local) {
 		}
 	}
 }
+
+export function aborted() {
+	var effect = /** @type {Effect} */ (active_effect);
+	return (effect.f & DESTROYED) !== 0;
+}