From 0d34b7abb68bd9cacc7c28b9fb8ffb0c3164f2fd Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Thu, 23 Jan 2025 22:43:34 +0000
Subject: [PATCH] more fixes

---
 .../phases/3-transform/client/visitors/AwaitExpression.js   | 6 +++++-
 packages/svelte/src/internal/client/dom/blocks/boundary.js  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
index 9189ed4b88..fdfa0c7a0c 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/AwaitExpression.js
@@ -15,7 +15,11 @@ export function AwaitExpression(node, context) {
 	}
 
 	const inside_derived = context.path.some(
-		(n) => n.type === 'CallExpression' && get_rune(n, context.state.scope) === '$derived'
+		(n) =>
+			n.type === 'VariableDeclaration' &&
+			n.declarations.some(
+				(d) => d.init?.type === 'CallExpression' && get_rune(d.init, context.state.scope) === '$derived'
+			)
 	);
 
 	const expression = b.call(
diff --git a/packages/svelte/src/internal/client/dom/blocks/boundary.js b/packages/svelte/src/internal/client/dom/blocks/boundary.js
index 9532b1c2e4..9a77aae368 100644
--- a/packages/svelte/src/internal/client/dom/blocks/boundary.js
+++ b/packages/svelte/src/internal/client/dom/blocks/boundary.js
@@ -281,6 +281,8 @@ export function capture() {
 		// prevent the active effect from outstaying its welcome
 		if (should_exit) {
 			queue_post_micro_task(exit);
+		} else {
+			debugger
 		}
 	};
 }
@@ -317,6 +319,7 @@ export async function script_suspend(fn) {
 	const restore = capture();
 	const unsuspend = suspend();
 	try {
+		exit();
 		return await fn();
 	} finally {
 		restore(false);