@sveltejs/kit 1.27.4 → 1.27.5

package/package.json

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

package/src/core/config/options.js

@@ -1,6 +1,6 @@
 import { join } from 'node:path';
 
-/** @typedef {import('./types').Validator} Validator */
+/** @typedef {import('./types.js').Validator} Validator */
 
 const directives = object({
 	'child-src': string_array(),

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

@@ -444,7 +444,7 @@ function create_routes_and_nodes(cwd, config, fallback) {
  * @param {string} file
  * @param {string[]} component_extensions
  * @param {string[]} module_extensions
- * @returns {import('./types').RouteFile}
+ * @returns {import('./types.js').RouteFile}
  */
 function analyze(project_relative, file, component_extensions, module_extensions) {
 	const component_extension = component_extensions.find((ext) => file.endsWith(ext));

package/src/core/sync/write_tsconfig.js

@@ -88,6 +88,7 @@ export function get_tsconfig(kit, include_base_url) {
 	const include = new Set([
 		'ambient.d.ts',
 		'./types/**/$types.d.ts',
+		config_relative('vite.config.js'),
 		config_relative('vite.config.ts')
 	]);
 	// TODO(v2): find a better way to include all src files. We can't just use routes/lib only because

package/src/exports/vite/build/build_server.js

@@ -10,7 +10,7 @@ import { normalizePath } from 'vite';
  * @param {import('types').ManifestData} manifest_data
  * @param {import('vite').Manifest} server_manifest
  * @param {import('vite').Manifest | null} client_manifest
- * @param {import('rollup').OutputAsset[] | null} css
+ * @param {import('vite').Rollup.OutputAsset[] | null} css
  */
 export function build_server_nodes(out, kit, manifest_data, server_manifest, client_manifest, css) {
 	mkdirp(`${out}/server/nodes`);

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

@@ -25,7 +25,7 @@ export function is_illegal(id, dirs) {
 
 /**
  * Creates a guard that checks that no id imports a module that is not allowed to be imported into client-side code.
- * @param {import('rollup').PluginContext} context
+ * @param {import('vite').Rollup.PluginContext} context
  * @param {{ cwd: string; lib: string }} paths
  */
 export function module_guard(context, { cwd, lib }) {

package/src/exports/vite/index.js

@@ -30,7 +30,7 @@ export { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 const cwd = process.cwd();
 
-/** @type {import('./types').EnforcedConfig} */
+/** @type {import('./types.js').EnforcedConfig} */
 const enforced_config = {
 	appType: true,
 	base: true,
@@ -702,7 +702,7 @@ function kit({ svelte_config }) {
 
 				secondary_build_started = true;
 
-				const { output } = /** @type {import('rollup').RollupOutput} */ (
+				const { output } = /** @type {import('vite').Rollup.RollupOutput} */ (
 					await vite.build({
 						configFile: vite_config.configFile,
 						// CLI args
@@ -742,7 +742,7 @@ function kit({ svelte_config }) {
 				};
 
 				const css = output.filter(
-					/** @type {(value: any) => value is import('rollup').OutputAsset} */
+					/** @type {(value: any) => value is import('vite').Rollup.OutputAsset} */
 					(value) => value.type === 'asset' && value.fileName.endsWith('.css')
 				);
 
@@ -863,7 +863,7 @@ function warn_overridden_config(config, resolved_config) {
 /**
  * @param {Record<string, any>} config
  * @param {Record<string, any>} resolved_config
- * @param {import('./types').EnforcedConfig} enforced_config
+ * @param {import('./types.js').EnforcedConfig} enforced_config
  * @param {string} path
  * @param {string[]} out used locally to compute the return value
  */

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

@@ -15,10 +15,7 @@ import { not_found } from '../utils.js';
 /** @typedef {(req: Req, res: Res, next: () => void) => void} Handler */
 
 /**
- * @param {{
- *   middlewares: import('connect').Server;
- *   httpServer: import('http').Server;
- * }} vite
+ * @param {{ middlewares: import('connect').Server }} vite
  * @param {import('vite').ResolvedConfig} vite_config
  * @param {import('types').ValidatedConfig} svelte_config
  */

package/src/runtime/client/client.js

@@ -22,7 +22,8 @@ import {
 	get_link_info,
 	get_router_options,
 	is_external_url,
-	scroll_state
+	scroll_state,
+	origin
 } from './utils.js';
 
 import { base } from '__sveltekit/paths';
@@ -55,9 +56,9 @@ function update_scroll_positions(index) {
 }
 
 /**
- * @param {import('./types').SvelteKitApp} app
+ * @param {import('./types.js').SvelteKitApp} app
  * @param {HTMLElement} target
- * @returns {import('./types').Client}
+ * @returns {import('./types.js').Client}
  */
 export function create_client(app, target) {
 	const routes = parse(app);
@@ -82,7 +83,7 @@ export function create_client(app, target) {
 	 */
 	const components = [];
 
-	/** @type {{id: string, promise: Promise<import('./types').NavigationResult>} | null} */
+	/** @type {{id: string, promise: Promise<import('./types.js').NavigationResult>} | null} */
 	let load_cache = null;
 
 	const callbacks = {
@@ -96,7 +97,7 @@ export function create_client(app, target) {
 		after_navigate: []
 	};
 
-	/** @type {import('./types').NavigationState} */
+	/** @type {import('./types.js').NavigationState} */
 	let current = {
 		branch: [],
 		error: null,
@@ -247,7 +248,7 @@ export function create_client(app, target) {
 		});
 	}
 
-	/** @param {import('./types').NavigationIntent} intent */
+	/** @param {import('./types.js').NavigationIntent} intent */
 	async function preload_data(intent) {
 		load_cache = {
 			id: intent.id,
@@ -274,7 +275,7 @@ export function create_client(app, target) {
 		await Promise.all(promises);
 	}
 
-	/** @param {import('./types').NavigationFinished} result */
+	/** @param {import('./types.js').NavigationFinished} result */
 	function initialize(result) {
 		if (DEV && result.state.error && document.querySelector('vite-error-overlay')) return;
 
@@ -315,7 +316,7 @@ export function create_client(app, target) {
 	 * @param {{
 	 *   url: URL;
 	 *   params: Record<string, string>;
-	 *   branch: Array<import('./types').BranchNode | undefined>;
+	 *   branch: Array<import('./types.js').BranchNode | undefined>;
 	 *   status: number;
 	 *   error: App.Error | null;
 	 *   route: import('types').CSRRoute | null;
@@ -340,7 +341,7 @@ export function create_client(app, target) {
 		// eslint-disable-next-line
 		url.search = url.search; // turn `/?` into `/`
 
-		/** @type {import('./types').NavigationFinished} */
+		/** @type {import('./types.js').NavigationFinished} */
 		const result = {
 			type: 'loaded',
 			state: {
@@ -417,9 +418,9 @@ export function create_client(app, target) {
 	 *   url: URL;
 	 *   params: Record<string, string>;
 	 *   route: { id: string | null };
-	 * 	 server_data_node: import('./types').DataNode | null;
+	 * 	 server_data_node: import('./types.js').DataNode | null;
 	 * }} options
-	 * @returns {Promise<import('./types').BranchNode>}
+	 * @returns {Promise<import('./types.js').BranchNode>}
 	 */
 	async function load_node({ loader, parent, url, params, route, server_data_node }) {
 		/** @type {Record<string, any> | null} */
@@ -589,8 +590,8 @@ export function create_client(app, target) {
 
 	/**
 	 * @param {import('types').ServerDataNode | import('types').ServerDataSkippedNode | null} node
-	 * @param {import('./types').DataNode | null} [previous]
-	 * @returns {import('./types').DataNode | null}
+	 * @param {import('./types.js').DataNode | null} [previous]
+	 * @returns {import('./types.js').DataNode | null}
 	 */
 	function create_data_node(node, previous) {
 		if (node?.type === 'data') return node;
@@ -599,8 +600,8 @@ export function create_client(app, target) {
 	}
 
 	/**
-	 * @param {import('./types').NavigationIntent} intent
-	 * @returns {Promise<import('./types').NavigationResult>}
+	 * @param {import('./types.js').NavigationIntent} intent
+	 * @returns {Promise<import('./types.js').NavigationResult>}
 	 */
 	async function load_route({ id, invalidating, url, params, route }) {
 		if (load_cache?.id === id) {
@@ -664,7 +665,7 @@ export function create_client(app, target) {
 		const branch_promises = loaders.map(async (loader, i) => {
 			if (!loader) return;
 
-			/** @type {import('./types').BranchNode | undefined} */
+			/** @type {import('./types.js').BranchNode | undefined} */
 			const previous = current.branch[i];
 
 			const server_data_node = server_data_nodes?.[i];
@@ -707,7 +708,7 @@ export function create_client(app, target) {
 		// if we don't do this, rejections will be unhandled
 		for (const p of branch_promises) p.catch(() => {});
 
-		/** @type {Array<import('./types').BranchNode | undefined>} */
+		/** @type {Array<import('./types.js').BranchNode | undefined>} */
 		const branch = [];
 
 		for (let i = 0; i < loaders.length; i += 1) {
@@ -781,9 +782,9 @@ export function create_client(app, target) {
 
 	/**
 	 * @param {number} i Start index to backtrack from
-	 * @param {Array<import('./types').BranchNode | undefined>} branch Branch to backtrack
+	 * @param {Array<import('./types.js').BranchNode | undefined>} branch Branch to backtrack
 	 * @param {Array<import('types').CSRPageNodeLoader | undefined>} errors All error pages for this branch
-	 * @returns {Promise<{idx: number; node: import('./types').BranchNode} | undefined>}
+	 * @returns {Promise<{idx: number; node: import('./types.js').BranchNode} | undefined>}
 	 */
 	async function load_nearest_error_page(i, branch, errors) {
 		while (i--) {
@@ -815,7 +816,7 @@ export function create_client(app, target) {
 	 *   url: URL;
 	 *   route: { id: string | null }
 	 * }} opts
-	 * @returns {Promise<import('./types').NavigationFinished>}
+	 * @returns {Promise<import('./types.js').NavigationFinished>}
 	 */
 	async function load_root_error_page({ status, error, url, route }) {
 		/** @type {Record<string, string>} */
@@ -843,7 +844,7 @@ export function create_client(app, target) {
 			} catch {
 				// at this point we have no choice but to fall back to the server, if it wouldn't
 				// bring us right back here, turning this into an endless loop
-				if (url.origin !== location.origin || url.pathname !== location.pathname || hydrated) {
+				if (url.origin !== origin || url.pathname !== location.pathname || hydrated) {
 					await native_navigation(url);
 				}
 			}
@@ -858,7 +859,7 @@ export function create_client(app, target) {
 			server_data_node: create_data_node(server_data_node)
 		});
 
-		/** @type {import('./types').BranchNode} */
+		/** @type {import('./types.js').BranchNode} */
 		const root_error = {
 			node: await default_error_loader(),
 			loader: default_error_loader,
@@ -891,7 +892,7 @@ export function create_client(app, target) {
 
 			if (params) {
 				const id = url.pathname + url.search;
-				/** @type {import('./types').NavigationIntent} */
+				/** @type {import('./types.js').NavigationIntent} */
 				const intent = { id, invalidating, route, params: decode_params(params), url };
 				return intent;
 			}
@@ -907,7 +908,7 @@ export function create_client(app, target) {
 	 * @param {{
 	 *   url: URL;
 	 *   type: import('@sveltejs/kit').Navigation["type"];
-	 *   intent?: import('./types').NavigationIntent;
+	 *   intent?: import('./types.js').NavigationIntent;
 	 *   delta?: number;
 	 * }} opts
 	 */
@@ -1170,10 +1171,10 @@ export function create_client(app, target) {
 	 * @param {{ id: string | null }} route
 	 * @param {App.Error} error
 	 * @param {number} status
-	 * @returns {Promise<import('./types').NavigationFinished>}
+	 * @returns {Promise<import('./types.js').NavigationFinished>}
 	 */
 	async function server_fallback(url, route, error, status) {
-		if (url.origin === location.origin && url.pathname === location.pathname && !hydrated) {
+		if (url.origin === origin && url.pathname === location.pathname && !hydrated) {
 			// We would reload the same page we're currently on, which isn't hydrated,
 			// which means no SSR, which means we would end up in an endless loop
 			return await load_root_error_page({
@@ -1765,7 +1766,7 @@ export function create_client(app, target) {
 				({ params = {}, route = { id: null } } = get_navigation_intent(url, false) || {});
 			}
 
-			/** @type {import('./types').NavigationFinished | undefined} */
+			/** @type {import('./types.js').NavigationFinished | undefined} */
 			let result;
 
 			try {
@@ -1792,7 +1793,7 @@ export function create_client(app, target) {
 					});
 				});
 
-				/** @type {Array<import('./types').BranchNode | undefined>} */
+				/** @type {Array<import('./types.js').BranchNode | undefined>} */
 				const branch = await Promise.all(branch_promises);
 
 				const parsed_route = routes.find(({ id }) => id === route.id);
@@ -2018,8 +2019,8 @@ function reset_focus() {
 }
 
 /**
- * @param {import('./types').NavigationState} current
- * @param {import('./types').NavigationIntent | undefined} intent
+ * @param {import('./types.js').NavigationState} current
+ * @param {import('./types.js').NavigationIntent | undefined} intent
  * @param {URL | null} url
  * @param {Exclude<import('@sveltejs/kit').NavigationType, 'enter'>} type
  */

package/src/runtime/client/parse.js

@@ -1,7 +1,7 @@
 import { exec, parse_route_id } from '../../utils/routing.js';
 
 /**
- * @param {import('./types').SvelteKitApp} app
+ * @param {import('./types.js').SvelteKitApp} app
  * @returns {import('types').CSRRoute[]}
  */
 export function parse({ nodes, server_loads, dictionary, matchers }) {

package/src/runtime/client/singletons.js

@@ -2,12 +2,12 @@ import { writable } from 'svelte/store';
 import { create_updated_store, notifiable_store } from './utils.js';
 import { BROWSER } from 'esm-env';
 
-/** @type {import('./types').Client} */
+/** @type {import('./types.js').Client} */
 export let client;
 
 /**
  * @param {{
- *   client: import('./types').Client;
+ *   client: import('./types.js').Client;
  * }} opts
  */
 export function init(opts) {

package/src/runtime/client/start.js

@@ -3,9 +3,9 @@ import { create_client } from './client.js';
 import { init } from './singletons.js';
 
 /**
- * @param {import('./types').SvelteKitApp} app
+ * @param {import('./types.js').SvelteKitApp} app
  * @param {HTMLElement} target
- * @param {Parameters<import('./types').Client['_hydrate']>[0]} [hydrate]
+ * @param {Parameters<import('./types.js').Client['_hydrate']>[0]} [hydrate]
  */
 export async function start(app, target, hydrate) {
 	if (DEV && target === document.body) {

package/src/runtime/client/types.d.ts

@@ -1,4 +1,4 @@
-import { applyAction } from '../app/forms';
+import { applyAction } from '../app/forms.js';
 import {
 	afterNavigate,
 	beforeNavigate,
@@ -8,7 +8,7 @@ import {
 	invalidateAll,
 	preloadCode,
 	preloadData
-} from '../app/navigation';
+} from '../app/navigation.js';
 import { SvelteComponent } from 'svelte';
 import { ClientHooks, CSRPageNode, CSRPageNodeLoader, CSRRoute, TrailingSlash, Uses } from 'types';
 import { Page, ParamMatcher } from '@sveltejs/kit';

package/src/runtime/client/utils.js

@@ -6,6 +6,8 @@ import { PRELOAD_PRIORITIES } from './constants.js';
 
 /* global __SVELTEKIT_APP_VERSION_FILE__, __SVELTEKIT_APP_VERSION_POLL_INTERVAL__ */
 
+export const origin = BROWSER ? location.origin : '';
+
 /** @param {HTMLDocument} doc */
 export function get_base_uri(doc) {
 	let baseURI = doc.baseURI;
@@ -135,7 +137,7 @@ export function get_link_info(a, base) {
 		is_external_url(url, base) ||
 		(a.getAttribute('rel') || '').split(/\s+/).includes('external');
 
-	const download = url?.origin === location.origin && a.hasAttribute('download');
+	const download = url?.origin === origin && a.hasAttribute('download');
 
 	return { url, external, target, download };
 }
@@ -290,5 +292,5 @@ export function create_updated_store() {
  * @param {string} base
  */
 export function is_external_url(url, base) {
-	return url.origin !== location.origin || !url.pathname.startsWith(base);
+	return url.origin !== origin || !url.pathname.startsWith(base);
 }

package/src/runtime/server/cookie.js

@@ -27,7 +27,7 @@ export function get_cookies(request, url, trailing_slash) {
 	// Emulate browser-behavior: if the cookie is set at '/foo/bar', its path is '/foo'
 	const default_path = normalized_url.split('/').slice(0, -1).join('/') || '/';
 
-	/** @type {Record<string, import('./page/types').Cookie>} */
+	/** @type {Record<string, import('./page/types.js').Cookie>} */
 	const new_cookies = {};
 
 	/** @type {import('cookie').CookieSerializeOptions} */
@@ -232,7 +232,7 @@ export function path_matches(path, constraint) {
 
 /**
  * @param {Headers} headers
- * @param {import('./page/types').Cookie[]} cookies
+ * @param {import('./page/types.js').Cookie[]} cookies
  */
 export function add_cookies_to_headers(headers, cookies) {
 	for (const new_cookie of cookies) {

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

@@ -223,8 +223,8 @@ export class Csp {
 	report_only_provider;
 
 	/**
-	 * @param {import('./types').CspConfig} config
-	 * @param {import('./types').CspOpts} opts
+	 * @param {import('./types.js').CspConfig} config
+	 * @param {import('./types.js').CspOpts} opts
 	 */
 	constructor({ mode, directives, reportOnly }, { prerender }) {
 		const use_hashes = mode === 'hash' || (mode === 'auto' && prerender);

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

@@ -96,7 +96,7 @@ export async function render_page(event, page, options, manifest, state, resolve
 		// inherit the prerender option of the page
 		state.prerender_default = should_prerender;
 
-		/** @type {import('./types').Fetched[]} */
+		/** @type {import('./types.js').Fetched[]} */
 		const fetched = [];
 
 		if (get_option(nodes, 'ssr') === false && !state.prerendering) {

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

@@ -144,7 +144,7 @@ export async function load_server_data({
  * Calls the user's `load` function.
  * @param {{
  *   event: import('@sveltejs/kit').RequestEvent;
- *   fetched: import('./types').Fetched[];
+ *   fetched: import('./types.js').Fetched[];
  *   node: import('types').SSRNode | undefined;
  *   parent: () => Promise<Record<string, any>>;
  *   resolve_opts: import('types').RequiredResolveOptions;
@@ -192,7 +192,7 @@ export async function load_data({
 /**
  * @param {Pick<import('@sveltejs/kit').RequestEvent, 'fetch' | 'url' | 'request' | 'route'>} event
  * @param {import('types').SSRState} state
- * @param {import('./types').Fetched[]} fetched
+ * @param {import('./types.js').Fetched[]} fetched
  * @param {boolean} csr
  * @param {Pick<Required<import('@sveltejs/kit').ResolveOptions>, 'filterSerializedResponseHeaders'>} resolve_opts
  */

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

@@ -26,8 +26,8 @@ const encoder = new TextEncoder();
 /**
  * Creates the HTML response.
  * @param {{
- *   branch: Array<import('./types').Loaded>;
- *   fetched: Array<import('./types').Fetched>;
+ *   branch: Array<import('./types.js').Loaded>;
+ *   fetched: Array<import('./types.js').Fetched>;
  *   options: import('types').SSROptions;
  *   manifest: import('@sveltejs/kit').SSRManifest;
  *   state: import('types').SSRState;

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

@@ -33,7 +33,7 @@ export async function respond_with_error({
 		return static_error_page(options, status, /** @type {Error} */ (error).message);
 	}
 
-	/** @type {import('./types').Fetched[]} */
+	/** @type {import('./types.js').Fetched[]} */
 	const fetched = [];
 
 	try {

package/src/runtime/server/respond.js

@@ -134,7 +134,7 @@ export async function respond(request, options, manifest, state) {
 	/** @type {Record<string, string>} */
 	const headers = {};
 
-	/** @type {Record<string, import('./page/types').Cookie>} */
+	/** @type {Record<string, import('./page/types.js').Cookie>} */
 	let cookies_to_add = {};
 
 	/** @type {import('@sveltejs/kit').RequestEvent} */

package/src/types/internal.d.ts

@@ -414,5 +414,5 @@ export type ValidatedConfig = RecursiveRequired<Config>;
 
 export type ValidatedKitConfig = RecursiveRequired<KitConfig>;
 
-export * from '../exports/index';
+export * from '../exports/index.js';
 export * from './private.js';

package/src/version.js

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