From be645b4d9f84cb7580683c7b2336d1023906c4da Mon Sep 17 00:00:00 2001
From: ComputerGuy <63362464+Ocean-OS@users.noreply.github.com>
Date: Sat, 30 Aug 2025 12:52:08 -0700
Subject: [PATCH] fix: place store setup inside async body (#16687)

* fix: place store setup inside async body

* fix?

* fix

* tweak

* more
---
 .changeset/wise-schools-report.md             |  5 ++++
 .../3-transform/client/transform-client.js    | 27 +++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/wise-schools-report.md

diff --git a/.changeset/wise-schools-report.md b/.changeset/wise-schools-report.md
new file mode 100644
index 0000000000..47ec887256
--- /dev/null
+++ b/.changeset/wise-schools-report.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: place store setup inside async body
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 bdd7eb3f17..706d2b4e10 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
@@ -360,15 +360,27 @@ export function client_component(analysis, options) {
 
 	let component_block = b.block([
 		store_init,
-		...store_setup,
 		...legacy_reactive_declarations,
 		...group_binding_declarations
 	]);
 
+	const should_inject_context =
+		dev ||
+		analysis.needs_context ||
+		analysis.reactive_statements.size > 0 ||
+		component_returned_object.length > 0;
+
 	if (analysis.instance.has_await) {
+		if (should_inject_context && component_returned_object.length > 0) {
+			component_block.body.push(b.var('$$exports'));
+		}
 		const body = b.block([
+			...store_setup,
 			...state.instance_level_snippets,
 			.../** @type {ESTree.Statement[]} */ (instance.body),
+			...(should_inject_context && component_returned_object.length > 0
+				? [b.stmt(b.assignment('=', b.id('$$exports'), b.object(component_returned_object)))]
+				: []),
 			b.if(b.call('$.aborted'), b.return()),
 			.../** @type {ESTree.Statement[]} */ (template.body)
 		]);
@@ -379,6 +391,10 @@ export function client_component(analysis, options) {
 			...state.instance_level_snippets,
 			.../** @type {ESTree.Statement[]} */ (instance.body)
 		);
+		if (should_inject_context && component_returned_object.length > 0) {
+			component_block.body.push(b.var('$$exports', b.object(component_returned_object)));
+		}
+		component_block.body.unshift(...store_setup);
 
 		if (!analysis.runes && analysis.needs_context) {
 			component_block.body.push(b.stmt(b.call('$.init', analysis.immutable ? b.true : undefined)));
@@ -393,12 +409,6 @@ export function client_component(analysis, options) {
 		);
 	}
 
-	const should_inject_context =
-		dev ||
-		analysis.needs_context ||
-		analysis.reactive_statements.size > 0 ||
-		component_returned_object.length > 0;
-
 	let should_inject_props =
 		should_inject_context ||
 		analysis.needs_props ||
@@ -445,7 +455,7 @@ export function client_component(analysis, options) {
 		let to_push;
 
 		if (component_returned_object.length > 0) {
-			let pop_call = b.call('$.pop', b.object(component_returned_object));
+			let pop_call = b.call('$.pop', b.id('$$exports'));
 			to_push = needs_store_cleanup ? b.var('$$pop', pop_call) : b.return(pop_call);
 		} else {
 			to_push = b.stmt(b.call('$.pop'));
@@ -456,6 +466,7 @@ export function client_component(analysis, options) {
 
 	if (needs_store_cleanup) {
 		component_block.body.push(b.stmt(b.call('$$cleanup')));
+
 		if (component_returned_object.length > 0) {
 			component_block.body.push(b.return(b.id('$$pop')));
 		}