fix: skip refreshing queries on full-page reload form submissions (#15803)

ottomated · web-flow · commit d3b525703c9b · 2026-05-11T16:35:44.000-06:00
If a non-enhanced remote form is submitted, it results in a full-page
reload. By the nature of a full-page reload, it's impossible for the
form to return refreshed queries to the client. Therefore, because
queries should be idempotent, we can simply turn `query().refresh()`
into a no-op if it's a full-page reload.
diff --git a/.changeset/shaky-ravens-search.md b/.changeset/shaky-ravens-search.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: skip refreshing queries on full-page reload form submissions
diff --git a/packages/kit/src/runtime/app/server/remote/query.js b/packages/kit/src/runtime/app/server/remote/query.js
@@ -434,6 +434,12 @@ function create_query_resource(__, payload, state, fn) {
 			return false;
 		},
 		refresh() {
+			const { event } = get_request_store();
+			if (!event.isRemoteRequest) {
+				// If the form submission is not a remote request, refreshing the data is
+				// useless, because it can't be returned to the client.
+				return Promise.resolve();
+			}
 			const refresh_context = get_refresh_context(__, 'refresh', payload);
 			const is_immediate_refresh = !refresh_context.cache[refresh_context.payload];
 			const value = is_immediate_refresh ? get_promise() : fn();
diff --git a/packages/kit/test/apps/async/src/routes/remote/form/noop-refresh-non-enhanced/[key]/+page.svelte b/packages/kit/test/apps/async/src/routes/remote/form/noop-refresh-non-enhanced/[key]/+page.svelte
@@ -0,0 +1,12 @@
+<script>
+	import { get_count, set } from './form.remote';
+
+	const { params } = $props();
+</script>
+
+<div id="count">Count: {await get_count(params.key)}</div>
+
+<form {...set}>
+	<input {...set.fields.key.as('hidden', params.key)} />
+	<button type="submit">Submit</button>
+</form>
diff --git a/packages/kit/test/apps/async/src/routes/remote/form/noop-refresh-non-enhanced/[key]/form.remote.ts b/packages/kit/test/apps/async/src/routes/remote/form/noop-refresh-non-enhanced/[key]/form.remote.ts
@@ -0,0 +1,17 @@
+import { form, query } from '$app/server';
+import * as v from 'valibot';
+
+let counts = new Map();
+
+export const get_count = query(v.string(), (key) => {
+	return counts.get(key) ?? 0;
+});
+export const increment_count = query(v.string(), (key) => {
+	counts.set(key, (counts.get(key) ?? 0) + 1);
+	return counts.get(key);
+});
+
+export const set = form(v.object({ key: v.string() }), async ({ key }) => {
+	await increment_count(key).refresh();
+	await get_count(key).refresh();
+});
diff --git a/packages/kit/test/apps/async/test/client.test.js b/packages/kit/test/apps/async/test/client.test.js
@@ -796,6 +796,17 @@ test.describe('remote function mutations', () => {
 		// the value display should also show the updated value
 		await expect(page.locator('#set-value-display')).toHaveText('Set via method');
 	});
+	test('form does refresh queries when a remote request', async ({ page }) => {
+		await page.goto(`/remote/form/noop-refresh-non-enhanced/${Date.now()}${Math.random()}`);
+
+		const count = page.locator('#count');
+		await expect(count).toHaveText('Count: 0');
+
+		await page.click('button');
+
+		// Should have refreshed
+		await expect(count).toHaveText('Count: 1');
+	});
 });
 
 test.describe('client error boundaries', () => {
diff --git a/packages/kit/test/apps/async/test/server.test.js b/packages/kit/test/apps/async/test/server.test.js
@@ -22,4 +22,15 @@ test.describe('remote functions', () => {
 		);
 		expect(code.includes('const with_read = prerender(')).toBe(false);
 	});
+	test("form doesn't refresh queries when not a remote request", async ({ page }) => {
+		await page.goto(`/remote/form/noop-refresh-non-enhanced/${Date.now()}${Math.random()}`);
+
+		const count = page.locator('#count');
+		await expect(count).toHaveText('Count: 0');
+
+		await page.click('button');
+
+		// Should not have refreshed
+		await expect(count).toHaveText('Count: 0');
+	});
 });

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@sveltejs/kit': patch
 +---
++
 +fix: skip refreshing queries on full-page reload form submissions