@sveltejs/kit 1.22.5 → 1.23.0

package/package.json

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

package/src/core/postbuild/analyse.js

@@ -60,7 +60,7 @@ async function analyse({ manifest_path, env }) {
 		const node = await loader();
 
 		metadata.nodes[node.index] = {
-			has_server_load: node.server?.load !== undefined
+			has_server_load: node.server?.load !== undefined || node.server?.trailingSlash !== undefined
 		};
 	}
 

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

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import colors from 'kleur';
 import mime from 'mime';
 import { list_files, runtime_directory } from '../../utils.js';
 import { posixify } from '../../../utils/filesystem.js';
@@ -201,8 +202,31 @@ function create_routes_and_nodes(cwd, config, fallback) {
 			// process files first
 			for (const file of files) {
 				if (file.is_dir) continue;
-				if (!file.name.startsWith('+')) continue;
-				if (!valid_extensions.find((ext) => file.name.endsWith(ext))) continue;
+
+				const ext = valid_extensions.find((ext) => file.name.endsWith(ext));
+				if (!ext) continue;
+
+				if (!file.name.startsWith('+')) {
+					const name = file.name.slice(0, -ext.length);
+					// check if it is a valid route filename but missing the + prefix
+					const typo =
+						/^(?:(page(?:@(.*))?)|(layout(?:@(.*))?)|(error))$/.test(name) ||
+						/^(?:(server)|(page(?:(@[a-zA-Z0-9_-]*))?(\.server)?)|(layout(?:(@[a-zA-Z0-9_-]*))?(\.server)?))$/.test(
+							name
+						);
+					if (typo) {
+						console.log(
+							colors
+								.bold()
+								.yellow(
+									`Missing route file prefix. Did you mean +${file.name}?` +
+										` at ${path.join(dir, file.name)}`
+								)
+						);
+					}
+
+					continue;
+				}
 
 				if (file.name.endsWith('.d.ts')) {
 					let name = file.name.slice(0, -5);

package/src/core/sync/write_client_manifest.js

@@ -1,6 +1,8 @@
+import path from 'node:path';
 import { relative_path, resolve_entry } from '../../utils/filesystem.js';
 import { s } from '../../utils/misc.js';
 import { dedent, write_if_changed } from './utils.js';
+import colors from 'kleur';
 
 /**
  * Writes the client manifest to disk. The manifest is used to power the router. It contains the
@@ -108,6 +110,18 @@ export function write_client_manifest(kit, manifest_data, output, metadata) {
 
 	const hooks_file = resolve_entry(kit.files.hooks.client);
 
+	const typo = resolve_entry('src/+hooks.client');
+	if (typo) {
+		console.log(
+			colors
+				.bold()
+				.yellow(
+					`Unexpected + prefix. Did you mean ${typo.split('/').at(-1)?.slice(1)}?` +
+						` at ${path.resolve(typo)}`
+				)
+		);
+	}
+
 	write_if_changed(
 		`${output}/app.js`,
 		dedent`

package/src/core/sync/write_server.js

@@ -1,4 +1,3 @@
-import fs from 'node:fs';
 import path from 'node:path';
 import { hash } from '../../runtime/hash.js';
 import { posixify, resolve_entry } from '../../utils/filesystem.js';
@@ -6,6 +5,7 @@ import { s } from '../../utils/misc.js';
 import { load_error_page, load_template } from '../config/index.js';
 import { runtime_directory } from '../utils.js';
 import { write_if_changed } from './utils.js';
+import colors from 'kleur';
 
 /**
  * @param {{
@@ -76,8 +76,19 @@ export { set_assets, set_building, set_private_env, set_public_env };
  * @param {string} output
  */
 export function write_server(config, output) {
-	// TODO the casting shouldn't be necessary — investigate
-	const hooks_file = /** @type {string} */ (resolve_entry(config.kit.files.hooks.server));
+	const hooks_file = resolve_entry(config.kit.files.hooks.server);
+
+	const typo = resolve_entry('src/+hooks.server');
+	if (typo) {
+		console.log(
+			colors
+				.bold()
+				.yellow(
+					`Unexpected + prefix. Did you mean ${typo.split('/').at(-1)?.slice(1)}?` +
+						` at ${path.resolve(typo)}`
+				)
+		);
+	}
 
 	/** @param {string} file */
 	function relative(file) {
@@ -88,7 +99,7 @@ export function write_server(config, output) {
 		`${output}/server/internal.js`,
 		server_template({
 			config,
-			hooks: fs.existsSync(hooks_file) ? relative(hooks_file) : null,
+			hooks: hooks_file ? relative(hooks_file) : null,
 			has_service_worker:
 				config.kit.serviceWorker.register && !!resolve_entry(config.kit.files.serviceWorker),
 			runtime_directory: relative(runtime_directory),

package/src/exports/index.js

@@ -38,14 +38,14 @@ export function error(status, body) {
  * Create a `Redirect` object. If thrown during request handling, SvelteKit will return a redirect response.
  * Make sure you're not catching the thrown redirect, which would prevent SvelteKit from handling it.
  * @param {300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308} status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages). Must be in the range 300-308.
- * @param {string} location The location to redirect to.
+ * @param {string | URL} location The location to redirect to.
  */
 export function redirect(status, location) {
 	if ((!BROWSER || DEV) && (isNaN(status) || status < 300 || status > 308)) {
 		throw new Error('Invalid status code');
 	}
 
-	return new Redirect(status, location);
+	return new Redirect(status, location.toString());
 }
 
 /**

package/src/exports/public.d.ts

@@ -119,7 +119,7 @@ export interface Builder {
 	getClientDirectory(): string;
 	/** Get the fully resolved path to the directory containing server-side code. */
 	getServerDirectory(): string;
-	/** Get the application path including any configured `base` path, e.g. `/my-base-path/_app`. */
+	/** Get the application path including any configured `base` path, e.g. `my-base-path/_app`. */
 	getAppPath(): string;
 
 	/**
@@ -851,7 +851,7 @@ export interface Navigation {
 	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
 	 * - `popstate`: Navigation was triggered by back/forward navigation
 	 */
-	type: Omit<NavigationType, 'enter'>;
+	type: Exclude<NavigationType, 'enter'>;
 	/**
 	 * Whether or not the navigation will result in the page being unloaded (i.e. not a client-side navigation)
 	 */
@@ -875,7 +875,7 @@ export interface BeforeNavigate extends Navigation {
 /**
  * The argument passed to [`afterNavigate`](https://kit.svelte.dev/docs/modules#$app-navigation-afternavigate) callbacks.
  */
-export interface AfterNavigate extends Navigation {
+export interface AfterNavigate extends Omit<Navigation, 'type'> {
 	/**
 	 * The type of navigation:
 	 * - `enter`: The app has hydrated
@@ -884,7 +884,7 @@ export interface AfterNavigate extends Navigation {
 	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
 	 * - `popstate`: Navigation was triggered by back/forward navigation
 	 */
-	type: Omit<NavigationType, 'leave'>;
+	type: Exclude<NavigationType, 'leave'>;
 	/**
 	 * Since `afterNavigate` is called after a navigation completes, it will never be called with a navigation that unloads the page.
 	 */

package/src/runtime/client/client.js

@@ -31,7 +31,7 @@ import { compact } from '../../utils/array.js';
 import { validate_page_exports } from '../../utils/exports.js';
 import { unwrap_promises } from '../../utils/promises.js';
 import { HttpError, Redirect } from '../control.js';
-import { INVALIDATED_PARAM, validate_depends } from '../shared.js';
+import { INVALIDATED_PARAM, TRAILING_SLASH_PARAM, validate_depends } from '../shared.js';
 import { INDEX_KEY, PRELOAD_PRIORITIES, SCROLL_KEY, SNAPSHOT_KEY } from './constants.js';
 import { stores } from './singletons.js';
 
@@ -902,7 +902,7 @@ export function create_client(app, target) {
 	/**
 	 * @param {{
 	 *   url: URL;
-	 *   type: import('@sveltejs/kit').NavigationType;
+	 *   type: import('@sveltejs/kit').Navigation["type"];
 	 *   intent?: import('./types').NavigationIntent;
 	 *   delta?: number;
 	 * }} opts
@@ -955,7 +955,7 @@ export function create_client(app, target) {
 	 *     replaceState: boolean;
 	 *     state: any;
 	 *   } | null;
-	 *   type: import('@sveltejs/kit').NavigationType;
+	 *   type: import('@sveltejs/kit').Navigation["type"];
 	 *   delta?: number;
 	 *   nav_token?: {};
 	 *   accepted: () => void;
@@ -1819,6 +1819,9 @@ export function create_client(app, target) {
 async function load_data(url, invalid) {
 	const data_url = new URL(url);
 	data_url.pathname = add_data_suffix(url.pathname);
+	if (url.pathname.endsWith('/')) {
+		data_url.searchParams.append(TRAILING_SLASH_PARAM, '1');
+	}
 	if (DEV && url.searchParams.has(INVALIDATED_PARAM)) {
 		throw new Error(`Cannot used reserved query parameter "${INVALIDATED_PARAM}"`);
 	}

package/src/runtime/server/respond.js

@@ -29,7 +29,7 @@ import {
 import { get_option } from '../../utils/options.js';
 import { error, json, text } from '../../exports/index.js';
 import { action_json_redirect, is_action_json_request } from './page/actions.js';
-import { INVALIDATED_PARAM } from '../shared.js';
+import { INVALIDATED_PARAM, TRAILING_SLASH_PARAM } from '../shared.js';
 
 /* global __SVELTEKIT_ADAPTER_NAME__ */
 
@@ -100,7 +100,10 @@ export async function respond(request, options, manifest, state) {
 	let invalidated_data_nodes;
 	if (is_data_request) {
 		decoded = strip_data_suffix(decoded) || '/';
-		url.pathname = strip_data_suffix(url.pathname) || '/';
+		url.pathname =
+			strip_data_suffix(url.pathname) +
+				(url.searchParams.get(TRAILING_SLASH_PARAM) === '1' ? '/' : '') || '/';
+		url.searchParams.delete(TRAILING_SLASH_PARAM);
 		invalidated_data_nodes = url.searchParams
 			.get(INVALIDATED_PARAM)
 			?.split('')

package/src/runtime/shared.js

@@ -12,3 +12,5 @@ export function validate_depends(route_id, dep) {
 }
 
 export const INVALIDATED_PARAM = 'x-sveltekit-invalidated';
+
+export const TRAILING_SLASH_PARAM = 'x-sveltekit-trailing-slash';

package/src/utils/url.js

@@ -139,6 +139,8 @@ export function make_trackable(url, callback) {
  * @param {URL} url
  */
 export function disable_hash(url) {
+	allow_nodejs_console_log(url);
+
 	Object.defineProperty(url, 'hash', {
 		get() {
 			throw new Error(
@@ -153,6 +155,8 @@ export function disable_hash(url) {
  * @param {URL} url
  */
 export function disable_search(url) {
+	allow_nodejs_console_log(url);
+
 	for (const property of ['search', 'searchParams']) {
 		Object.defineProperty(url, property, {
 			get() {
@@ -162,6 +166,19 @@ export function disable_search(url) {
 	}
 }
 
+/**
+ * Allow URL to be console logged, bypassing disabled properties.
+ * @param {URL} url
+ */
+function allow_nodejs_console_log(url) {
+	if (!BROWSER) {
+		// @ts-ignore
+		url[Symbol.for('nodejs.util.inspect.custom')] = (depth, opts, inspect) => {
+			return inspect(new URL(url), opts);
+		};
+	}
+}
+
 const DATA_SUFFIX = '/__data.json';
 
 /** @param {string} pathname */

package/src/version.js

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

package/types/index.d.ts

@@ -99,7 +99,7 @@ declare module '@sveltejs/kit' {
 		getClientDirectory(): string;
 		/** Get the fully resolved path to the directory containing server-side code. */
 		getServerDirectory(): string;
-		/** Get the application path including any configured `base` path, e.g. `/my-base-path/_app`. */
+		/** Get the application path including any configured `base` path, e.g. `my-base-path/_app`. */
 		getAppPath(): string;
 
 		/**
@@ -831,7 +831,7 @@ declare module '@sveltejs/kit' {
 		 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
 		 * - `popstate`: Navigation was triggered by back/forward navigation
 		 */
-		type: Omit<NavigationType, 'enter'>;
+		type: Exclude<NavigationType, 'enter'>;
 		/**
 		 * Whether or not the navigation will result in the page being unloaded (i.e. not a client-side navigation)
 		 */
@@ -855,7 +855,7 @@ declare module '@sveltejs/kit' {
 	/**
 	 * The argument passed to [`afterNavigate`](https://kit.svelte.dev/docs/modules#$app-navigation-afternavigate) callbacks.
 	 */
-	export interface AfterNavigate extends Navigation {
+	export interface AfterNavigate extends Omit<Navigation, 'type'> {
 		/**
 		 * The type of navigation:
 		 * - `enter`: The app has hydrated
@@ -864,7 +864,7 @@ declare module '@sveltejs/kit' {
 		 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
 		 * - `popstate`: Navigation was triggered by back/forward navigation
 		 */
-		type: Omit<NavigationType, 'leave'>;
+		type: Exclude<NavigationType, 'leave'>;
 		/**
 		 * Since `afterNavigate` is called after a navigation completes, it will never be called with a navigation that unloads the page.
 		 */
@@ -1675,7 +1675,7 @@ declare module '@sveltejs/kit' {
 	 * @param status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages). Must be in the range 300-308.
 	 * @param location The location to redirect to.
 	 */
-	export function redirect(status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308, location: string): Redirect_1;
+	export function redirect(status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308, location: string | URL): Redirect_1;
 	/**
 	 * Create a JSON `Response` object from the supplied data.
 	 * @param data The value that will be serialized as JSON.