Merge branch 'main' into pr/astralhpi/13427

Author: eltigerchino

.changeset/angry-ravens-eat.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: only call `afterNavigate` once on app start when SSR is disabled

packages/adapter-cloudflare/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sveltejs/adapter-cloudflare
 
+## 6.0.1
+### Patch Changes
+
+
+- fix: revert writing server files to the cloudflare build directory ([#13622](https://github.com/sveltejs/kit/pull/13622))
+
 ## 6.0.0
 ### Major Changes
 

packages/adapter-cloudflare/index.js

@@ -62,6 +62,12 @@ export default function (options = {}) {
 					`export const prerendered = new Set(${JSON.stringify(builder.prerendered.paths)});\n\n` +
 					`export const base_path = ${JSON.stringify(builder.config.kit.paths.base)};\n`
 			);
+			builder.copy(`${files}/worker.js`, `${dest}/_worker.js`, {
+				replace: {
+					SERVER: `${relative_path}/index.js`,
+					MANIFEST: `${path.posix.relative(dest, tmp)}/manifest.js`
+				}
+			});
 
 
 			// _headers

packages/adapter-cloudflare/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-cloudflare",
-	"version": "6.0.0",
+	"version": "6.0.1",
 	"description": "Adapter for building SvelteKit applications on Cloudflare Pages with Workers integration",
 	"keywords": [
 		"adapter",

packages/kit/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sveltejs/kit
 
+## 2.20.2
+### Patch Changes
+
+
+- fix: allow non-prerendered API endpoint calls during reroute when prerendering ([#13616](https://github.com/sveltejs/kit/pull/13616))
+
 ## 2.20.1
 ### Patch Changes
 

packages/kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "2.20.1",
+	"version": "2.20.2",
 	"description": "SvelteKit is the fastest way to build Svelte apps",
 	"keywords": [
 		"framework",

packages/kit/src/exports/public.d.ts

@@ -1025,7 +1025,7 @@ export interface NavigationTarget {
 }
 
 /**
- * - `enter`: The app has hydrated
+ * - `enter`: The app has hydrated/started
  * - `form`: The user submitted a `<form>` with a GET method
  * - `leave`: The user is leaving the app by closing the tab or using the back/forward buttons to go to a different document
  * - `link`: Navigation was triggered by a link click
@@ -1101,7 +1101,7 @@ export interface OnNavigate extends Navigation {
 export interface AfterNavigate extends Omit<Navigation, 'type'> {
 	/**
 	 * The type of navigation:
-	 * - `enter`: The app has hydrated
+	 * - `enter`: The app has hydrated/started
 	 * - `form`: The user submitted a `<form>`
 	 * - `link`: Navigation was triggered by a link click
 	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect

packages/kit/src/runtime/client/client.js

@@ -320,8 +320,10 @@ export async function start(_app, _target, hydrate) {
 	if (hydrate) {
 		await _hydrate(target, hydrate);
 	} else {
-		await goto(app.hash ? decode_hash(new URL(location.href)) : location.href, {
-			replaceState: true
+		await navigate({
+			type: 'enter',
+			url: resolve_url(app.hash ? decode_hash(new URL(location.href)) : location.href),
+			replace_state: true
 		});
 	}
 
@@ -479,20 +481,22 @@ function initialize(result, target, hydrate) {
 
 	restore_snapshot(current_navigation_index);
 
-	/** @type {import('@sveltejs/kit').AfterNavigate} */
-	const navigation = {
-		from: null,
-		to: {
-			params: current.params,
-			route: { id: current.route?.id ?? null },
-			url: new URL(location.href)
-		},
-		willUnload: false,
-		type: 'enter',
-		complete: Promise.resolve()
-	};
+	if (hydrate) {
+		/** @type {import('@sveltejs/kit').AfterNavigate} */
+		const navigation = {
+			from: null,
+			to: {
+				params: current.params,
+				route: { id: current.route?.id ?? null },
+				url: new URL(location.href)
+			},
+			willUnload: false,
+			type: 'enter',
+			complete: Promise.resolve()
+		};
 
-	after_navigate_callbacks.forEach((fn) => fn(navigation));
+		after_navigate_callbacks.forEach((fn) => fn(navigation));
+	}
 
 	started = true;
 }
@@ -1373,7 +1377,7 @@ function _before_navigate({ url, type, intent, delta }) {
 
 /**
  * @param {{
- *   type: import('@sveltejs/kit').Navigation["type"];
+ *   type: import('@sveltejs/kit').NavigationType;
  *   url: URL;
  *   popped?: {
  *     state: Record<string, any>;
@@ -1407,7 +1411,10 @@ async function navigate({
 	token = nav_token;
 
 	const intent = await get_navigation_intent(url, false);
-	const nav = _before_navigate({ url, type, delta: popped?.delta, intent });
+	const nav =
+		type === 'enter'
+			? create_navigation(current, intent, url, type)
+			: _before_navigate({ url, type, delta: popped?.delta, intent });
 
 	if (!nav) {
 		block();
@@ -1423,7 +1430,7 @@ async function navigate({
 
 	is_navigating = true;
 
-	if (started) {
+	if (started && nav.navigation.type !== 'enter') {
 		stores.navigating.set((navigating.current = nav.navigation));
 	}
 
@@ -2847,10 +2854,11 @@ function reset_focus() {
 }
 
 /**
+ * @template {import('@sveltejs/kit').NavigationType} T
  * @param {import('./types.js').NavigationState} current
  * @param {import('./types.js').NavigationIntent | undefined} intent
  * @param {URL | null} url
- * @param {Exclude<import('@sveltejs/kit').NavigationType, 'enter'>} type
+ * @param {T} type
  */
 function create_navigation(current, intent, url, type) {
 	/** @type {(value: any) => void} */
@@ -2867,7 +2875,7 @@ function create_navigation(current, intent, url, type) {
 	// Handle any errors off-chain so that it doesn't show up as an unhandled rejection
 	complete.catch(() => {});
 
-	/** @type {import('@sveltejs/kit').Navigation} */
+	/** @type {Omit<import('@sveltejs/kit').Navigation, 'type'> & { type: T }} */
 	const navigation = {
 		from: {
 			params: current.params,

packages/kit/src/runtime/server/endpoint.js

@@ -29,7 +29,7 @@ export async function render_endpoint(event, mod, state) {
 		throw new Error('Cannot prerender endpoints that have mutative methods');
 	}
 
-	if (state.prerendering && !prerender) {
+	if (state.prerendering && !state.prerendering.inside_reroute && !prerender) {
 		if (state.depth > 0) {
 			// if request came from a prerendered page, bail
 			throw new Error(`${event.route.id} is not prerenderable`);
@@ -41,7 +41,7 @@ export async function render_endpoint(event, mod, state) {
 	}
 
 	try {
-		let response = await with_event(event, () =>
+		const response = await with_event(event, () =>
 			handler(/** @type {import('@sveltejs/kit').RequestEvent<Record<string, any>>} */ (event))
 		);
 
@@ -51,15 +51,28 @@ export async function render_endpoint(event, mod, state) {
 			);
 		}
 
-		if (state.prerendering) {
-			// the returned Response might have immutable Headers
-			// so we should clone them before trying to mutate them
-			response = new Response(response.body, {
+		if (state.prerendering && (!state.prerendering.inside_reroute || prerender)) {
+			// The returned Response might have immutable Headers
+			// so we should clone them before trying to mutate them.
+			// We also need to clone the response body since it may be read twice during prerendering
+			const cloned = new Response(response.clone().body, {
 				status: response.status,
 				statusText: response.statusText,
 				headers: new Headers(response.headers)
 			});
-			response.headers.set('x-sveltekit-prerender', String(prerender));
+			cloned.headers.set('x-sveltekit-prerender', String(prerender));
+
+			if (state.prerendering.inside_reroute && prerender) {
+				// Without this, the route wouldn't be recorded as prerendered,
+				// because there's nothing after reroute that would do that.
+				cloned.headers.set(
+					'x-sveltekit-routeid',
+					encodeURI(/** @type {string} */ (event.route.id))
+				);
+				state.prerendering.dependencies.set(event.url.pathname, { response: cloned, body: null });
+			} else {
+				return cloned;
+			}
 		}
 
 		return response;

packages/kit/src/runtime/server/respond.js

@@ -183,14 +183,21 @@ export async function respond(request, options, manifest, state) {
 
 	let resolved_path;
 
+	const prerendering_reroute_state = state.prerendering?.inside_reroute;
 	try {
+		// For the duration or a reroute, disable the prerendering state as reroute could call API endpoints
+		// which would end up in the wrong logic path if not disabled.
+		if (state.prerendering) state.prerendering.inside_reroute = true;
+
 		// reroute could alter the given URL, so we pass a copy
 		resolved_path =
 			(await options.hooks.reroute({ url: new URL(url), fetch: event.fetch })) ?? url.pathname;
 	} catch {
 		return text('Internal Server Error', {
 			status: 500
 		});
+	} finally {
+		if (state.prerendering) state.prerendering.inside_reroute = prerendering_reroute_state;
 	}
 
 	try {
@@ -349,7 +356,9 @@ export async function respond(request, options, manifest, state) {
 
 		set_trailing_slash(trailing_slash);
 
-		if (state.prerendering && !state.prerendering.fallback) disable_search(url);
+		if (state.prerendering && !state.prerendering.fallback && !state.prerendering.inside_reroute) {
+			disable_search(url);
+		}
 
 		const response = await with_event(event, () =>
 			options.hooks.handle({

packages/kit/src/types/internal.d.ts

@@ -216,6 +216,8 @@ export interface PrerenderOptions {
 	cache?: string; // including this here is a bit of a hack, but it makes it easy to add <meta http-equiv>
 	fallback?: boolean;
 	dependencies: Map<string, PrerenderDependency>;
+	/** True for the duration of a call to the `reroute` hook */
+	inside_reroute?: boolean;
 }
 
 export type RecursiveRequired<T> = {

packages/kit/src/version.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '2.20.1';
+export const VERSION = '2.20.2';

packages/kit/test/apps/basics/src/hooks.js

@@ -31,6 +31,10 @@ export const reroute = ({ url, fetch }) => {
 		return fetch('/reroute/api').then((r) => r.text());
 	}
 
+	if (url.pathname === '/reroute/async/c') {
+		return fetch('/reroute/api/prerendered').then((r) => r.text());
+	}
+
 	if (url.pathname === '/reroute/prerendered/to-destination') {
 		return '/reroute/prerendered/destination';
 	}

packages/kit/test/apps/basics/src/routes/no-ssr/after-navigate/+page.svelte

@@ -0,0 +1,13 @@
+<script>
+	import { afterNavigate } from '$app/navigation';
+
+	let count = 0;
+	let type = '';
+
+	afterNavigate((event) => {
+		count += 1;
+		type = event.type;
+	});
+</script>
+
+<p>{type.toString()} {count}</p>

packages/kit/test/apps/basics/src/routes/reroute/api/[prerendered]/+server.ts

@@ -0,0 +1,9 @@
+import { text } from '@sveltejs/kit';
+
+// This is inside a route with a route segment to ensure that the route is marked as prerendered
+// as part of reroute resolution even when no `entries` is given.
+export const prerender = true;
+
+export function GET() {
+	return text('/reroute/async/b');
+}

packages/kit/test/apps/basics/src/routes/reroute/async/+page.svelte

@@ -1 +1,4 @@
 <a href="/reroute/async/a">Go to url that should be rewritten</a>
+<a href="/reroute/async/c"
+	>Go to url that should be rewritten and its reroute api call prerendered</a
+>

packages/kit/test/apps/basics/src/routes/reroute/async/+page.ts

@@ -0,0 +1,3 @@
+// through this we test that the crawler during prerendering does not fail on
+// reroute calls that call non-prerendered endpoints.
+export const prerender = true;

packages/kit/test/apps/basics/svelte.config.js

@@ -25,7 +25,13 @@ const config = {
 				'/routing/prerendered/trailing-slash/never',
 				'/routing/prerendered/trailing-slash/ignore'
 			],
-			handleHttpError: 'warn'
+			handleHttpError: ({ path, message }) => {
+				if (path.includes('/reroute/async')) {
+					throw new Error('shouldnt error on ' + path);
+				}
+
+				console.warn(message);
+			}
 		},
 
 		version: {