@sveltejs/kit 3.0.0-next.21 → 3.0.0-next.23

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

@@ -1,4 +1,4 @@
-/** @import { RemoteCommand } from '@sveltejs/kit/remote' */
+/** @import { RemoteCommand } from '$app/server' */
 /** @import { MaybePromise, RemoteCommandInternals } from 'types' */
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
 import { get_request_store } from '@sveltejs/kit/internal/server';

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

@@ -1,4 +1,4 @@
-/** @import { RemoteFormInput, RemoteForm, InvalidField } from '@sveltejs/kit/remote' */
+/** @import { RemoteFormInput, RemoteForm, RemoteFormInvalidField } from '$app/server' */
 /** @import { InternalRemoteFormIssue, MaybePromise, HasNonOptionalBoolean, RemoteFormInternals } from 'types' */
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
 import { get_request_store } from '@sveltejs/kit/internal/server';
@@ -33,7 +33,7 @@ import { ValidationError } from '@sveltejs/kit/internal';
  * @template Output
  * @overload
  * @param {'unchecked'} validate
- * @param {(data: Input, issue: InvalidField<Input>) => MaybePromise<Output>} fn
+ * @param {(data: Input, issue: RemoteFormInvalidField<Input>) => MaybePromise<Output>} fn
  * @returns {RemoteForm<Input, Output>}
  * @since 2.27
  */
@@ -46,7 +46,7 @@ import { ValidationError } from '@sveltejs/kit/internal';
  * @template Output
  * @overload
  * @param {true extends HasNonOptionalBoolean<StandardSchemaV1.InferInput<Schema>> ? 'Error: All booleans in form schemas must be optional (e.g. `v.optional(v.boolean(), false)`) because checkbox inputs do not send a false value when unchecked.' : Schema} validate
- * @param {(data: StandardSchemaV1.InferOutput<Schema>, issue: InvalidField<StandardSchemaV1.InferInput<Schema>>) => MaybePromise<Output>} fn
+ * @param {(data: StandardSchemaV1.InferOutput<Schema>, issue: RemoteFormInvalidField<StandardSchemaV1.InferInput<Schema>>) => MaybePromise<Output>} fn
  * @returns {RemoteForm<StandardSchemaV1.InferInput<Schema>, Output>}
  * @since 2.27
  */
