@sveltejs/kit 1.0.0-next.217 → 1.0.0-next.220

package/assets/kit.js

@@ -744,10 +744,18 @@ async function render_response({
 		headers['permissions-policy'] = 'interest-cohort=()';
 	}
 
+	const segments = url.pathname.slice(options.paths.base.length).split('/').slice(2);
+	const assets =
+		options.paths.assets || (segments.length > 0 ? segments.map(() => '..').join('/') : '.');
+
 	return {
 		status,
 		headers,
-		body: options.template({ head, body })
+		body: options.template({
+			head,
+			body,
+			assets
+		})
 	};
 }
 
@@ -1214,53 +1222,53 @@ async function load_node({
  * }} opts
  */
 async function respond_with_error({ request, options, state, $session, status, error }) {
-	const default_layout = await options.manifest._.nodes[0](); // 0 is always the root layout
-	const default_error = await options.manifest._.nodes[1](); // 1 is always the root error
-
-	/** @type {Record<string, string>} */
-	const params = {}; // error page has no params
+	try {
+		const default_layout = await options.manifest._.nodes[0](); // 0 is always the root layout
+		const default_error = await options.manifest._.nodes[1](); // 1 is always the root error
 
-	// error pages don't fall through, so we know it's not undefined
-	const loaded = /** @type {Loaded} */ (
-		await load_node({
-			request,
-			options,
-			state,
-			route: null,
-			url: request.url, // TODO this is redundant, no?
-			params,
-			node: default_layout,
-			$session,
-			stuff: {},
-			prerender_enabled: is_prerender_enabled(options, default_error, state),
-			is_leaf: false,
-			is_error: false
-		})
-	);
+		/** @type {Record<string, string>} */
+		const params = {}; // error page has no params
 
-	const branch = [
-		loaded,
-		/** @type {Loaded} */ (
+		// error pages don't fall through, so we know it's not undefined
+		const loaded = /** @type {Loaded} */ (
 			await load_node({
 				request,
 				options,
 				state,
 				route: null,
-				url: request.url,
+				url: request.url, // TODO this is redundant, no?
 				params,
-				node: default_error,
+				node: default_layout,
 				$session,
-				stuff: loaded ? loaded.stuff : {},
+				stuff: {},
 				prerender_enabled: is_prerender_enabled(options, default_error, state),
 				is_leaf: false,
-				is_error: true,
-				status,
-				error
+				is_error: false
 			})
-		)
-	];
+		);
+
+		const branch = [
+			loaded,
+			/** @type {Loaded} */ (
+				await load_node({
+					request,
+					options,
+					state,
+					route: null,
+					url: request.url,
+					params,
+					node: default_error,
+					$session,
+					stuff: loaded ? loaded.stuff : {},
+					prerender_enabled: is_prerender_enabled(options, default_error, state),
+					is_leaf: false,
+					is_error: true,
+					status,
+					error
+				})
+			)
+		];
 
-	try {
 		return await render_response({
 			options,
 			$session,
@@ -1897,16 +1905,30 @@ async function respond(incoming, options, state = {}) {
 				}
 			}
 		});
-	} catch (/** @type {unknown} */ err) {
-		const e = coalesce_to_error(err);
+	} catch (/** @type {unknown} */ e) {
+		const error = coalesce_to_error(e);
 
-		options.handle_error(e, request);
+		options.handle_error(error, request);
 
-		return {
-			status: 500,
-			headers: {},
-			body: options.dev ? e.stack : e.message
-		};
+		try {
+			const $session = await options.hooks.getSession(request);
+			return await respond_with_error({
+				request,
+				options,
+				state,
+				$session,
+				status: 500,
+				error
+			});
+		} catch (/** @type {unknown} */ e) {
+			const error = coalesce_to_error(e);
+
+			return {
+				status: 500,
+				headers: {},
+				body: options.dev ? error.stack : error.message
+			};
+		}
 	}
 }
 

package/assets/runtime/internal/start.js

@@ -168,6 +168,10 @@ class Router {
 				// Call `pushState` to add url to history so going back works.
 				// Also make a delay, otherwise the browser default behaviour would not kick in
 				setTimeout(() => history.pushState({}, '', url.href));
+				const info = this.parse(url);
+				if (info) {
+					return this.renderer.update(info, [], false);
+				}
 				return;
 			}
 
@@ -543,6 +547,9 @@ class Renderer {
 
 		let error_args;
 
+		// url.hash is empty when coming from the server
+		url.hash = window.location.hash;
+
 		try {
 			for (let i = 0; i < nodes.length; i += 1) {
 				const is_leaf = i === nodes.length - 1;