@sveltejs/kit 1.0.0-next.227 → 1.0.0-next.230

package/assets/{runtime/app → app}/navigation.js

@@ -1,4 +1,4 @@
-import { renderer, router as router$1 } from '../internal/singletons.js';
+import { renderer, router as router$1 } from '../client/singletons.js';
 import { g as get_base_uri } from '../chunks/utils.js';
 
 const router = /** @type {import('../client/router').Router} */ (router$1);

package/assets/{runtime/internal → client}/start.js

@@ -1,5 +1,5 @@
-import Root from '../../generated/root.svelte';
-import { fallback, routes } from '../../generated/manifest.js';
+import Root from '__GENERATED__/root.svelte';
+import { fallback, routes } from '__GENERATED__/manifest.js';
 import { onMount, tick } from 'svelte';
 import { g as get_base_uri } from '../chunks/utils.js';
 import { writable } from 'svelte/store';
@@ -156,7 +156,7 @@ class Router {
 		addEventListener('sveltekit:trigger_prefetch', trigger_prefetch);
 
 		/** @param {MouseEvent} event */
-		addEventListener('click', async (event) => {
+		addEventListener('click', (event) => {
 			if (!this.enabled) return;
 
 			// Adapted from https://github.com/visionmedia/page.js
@@ -1326,8 +1326,6 @@ class Renderer {
 	}
 }
 
-// @ts-expect-error - doesn't exist yet. generated by Rollup
-
 /**
  * @param {{
  *   paths: {

package/assets/{kit.js → server/index.js}

@@ -537,12 +537,25 @@ function escape(str, dict, unicode_encoder) {
 
 const s = JSON.stringify;
 
+/** @param {URL} url */
+function create_prerendering_url_proxy(url) {
+	return new Proxy(url, {
+		get: (target, prop, receiver) => {
+			if (prop === 'search' || prop === 'searchParams') {
+				throw new Error(`Cannot access url.${prop} on a page with prerendering enabled`);
+			}
+			return Reflect.get(target, prop, receiver);
+		}
+	});
+}
+
 // TODO rename this function/module
 
 /**
  * @param {{
  *   branch: Array<import('./types').Loaded>;
  *   options: import('types/internal').SSRRenderOptions;
+ *   state: import('types/internal').SSRRenderState;
  *   $session: any;
  *   page_config: { hydrate: boolean, router: boolean };
  *   status: number;
@@ -556,6 +569,7 @@ const s = JSON.stringify;
 async function render_response({
 	branch,
 	options,
+	state,
 	$session,
 	page_config,
 	status,
@@ -605,7 +619,13 @@ async function render_response({
 				navigating: writable(null),
 				session
 			},
-			page: { url, params, status, error, stuff },
+			page: {
+				url: state.prerender ? create_prerendering_url_proxy(url) : url,
+				params,
+				status,
+				error,
+				stuff
+			},
 			components: branch.map(({ node }) => node.module.default)
 		};
 
@@ -895,7 +915,6 @@ function is_root_relative(path) {
  *   node: import('types/internal').SSRNode;
  *   $session: any;
  *   stuff: Record<string, any>;
- *   prerender_enabled: boolean;
  *   is_error: boolean;
  *   status?: number;
  *   error?: Error;
@@ -912,7 +931,6 @@ async function load_node({
 	node,
 	$session,
 	stuff,
-	prerender_enabled,
 	is_error,
 	status,
 	error
@@ -937,19 +955,10 @@ async function load_node({
 
 	let loaded;
 
-	const url_proxy = new Proxy(url, {
-		get: (target, prop, receiver) => {
-			if (prerender_enabled && (prop === 'search' || prop === 'searchParams')) {
-				throw new Error('Cannot access query on a page with prerendering enabled');
-			}
-			return Reflect.get(target, prop, receiver);
-		}
-	});
-
 	if (module.load) {
 		/** @type {import('types/page').LoadInput | import('types/page').ErrorLoadInput} */
 		const load_input = {
-			url: url_proxy,
+			url: state.prerender ? create_prerendering_url_proxy(url) : url,
 			params,
 			get session() {
 				uses_credentials = true;
@@ -1196,7 +1205,6 @@ async function load_node({
 
 /**
  * @typedef {import('./types.js').Loaded} Loaded
- * @typedef {import('types/internal').SSRNode} SSRNode
  * @typedef {import('types/internal').SSRRenderOptions} SSRRenderOptions
  * @typedef {import('types/internal').SSRRenderState} SSRRenderState
  */
@@ -1239,7 +1247,6 @@ async function respond_with_error({
 				node: default_layout,
 				$session,
 				stuff: {},
-				prerender_enabled: is_prerender_enabled(options, default_error, state),
 				is_error: false
 			})
 		);
@@ -1255,7 +1262,6 @@ async function respond_with_error({
 				node: default_error,
 				$session,
 				stuff: layout_loaded ? layout_loaded.stuff : {},
-				prerender_enabled: is_prerender_enabled(options, default_error, state),
 				is_error: true,
 				status,
 				error
@@ -1264,6 +1270,7 @@ async function respond_with_error({
 
 		return await render_response({
 			options,
+			state,
 			$session,
 			page_config: {
 				hydrate: options.hydrate,
@@ -1290,17 +1297,6 @@ async function respond_with_error({
 	}
 }
 
-/**
- * @param {SSRRenderOptions} options
- * @param {SSRNode} node
- * @param {SSRRenderState} state
- */
-function is_prerender_enabled(options, node, state) {
-	return (
-		options.prerender && (!!node.module.prerender || (!!state.prerender && state.prerender.all))
-	);
-}
-
 /**
  * @typedef {import('./types.js').Loaded} Loaded
  * @typedef {import('types/hooks').ServerResponse} ServerResponse
@@ -1403,7 +1399,6 @@ async function respond$1(opts) {
 						url: request.url,
 						node,
 						stuff,
-						prerender_enabled: is_prerender_enabled(options, node, state),
 						is_error: false
 					});
 
@@ -1458,7 +1453,6 @@ async function respond$1(opts) {
 										url: request.url,
 										node: error_node,
 										stuff: node_loaded.stuff,
-										prerender_enabled: is_prerender_enabled(options, error_node, state),
 										is_error: true,
 										status,
 										error
@@ -1892,6 +1886,7 @@ async function respond(incoming, options, state = {}) {
 						url: request.url,
 						params: request.params,
 						options,
+						state,
 						$session: await options.hooks.getSession(request),
 						page_config: { router: true, hydrate: true },
 						stuff: {},
@@ -1926,9 +1921,25 @@ async function respond(incoming, options, state = {}) {
 								const etag = `"${hash(response.body || '')}"`;
 
 								if (if_none_match_value === etag) {
+									/** @type {import('types/helper').ResponseHeaders} */
+									const headers = { etag };
+
+									// https://datatracker.ietf.org/doc/html/rfc7232#section-4.1
+									for (const key of [
+										'cache-control',
+										'content-location',
+										'date',
+										'expires',
+										'vary'
+									]) {
+										if (key in response.headers) {
+											headers[key] = /** @type {string} */ (response.headers[key]);
+										}
+									}
+
 									return {
 										status: 304,
-										headers: {}
+										headers
 									};
 								}