@sveltejs/kit 2.62.0 → 3.0.0-next.0

package/src/exports/vite/module_ids.js

@@ -1,16 +1,20 @@
 import { fileURLToPath } from 'node:url';
-import { posixify } from '../../utils/filesystem.js';
+import { posixify } from '../../utils/os.js';
 
-export const env_static_private = '\0virtual:env/static/private';
-export const env_static_public = '\0virtual:env/static/public';
-export const env_dynamic_private = '\0virtual:env/dynamic/private';
-export const env_dynamic_public = '\0virtual:env/dynamic/public';
+export const sveltekit_env = '\0virtual:__sveltekit/env';
+export const sveltekit_env_public_client = '\0virtual:__sveltekit/env/public/client';
+export const sveltekit_env_public_server = '\0virtual:__sveltekit/env/public/server';
+export const sveltekit_env_private = '\0virtual:__sveltekit/env/private';
+export const sveltekit_env_service_worker = '\0virtual:__sveltekit/env/service-worker';
 
 export const service_worker = '\0virtual:service-worker';
 
-export const sveltekit_environment = '\0virtual:__sveltekit/environment';
 export const sveltekit_server = '\0virtual:__sveltekit/server';
 
 export const app_server = posixify(
 	fileURLToPath(new URL('../../runtime/app/server/index.js', import.meta.url))
 );
+
+export const app_env_private = posixify(
+	fileURLToPath(new URL('../../runtime/app/env/private.js', import.meta.url))
+);

package/src/exports/vite/options.js

@@ -0,0 +1,17 @@
+/** @import { Validator } from '../../core/config/types.js' */
+
+import { object, validate } from '../../core/config/options.js';
+
+/** @type {Validator} */
+const options = object({
+	adapter: validate(undefined, (input, keypath) => {
+		if (typeof input !== 'object' || !input.adapt) {
+			const message = `The SvelteKit Vite plugin ${keypath} should be an object with an \`adapt\` method`;
+			throw new Error(`${message}. See https://svelte.dev/docs/kit/adapters`);
+		}
+
+		return input;
+	})
+});
+
+export default options;

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

@@ -5,7 +5,6 @@ import { lookup } from 'mrmime';
 import sirv from 'sirv';
 import { loadEnv, normalizePath } from 'vite';
 import { createReadableStream, getRequest, setResponse } from '../../../exports/node/index.js';
-import { installPolyfills } from '../../../exports/node/polyfills.js';
 import { SVELTE_KIT_ASSETS } from '../../../constants.js';
 import { is_chrome_devtools_request, not_found } from '../utils.js';
 
@@ -17,10 +16,9 @@ import { is_chrome_devtools_request, not_found } from '../utils.js';
  * @param {import('vite').PreviewServer} vite
  * @param {import('vite').ResolvedConfig} vite_config
  * @param {import('types').ValidatedConfig} svelte_config
+ * @param {import('@sveltejs/kit').Adapter | undefined} adapter
  */
