@sveltejs/kit 1.5.5 → 1.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -80,7 +80,7 @@
     "node": "^16.14 || >=18"
   },
   "scripts": {
-    "lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore && eslint src/**",
+    "lint": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore && eslint src/**/*.js",
     "check": "tsc",
     "check:all": "tsc && pnpm -r --filter=\"./**\" check",
     "format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",

package/src/exports/vite/index.js

@@ -179,6 +179,9 @@ function kit({ svelte_config }) {
 	/** @type {() => Promise<void>} */
 	let finalise;
 
+	/** @type {import('vite').UserConfig} */
+	let initial_config;
+
 	const service_worker_entry_file = resolve_entry(kit.files.serviceWorker);
 
 	/** @type {import('vite').Plugin} */
@@ -190,6 +193,7 @@ function kit({ svelte_config }) {
 		 * @see https://vitejs.dev/guide/api-plugin.html#config
 		 */
 		async config(config, config_env) {
+			initial_config = config;
 			vite_config_env = config_env;
 			is_build = config_env.command === 'build';
 
@@ -316,7 +320,7 @@ function kit({ svelte_config }) {
 
 		async resolveId(id) {
 			// treat $env/static/[public|private] as virtual
-			if (id.startsWith('$env/') || id === '$internal/paths' || id === '$service-worker') {
+			if (id.startsWith('$env/') || id === '@sveltejs/kit/paths' || id === '$service-worker') {
 				return `\0${id}`;
 			}
 		},
@@ -354,7 +358,9 @@ function kit({ svelte_config }) {
 					);
 				case '\0$service-worker':
 					return create_service_worker_module(svelte_config);
-				case '\0$internal/paths':
+				// 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@sveltejs/kit/paths':
 					const { assets, base } = svelte_config.kit.paths;
 					return `export const base = ${s(base)};
 export let assets = ${assets ? s(assets) : 'base'};
@@ -634,7 +640,7 @@ export function set_assets(path) {
 						logLevel: vite_config.logLevel,
 						clearScreen: vite_config.clearScreen,
 						build: {
-							minify: vite_config.build.minify,
+							minify: initial_config.build?.minify,
 							assetsInlineLimit: vite_config.build.assetsInlineLimit,
 							sourcemap: vite_config.build.sourcemap
 						},

package/src/internal.d.ts

@@ -0,0 +1,6 @@
+/** Internal version of $app/paths */
+declare module '@sveltejs/kit/paths' {
+	export const base: `/${string}`;
+	export let assets: `https://${string}` | `http://${string}`;
+	export function set_assets(path: string): void;
+}

package/src/runtime/app/paths.js

@@ -1 +1 @@
-export { base, assets } from '$internal/paths';
+export { base, assets } from '@sveltejs/kit/paths';

package/src/runtime/client/client.js

@@ -27,7 +27,7 @@ import { parse } from './parse.js';
 
 import Root from '__GENERATED__/root.svelte';
 import { nodes, server_loads, dictionary, matchers, hooks } from '__CLIENT__/manifest.js';
-import { base } from '$internal/paths';
+import { base } from '@sveltejs/kit/paths';
 import { HttpError, Redirect } from '../control.js';
 import { stores } from './singletons.js';
 import { unwrap_promises } from '../../utils/promises.js';
@@ -311,7 +311,7 @@ export function create_client({ target }) {
 				);
 				return false;
 			}
-		} else if (/** @type {number} */ (navigation_result.props?.page?.status) >= 400) {
+		} else if (/** @type {number} */ (navigation_result.props.page?.status) >= 400) {
 			const updated = await stores.updated.check();
 			if (updated) {
 				await native_navigation(url);
@@ -331,6 +331,14 @@ export function create_client({ target }) {
 			capture_snapshot(previous_history_index);
 		}
 
+		// ensure the url pathname matches the page's trailing slash option
+		if (
+			navigation_result.props.page?.url &&
+			navigation_result.props.page.url.pathname !== url.pathname
+		) {
+			url.pathname = navigation_result.props.page?.url.pathname;
+		}
+
 		if (opts && opts.details) {
 			const { details } = opts;
 			const change = details.replaceState ? 0 : 1;
@@ -355,6 +363,7 @@ export function create_client({ target }) {
 		if (started) {
 			current = navigation_result.state;
 
+			// reset url before updating page store
 			if (navigation_result.props.page) {
 				navigation_result.props.page.url = url;
 			}

package/src/runtime/client/utils.js

@@ -1,6 +1,6 @@
 import { BROWSER, DEV } from 'esm-env';
 import { writable } from 'svelte/store';
-import { assets } from '$internal/paths';
+import { assets } from '@sveltejs/kit/paths';
 import { version } from '../shared.js';
 import { PRELOAD_PRIORITIES } from './constants.js';
 

package/src/runtime/server/fetch.js

@@ -1,6 +1,6 @@
 import * as set_cookie_parser from 'set-cookie-parser';
 import { respond } from './respond.js';
-import * as paths from '$internal/paths';
+import * as paths from '@sveltejs/kit/paths';
 
 /**
  * @param {{

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

@@ -1,7 +1,7 @@
 import * as devalue from 'devalue';
 import { readable, writable } from 'svelte/store';
 import { DEV } from 'esm-env';
-import { assets, base } from '$internal/paths';
+import { assets, base } from '@sveltejs/kit/paths';
 import { hash } from '../../hash.js';
 import { serialize_data } from './serialize_data.js';
 import { s } from '../../../utils/misc.js';

package/src/runtime/server/respond.js

@@ -1,5 +1,5 @@
 import { DEV } from 'esm-env';
-import { base } from '$internal/paths';
+import { base } from '@sveltejs/kit/paths';
 import { is_endpoint_request, render_endpoint } from './endpoint.js';
 import { render_page } from './page/index.js';
 import { render_response } from './page/render.js';

package/src/runtime/shared.js

@@ -1,4 +1,4 @@
-export { set_assets } from '$internal/paths';
+export { set_assets } from '@sveltejs/kit/paths';
 
 export let building = false;
 export let version = '';

package/types/ambient.d.ts

@@ -438,10 +438,3 @@ declare module '@sveltejs/kit/vite' {
 	export function sveltekit(): Promise<Plugin[]>;
 	export { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 }
-
-/** Internal version of $app/paths */
-declare module '$internal/paths' {
-	export const base: `/${string}`;
-	export let assets: `https://${string}` | `http://${string}`;
-	export function set_assets(path: string): void;
-}

package/types/index.d.ts

@@ -1129,7 +1129,7 @@ export type ActionResult<
  * Creates an `HttpError` object with an HTTP status code and an optional message.
  * This object, if thrown during request handling, will cause SvelteKit to
  * return an error response without invoking `handleError`.
- * Make sure you're not catching the thrown error, which results in a noop.
+ * Make sure you're not catching the thrown error, which would prevent SvelteKit from handling it.
  * @param status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses). Must be in the range 400-599.
  * @param body An object that conforms to the App.Error type. If a string is passed, it will be used as the message property.
  */
@@ -1152,7 +1152,7 @@ export interface HttpError {
 
 /**
  * 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 results in a noop.
+ * Make sure you're not catching the thrown redirect, which would prevent SvelteKit from handling it.
  * @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.
  */