@@ -293,10 +293,10 @@ function handle_issues(output, issues, form_data, form_id) {
 
 /**
  * Creates an invalid function that can be used to imperatively mark form fields as invalid
- * @returns {InvalidField<any>}
+ * @returns {RemoteFormInvalidField<any>}
  */
 function create_issues() {
-	return /** @type {InvalidField<any>} */ (
+	return /** @type {RemoteFormInvalidField<any>} */ (
 		new Proxy(
 			/** @param {string} message */
 			(message) => {

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

@@ -1,4 +1,4 @@
-/** @import { RemoteResource, RemotePrerenderFunction } from '@sveltejs/kit/remote' */
+/** @import { RemoteResource, RemotePrerenderFunction } from '$app/server' */
 /** @import { RemoteFunctionResponse, RemotePrerenderInputsGenerator, RemotePrerenderInternals, MaybePromise } from 'types' */
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
 import { json } from '@sveltejs/kit';

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

@@ -1,5 +1,5 @@
-/** @import { RemoteLiveQuery, RemoteLiveQueryFunction, RemoteQuery, RemoteQueryFunction } from '@sveltejs/kit/remote' */
-/** @import { RequestEvent } from '$app/server' */
+/** @import { RemoteLiveQuery, RemoteLiveQueryFunction, RemoteQuery, RemoteQueryFunction } from '$app/server' */
+/** @import { RequestEvent } from '@sveltejs/kit' */
 /** @import { RemoteInternals, MaybePromise, RequestState, RemoteQueryLiveInternals, RemoteQueryBatchInternals, RemoteQueryInternals, RemoteLiveQueryUserFunctionReturnType } from 'types' */
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
 import { get_request_store } from '@sveltejs/kit/internal/server';

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

@@ -1,4 +1,4 @@
-/** @import { RemoteLiveQuery, RemoteLiveQueryFunction, RemoteQuery, RemoteQueryFunction, RequestedResult, QueryRequestedResult, LiveQueryRequestedResult } from '@sveltejs/kit/remote' */
+/** @import { RemoteLiveQuery, RemoteLiveQueryFunction, RemoteQuery, RemoteQueryFunction, RequestedResult, RemoteQueryRequestedResult, RemoteLiveQueryRequestedResult } from '$app/server' */
 /** @import { MaybePromise, RemoteAnyQueryInternals } from 'types' */
 import { HttpError } from '@sveltejs/kit/internal';
 import { get_request_store } from '@sveltejs/kit/internal/server';
@@ -53,7 +53,7 @@ import { refresh } from './query.js';
  * @overload
  * @param {RemoteQueryFunction<Input, Output, Validated>} query
  * @param {number} limit
- * @returns {QueryRequestedResult<Validated, Output>}
+ * @returns {RemoteQueryRequestedResult<Validated, Output>}
  */
 /**
  * Inside a remote `command` or `form` callback, returns an iterable
@@ -91,7 +91,7 @@ import { refresh } from './query.js';
  * @overload
  * @param {RemoteLiveQueryFunction<Input, Output, Validated>} query
  * @param {number} limit
- * @returns {LiveQueryRequestedResult<Validated, Output>}
+ * @returns {RemoteLiveQueryRequestedResult<Validated, Output>}
  */
 /**
  * @template Input

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

@@ -1,4 +1,4 @@
-/** @import { RequestEvent } from '$app/server' */
+/** @import { RequestEvent } from '@sveltejs/kit' */
 /** @import { MaybePromise, RequestState, RemoteInternals, RequestStore, RemoteLiveQueryUserFunctionReturnType } from 'types' */
 import { error } from '@sveltejs/kit';
 import { ValidationError } from '@sveltejs/kit/internal';

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

@@ -1,4 +1,4 @@
-/** @import { RemoteCommand, RemoteQueryUpdate } from '@sveltejs/kit/remote' */
+/** @import { RemoteCommand, RemoteQueryUpdate } from '$app/server' */
 import { app_dir, base } from '#app/paths';
 import { stringify_command_arg } from '../../shared.js';
 import { get_remote_request_headers, categorize_updates, remote_request } from './shared.svelte.js';

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

@@ -1,5 +1,5 @@
 /** @import { StandardSchemaV1 } from '@standard-schema/spec' */
-/** @import { RemoteFormInput, RemoteForm, RemoteQueryUpdate } from '@sveltejs/kit/remote' */
+/** @import { RemoteFormInput, RemoteForm, RemoteQueryUpdate } from '$app/server' */
 /** @import { InternalRemoteFormIssue } from 'types' */
 import { app_dir, base } from '#app/paths';
 import { DEV } from 'esm-env';

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

@@ -1,4 +1,4 @@
-/** @import { RemotePrerenderFunction } from '@sveltejs/kit/remote' */
+/** @import { RemotePrerenderFunction } from '$app/server' */
 import { app_dir, base } from '#app/paths';
 import { version } from '$app/env';
 import * as devalue from 'devalue';

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

@@ -1,4 +1,4 @@
-/** @import { RemoteQueryFunction } from '@sveltejs/kit/remote' */
+/** @import { RemoteQueryFunction } from '$app/server' */
 import { app_dir, base } from '#app/paths';
 import { _goto, query_map } from '../../client.js';
 import { QUERY_FUNCTION_ID, remote_request } from '../shared.svelte.js';

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

@@ -3,6 +3,7 @@ import { query_responses, handle_error } from '../../client.js';
 import { HandledHttpError } from '@sveltejs/kit/internal';
 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';
 
 /**
@@ -101,7 +102,7 @@ export class Query {
 	#run() {
 		this.#loading = true;
 
-		const { promise, resolve, reject } = Promise.withResolvers();
+		const { promise, resolve, reject } = with_resolvers();
 
 		// the rejection is surfaced via `.error` / the `then` getter for awaiting
 		// consumers — a purely reactive consumer (`.current`) attaches no handler,

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

@@ -1,4 +1,4 @@
-/** @import { RemoteQueryFunction } from '@sveltejs/kit/remote' */
+/** @import { RemoteQueryFunction } from '$app/server' */
 import { app_dir, base } from '#app/paths';
 import { _goto } from '../client.js';
 import { QUERY_FUNCTION_ID, remote_request } from './shared.svelte.js';

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

@@ -1,4 +1,4 @@
-/** @import { RemoteLiveQuery, RemoteLiveQueryFunction } from '@sveltejs/kit/remote' */
+/** @import { RemoteLiveQuery, RemoteLiveQueryFunction } from '$app/server' */
 import { live_query_map } from '../../client.js';
 import { QUERY_FUNCTION_ID } from '../shared.svelte.js';
 import { DEV } from 'esm-env';

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

@@ -1,6 +1,7 @@
 import { query_responses, handle_error } from '../../client.js';
 import { HttpError, Redirect, HandledHttpError } 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 { create_live_iterator } from './iterator.js';
@@ -78,7 +79,7 @@ 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 } = Promise.withResolvers();
+		const { promise, resolve, reject } = with_resolvers();
 		this.#promise = $state.raw(promise);
 		this.#resolve_first = resolve;
 		this.#reject_first = reject;
@@ -121,7 +122,7 @@ export class LiveQuery {
 		if (this.#interrupt) return;
 
 		/** @type {PromiseWithResolvers<void>} */
-		const { promise: stopped, resolve: on_stop } = Promise.withResolvers();
+		const { promise: stopped, resolve: on_stop } = with_resolvers();
 		let connected = false;
 
 		while (!this.#done) {
@@ -352,7 +353,7 @@ export class LiveQuery {
 	async reconnect() {
 		await this.#interrupt?.();
 		/** @type {PromiseWithResolvers<void>} */
-		const { promise, resolve: on_connect, reject: on_connect_failed } = Promise.withResolvers();
+		const { promise, resolve: on_connect, reject: on_connect_failed } = with_resolvers();
 		promise.catch(noop);
 		this.#done = false;
 		this.#attempt = 0;

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

@@ -1,5 +1,5 @@
 /** @import { RemoteFunctionResponse, RemoteFunctionData, RemoteFunctionDataNode } from 'types' */
-/** @import { RemoteQueryUpdate } from '@sveltejs/kit/remote' */
+/** @import { RemoteQueryUpdate } from '$app/server' */
 /** @import { CacheEntry } from './cache.svelte.js' */
 import * as devalue from 'devalue';
 import { app, _goto, live_query_map, query_map, query_responses } from '../client.js';

package/src/runtime/server/cookie.js

@@ -76,11 +76,11 @@ export function get_cookies(request, url) {
 		secure: !__SVELTEKIT_DEV__ && !(url.hostname === 'localhost' && url.protocol === 'http:')
 	};
 
-	/** @type {import('$app/server').Cookies} */
+	/** @type {import('@sveltejs/kit').Cookies} */
 	const cookies = {
 		// The JSDoc param annotations appearing below for get, set and delete
 		// are necessary to expose the `cookie` library types to
-		// typescript users. `@type {import('$app/server').Cookies}` above is not
+		// typescript users. `@type {import('@sveltejs/kit').Cookies}` above is not
 		// sufficient to do so.
 
 		get(name, opts) {

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

@@ -10,7 +10,7 @@ import { text_encoder } from '../../utils.js';
 import { with_version_header } from '../utils.js';
 
 /**
- * @param {import('$app/server').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').RequestState} state
  * @param {import('types').SSRRoute} route
  * @param {import('types').SSROptions} options

package/src/runtime/server/endpoint.js

@@ -5,7 +5,7 @@ import { negotiate } from '../../utils/http.js';
 import { method_not_allowed } from './utils.js';
 
 /**
- * @param {import('$app/server').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').RequestState} state
  * @param {import('types').SSREndpoint} mod
  * @returns {Promise<Response>}
@@ -42,7 +42,7 @@ export async function render_endpoint(event, state, mod) {
 
 	try {
 		const response = await with_request_store({ event, state }, () =>
-			handler(/** @type {import('$app/server').RequestEvent<Record<string, any>>} */ (event))
+			handler(/** @type {import('@sveltejs/kit').RequestEvent<Record<string, any>>} */ (event))
 		);
 
 		if (!(response instanceof Response)) {
@@ -89,7 +89,7 @@ export async function render_endpoint(event, state, mod) {
 }
 
 /**
- * @param {import('$app/server').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  */
 export function is_endpoint_request(event) {
 	const { method, headers } = event.request;

package/src/runtime/server/errors.js

@@ -12,7 +12,7 @@ import { fix_stack_trace } from './internal.js';
 import { escape_html } from '../../utils/escape.js';
 
 /**
- * @param {import('$app/server').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').RequestState} state
  * @param {import('types').SSROptions} options
  * @param {unknown} error
@@ -37,7 +37,7 @@ export async function handle_fatal_error(event, state, options, error) {
 }
 
 /**
- * @param {import('$app/server').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').RequestState} state
  * @param {import('types').SSROptions} options
  * @param {any} error

package/src/runtime/server/fetch.js

@@ -8,7 +8,7 @@ import { fork_state_for_subrequest } from './state.js';
 
 /**
  * @param {{
- *   event: import('$app/server').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   options: import('types').SSROptions;
  *   manifest: import('@sveltejs/kit').SSRManifest;
  *   state: import('types').RequestState;

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

@@ -1,5 +1,4 @@
-/** @import { Actions } from '@sveltejs/kit' */
-/** @import { RequestEvent } from '$app/server' */
+/** @import { RequestEvent, Actions } from '@sveltejs/kit' */
 /** @import { ActionResult } from '$app/forms' */
 /** @import { SSROptions, SSRNode, ServerNode } from 'types' */
 import { DEV } from 'esm-env';

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

@@ -8,7 +8,7 @@ import { encoders } from '#app/internal/transport';
 /**
  * If the serialized data contains promises, `chunks` will be an
  * async iterable containing their resolutions
- * @param {import('$app/server').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').RequestState} state
  * @param {import('types').SSROptions} options
  * @returns {import('./types.js').ServerDataSerializer}
@@ -125,7 +125,7 @@ export function server_data_serializer(event, state, options) {
 /**
  * If the serialized data contains promises, `chunks` will be an
  * async iterable containing their resolutions
- * @param {import('$app/server').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {import('types').RequestState} state
  * @param {import('types').SSROptions} options
  * @returns {import('./types.js').ServerDataSerializerJson}

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

@@ -1,6 +1,5 @@
 /** @import { Component } from 'svelte' */
-/** @import { SSRManifest } from '@sveltejs/kit' */
-/** @import { RequestEvent } from '$app/server' */
+/** @import { RequestEvent, SSRManifest } from '@sveltejs/kit' */
 /** @import { ActionResult } from '$app/forms' */
 /** @import { PageNodeIndexes, RequestState, RequiredResolveOptions, ServerDataNode, SSRNode, SSROptions } from 'types' */
 import { text } from '@sveltejs/kit';

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

@@ -10,7 +10,7 @@ import { get_node_type } from '../utils.js';
 /**
  * Calls the user's server `load` function.
  * @param {{
- *   event: import('$app/server').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   state: import('types').RequestState;
  *   node: import('types').SSRNode | undefined;
  *   parent: () => Promise<Record<string, any>>;
@@ -191,7 +191,7 @@ export async function load_server_data({ event, state, node, parent }) {
 /**
  * Calls the user's `load` function.
  * @param {{
- *   event: import('$app/server').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   state: import('types').RequestState;
  *   fetched: import('./types.js').Fetched[];
  *   node: import('types').SSRNode | undefined;
@@ -256,7 +256,7 @@ export async function load_data({
 }
 
 /**
- * @param {Pick<import('$app/server').RequestEvent, 'fetch' | 'url' | 'request' | 'route'>} event
+ * @param {Pick<import('@sveltejs/kit').RequestEvent, 'fetch' | 'url' | 'request' | 'route'>} event
  * @param {import('types').PrerenderOptions | undefined} prerendering
  * @param {import('./types.js').Fetched[]} fetched
  * @param {boolean} csr

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

@@ -40,7 +40,7 @@ import { has_custom_transporters, uneval } from '#app/internal/transport';
  *   page_config: { ssr: boolean; csr: boolean };
  *   status: number;
  *   error: App.Error | null;
- *   event: import('$app/server').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   state: import('types').RequestState;
  *   resolve_opts: import('types').RequiredResolveOptions;
  *   action_result?: import('$app/forms').ActionResult;

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

@@ -12,7 +12,7 @@ import { server_data_serializer } from './data_serializer.js';
 
 /**
  * @param {{
- *   event: import('$app/server').RequestEvent;
+ *   event: import('@sveltejs/kit').RequestEvent;
  *   state: import('types').RequestState;
  *   options: import('types').SSROptions;
  *   manifest: import('@sveltejs/kit').SSRManifest;

package/src/runtime/server/remote-functions.js

@@ -1,6 +1,5 @@
-/** @import { SSRManifest } from '@sveltejs/kit' */
-/** @import { RemoteForm } from '@sveltejs/kit/remote' */
-/** @import { RequestEvent } from '$app/server' */
+/** @import { RequestEvent, SSRManifest } from '@sveltejs/kit' */
+/** @import { RemoteForm } from '$app/server' */
 /** @import { ActionResult } from '$app/forms' */
 /** @import { RemoteFormInternals, RemoteFunctionData, RemoteFunctionResponse, RemoteInternals, RequestState, SSROptions } from 'types' */
 

package/src/runtime/server/respond.js

@@ -183,7 +183,7 @@ export async function internal_respond(request, options, manifest, state) {
 		url
 	);
 
-	/** @type {import('$app/server').RequestEvent} */
+	/** @type {import('@sveltejs/kit').RequestEvent} */
 	const event = {
 		cookies,
 		// @ts-expect-error `fetch` needs to be created after the `event` itself
@@ -574,7 +574,7 @@ export async function internal_respond(request, options, manifest, state) {
 	}
 
 	/**
-	 * @param {import('$app/server').RequestEvent} event
+	 * @param {import('@sveltejs/kit').RequestEvent} event
 	 * @param {PageNodes | undefined} page_nodes
 	 * @param {import('@sveltejs/kit/hooks').ResolveOptions} [opts]
 	 */

package/src/runtime/server/utils.js

@@ -59,7 +59,7 @@ export function with_version_header(response) {
 }
 
 /**
- * @param {import('$app/server').RequestEvent} event
+ * @param {import('@sveltejs/kit').RequestEvent} event
  * @param {Error & { path: string }} error
  */
 export function clarify_devalue_error(event, error) {

package/src/types/internal.d.ts

@@ -6,12 +6,12 @@ import {
 	Server,
 	ServerInitOptions,
 	Actions,
+	RequestEvent,
 	SSRManifest,
 	Emulator
 } from '@sveltejs/kit';
-import { RemoteFormIssue, RemoteQuery, RemoteLiveQuery } from '@sveltejs/kit/remote';
+import { RemoteFormIssue, RemoteQuery, RemoteLiveQuery } from '$app/server';
 import { Config } from '@sveltejs/kit/vite';
-import { RequestEvent } from '$app/server';
 import {
 	ClientInit,
 	Handle,

package/src/utils/promise.js

@@ -0,0 +1,25 @@
+/**
+ * Replacement for `Promise.withResolvers()` that does not require the native
+ * static method, which only shipped in Safari 17.4 / Chrome 119 / Firefox 121.
+ *
+ * The client remote-function runtime is bundled and shipped to browsers verbatim
+ * (Vite 8's default build target is Safari 16.4 / Chrome 111) and is not
+ * polyfilled, so it must not assume `Promise.withResolvers` exists. The
+ * server-side and build-time call sites run on Node 22+ and keep using the
+ * native method.
+ *
+ * @template T
+ * @returns {PromiseWithResolvers<T>}
+ */
+export function with_resolvers() {
+	let resolve;
+	let reject;
+
+	const promise = new Promise((res, rej) => {
+		resolve = res;
+		reject = rej;
+	});
+
+	// @ts-expect-error `resolve` and `reject` are assigned!
+	return { promise, resolve, reject };
+}

package/src/version.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '3.0.0-next.21';
+export const VERSION = '3.0.0-next.23';