@sveltejs/kit 1.0.0-next.543 → 1.0.0-next.545

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.543",
+  "version": "1.0.0-next.545",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/src/core/generate_manifest/index.js

@@ -19,9 +19,11 @@ export function generate_manifest({ build_data, relative_path, routes, format =
 	 */
 	const reindexed = new Map();
 	/**
-	 * @type {Set<any>} All nodes actually used in the routes definition (prerendered routes are omitted)
+	 * All nodes actually used in the routes definition (prerendered routes are omitted).
+	 * Root layout/error is always included as they are needed for 404 and root errors.
+	 * @type {Set<any>}
 	 */
-	const used_nodes = new Set();
+	const used_nodes = new Set([0, 1]);
 
 	for (const route of routes) {
 		if (route.page) {

package/src/core/sync/create_manifest_data/index.js

@@ -258,7 +258,12 @@ function create_routes_and_nodes(cwd, config, fallback) {
 	// and smaller indexes take fewer bytes. also, this guarantees that
 	// the default error/layout are 0/1
 	for (const route of routes) {
-		if (route.layout) nodes.push(route.layout);
+		if (route.layout) {
+			if (!route.layout?.component) {
+				route.layout.component = posixify(path.relative(cwd, `${fallback}/layout.svelte`));
+			}
+			nodes.push(route.layout);
+		}
 		if (route.error) nodes.push(route.error);
 	}
 

package/src/core/sync/utils.js

@@ -27,7 +27,7 @@ export function write(file, code) {
 
 /** @param {string} str */
 export function trim(str) {
-	const indentation = /** @type {RegExpExecArray} */ (/\n?(\s*)/.exec(str))[1];
+	const indentation = /** @type {RegExpExecArray} */ (/\n?([ \t]*)/.exec(str))[1];
 	const pattern = new RegExp(`^${indentation}`, 'gm');
 	return str.replace(pattern, '').trim();
 }

package/src/exports/index.js

@@ -13,7 +13,7 @@ export function error(status, message) {
 
 /** @type {import('@sveltejs/kit').redirect} */
 export function redirect(status, location) {
-	if (isNaN(status) || status < 300 || status > 399) {
+	if (isNaN(status) || status < 300 || status > 308) {
 		throw new Error('Invalid status code');
 	}
 

package/src/exports/vite/preview/index.js

@@ -5,7 +5,7 @@ import { pathToFileURL } from 'url';
 import { getRequest, setResponse } from '../../../exports/node/index.js';
 import { installPolyfills } from '../../../exports/node/polyfills.js';
 import { SVELTE_KIT_ASSETS } from '../../../constants.js';
-import { loadEnv } from 'vite';
+import { loadEnv, normalizePath } from 'vite';
 
 /** @typedef {import('http').IncomingMessage} Req */
 /** @typedef {import('http').ServerResponse} Res */
@@ -100,7 +100,9 @@ export async function preview(vite, vite_config, svelte_config) {
 
 				const { pathname } = new URL(/** @type {string} */ (req.url), 'http://dummy');
 
-				let filename = join(svelte_config.kit.outDir, 'output/prerendered/pages' + pathname);
+				let filename = normalizePath(
+					join(svelte_config.kit.outDir, 'output/prerendered/pages' + pathname)
+				);
 				let prerendered = is_file(filename);
 
 				if (!prerendered) {

package/src/runtime/control.js

@@ -58,11 +58,11 @@ export function error(status, message) {
 /**
  * Creates a `Redirect` object. If thrown during request handling, SvelteKit will
  * return a redirect response.
- * @param {number} status
+ * @param {300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308} status
  * @param {string} location
  */
 export function redirect(status, location) {
-	if (isNaN(status) || status < 300 || status > 399) {
+	if (isNaN(status) || status < 300 || status > 308) {
 		throw new Error('Invalid status code');
 	}
 

package/types/ambient.d.ts

@@ -95,6 +95,8 @@ declare module '$app/environment' {
 declare module '$app/forms' {
 	import type { ActionResult } from '@sveltejs/kit';
 
+	type MaybePromise<T> = T | Promise<T>;
+
 	export type SubmitFunction<
 		Success extends Record<string, unknown> | undefined = Record<string, any>,
 		Invalid extends Record<string, unknown> | undefined = Record<string, any>
@@ -104,7 +106,7 @@ declare module '$app/forms' {
 		form: HTMLFormElement;
 		controller: AbortController;
 		cancel(): void;
-	}) =>
+	}) => MaybePromise<
 		| void
 		| ((opts: {
 				form: HTMLFormElement;
@@ -115,7 +117,8 @@ declare module '$app/forms' {
 				 * @param options Set `reset: false` if you don't want the `<form>` values to be reset after a successful submission.
 				 */
 				update(options?: { reset: boolean }): Promise<void>;
-		  }) => void);
+		  }) => void)
+	>;
 
 	/**
 	 * This action enhances a `<form>` element that otherwise would work without JavaScript.

package/types/index.d.ts

@@ -731,7 +731,10 @@ export function error(
  * Creates a `Redirect` object. If thrown during request handling, SvelteKit will
  * return a redirect response.
  */
-export function redirect(status: number, location: string): Redirect;
+export function redirect(
+	status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308,
+	location: string
+): Redirect;
 
 /**
  * Generates a JSON `Response` object from the supplied data.