@sveltejs/kit 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "The fastest way to build Svelte apps",
   "repository": {
     "type": "git",

package/src/runtime/client/client.js

@@ -660,10 +660,10 @@ export function create_client(app, target) {
 			server: server_data_node,
 			universal: node.universal?.load ? { type: 'data', data, uses } : null,
 			data: data ?? server_data_node?.data ?? null,
-			// if `paths.base === '/a/b/c`, then the root route is `/a/b/c/`,
-			// regardless of the `trailingSlash` route option
+			// if `paths.base === '/a/b/c`, then the root route is always `/a/b/c/`, regardless of
+			// the `trailingSlash` route option, so that relative paths to JS and CSS work
 			slash:
-				url.pathname === base || url.pathname === base + '/'
+				base && (url.pathname === base || url.pathname === base + '/')
 					? 'always'
 					: node.universal?.trailingSlash ?? server_data_node?.slash
 		};
@@ -2118,16 +2118,21 @@ async function load_data(url, invalid) {
 
 	const res = await native_fetch(data_url.href);
 
-	// if `__data.json` doesn't exist or the server has an internal error,
-	// fallback to native navigation so we avoid parsing the HTML error page as a JSON
-	if (res.headers.get('content-type')?.includes('text/html')) {
-		await native_navigation(url);
-	}
-
 	if (!res.ok) {
 		// error message is a JSON-stringified string which devalue can't handle at the top level
 		// turn it into a HttpError to not call handleError on the client again (was already handled on the server)
-		throw new HttpError(res.status, await res.json());
+		// if `__data.json` doesn't exist or the server has an internal error,
+		// avoid parsing the HTML error page as a JSON
+		/** @type {string | undefined} */
+		let message;
+		if (res.headers.get('content-type')?.includes('application/json')) {
+			message = await res.json();
+		} else if (res.status === 404) {
+			message = 'Not Found';
+		} else if (res.status === 500) {
+			message = 'Internal Error';
+		}
+		throw new HttpError(res.status, message);
 	}
 
 	// TODO: fix eslint error / figure out if it actually applies to our situation

package/src/runtime/control.js

@@ -33,6 +33,7 @@ export class Redirect {
 /**
  * An error that was thrown from within the SvelteKit runtime that is not fatal and doesn't result in a 500, such as a 404.
  * `SvelteKitError` goes through `handleError`.
+ * @extends Error
  */
 export class SvelteKitError extends Error {
 	/**

package/src/runtime/server/page/respond_with_error.js

@@ -86,7 +86,7 @@ export async function respond_with_error({
 			state,
 			page_config: {
 				ssr,
-				csr: get_option([default_layout], 'csr') ?? true
+				csr
 			},
 			status,
 			error: await handle_error_and_jsonify(event, options, error),

package/src/version.js

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