fix: don't wait for remote functions that are not awaited in the template

.changeset/large-squids-pull.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: don't wait for remote functions that are not awaited in the template

packages/kit/src/runtime/server/page/render.js

@@ -493,7 +493,30 @@ export async function render_response({
 				if (!info.id) continue;
 
 				for (const key in cache) {
-					remote[create_remote_key(info.id, key)] = await cache[key];
+					const remote_key = create_remote_key(info.id, key);
+
+					if (event_state.refreshes?.[remote_key] !== undefined) {
+						// This entry was refreshed/set by a command or form action.
+						// Always await it so the mutation result is serialized.
+						remote[remote_key] = await cache[key];
+					} else {
+						// Don't block the response on pending remote data - if a query
+						// hasn't settled yet, it wasn't awaited in the template (or is behind a pending boundary).
+						const result = await Promise.race([
+							Promise.resolve(cache[key]).then(
+								(v) => /** @type {const} */ ({ settled: true, value: v }),
+								(e) => /** @type {const} */ ({ settled: true, error: e })
+							),
+							new Promise((resolve) => {
+								queueMicrotask(() => resolve(/** @type {const} */ ({ settled: false })));
+							})
+						]);
+
+						if (result.settled) {
+							if ('error' in result) throw result.error;
+							remote[remote_key] = result.value;
+						}
+					}
 				}
 			}
 

packages/kit/test/apps/async/src/routes/remote/query-boundary/+page.svelte

@@ -0,0 +1,14 @@
+<script>
+	import { get_delayed_data, get_fast_data } from './data.remote.js';
+
+	// shouldn't block SSR since requested immediately but awaited inside pending boundary
+	const delayed = get_delayed_data();
+</script>
+
+<p id="fast-result">{await get_fast_data()}</p>
+<svelte:boundary>
+	{#snippet pending()}
+		<p id="delayed-pending">loading delayed</p>
+	{/snippet}
+	<p id="delayed-result">{await delayed}</p>
+</svelte:boundary>

packages/kit/test/apps/async/src/routes/remote/query-boundary/data.remote.js

@@ -0,0 +1,10 @@
+import { query } from '$app/server';
+
+export const get_delayed_data = query(async () => {
+	await new Promise((resolve) => setTimeout(resolve, 2000));
+	return 'delayed data';
+});
+
+export const get_fast_data = query(() => {
+	return 'fast data';
+});

packages/kit/test/apps/async/test/test.js

@@ -482,4 +482,19 @@ test.describe('remote functions', () => {
 			})
 		);
 	});
+
+	test('query stored as variable does not block SSR inside boundary', async ({
+		page,
+		javaScriptEnabled
+	}) => {
+		await page.goto('/remote/query-boundary');
+
+		await expect(page.locator('#delayed-pending')).toHaveText('loading delayed');
+
+		if (javaScriptEnabled) {
+			await expect(page.locator('#delayed-result')).toHaveText('delayed data', {
+				timeout: 5000
+			});
+		}
+	});
 });