@sveltejs/kit 1.30.3 → 2.0.0

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

@@ -7,8 +7,6 @@ import { loadEnv, normalizePath } from 'vite';
 import { getRequest, setResponse } from '../../../exports/node/index.js';
 import { installPolyfills } from '../../../exports/node/polyfills.js';
 import { SVELTE_KIT_ASSETS } from '../../../constants.js';
-import { should_polyfill } from '../../../utils/platform.js';
-import { not_found } from '../utils.js';
 
 /** @typedef {import('http').IncomingMessage} Req */
 /** @typedef {import('http').ServerResponse} Res */
@@ -20,12 +18,9 @@ import { not_found } from '../utils.js';
  * @param {import('types').ValidatedConfig} svelte_config
  */
 export async function preview(vite, vite_config, svelte_config) {
-	if (should_polyfill) {
-		installPolyfills();
-	}
+	installPolyfills();
 
 	const { paths } = svelte_config.kit;
-	const base = paths.base;
 	const assets = paths.assets ? SVELTE_KIT_ASSETS : paths.base;
 
 	const protocol = vite_config.preview.https ? 'https' : 'http';
@@ -54,131 +49,84 @@ export async function preview(vite, vite_config, svelte_config) {
 	});
 
 	return () => {
-		// generated client assets and the contents of `static`
+		// prerendered dependencies
 		vite.middlewares.use(
-			scoped(
-				assets,
-				sirv(join(svelte_config.kit.outDir, 'output/client'), {
-					setHeaders: (res, pathname) => {
-						// only apply to immutable directory, not e.g. version.json
-						if (pathname.startsWith(`/${svelte_config.kit.appDir}/immutable`)) {
-							res.setHeader('cache-control', 'public,max-age=31536000,immutable');
-						}
-					}
-				})
-			)
+			mutable(join(svelte_config.kit.outDir, 'output/prerendered/dependencies'))
 		);
 
+		// prerendered pages (we can't just use sirv because we need to
+		// preserve the correct trailingSlash behaviour)
 		vite.middlewares.use((req, res, next) => {
-			const original_url = /** @type {string} */ (req.url);
-			const { pathname, search } = new URL(original_url, 'http://dummy');
-
-			// if `paths.base === '/a/b/c`, then the root route is `/a/b/c/`,
-			// regardless of the `trailingSlash` route option
-			if (base.length > 1 && pathname === base) {
-				let location = base + '/';
-				if (search) location += search;
-				res.writeHead(307, {
-					location
-				});
+			let if_none_match_value = req.headers['if-none-match'];
+
+			if (if_none_match_value?.startsWith('W/"')) {
+				if_none_match_value = if_none_match_value.substring(2);
+			}
+
+			if (if_none_match_value === etag) {
+				res.statusCode = 304;
 				res.end();
 				return;
 			}
 
-			if (pathname.startsWith(base)) {
-				next();
-			} else {
-				res.statusCode = 404;
-				not_found(req, res, base);
-			}
-		});
+			const { pathname, search } = new URL(/** @type {string} */ (req.url), 'http://dummy');
 
-		// prerendered dependencies
-		vite.middlewares.use(
-			scoped(base, mutable(join(svelte_config.kit.outDir, 'output/prerendered/dependencies')))
-		);
-
-		// prerendered pages (we can't just use sirv because we need to
-		// preserve the correct trailingSlash behaviour)
-		vite.middlewares.use(
-			scoped(base, (req, res, next) => {
-				let if_none_match_value = req.headers['if-none-match'];
+			let filename = normalizePath(
+				join(svelte_config.kit.outDir, 'output/prerendered/pages' + pathname)
+			);
+			let prerendered = is_file(filename);
 
-				if (if_none_match_value?.startsWith('W/"')) {
-					if_none_match_value = if_none_match_value.substring(2);
-				}
+			if (!prerendered) {
+				const has_trailing_slash = pathname.endsWith('/');
+				const html_filename = `${filename}${has_trailing_slash ? 'index.html' : '.html'}`;
 
-				if (if_none_match_value === etag) {
-					res.statusCode = 304;
-					res.end();
-					return;
-				}
+				/** @type {string | undefined} */
+				let redirect;
 
-				const { pathname, search } = new URL(/** @type {string} */ (req.url), 'http://dummy');
-
-				let filename = normalizePath(
-					join(svelte_config.kit.outDir, 'output/prerendered/pages' + pathname)
-				);
-				let prerendered = is_file(filename);
-
-				if (!prerendered) {
-					const has_trailing_slash = pathname.endsWith('/');
-					const html_filename = `${filename}${has_trailing_slash ? 'index.html' : '.html'}`;
-
-					/** @type {string | undefined} */
-					let redirect;
-
-					if (is_file(html_filename)) {
-						filename = html_filename;
-						prerendered = true;
-					} else if (has_trailing_slash) {
-						if (is_file(filename.slice(0, -1) + '.html')) {
-							redirect = pathname.slice(0, -1);
-						}
-					} else if (is_file(filename + '/index.html')) {
-						redirect = pathname + '/';
+				if (is_file(html_filename)) {
+					filename = html_filename;
+					prerendered = true;
+				} else if (has_trailing_slash) {
+					if (is_file(filename.slice(0, -1) + '.html')) {
+						redirect = pathname.slice(0, -1);
 					}
+				} else if (is_file(filename + '/index.html')) {
+					redirect = pathname + '/';
+				}
 
-					if (redirect) {
-						if (search) redirect += search;
-						res.writeHead(307, {
-							location: redirect
-						});
+				if (redirect) {
+					if (search) redirect += search;
+					res.writeHead(307, {
+						location: redirect
+					});
 
-						res.end();
+					res.end();
 
-						return;
-					}
+					return;
 				}
+			}
 
-				if (prerendered) {
-					res.writeHead(200, {
-						'content-type': lookup(pathname) || 'text/html',
-						etag
-					});
+			if (prerendered) {
+				res.writeHead(200, {
+					'content-type': lookup(pathname) || 'text/html',
+					etag
+				});
 
-					fs.createReadStream(filename).pipe(res);
-				} else {
-					next();
-				}
-			})
-		);
+				fs.createReadStream(filename).pipe(res);
+			} else {
+				next();
+			}
+		});
 
 		// SSR
 		vite.middlewares.use(async (req, res) => {
 			const host = req.headers['host'];
+			req.url = req.originalUrl;
 
-			let request;
-
-			try {
-				request = await getRequest({
-					base: `${protocol}://${host}`,
-					request: req
-				});
-			} catch (/** @type {any} */ err) {
-				res.statusCode = err.status || 400;
-				return res.end('Invalid request body');
-			}
+			const request = await getRequest({
+				base: `${protocol}://${host}`,
+				request: req
+			});
 
 			setResponse(
 				res,
@@ -204,31 +152,9 @@ const mutable = (dir) =>
 		? sirv(dir, {
 				etag: true,
 				maxAge: 0
-		  })
+			})
 		: (_req, _res, next) => next();
 
-/**
- * @param {string} scope
- * @param {Handler} handler
- * @returns {Handler}
- */
-function scoped(scope, handler) {
-	if (scope === '') return handler;
-
-	return (req, res, next) => {
-		if (req.url?.startsWith(scope)) {
-			const original_url = req.url;
-			req.url = req.url.slice(scope.length);
-			handler(req, res, () => {
-				req.url = original_url;
-				next();
-			});
-		} else {
-			next();
-		}
-	};
-}
-
 /** @param {string} path */
 function is_file(path) {
 	return fs.existsSync(path) && !fs.statSync(path).isDirectory();

package/src/runtime/app/forms.js

@@ -49,20 +49,6 @@ export function deserialize(result) {
 	return parsed;
 }
 
-/**
- * @param {string} old_name
- * @param {string} new_name
- * @param {string} call_location
- * @returns void
- */
-function warn_on_access(old_name, new_name, call_location) {
-	if (!DEV) return;
-	// TODO 2.0: Remove this code
-	console.warn(
-		`\`${old_name}\` has been deprecated in favor of \`${new_name}\`. \`${old_name}\` will be removed in a future version. (Called from ${call_location})`
-	);
-}
-
 /**
  * Shallow clone an element, so that we can access e.g. `form.action` without worrying
  * that someone has added an `<input name="action">` (https://github.com/sveltejs/kit/issues/7593)
@@ -157,11 +143,9 @@ export function enhance(form_element, submit = () => {}) {
 		if (DEV && clone(form_element).enctype !== 'multipart/form-data') {
 			for (const value of form_data.values()) {
 				if (value instanceof File) {
-					// TODO 2.0: Upgrade to `throw Error`
-					console.warn(
-						'Your form contains <input type="file"> fields, but is missing the `enctype="multipart/form-data"` attribute. This will lead to inconsistent behavior between enhanced and native forms. For more details, see https://github.com/sveltejs/kit/issues/9819. This will be upgraded to an error in v2.0.'
+					throw new Error(
+						'Your form contains <input type="file"> fields, but is missing the necessary `enctype="multipart/form-data"` attribute. This will lead to inconsistent behavior between enhanced and native forms. For more details, see https://github.com/sveltejs/kit/issues/9819.'
 					);
-					break;
 				}
 			}
 		}
@@ -176,21 +160,12 @@ export function enhance(form_element, submit = () => {}) {
 		let cancelled = false;
 		const cancel = () => (cancelled = true);
 
-		// TODO 2.0: Remove `data` and `form`
 		const callback =
 			(await submit({
 				action,
 				cancel,
 				controller,
-				get data() {
-					warn_on_access('data', 'formData', 'use:enhance submit function');
-					return form_data;
-				},
 				formData: form_data,
-				get form() {
-					warn_on_access('form', 'formElement', 'use:enhance submit function');
-					return form_element;
-				},
 				formElement: form_element,
 				submitter: event.submitter
 			})) ?? fallback_callback;
@@ -220,15 +195,7 @@ export function enhance(form_element, submit = () => {}) {
 
 		callback({
 			action,
-			get data() {
-				warn_on_access('data', 'formData', 'callback returned from use:enhance submit function');
-				return form_data;
-			},
 			formData: form_data,
-			get form() {
-				warn_on_access('form', 'formElement', 'callback returned from use:enhance submit function');
-				return form_element;
-			},
 			formElement: form_element,
 			update: (opts) =>
 				fallback_callback({

package/src/runtime/app/navigation.js

@@ -11,20 +11,13 @@ export const disableScrollHandling = /* @__PURE__ */ client_method('disable_scro
  * Returns a Promise that resolves when SvelteKit navigates (or fails to navigate, in which case the promise rejects) to the specified `url`.
  * For external URLs, use `window.location = url` instead of calling `goto(url)`.
  *
- * @type {(url: string | URL, opts?: {
- *   replaceState?: boolean;
- *   noScroll?: boolean;
- *   keepFocus?: boolean;
- *   invalidateAll?: boolean;
- *   state?: any
- * }) => Promise<void>}
+ * @type {(url: string | URL, opts?: { replaceState?: boolean; noScroll?: boolean; keepFocus?: boolean; invalidateAll?: boolean; }) => Promise<void>}
  * @param {string | URL} url Where to navigate to. Note that if you've set [`config.kit.paths.base`](https://kit.svelte.dev/docs/configuration#paths) and the URL is root-relative, you need to prepend the base path if you want to navigate within the app.
  * @param {Object} [opts] Options related to the navigation
  * @param {boolean} [opts.replaceState] If `true`, will replace the current `history` entry rather than creating a new one with `pushState`
  * @param {boolean} [opts.noScroll] If `true`, the browser will maintain its scroll position rather than scrolling to the top of the page after navigation
  * @param {boolean} [opts.keepFocus] If `true`, the currently focused element will retain focus after navigation. Otherwise, focus will be reset to the body
- * @param {boolean} [invalidateAll] If `true`, all `load` functions of the page will be rerun. See https://kit.svelte.dev/docs/load#rerunning-load-functions for more info on invalidation.
- * @param {any} [opts.state] The state of the new/updated history entry
+ * @param {boolean} [opts.invalidateAll] If `true`, all `load` functions of the page will be rerun. See https://kit.svelte.dev/docs/load#rerunning-load-functions for more info on invalidation.
  * @returns {Promise<void>}
  */
 export const goto = /* @__PURE__ */ client_method('goto');
@@ -64,11 +57,11 @@ export const invalidateAll = /* @__PURE__ */ client_method('invalidate_all');
  *
  * This is the same behaviour that SvelteKit triggers when the user taps or mouses over an `<a>` element with `data-sveltekit-preload-data`.
  * If the next navigation is to `href`, the values returned from load will be used, making navigation instantaneous.
- * Returns a Promise that resolves when the preload is complete.
+ * Returns a Promise that resolves with the result of running the new route's `load` functions once the preload is complete.
  *
- * @type {(href: string) => Promise<void>}
+ * @type {(href: string) => Promise<Record<string, any>>}
  * @param {string} href Page to preload
- * @returns {Promise<void>}
+ * @returns {Promise<{ type: 'loaded'; status: number; data: Record<string, any> } | { type: 'redirect'; location: string }>}
  */
 export const preloadData = /* @__PURE__ */ client_method('preload_data');
 
@@ -81,8 +74,8 @@ export const preloadData = /* @__PURE__ */ client_method('preload_data');
  * Unlike `preloadData`, this won't call `load` functions.
  * Returns a Promise that resolves when the modules have been imported.
  *
- * @type {(...urls: string[]) => Promise<void>}
- * @param {...string[]} urls
+ * @type {(url: string) => Promise<void>}
+ * @param {string} url
  * @returns {Promise<void>}
  */
 export const preloadCode = /* @__PURE__ */ client_method('preload_code');
@@ -111,7 +104,7 @@ export const beforeNavigate = /* @__PURE__ */ client_method('before_navigate');
  * If a function (or a `Promise` that resolves to a function) is returned from the callback, it will be called once the DOM has updated.
  *
  * `onNavigate` must be called during a component initialization. It remains active as long as the component is mounted.
- * @type {(callback: (navigation: import('@sveltejs/kit').OnNavigate) => import('../../types/internal.js').MaybePromise<(() => void) | void>) => void}
+ * @type {(callback: (navigation: import('@sveltejs/kit').OnNavigate) => import('types').MaybePromise<(() => void) | void>) => void}
  * @param {(navigation: import('@sveltejs/kit').OnNavigate) => void} callback
  * @returns {void}
  */
@@ -126,3 +119,23 @@ export const onNavigate = /* @__PURE__ */ client_method('on_navigate');
  * @returns {void}
  */
 export const afterNavigate = /* @__PURE__ */ client_method('after_navigate');
+
+/**
+ * Programmatically create a new history entry with the given `$page.state`. To use the current URL, you can pass `''` as the first argument. Used for [shallow routing](https://kit.svelte.dev/docs/shallow-routing).
+ *
+ * @type {(url: string | URL, state: App.PageState) => void}
+ * @param {string | URL} url
+ * @param {App.PageState} state
+ * @returns {void}
+ */
+export const pushState = /* @__PURE__ */ client_method('push_state');
+
+/**
+ * Programmatically replace the current history entry with the given `$page.state`. To use the current URL, you can pass `''` as the first argument. Used for [shallow routing](https://kit.svelte.dev/docs/shallow-routing).
+ *
+ * @type {(url: string | URL, state: App.PageState) => void}
+ * @param {string | URL} url
+ * @param {App.PageState} state
+ * @returns {void}
+ */
+export const replaceState = /* @__PURE__ */ client_method('replace_state');

package/src/runtime/app/paths.js

@@ -1,8 +1,6 @@
 export { base, assets } from '__sveltekit/paths';
 import { base } from '__sveltekit/paths';
-import { get_route_segments } from '../../utils/routing.js';
-
-const basic_param_pattern = /\[(\[)?(\.\.\.)?(\w+?)(?:=(\w+))?\]\]?/g;
+import { resolve_route } from '../../utils/routing.js';
 
 /**
  * Populate a route ID with params to resolve a pathname.
@@ -21,30 +19,5 @@ const basic_param_pattern = /\[(\[)?(\.\.\.)?(\w+?)(?:=(\w+))?\]\]?/g;
  * @returns {string}
  */
 export function resolveRoute(id, params) {
-	const segments = get_route_segments(id);
-	return (
-		base +
-		'/' +
-		segments
-			.map((segment) =>
-				segment.replace(basic_param_pattern, (_, optional, rest, name) => {
-					const param_value = params[name];
-
-					// This is nested so TS correctly narrows the type
-					if (!param_value) {
-						if (optional) return '';
-						if (rest && param_value !== undefined) return '';
-						throw new Error(`Missing parameter '${name}' in route ${id}`);
-					}
-
-					if (param_value.startsWith('/') || param_value.endsWith('/'))
-						throw new Error(
-							`Parameter '${name}' in route ${id} cannot start or end with a slash -- this would cause an invalid route like foo//bar`
-						);
-					return param_value;
-				})
-			)
-			.filter(Boolean)
-			.join('/')
-	);
+	return base + resolve_route(id, params);
 }