Merge branch 'main' into issue-15192

Author: teemingc

.changeset/quiet-swans-render.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: avoid triggering `handleError` when redirecting in a remote function

documentation/docs/20-core-concepts/10-routing.md

@@ -39,21 +39,36 @@ A `+page.svelte` component defines a page of your app. By default, pages are ren
 
 > [!NOTE] SvelteKit uses `<a>` elements to navigate between routes, rather than a framework-specific `<Link>` component.
 
-Pages can receive data from `load` functions via the `data` prop. They also receive `params`, which is typed based on the route parameters.
+Pages can receive data from `load` functions via the `data` prop.
 
 ```svelte
 <!--- file: src/routes/blog/[slug]/+page.svelte --->
 <script>
 	/** @type {import('./$types').PageProps} */
-	let { data, params } = $props();
+	let { data } = $props();
 </script>
 
-<span>blog/{params.slug}</span>
-
 <h1>{data.title}</h1>
 <div>{@html data.content}</div>
 ```
 
+As of 2.24, pages also receive a `params` prop which is typed based on the route parameters. This is particularly useful alongside [remote functions](remote-functions):
+
+```svelte
+<!--- file: src/routes/blog/[slug]/+page.svelte --->
+<script>
+	import { getPost } from '../blog.remote';
+
+	/** @type {import('./$types').PageProps} */
+	let { params } = $props();
+
+	const post = $derived(await getPost(params.slug));
+</script>
+
+<h1>{post.title}</h1>
+<div>{@html post.content}</div>
+```
+
 > [!LEGACY]
 > `PageProps` was added in 2.16.0. In earlier versions, you had to type the `data` property manually with `PageData` instead, see [$types](#\$types).
 >

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

@@ -1,5 +1,5 @@
 import { text } from '@sveltejs/kit';
-import { Redirect } from '@sveltejs/kit/internal';
+import { HttpError, Redirect } from '@sveltejs/kit/internal';
 import { compact } from '../../../utils/array.js';
 import { get_status, normalize_error } from '../../../utils/error.js';
 import { add_data_suffix } from '../../pathname.js';
@@ -357,6 +357,11 @@ export async function render_page(
 				ssr === false ? server_data_serializer(event, event_state, options) : data_serializer
 		});
 	} catch (e) {
+		// a remote function could have thrown a redirect during render
+		if (e instanceof Redirect) {
+			return redirect_response(e.status, e.location);
+		}
+
 		// if we end up here, it means the data loaded successfully
 		// but the page failed to render, or that a prerendering error occurred
 		return await respond_with_error({
@@ -365,7 +370,7 @@ export async function render_page(
 			options,
 			manifest,
 			state,
-			status: 500,
+			status: e instanceof HttpError ? e.status : 500,
 			error: e,
 			resolve_opts
 		});

packages/kit/test/apps/async/src/hooks.server.js

@@ -1,10 +1,17 @@
+import { isRedirect } from '@sveltejs/kit';
+
 /** @type {import('@sveltejs/kit').HandleValidationError} */
 export const handleValidationError = ({ issues }) => {
 	return { message: issues[0].message };
 };
 
 /** @type {import('@sveltejs/kit').HandleServerError} */
 export const handleError = ({ error: e, status, message }) => {
+	// helps us catch sveltekit redirects thrown in component code
+	if (isRedirect(e)) {
+		throw new Error("Redirects shouldn't trigger the handleError hook");
+	}
+
 	const error = /** @type {Error} */ (e);
 
 	return { message: `${error.message} (${status} ${message})` };

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

@@ -1,3 +1,4 @@
+import http from 'node:http';
 import { expect } from '@playwright/test';
 import { test } from '../../../utils.js';
 
@@ -25,6 +26,24 @@ test.describe('remote functions', () => {
 		await expect(page.locator('#redirected')).toHaveText('redirected');
 	});
 
+	test("query that's awaited and throws a redirect doesn't trigger handleError hook", async ({
+		baseURL
+	}) => {
+		const { status, location } = await new Promise((fulfil, reject) => {
+			const request = http.get(`${baseURL}/remote/query-redirect/from-page`, (response) => {
+				fulfil({
+					status: response.statusCode,
+					location: response.headers.location
+				});
+				response.resume();
+			});
+			request.on('error', reject);
+		});
+
+		expect(status).toBe(307);
+		expect(location).toBe('/remote/query-redirect/redirected');
+	});
+
 	test('non-exported queries do not clobber each other', async ({ page }) => {
 		await page.goto('/remote/query-non-exported');