-export async function preview(vite, vite_config, svelte_config) {
-	installPolyfills();
-
+export async function preview(vite, vite_config, svelte_config, adapter) {
 	const { paths } = svelte_config.kit;
 	const base = paths.base;
 	const assets = paths.assets ? SVELTE_KIT_ASSETS : paths.base;
@@ -56,7 +54,7 @@ export async function preview(vite, vite_config, svelte_config) {
 		read: (file) => createReadableStream(`${dir}/${file}`)
 	});
 
-	const emulator = await svelte_config.kit.adapter?.emulate?.();
+	const emulator = await adapter?.emulate?.();
 
 	return () => {
 		// Remove the base middleware. It screws with the URL.

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

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import { tsPlugin } from '@sveltejs/acorn-typescript';
 import { Parser } from 'acorn';
 import { read } from '../../../utils/filesystem.js';
@@ -213,11 +214,13 @@ function get_name(node) {
 /**
  * Reads and statically analyses a file for page options
  * @param {string} filepath
+ * @param {string} root The project root directory
  * @returns {PageOptions | null} Returns the page options for the file or `null` if unanalysable
  */
-export function get_page_options(filepath) {
+export function get_page_options(filepath, root) {
+	const input = read(path.resolve(root, filepath));
+
 	try {
-		const input = read(filepath);
 		const page_options = statically_analyse_page_options(filepath, input);
 		if (page_options === null) {
 			return null;
@@ -229,7 +232,10 @@ export function get_page_options(filepath) {
 	}
 }
 
-export function create_node_analyser() {
+/**
+ * @param {string} root
+ */
+export function create_node_analyser(root) {
 	const static_exports = new Map();
 
 	/**
@@ -273,7 +279,7 @@ export function create_node_analyser() {
 		}
 
 		if (node.server) {
-			const server_page_options = get_page_options(node.server);
+			const server_page_options = get_page_options(node.server, root);
 			if (server_page_options === null) {
 				cache(key, null);
 				return null;
@@ -282,7 +288,7 @@ export function create_node_analyser() {
 		}
 
 		if (node.universal) {
-			const universal_page_options = get_page_options(node.universal);
+			const universal_page_options = get_page_options(node.universal, root);
 			if (universal_page_options === null) {
 				cache(key, null);
 				return null;

package/src/exports/vite/utils.js

@@ -1,17 +1,13 @@
 import path from 'node:path';
-import { loadEnv } from 'vite';
-import { posixify } from '../../utils/filesystem.js';
+import { posixify } from '../../utils/os.js';
 import { negotiate } from '../../utils/http.js';
-import { filter_env } from '../../utils/env.js';
 import { escape_html } from '../../utils/escape.js';
 import { dedent } from '../../core/sync/utils.js';
 import {
 	app_server,
-	env_dynamic_private,
-	env_dynamic_public,
-	env_static_private,
-	env_static_public,
-	service_worker
+	app_env_private,
+	service_worker,
+	sveltekit_env_private
 } from './module_ids.js';
 
 /**
@@ -20,8 +16,9 @@ import {
  * Related to tsconfig path alias creation.
  *
  * @param {import('types').ValidatedKitConfig} config
+ * @param {string} root
  * */
-export function get_config_aliases(config) {
+export function get_config_aliases(config, root) {
 	/** @type {import('vite').Alias[]} */
 	const alias = [
 		// For now, we handle `$lib` specially here rather than make it a default value for
@@ -38,16 +35,16 @@ export function get_config_aliases(config) {
 			// Doing just `{ find: key.slice(0, -2) ,..}` would mean `import .. from "key"` would also be matched, which we don't want
 			alias.push({
 				find: new RegExp(`^${escape_for_regexp(key.slice(0, -2))}\\/(.+)$`),
-				replacement: `${path.resolve(value)}/$1`
+				replacement: `${path.resolve(root, value)}/$1`
 			});
 		} else if (key + '/*' in config.alias) {
 			// key and key/* both exist -> the replacement for key needs to happen _only_ on import .. from "key"
 			alias.push({
 				find: new RegExp(`^${escape_for_regexp(key)}$`),
-				replacement: path.resolve(value)
+				replacement: path.resolve(root, value)
 			});
 		} else {
-			alias.push({ find: key, replacement: path.resolve(value) });
+			alias.push({ find: key, replacement: path.resolve(root, value) });
 		}
 	}
 
@@ -61,21 +58,6 @@ function escape_for_regexp(str) {
 	return str.replace(/[.*+?^${}()|[\]\\]/g, (match) => '\\' + match);
 }
 
-/**
- * Load environment variables from process.env and .env files
- * @param {import('types').ValidatedKitConfig['env']} env_config
- * @param {string} mode
- */
-export function get_env(env_config, mode) {
-	const { publicPrefix: public_prefix, privatePrefix: private_prefix } = env_config;
-	const env = loadEnv(mode, env_config.dir, '');
-
-	return {
-		public: filter_env(env, public_prefix, private_prefix),
-		private: filter_env(env, private_prefix, public_prefix)
-	};
-}
-
 /**
  * Silently respond with 404 for Chrome DevTools workspaces request.
  * Chrome always requests this at the root, regardless of base path.
@@ -155,20 +137,8 @@ export function normalize_id(id, lib, cwd) {
 		return '$app/server';
 	}
 
-	if (id === env_static_private) {
-		return '$env/static/private';
-	}
-
-	if (id === env_static_public) {
-		return '$env/static/public';
-	}
-
-	if (id === env_dynamic_private) {
-		return '$env/dynamic/private';
-	}
-
-	if (id === env_dynamic_public) {
-		return '$env/dynamic/public';
+	if (id === app_env_private || id === sveltekit_env_private) {
+		return '$app/env/private';
 	}
 
 	if (id === service_worker) {

package/src/runtime/app/env/index.js

@@ -0,0 +1,2 @@
+export { BROWSER as browser, DEV as dev } from 'esm-env';
+export { building, version } from './internal.js';

package/src/runtime/app/env/internal.js

@@ -0,0 +1,14 @@
+export const version = __SVELTEKIT_APP_VERSION__;
+export let building = false;
+export let prerendering = false;
+
+export function set_building() {
+	building = true;
+}
+
+export function set_prerendering() {
+	prerendering = true;
+}
+
+// force /@vite/client to be injected
+import.meta.hot;

package/src/runtime/app/env/private.js

@@ -0,0 +1 @@
+export * from '__sveltekit/env/private';

package/src/runtime/app/env/public/client.js

@@ -0,0 +1 @@
+export * from '__sveltekit/env/public/client';

package/src/runtime/app/env/public/index.js

@@ -0,0 +1 @@
+export * from '#app/env/public';

package/src/runtime/app/env/public/server.js

@@ -0,0 +1 @@
+export * from '__sveltekit/env/public/server';

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

@@ -1,5 +1,5 @@
 import { read_implementation, manifest } from '__sveltekit/server';
-import { base } from '$app/paths';
+import { assets } from '$app/paths/internal/server';
 import { base64_decode } from '../../utils.js';
 
 /**
@@ -54,7 +54,9 @@ export function read(asset) {
 	}
 
 	const file = decodeURIComponent(
-		__SVELTEKIT_DEV__ && asset.startsWith('/@fs') ? asset : asset.slice(base.length + 1)
+		__SVELTEKIT_DEV__ && asset.startsWith(assets + '/@fs')
+			? asset.slice(assets.length)
+			: asset.slice(assets.length + 1)
 	);
 
 	if (file in manifest._.server_assets) {

package/src/runtime/app/server/remote/form.js

@@ -2,11 +2,9 @@
 /** @import { InternalRemoteFormIssue, MaybePromise, RemoteFormInternals } from 'types' */
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
 import { get_request_store } from '@sveltejs/kit/internal/server';
-import { DEV } from 'esm-env';
 import {
 	create_field_proxy,
 	set_nested_value,
-	throw_on_old_property_access,
 	deep_set,
 	normalize_issue,
 	flatten_issues
@@ -90,32 +88,6 @@ export function form(validate_or_fn, maybe_fn) {
 			name: '',
 			id: '',
 			fn: async (data, meta, form_data) => {
-				// TODO 3.0 remove this warning
-				if (DEV && !data) {
-					const error = () => {
-						throw new Error(
-							'Remote form functions no longer get passed a FormData object. ' +
-								"`form` now has the same signature as `query` or `command`, i.e. it expects to be invoked like `form(schema, callback)` or `form('unchecked', callback)`. " +
-								'The payload of the callback function is now a POJO instead of a FormData object. See https://kit.svelte.dev/docs/remote-functions#form for details.'
-						);
-					};
-					data = {};
-					for (const key of [
-						'append',
-						'delete',
-						'entries',
-						'forEach',
-						'get',
-						'getAll',
-						'has',
-						'keys',
-						'set',
-						'values'
-					]) {
-						Object.defineProperty(data, key, { get: error });
-					}
-				}
-
 				/** @type {{ submission: true, input?: Record<string, any>, issues?: InternalRemoteFormIssue[], result: Output }} */
 				const output = {};
 
@@ -203,20 +175,6 @@ export function form(validate_or_fn, maybe_fn) {
 			}
 		});
 
-		// TODO 3.0 remove
-		if (DEV) {
-			throw_on_old_property_access(instance);
-
-			Object.defineProperty(instance, 'buttonProps', {
-				get() {
-					throw new Error(
-						'`form.buttonProps` has been removed: Instead of `<button {...form.buttonProps}>, use `<button {...form.fields.action.as("submit", "value")}>`.' +
-							' See the PR for more info: https://github.com/sveltejs/kit/pull/14622'
-					);
-				}
-			});
-		}
-
 		Object.defineProperty(instance, 'result', {
 			get() {
 				try {
@@ -320,15 +278,6 @@ function create_issues() {
 		new Proxy(
 			/** @param {string} message */
 			(message) => {
-				// TODO 3.0 remove
-				if (typeof message !== 'string') {
-					throw new Error(
-						'`invalid` should now be imported from `@sveltejs/kit` to throw validation issues. ' +
-							"The second parameter provided to the form function (renamed to `issue`) is still used to construct issues, e.g. `invalid(issue.field('message'))`. " +
-							'For more info see https://github.com/sveltejs/kit/pulls/14768'
-					);
-				}
-
 				return create_issue(message);
 			},
 			{

package/src/runtime/app/server/remote/query.js

@@ -3,7 +3,7 @@
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
 import { get_request_store } from '@sveltejs/kit/internal/server';
 import { create_remote_key, stringify, stringify_remote_arg } from '../../../shared.js';
-import { prerendering } from '__sveltekit/environment';
+import { prerendering } from '$app/env/internal';
 import {
 	create_validator,
 	get_cache,
@@ -435,13 +435,6 @@ function create_query_resource(__, payload, state, fn) {
 		set(value) {
 			return update_refresh_value(get_refresh_context(__, 'set', payload), value);
 		},
-		// TODO 3.0 remove this
-		// @ts-expect-error This method no longer exists
-		run() {
-			throw new Error(
-				`\`myQuery().run()\` has been removed — please replace it with \`myQuery()\`. See https://github.com/sveltejs/kit/pull/15779 for more details`
-			);
-		},
 		/** @type {Promise<any>['then']} */
 		then(onfulfilled, onrejected) {
 			return get_promise().then(onfulfilled, onrejected);

package/src/runtime/app/server/remote/shared.js

@@ -2,9 +2,10 @@
 /** @import { ServerHooks, MaybePromise, RequestState, RemoteInternals, RequestStore, RemoteLiveQueryUserFunctionReturnType } from 'types' */
 import { parse } from 'devalue';
 import { error } from '@sveltejs/kit';
+import { hydratable } from 'svelte';
 import { with_request_store, get_request_store } from '@sveltejs/kit/internal/server';
+import { create_remote_key, stringify } from '../../../shared.js';
 import { noop } from '../../../../utils/functions.js';
-import { create_remote_key, stringify, unfriendly_hydratable } from '../../../shared.js';
 
 /**
  * @param {any} validate_or_fn
@@ -85,9 +86,9 @@ export async function get_response(internals, payload, state, get_result) {
 	if (state.is_in_render && internals.id) {
 		const remote_key = create_remote_key(internals.id, payload);
 
-		Promise.resolve(entry.data)
+		void Promise.resolve(entry.data)
 			.then((value) => {
-				void unfriendly_hydratable(remote_key, () => stringify(value, state.transport));
+				void hydratable(remote_key, () => stringify(value, state.transport));
 			})
 			.catch(noop);
 	}

package/src/runtime/app/state/client.js

@@ -1,4 +1,3 @@
-import { DEV } from 'esm-env';
 import {
 	page as _page,
 	navigating as _navigating,
@@ -47,23 +46,13 @@ export const navigating = {
 		return _navigating.current ? _navigating.current.willUnload : null;
 	},
 	get delta() {
-		return _navigating.current ? _navigating.current.delta : null;
+		return _navigating.current?.type === 'popstate' ? _navigating.current.delta : null;
 	},
 	get complete() {
 		return _navigating.current ? _navigating.current.complete : null;
 	}
 };
 
-// TODO: remove in 3.0
-if (DEV) {
-	Object.defineProperty(navigating, 'current', {
-		get() {
-			// between 2.12.0 and 2.12.1 `navigating.current` existed
-			throw new Error('Replace navigating.current.<prop> with navigating.<prop>');
-		}
-	});
-}
-
 export const updated = {
 	get current() {
 		return _updated.current;

package/src/runtime/client/client.js

@@ -1619,7 +1619,7 @@ function _before_navigate({ url, type, intent, delta, event, scroll }) {
 
 	const nav = create_navigation(current, intent, url, type, scroll ?? null);
 
-	if (delta !== undefined) {
+	if (nav.navigation.type === 'popstate' && delta !== undefined) {
 		nav.navigation.delta = delta;
 	}
 

package/src/runtime/client/constants.js

@@ -11,6 +11,5 @@ export const PRELOAD_PRIORITIES = /** @type {const} */ ({
 	hover: 2,
 	viewport: 3,
 	eager: 4,
-	off: -1,
 	false: -1
 });

package/src/runtime/client/remote-functions/form.svelte.js

@@ -15,7 +15,6 @@ import {
 	create_field_proxy,
 	deep_set,
 	set_nested_value,
-	throw_on_old_property_access,
 	build_path_string,
 	normalize_issue,
 	serialize_binary_form,
@@ -304,22 +303,6 @@ export function form(id) {
 					{},
 					{
 						...descriptors,
-						data: {
-							get() {
-								// TODO 3.0 remove
-								throw new Error(
-									`The \`data\` property has been removed from the \`enhance\` callback argument. Use \`instance.fields.value()\` instead.`
-								);
-							}
-						},
-						form: {
-							get() {
-								// TODO 3.0 remove
-								throw new Error(
-									`The \`form\` property has been removed from the \`enhance\` callback argument. To get the current \`<form>\` element, use \`instance.element\` instead.`
-								);
-							}
-						},
 						element: {
 							value: form
 						},
@@ -543,20 +526,6 @@ export function form(id) {
 
 		let validate_id = 0;
 
-		// TODO 3.0 remove
-		if (DEV) {
-			throw_on_old_property_access(instance);
-
-			Object.defineProperty(instance, 'buttonProps', {
-				get() {
-					throw new Error(
-						'`form.buttonProps` has been removed: Instead of `<button {...form.buttonProps}>, use `<button {...form.fields.action.as("submit", "value")}>`.' +
-							' See the PR for more info: https://github.com/sveltejs/kit/pull/14622'
-					);
-				}
-			});
-		}
-
 		Object.defineProperties(instance, {
 			element: {
 				get: () => element

package/src/runtime/client/remote-functions/prerender.svelte.js

@@ -1,6 +1,6 @@
 /** @import { RemotePrerenderFunction } from '@sveltejs/kit' */
 import { app_dir, base } from '$app/paths/internal/client';
-import { version } from '__sveltekit/environment';
+import { version } from '$app/env';
 import * as devalue from 'devalue';
 import { app, prerender_responses } from '../client.js';
 import { get_remote_request_headers, remote_request } from './shared.svelte.js';

package/src/runtime/client/remote-functions/query/index.js

@@ -4,7 +4,7 @@ import { app, query_map, query_responses } from '../../client.js';
 import { get_remote_request_headers, QUERY_FUNCTION_ID, remote_request } from '../shared.svelte.js';
 import * as devalue from 'devalue';
 import { DEV } from 'esm-env';
-import { unfriendly_hydratable } from '../../../shared.js';
+import { hydratable } from 'svelte';
 import { QueryProxy } from './proxy.js';
 
 /**
@@ -34,7 +34,7 @@ export function query(id) {
 
 			const url = `${base}/${app_dir}/remote/${id}${payload ? `?payload=${payload}` : ''}`;
 
-			const serialized = await unfriendly_hydratable(key, () =>
+			const serialized = await hydratable(key, () =>
 				remote_request(url, get_remote_request_headers())
 			);
 

package/src/runtime/client/remote-functions/query/instance.svelte.js

@@ -1,7 +1,6 @@
 import { query_responses } from '../../client.js';
 import { QUERY_OVERRIDE_KEY } from '../shared.svelte.js';
 import { noop } from '../../../../utils/functions.js';
-import { with_resolvers } from '../../../../utils/promise.js';
 import { tick, untrack } from 'svelte';
 
 /**
@@ -87,7 +86,7 @@ export class Query {
 	#run() {
 		this.#loading = true;
 
-		const { promise, resolve, reject } = with_resolvers();
+		const { promise, resolve, reject } = Promise.withResolvers();
 
 		this.#latest.push(resolve);
 

package/src/runtime/client/remote-functions/query-batch.svelte.js

@@ -6,7 +6,7 @@ import { get_remote_request_headers, QUERY_FUNCTION_ID } from './shared.svelte.j
 import { QueryProxy } from './query/proxy.js';
 import * as devalue from 'devalue';
 import { HttpError, Redirect } from '@sveltejs/kit/internal';
-import { unfriendly_hydratable } from '../../shared.js';
+import { hydratable } from 'svelte';
 
 /**
  * @param {string} id
@@ -19,7 +19,7 @@ export function query_batch(id) {
 	/** @type {RemoteQueryFunction<any, any>} */
 	const wrapper = (arg) => {
 		return new QueryProxy(id, arg, async (key, payload) => {
-			const serialized = await unfriendly_hydratable(key, () => {
+			const serialized = await hydratable(key, () => {
 				return new Promise((resolve, reject) => {
 					// create_remote_function caches identical calls, but in case a refresh to the same query is called multiple times this function
 					// is invoked multiple times with the same payload, so we need to deduplicate here

package/src/runtime/client/remote-functions/query-live/instance.svelte.js

@@ -1,12 +1,9 @@
-/** @import { PromiseWithResolvers } from '../../../../utils/promise.js' */
 import { app } from '../../client.js';
 import * as devalue from 'devalue';
 import { HttpError, Redirect } from '@sveltejs/kit/internal';
 import { noop, once } from '../../../../utils/functions.js';
-import { with_resolvers } from '../../../../utils/promise.js';
 import { SharedIterator } from '../../../../utils/shared-iterator.js';
-import { tick } from 'svelte';
-import { unfriendly_hydratable } from '../../../shared.js';
+import { hydratable, tick } from 'svelte';
 import { create_live_iterator } from './iterator.js';
 
 /**
@@ -82,12 +79,12 @@ export class LiveQuery {
 		// the semantics of awaiting a live query are a bit weird, but it's basically:
 		// - It's a promise that resolves to the first value from the server
 		// - Thereafter, it's a promise that immediately resolves to the current value
-		const { promise, resolve, reject } = with_resolvers();
+		const { promise, resolve, reject } = Promise.withResolvers();
 		this.#promise = $state.raw(promise);
 		this.#resolve_first = resolve;
 		this.#reject_first = reject;
 
-		const serialized = unfriendly_hydratable(key, () => undefined);
+		const serialized = hydratable(key, () => undefined);
 		if (serialized !== undefined) {
 			this.set(devalue.parse(serialized, app.decoders));
 		}
@@ -109,7 +106,7 @@ export class LiveQuery {
 		if (this.#interrupt) return;
 
 		/** @type {PromiseWithResolvers<void>} */
-		const { promise: stopped, resolve: on_stop } = with_resolvers();
+		const { promise: stopped, resolve: on_stop } = Promise.withResolvers();
 
 		while (!this.#done) {
 			const controller = new AbortController();
@@ -327,7 +324,7 @@ export class LiveQuery {
 	async reconnect() {
 		await this.#interrupt?.();
 		/** @type {PromiseWithResolvers<void>} */
-		const { promise, resolve: on_connect, reject: on_connect_failed } = with_resolvers();
+		const { promise, resolve: on_connect, reject: on_connect_failed } = Promise.withResolvers();
 		promise.catch(noop);
 		this.#done = false;
 		this.#attempt = 0;