@sveltejs/kit 1.25.1 → 1.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.25.1",
+  "version": "1.26.0",
   "description": "The fastest way to build Svelte apps",
   "repository": {
     "type": "git",
@@ -18,17 +18,16 @@
     "esm-env": "^1.0.0",
     "kleur": "^4.1.5",
     "magic-string": "^0.30.0",
-    "mime": "^3.0.0",
+    "mrmime": "^1.0.1",
     "sade": "^1.8.1",
     "set-cookie-parser": "^2.6.0",
     "sirv": "^2.0.2",
     "tiny-glob": "^0.2.9",
-    "undici": "~5.25.0"
+    "undici": "~5.26.2"
   },
   "devDependencies": {
     "@playwright/test": "1.30.0",
     "@types/connect": "^3.4.35",
-    "@types/mime": "^3.0.1",
     "@types/node": "^16.18.6",
     "@types/sade": "^1.7.4",
     "@types/set-cookie-parser": "^2.4.2",
@@ -38,8 +37,8 @@
     "svelte": "^4.0.5",
     "svelte-preprocess": "^5.0.4",
     "typescript": "^4.9.4",
-    "vite": "^4.4.2",
-    "vitest": "^0.34.0"
+    "vite": "^4.4.9",
+    "vitest": "^0.34.5"
   },
   "peerDependencies": {
     "svelte": "^3.54.0 || ^4.0.0-next.0",

package/src/core/adapt/builder.js

@@ -181,7 +181,10 @@ export function create_builder({
 		},
 
 		writeClient(dest) {
-			return copy(`${config.kit.outDir}/output/client`, dest);
+			return copy(`${config.kit.outDir}/output/client`, dest, {
+				// avoid making vite build artefacts public
+				filter: (basename) => basename !== '.vite'
+			});
 		},
 
 		writePrerendered(dest) {

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

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import colors from 'kleur';
-import mime from 'mime';
+import { lookup } from 'mrmime';
 import { list_files, runtime_directory } from '../../utils.js';
 import { posixify } from '../../../utils/filesystem.js';
 import { parse_route_id } from '../../../utils/routing.js';
@@ -48,7 +48,7 @@ export function create_assets(config) {
 	return list_files(config.kit.files.assets).map((file) => ({
 		file,
 		size: fs.statSync(path.resolve(config.kit.files.assets, file)).size,
-		type: mime.getType(file)
+		type: lookup(file) || null
 	}));
 }
 

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

@@ -188,10 +188,18 @@ function update_types(config, routes, route, to_delete = new Set()) {
 	// add 'Expand' helper
 	// Makes sure a type is "repackaged" and therefore more readable
 	declarations.push('type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;');
+
+	// returns the predicate of a matcher's type guard - or string if there is no type guard
 	declarations.push(
-		`type RouteParams = { ${route.params
-			.map((param) => `${param.name}${param.optional ? '?' : ''}: string`)
-			.join('; ')} }`
+		// TS complains on infer U, which seems weird, therefore ts-ignore it
+		[
+			'// @ts-ignore',
+			'type MatcherParam<M> = M extends (param : string) => param is infer U ? U extends string ? U : string : string;'
+		].join('\n')
+	);
+
+	declarations.push(
+		'type RouteParams = ' + generate_params_type(route.params, outdir, config) + ';'
 	);
 
 	if (route.params.length > 0) {
@@ -265,7 +273,8 @@ function update_types(config, routes, route, to_delete = new Set()) {
 
 	if (route.layout) {
 		let all_pages_have_load = true;
-		const layout_params = new Set();
+		/** @type {import('types').RouteParam[]} */
+		const layout_params = [];
 		const ids = ['RouteId'];
 
 		route.layout.child_pages?.forEach((page) => {
@@ -274,7 +283,9 @@ function update_types(config, routes, route, to_delete = new Set()) {
 				if (leaf.route.page) ids.push(`"${leaf.route.id}"`);
 
 				for (const param of leaf.route.params) {
-					layout_params.add(param.name);
+					// skip if already added
+					if (layout_params.some((p) => p.name === param.name)) continue;
+					layout_params.push({ ...param, optional: true });
 				}
 
 				ensureProxies(page, leaf.proxies);
@@ -301,9 +312,7 @@ function update_types(config, routes, route, to_delete = new Set()) {
 		declarations.push(`type LayoutRouteId = ${ids.join(' | ')}`);
 
 		declarations.push(
-			`type LayoutParams = RouteParams & { ${Array.from(layout_params).map(
-				(param) => `${param}?: string`
-			)} }`
+			'type LayoutParams = RouteParams & ' + generate_params_type(layout_params, outdir, config)
 		);
 
 		const {
@@ -567,6 +576,28 @@ function replace_ext_with_js(file_path) {
 	return file_path.slice(0, -ext.length) + '.js';
 }
 
+/**
+ * @param {import('types').RouteParam[]} params
+ * @param {string} outdir
+ * @param {import('types').ValidatedConfig} config
+ */
+function generate_params_type(params, outdir, config) {
+	/** @param {string} matcher */
+	const path_to_matcher = (matcher) =>
+		posixify(path.relative(outdir, path.join(config.kit.files.params, matcher)));
+
+	return `{ ${params
+		.map(
+			(param) =>
+				`${param.name}${param.optional ? '?' : ''}: ${
+					param.matcher
+						? `MatcherParam<typeof import('${path_to_matcher(param.matcher)}').match>`
+						: 'string'
+				}`
+		)
+		.join('; ')} }`;
+}
+
 /**
  * @param {string} content
  * @param {boolean} is_server

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

@@ -1,7 +1,11 @@
 import path from 'node:path';
 import { posixify } from '../../../utils/filesystem.js';
+import { strip_virtual_prefix } from '../utils.js';
 
-const ILLEGAL_IMPORTS = new Set(['\0$env/dynamic/private', '\0$env/static/private']);
+const ILLEGAL_IMPORTS = new Set([
+	'\0virtual:$env/dynamic/private',
+	'\0virtual:$env/static/private'
+]);
 const ILLEGAL_MODULE_NAME_PATTERN = /.*\.server\..+/;
 
 /**
@@ -51,10 +55,14 @@ export function module_guard(context, { cwd, lib }) {
 				chain.map(({ id, dynamic }, i) => {
 					id = normalize_id(id, lib, cwd);
 
-					return `${' '.repeat(i * 2)}- ${id} ${dynamic ? 'dynamically imports' : 'imports'}\n`;
-				}) + `${' '.repeat(chain.length)}- ${id}`;
+					return `${' '.repeat(i * 2)}- ${strip_virtual_prefix(id)} ${
+						dynamic ? 'dynamically imports' : 'imports'
+					}\n`;
+				}) + `${' '.repeat(chain.length)}- ${strip_virtual_prefix(id)}`;
 
-			const message = `Cannot import ${id} into client-side code:\n${pyramid}`;
+			const message = `Cannot import ${strip_virtual_prefix(
+				id
+			)} into client-side code:\n${pyramid}`;
 
 			throw new Error(message);
 		}

package/src/exports/vite/index.js

@@ -18,7 +18,7 @@ import { assets_base, find_deps } from './build/utils.js';
 import { dev } from './dev/index.js';
 import { is_illegal, module_guard, normalize_id } from './graph_analysis/index.js';
 import { preview } from './preview/index.js';
-import { get_config_aliases, get_env } from './utils.js';
+import { get_config_aliases, get_env, strip_virtual_prefix } from './utils.js';
 import { write_client_manifest } from '../../core/sync/write_client_manifest.js';
 import prerender from '../../core/postbuild/prerender.js';
 import analyse from '../../core/postbuild/analyse.js';
@@ -336,7 +336,7 @@ function kit({ svelte_config }) {
 		async resolveId(id) {
 			// treat $env/static/[public|private] as virtual
 			if (id.startsWith('$env/') || id.startsWith('__sveltekit/') || id === '$service-worker') {
-				return `\0${id}`;
+				return `\0virtual:${id}`;
 			}
 		},
 
@@ -358,24 +358,24 @@ function kit({ svelte_config }) {
 					})
 				) {
 					const relative = normalize_id(id, normalized_lib, normalized_cwd);
-					throw new Error(`Cannot import ${relative} into client-side code`);
+					throw new Error(`Cannot import ${strip_virtual_prefix(relative)} into client-side code`);
 				}
 			}
 
 			switch (id) {
-				case '\0$env/static/private':
+				case '\0virtual:$env/static/private':
 					return create_static_module('$env/static/private', env.private);
 
-				case '\0$env/static/public':
+				case '\0virtual:$env/static/public':
 					return create_static_module('$env/static/public', env.public);
 
-				case '\0$env/dynamic/private':
+				case '\0virtual:$env/dynamic/private':
 					return create_dynamic_module(
 						'private',
 						vite_config_env.command === 'serve' ? env.private : undefined
 					);
 
-				case '\0$env/dynamic/public':
+				case '\0virtual:$env/dynamic/public':
 					// populate `$env/dynamic/public` from `window`
 					if (browser) {
 						return `export const env = ${global}.env;`;
@@ -386,12 +386,12 @@ function kit({ svelte_config }) {
 						vite_config_env.command === 'serve' ? env.public : undefined
 					);
 
-				case '\0$service-worker':
+				case '\0virtual:$service-worker':
 					return create_service_worker_module(svelte_config);
 
 				// for internal use only. it's published as $app/paths externally
 				// we use this alias so that we won't collide with user aliases
-				case '\0__sveltekit/paths': {
+				case '\0virtual:__sveltekit/paths': {
 					const { assets, base } = svelte_config.kit.paths;
 
 					// use the values defined in `global`, but fall back to hard-coded values
@@ -429,7 +429,7 @@ function kit({ svelte_config }) {
 					`;
 				}
 
-				case '\0__sveltekit/environment': {
+				case '\0virtual:__sveltekit/environment': {
 					const { version } = svelte_config.kit;
 
 					return dedent`
@@ -555,7 +555,7 @@ function kit({ svelte_config }) {
 						cssCodeSplit: true,
 						cssMinify: initial_config.build?.minify == null ? true : !!initial_config.build.minify,
 						// don't use the default name to avoid collisions with 'static/manifest.json'
-						manifest: 'vite-manifest.json',
+						manifest: '.vite/manifest.json', // TODO: remove this after bumping peer dep to vite 5
 						outDir: `${out}/${ssr ? 'server' : 'client'}`,
 						rollupOptions: {
 							input,
@@ -805,10 +805,6 @@ function kit({ svelte_config }) {
 							.cyan('npm run preview')} to preview your production build locally.`
 					);
 
-					// avoid making the manifest available to users
-					fs.unlinkSync(`${out}/client/${vite_config.build.manifest}`);
-					fs.unlinkSync(`${out}/server/${vite_config.build.manifest}`);
-
 					if (kit.adapter) {
 						const { adapt } = await import('../../core/adapt/index.js');
 						await adapt(svelte_config, build_data, metadata, prerendered, prerender_map, log);

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

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { lookup } from 'mrmime';
 import sirv from 'sirv';
 import { loadEnv, normalizePath } from 'vite';
 import { getRequest, setResponse } from '../../../exports/node/index.js';
@@ -141,7 +142,7 @@ export async function preview(vite, vite_config, svelte_config) {
 
 				if (prerendered) {
 					res.writeHead(200, {
-						'content-type': 'text/html',
+						'content-type': lookup(pathname) || 'text/html',
 						etag
 					});
 

package/src/exports/vite/utils.js

@@ -97,3 +97,5 @@ export function not_found(req, res, base) {
 		);
 	}
 }
+
+export const strip_virtual_prefix = /** @param {string} id */ (id) => id.replace('\0virtual:', '');

package/src/runtime/client/client.js

@@ -173,7 +173,7 @@ export function create_client(app, target) {
 
 		if (navigation_result) {
 			if (navigation_result.type === 'redirect') {
-				return goto(new URL(navigation_result.location, url).href, {}, [url.pathname], nav_token);
+				return goto(new URL(navigation_result.location, url).href, {}, 1, nav_token);
 			} else {
 				if (navigation_result.props.page !== undefined) {
 					page = navigation_result.props.page;
@@ -208,7 +208,7 @@ export function create_client(app, target) {
 	/**
 	 * @param {string | URL} url
 	 * @param {{ noScroll?: boolean; replaceState?: boolean; keepFocus?: boolean; state?: any; invalidateAll?: boolean }} opts
-	 * @param {string[]} redirect_chain
+	 * @param {number} redirect_count
 	 * @param {{}} [nav_token]
 	 */
 	async function goto(
@@ -220,7 +220,7 @@ export function create_client(app, target) {
 			state = {},
 			invalidateAll = false
 		},
-		redirect_chain,
+		redirect_count,
 		nav_token
 	) {
 		if (typeof url === 'string') {
@@ -231,7 +231,7 @@ export function create_client(app, target) {
 			url,
 			scroll: noScroll ? scroll_state() : null,
 			keepfocus: keepFocus,
-			redirect_chain,
+			redirect_count,
 			details: {
 				state,
 				replaceState
@@ -941,7 +941,7 @@ export function create_client(app, target) {
 	 *   url: URL;
 	 *   scroll: { x: number, y: number } | null;
 	 *   keepfocus: boolean;
-	 *   redirect_chain: string[];
+	 *   redirect_count: number;
 	 *   details: {
 	 *     replaceState: boolean;
 	 *     state: any;
@@ -957,7 +957,7 @@ export function create_client(app, target) {
 		url,
 		scroll,
 		keepfocus,
-		redirect_chain,
+		redirect_count,
 		details,
 		type,
 		delta,
@@ -1014,7 +1014,8 @@ export function create_client(app, target) {
 		}
 
 		if (navigation_result.type === 'redirect') {
-			if (redirect_chain.length > 10 || redirect_chain.includes(url.pathname)) {
+			// whatwg fetch spec https://fetch.spec.whatwg.org/#http-redirect-fetch says to error after 20 redirects
+			if (redirect_count >= 20) {
 				navigation_result = await load_root_error_page({
 					status: 500,
 					error: await handle_error(new Error('Redirect loop'), {
@@ -1026,12 +1027,7 @@ export function create_client(app, target) {
 					route: { id: null }
 				});
 			} else {
-				goto(
-					new URL(navigation_result.location, url).href,
-					{},
-					[...redirect_chain, url.pathname],
-					nav_token
-				);
+				goto(new URL(navigation_result.location, url).href, {}, redirect_count + 1, nav_token);
 				return false;
 			}
 		} else if (/** @type {number} */ (navigation_result.props.page?.status) >= 400) {
@@ -1379,7 +1375,7 @@ export function create_client(app, target) {
 		},
 
 		goto: (href, opts = {}) => {
-			return goto(href, opts, []);
+			return goto(href, opts, 0);
 		},
 
 		invalidate: (resource) => {
@@ -1440,7 +1436,7 @@ export function create_client(app, target) {
 					tick().then(reset_focus);
 				}
 			} else if (result.type === 'redirect') {
-				goto(result.location, { invalidateAll: true }, []);
+				goto(result.location, { invalidateAll: true }, 0);
 			} else {
 				/** @type {Record<string, any>} */
 				root.$set({
@@ -1595,7 +1591,7 @@ export function create_client(app, target) {
 					url,
 					scroll: options.noscroll ? scroll_state() : null,
 					keepfocus: options.keep_focus ?? false,
-					redirect_chain: [],
+					redirect_count: 0,
 					details: {
 						state: {},
 						replaceState: options.replace_state ?? url.href === location.href
@@ -1649,7 +1645,7 @@ export function create_client(app, target) {
 					url,
 					scroll: noscroll ? scroll_state() : null,
 					keepfocus: keep_focus ?? false,
-					redirect_chain: [],
+					redirect_count: 0,
 					details: {
 						state: {},
 						replaceState: replace_state ?? url.href === location.href
@@ -1662,16 +1658,19 @@ export function create_client(app, target) {
 			});
 
 			addEventListener('popstate', async (event) => {
+				token = {};
 				if (event.state?.[INDEX_KEY]) {
 					// if a popstate-driven navigation is cancelled, we need to counteract it
 					// with history.go, which means we end up back here, hence this check
 					if (event.state[INDEX_KEY] === current_history_index) return;
 
 					const scroll = scroll_positions[event.state[INDEX_KEY]];
+					const url = new URL(location.href);
 
 					// if the only change is the hash, we don't need to do anything...
 					if (current.url.href.split('#')[0] === location.href.split('#')[0]) {
-						// ...except handle scroll
+						// ...except update our internal URL tracking and handle scroll
+						update_url(url);
 						scroll_positions[current_history_index] = scroll_state();
 						current_history_index = event.state[INDEX_KEY];
 						scrollTo(scroll.x, scroll.y);
@@ -1681,10 +1680,10 @@ export function create_client(app, target) {
 					const delta = event.state[INDEX_KEY] - current_history_index;
 
 					await navigate({
-						url: new URL(location.href),
+						url,
 						scroll,
 						keepfocus: false,
-						redirect_chain: [],
+						redirect_count: 0,
 						details: null,
 						accepted: () => {
 							current_history_index = event.state[INDEX_KEY];
@@ -1693,7 +1692,8 @@ export function create_client(app, target) {
 							history.go(-delta);
 						},
 						type: 'popstate',
-						delta
+						delta,
+						nav_token: token
 					});
 				} else {
 					// since popstate event is also emitted when an anchor referencing the same

package/src/runtime/client/fetcher.js

@@ -23,6 +23,10 @@ if (DEV) {
 
 	check_stack_trace();
 
+	/**
+	 * @param {RequestInfo | URL} input
+	 * @param {RequestInit & Record<string, any> | undefined} init
+	 */
 	window.fetch = (input, init) => {
 		// Check if fetch was called via load_node. the lock method only checks if it was called at the
 		// same time, but not necessarily if it was called from `load`.
@@ -36,10 +40,14 @@ if (DEV) {
 		const cutoff = stack_array.findIndex((a) => a.includes('load@') || a.includes('at load'));
 		const stack = stack_array.slice(0, cutoff + 2).join('\n');
 
-		const heuristic = can_inspect_stack_trace
+		const in_load_heuristic = can_inspect_stack_trace
 			? stack.includes('src/runtime/client/client.js')
 			: loading;
-		if (heuristic) {
+
+		// This flag is set in initial_fetch and subsequent_fetch
+		const used_kit_fetch = init?.__sveltekit_fetch__;
+
+		if (in_load_heuristic && !used_kit_fetch) {
 			console.warn(
 				`Loading ${url} using \`window.fetch\`. For best results, use the \`fetch\` that is passed to your \`load\` function: https://kit.svelte.dev/docs/load#making-fetch-requests`
 			);
@@ -86,7 +94,7 @@ export function initial_fetch(resource, opts) {
 		return Promise.resolve(new Response(body, init));
 	}
 
-	return native_fetch(resource, opts);
+	return DEV ? dev_fetch(resource, opts) : window.fetch(resource, opts);
 }
 
 /**
@@ -112,7 +120,22 @@ export function subsequent_fetch(resource, resolved, opts) {
 		}
 	}
 
-	return native_fetch(resolved, opts);
+	return DEV ? dev_fetch(resolved, opts) : window.fetch(resolved, opts);
+}
+
+/**
+ * @param {RequestInfo | URL} resource
+ * @param {RequestInit & Record<string, any> | undefined} opts
+ */
+function dev_fetch(resource, opts) {
+	const patched_opts = { ...opts };
+	// This assigns the __sveltekit_fetch__ flag and makes it non-enumerable
+	Object.defineProperty(patched_opts, '__sveltekit_fetch__', {
+		value: true,
+		writable: true,
+		configurable: true
+	});
+	return window.fetch(resource, patched_opts);
 }
 
 /**

package/src/version.js

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