npm - @sveltejs/kit - Versions diffs - 3.0.0-next.2 → 3.0.0-next.21 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (195) hide show

package/package.json +62 -36
package/src/cli.js +15 -12
package/src/constants.js +6 -1
package/src/core/adapt/builder.js +66 -72
package/src/core/adapt/index.js +17 -6
package/src/core/config/index.js +134 -80
package/src/core/config/options.js +295 -273
package/src/core/config/types.d.ts +1 -1
package/src/core/env.js +146 -16
package/src/core/generate_manifest/index.js +18 -15
package/src/core/postbuild/analyse.js +8 -20
package/src/core/postbuild/crawl.js +22 -6
package/src/core/postbuild/entities.js +8 -2
package/src/core/postbuild/fallback.js +4 -2
package/src/core/postbuild/prerender.js +222 -70
package/src/core/postbuild/queue.js +2 -1
package/src/core/sync/create_manifest_data/conflict.js +1 -1
package/src/core/sync/create_manifest_data/index.js +82 -62
package/src/core/sync/sync.js +40 -31
package/src/core/sync/ts.js +1 -1
package/src/core/sync/utils.js +22 -2
package/src/core/sync/{write_non_ambient.js → write_app_types.js} +107 -58
package/src/core/sync/write_client_manifest.js +14 -29
package/src/core/sync/write_env.js +7 -5
package/src/core/sync/write_server.js +37 -45
package/src/core/sync/write_tsconfig/index.js +274 -0
package/src/core/sync/write_tsconfig/test-app/package.json +7 -0
package/src/core/sync/write_tsconfig/utils.js +77 -0
package/src/core/sync/write_tsconfig/validate.js +128 -0
package/src/core/sync/write_types/index.js +127 -123
package/src/core/utils.js +30 -5
package/src/exports/env/index.js +77 -0
package/src/exports/env/public.d.ts +55 -0
package/src/exports/hooks/index.js +3 -9
package/src/exports/hooks/public.d.ts +195 -0
package/src/exports/hooks/sequence.js +9 -6
package/src/exports/index.js +52 -29
package/src/exports/internal/client.js +5 -0
package/src/exports/internal/env.js +8 -5
package/src/exports/internal/index.js +1 -90
package/src/exports/internal/{event.js → server/event.js} +2 -3
package/src/exports/internal/server/index.js +37 -0
package/src/exports/internal/server/telemetry.js +95 -0
package/src/exports/internal/shared.js +90 -0
package/src/exports/node/index.js +64 -22
package/src/exports/params/index.js +70 -0
package/src/exports/params/public.d.ts +63 -0
package/src/exports/public.d.ts +50 -1733
package/src/exports/remote/index.js +11 -0
package/src/exports/remote/public.d.ts +519 -0
package/src/exports/url.js +86 -0
package/src/exports/vite/build/build_server.js +54 -65
package/src/exports/vite/build/remote.js +24 -19
package/src/exports/vite/build/utils.js +0 -8
package/src/exports/vite/dev/index.js +218 -146
package/src/exports/vite/index.js +1590 -858
package/src/exports/vite/module_ids.js +2 -2
package/src/exports/vite/preview/index.js +40 -32
package/src/exports/vite/public.d.ts +588 -0
package/src/exports/vite/utils.js +84 -46
package/src/pathname.js +55 -0
package/src/runner.js +15 -0
package/src/runtime/app/env/internal.js +4 -4
package/src/runtime/app/env/types.d.ts +1 -1
package/src/runtime/app/environment/index.js +3 -3
package/src/runtime/app/{forms.js → forms/index.js} +73 -42
package/src/runtime/app/forms/public.d.ts +2 -0
package/src/runtime/app/forms/types.d.ts +56 -0
package/src/runtime/app/internal/transport.js +53 -0
package/src/runtime/app/manifest/index.js +1 -0
package/src/runtime/app/{navigation.js → navigation/index.js} +2 -1
package/src/runtime/app/navigation/public.d.ts +237 -0
package/src/runtime/app/paths/client.js +37 -37
package/src/runtime/app/paths/index.js +1 -1
package/src/runtime/app/paths/internal/client.js +34 -2
package/src/runtime/app/paths/internal/server.js +6 -23
package/src/runtime/app/paths/internal.d.ts +3 -0
package/src/runtime/app/paths/public.d.ts +1 -29
package/src/runtime/app/paths/server.js +36 -17
package/src/runtime/app/paths/types.d.ts +11 -19
package/src/runtime/app/server/index.js +2 -2
package/src/runtime/app/server/public.d.ts +201 -0
package/src/runtime/app/server/remote/command.js +13 -11
package/src/runtime/app/server/remote/form.js +61 -39
package/src/runtime/app/server/remote/prerender.js +45 -45
package/src/runtime/app/server/remote/query.js +106 -108
package/src/runtime/app/server/remote/requested.js +27 -19
package/src/runtime/app/server/remote/shared.js +76 -76
package/src/runtime/app/service-worker/index.js +24 -0
package/src/runtime/app/state/client.js +4 -2
package/src/runtime/app/state/index.js +7 -5
package/src/runtime/app/state/public.d.ts +72 -0
package/src/runtime/app/state/server.js +3 -0
package/src/runtime/app/stores.js +15 -78
package/src/runtime/client/bundle.js +1 -1
package/src/runtime/client/client-entry.js +3 -0
package/src/runtime/client/client.js +1336 -648
package/src/runtime/client/constants.js +3 -6
package/src/runtime/client/entry.js +24 -3
package/src/runtime/client/fetcher.js +25 -25
package/src/runtime/client/ndjson.js +1 -1
package/src/runtime/client/parse.js +1 -1
package/src/runtime/client/payload.js +17 -0
package/src/runtime/client/remote-functions/cache.svelte.js +3 -1
package/src/runtime/client/remote-functions/command.svelte.js +37 -61
package/src/runtime/client/remote-functions/form.svelte.js +267 -178
package/src/runtime/client/remote-functions/prerender.svelte.js +32 -11
package/src/runtime/client/remote-functions/query/index.js +10 -17
package/src/runtime/client/remote-functions/query/instance.svelte.js +64 -18
package/src/runtime/client/remote-functions/query/proxy.js +5 -5
package/src/runtime/client/remote-functions/query-batch.svelte.js +61 -70
package/src/runtime/client/remote-functions/query-live/index.js +1 -1
package/src/runtime/client/remote-functions/query-live/instance.svelte.js +63 -21
package/src/runtime/client/remote-functions/query-live/iterator.js +15 -12
package/src/runtime/client/remote-functions/query-live/proxy.js +2 -12
package/src/runtime/client/remote-functions/shared.svelte.js +90 -65
package/src/runtime/client/snapshots.js +147 -0
package/src/runtime/client/state.svelte.js +94 -55
package/src/runtime/client/stream.js +3 -2
package/src/runtime/client/types.d.ts +13 -9
package/src/runtime/client/utils.js +22 -110
package/src/runtime/components/root.svelte +56 -0
package/src/runtime/env/dynamic/private.js +7 -0
package/src/runtime/env/dynamic/public.js +7 -0
package/src/runtime/env/static/private.js +6 -0
package/src/runtime/env/static/public.js +6 -0
package/src/runtime/form-utils.js +172 -61
package/src/runtime/pathname.js +20 -32
package/src/runtime/props.svelte.js +72 -0
package/src/runtime/server/constants.js +0 -3
package/src/runtime/server/cookie.js +72 -55
package/src/runtime/server/csrf.js +65 -0
package/src/runtime/server/data/index.js +49 -53
package/src/runtime/server/dev.js +22 -0
package/src/runtime/server/endpoint.js +6 -7
package/src/runtime/server/env_module.js +0 -5
package/src/runtime/server/errors.js +160 -0
package/src/runtime/server/fetch.js +32 -39
package/src/runtime/server/index.js +90 -64
package/src/runtime/server/internal.js +71 -0
package/src/runtime/server/page/actions.js +85 -64
package/src/runtime/server/page/crypto.js +2 -2
package/src/runtime/server/page/csp.js +88 -104
package/src/runtime/server/page/data_serializer.js +24 -25
package/src/runtime/server/page/index.js +36 -53
package/src/runtime/server/page/load_data.js +50 -57
package/src/runtime/server/page/render.js +173 -239
package/src/runtime/server/page/respond_with_error.js +17 -31
package/src/runtime/server/page/serialize_data.js +2 -13
package/src/runtime/server/page/server_routing.js +85 -26
package/src/runtime/server/remote-functions.js +640 -0
package/src/runtime/server/respond.js +190 -131
package/src/runtime/server/sourcemaps.js +183 -0
package/src/runtime/server/state.js +53 -0
package/src/runtime/server/utils.js +13 -155
package/src/runtime/shared.js +20 -40
package/src/runtime/utils.js +3 -0
package/src/types/ambient-private.d.ts +11 -1
package/src/types/ambient.d.ts +87 -36
package/src/types/global-private.d.ts +25 -25
package/src/types/internal.d.ts +163 -157
package/src/types/private.d.ts +41 -1
package/src/utils/error.js +28 -4
package/src/utils/escape.js +9 -25
package/src/utils/features.js +1 -1
package/src/utils/filesystem.js +1 -23
package/src/utils/fork.js +7 -2
package/src/utils/hash.js +21 -0
package/src/utils/http.js +8 -7
package/src/utils/import.js +9 -2
package/src/utils/imports.js +83 -0
package/src/utils/mime.js +9 -0
package/src/utils/page_nodes.js +6 -7
package/src/utils/params.js +67 -0
package/src/utils/regex.js +9 -0
package/src/utils/routing.js +145 -73
package/src/utils/shared-iterator.js +5 -0
package/src/utils/streaming.js +14 -4
package/src/utils/url.js +33 -2
package/src/version.js +1 -1
package/types/index.d.ts +2616 -2433
package/types/index.d.ts.map +120 -106
package/src/core/sync/write_ambient.js +0 -18
package/src/core/sync/write_root.js +0 -148
package/src/core/sync/write_tsconfig.js +0 -250
package/src/exports/internal/server.js +0 -22
package/src/exports/node/polyfills.js +0 -30
package/src/runtime/server/app.js +0 -9
package/src/runtime/server/remote.js +0 -457
package/src/runtime/shared-server.js +0 -7
package/src/runtime/telemetry/otel.js +0 -21
package/src/runtime/telemetry/record_span.js +0 -65
package/src/types/synthetic/$lib.md +0 -5
/package/src/exports/internal/{remote-functions.js → server/remote-functions.js} +0 -0
/package/src/{runtime/telemetry/noop.js → telemetry.js} +0 -0

package/src/runtime/app/navigation/public.d.ts ADDED Viewed

@@ -0,0 +1,237 @@
+import type { LayoutParams as AppLayoutParams, RouteId as AppRouteId } from '$app/types';
+export * from './index.js';
+/**
+ * Information about the target of a specific navigation.
+ */
+export interface NavigationTarget<
+	Params extends AppLayoutParams<'/'> = AppLayoutParams<'/'>,
+	RouteId extends AppRouteId | null = AppRouteId | null
+> {
+	/**
+	 * Parameters of the target page - e.g. for a route like `/blog/[slug]`, a `{ slug: string }` object.
+	 * Is `null` if the target is not part of the SvelteKit app (could not be resolved to a route).
+	 */
+	params: Params | null;
+	/**
+	 * Info about the target route
+	 */
+	route: {
+		/**
+		 * The ID of the current route - e.g. for `src/routes/blog/[slug]`, it would be `/blog/[slug]`. It is `null` when no route is matched.
+		 */
+		id: RouteId | null;
+	};
+	/**
+	 * The URL that is navigated to
+	 */
+	url: URL;
+	/**
+	 * The scroll position associated with this navigation.
+	 *
+	 * For the `from` target, this is the scroll position at the moment of navigation.
+	 *
+	 * For the `to` target, this represents the scroll position that will be or was restored:
+	 * - In `beforeNavigate` and `onNavigate`, this is only available for `popstate` navigations (back/forward button)
+	 *   and will be `null` for other navigation types, since the final scroll position isn't known
+	 *   ahead of time.
+	 * - In `afterNavigate`, this is always the scroll position that was applied after the navigation
+	 *   completed.
+	 */
+	scroll: { x: number; y: number } | null;
+}
+export interface GotoOptions {
+	/**
+	 * If `true`, replaces the current history entry rather than creating a new one.
+	 * @default false
+	 */
+	replace?: boolean;
+	/** @deprecated Use `replace` instead. */
+	replaceState?: boolean;
+	/**
+	 * If `true`, updates the URL and `page.state` without navigating.
+	 * @default false
+	 */
+	shallow?: boolean;
+	/**
+	 * If `true`, resets the scroll position (to the top of the page, or to the element
+	 * matching the URL's `#hash` if there is one) and resets focus (to the `<body>`, or the
+	 * `autofocus` element if there is one) once the navigation completes.
+	 *
+	 * If `false`, the current scroll position and focused element are left alone.
+	 * @default true, or false when `shallow` is true
+	 */
+	reset?: boolean;
+	/**
+	 * If `true`, reruns all `load` functions and queries of the page.
+	 * @default false
+	 */
+	refreshAll?: boolean;
+	/** Causes any `load` functions to rerun if they depend on one of the URLs. */
+	invalidate?: Array<string | URL | ((url: URL) => boolean)>;
+	/** @deprecated Use `refreshAll` instead. */
+	invalidateAll?: boolean;
+	/** An optional object that will be available as `page.state`. */
+	state?: App.PageState;
+	/**
+	 * If `true`, `page.state` will be restored after a full page reload.
+	 * @default false
+	 */
+	persistState?: boolean;
+}
+/**
+ * - `enter`: The app has hydrated/started
+ * - `form`: The user submitted a `<form method="GET">`
+ * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
+ * - `leave`: The app is being left either because the tab is being closed or a navigation to a different document is occurring
+ * - `link`: Navigation was triggered by a link click
+ * - `popstate`: Navigation was triggered by back/forward navigation
+ */
+export type NavigationType = 'enter' | 'form' | 'leave' | 'link' | 'goto' | 'popstate';
+export interface NavigationBase {
+	/**
+	 * The type of navigation:
+	 * - `enter`: The app has hydrated/started
+	 * - `form`: The user submitted a `<form method="GET">`
+	 * - `goto`: Navigation was triggered by a `goto(...)` call or a redirect
+	 * - `leave`: The app is being left either because the tab is being closed or a navigation to a different document is occurring
+	 * - `link`: Navigation was triggered by a link click
+	 * - `popstate`: Navigation was triggered by back/forward navigation
+	 */
+	type: NavigationType;
+	/** Whether this is a shallow navigation. */
+	shallow: boolean;
+	/**
+	 * Where navigation was triggered from
+	 */
+	from: NavigationTarget | null;
+	/**
+	 * Where navigation is going to/has gone to
+	 */
+	to: NavigationTarget | null;
+	/**
+	 * Whether or not the navigation will result in the page being unloaded (i.e. not a client-side navigation).
+	 */
+	willUnload: boolean;
+	/**
+	 * A promise that resolves once the navigation is complete, and rejects if the navigation
+	 * fails or is aborted. In the case of a `willUnload` navigation, the promise will never resolve
+	 */
+	complete: Promise<void>;
+}
+/**
+ * The navigation that occurs when the app starts/hydrates
+ */
+export interface NavigationEnter extends NavigationBase {
+	type: 'enter';
+	/**
+	 * In case of a history back/forward navigation, the number of steps to go back/forward
+	 */
+	delta?: undefined;
+	/**
+	 * Dispatched `Event` object when navigation occurred by `popstate` or `link`.
+	 */
+	event?: undefined;
+}
+export type NavigationExternal = NavigationGoto | NavigationLeave;
+/**
+ * A navigation triggered by a `goto(...)` call or a redirect
+ */
+export interface NavigationGoto extends NavigationBase {
+	type: 'goto';
+}
+/**
+ * A navigation triggered by the tab being closed, or the user navigating to a different document
+ */
+export interface NavigationLeave extends NavigationBase {
+	type: 'leave';
+}
+/**
+ * A navigation triggered by a `<form method="GET">`
+ */
+export interface NavigationFormSubmit extends NavigationBase {
+	type: 'form';
+	/**
+	 * The `SubmitEvent` that caused the navigation
+	 */
+	event: SubmitEvent;
+}
+/**
+ * A navigation triggered by back/forward navigation
+ */
+export interface NavigationPopState extends NavigationBase {
+	type: 'popstate';
+	/**
+	 * In case of a history back/forward navigation, the number of steps to go back/forward
+	 */
+	delta: number;
+	/**
+	 * The `PopStateEvent` that caused the navigation
+	 */
+	event: PopStateEvent;
+}
+/**
+ * A navigation triggered by a link click
+ */
+export interface NavigationLink extends NavigationBase {
+	type: 'link';
+	/**
+	 * The `PointerEvent` that caused the navigation
+	 */
+	event: PointerEvent;
+}
+export type Navigation =
+	| NavigationExternal
+	| NavigationFormSubmit
+	| NavigationPopState
+	| NavigationLink;
+/**
+ * The argument passed to [`beforeNavigate`](https://svelte.dev/docs/kit/$app-navigation#beforeNavigate) callbacks.
+ */
+export type BeforeNavigate = Navigation & {
+	/**
+	 * Call this to prevent the navigation from starting.
+	 */
+	cancel: () => void;
+};
+/**
+ * The argument passed to [`onNavigate`](https://svelte.dev/docs/kit/$app-navigation#onNavigate) callbacks.
+ */
+export type OnNavigate = Navigation & {
+	type: Exclude<NavigationType, 'enter' | 'leave'>;
+	/**
+	 * Since `onNavigate` callbacks are called immediately before a client-side navigation, they will never be called with a navigation that unloads the page.
+	 */
+	willUnload: false;
+};
+/**
+ * The argument passed to [`afterNavigate`](https://svelte.dev/docs/kit/$app-navigation#afterNavigate) callbacks.
+ */
+export type AfterNavigate = (Navigation | NavigationEnter) & {
+	type: Exclude<NavigationType, 'leave'>;
+	/**
+	 * Since `afterNavigate` callbacks are called after a navigation completes, they will never be called with a navigation that unloads the page.
+	 */
+	willUnload: false;
+};

package/src/runtime/app/paths/client.js CHANGED Viewed

@@ -1,11 +1,13 @@
-/** @import { Asset, RouteId, RouteIdWithSearchOrHash, Pathname, PathnameWithSearchOrHash, ResolvedPathname } from '$app/types' */
+/** @import { AssetPath, RouteId, RouteIdWithSearchOrHash, PathnameWithSearchOrHash, ResolvedPathname, RouteParams } from '$app/types' */
 /** @import { ResolveArgs } from './types.js' */
-import { base, assets, hash_routing } from './internal/client.js';
+import { base, assets, hash_routing, match_implementation } from './internal/client.js';
 import { resolve_route } from '../../../utils/routing.js';
-import { get_navigation_intent } from '../../client/client.js';
+import { DEV } from 'esm-env';
+export { base, assets, app_dir } from './internal/client.js';
 /**
- * Resolve the URL of an asset in your `static` directory, by prefixing it with [`config.kit.paths.assets`](https://svelte.dev/docs/kit/configuration#paths) if configured, or otherwise by prefixing it with the base path.
+ * Resolve the URL of an asset in your `static` directory, by prefixing it with [`config.paths.assets`](https://svelte.dev/docs/kit/configuration#paths) if configured, or otherwise by prefixing it with the base path.
  *
  * During server rendering, the base path is relative and depends on the page currently being rendered.
  *
@@ -15,15 +17,26 @@ import { get_navigation_intent } from '../../client/client.js';
  * 	import { asset } from '$app/paths';
  * </script>
  *
- * <img alt="a potato" src={asset('/potato.jpg')} />
+ * <img alt="a potato" src={asset('potato.jpg')} />
  * ```
  * @since 2.26
  *
- * @param {Asset} file
+ * @param {AssetPath} file
  * @returns {string}
  */
 export function asset(file) {
-	return (assets || base) + file;
+	let path = /** @type {string} */ (file);
+	// TODO 4.0 remove this
+	if (path[0] === '/') {
+		if (DEV) {
+			console.warn(`\`asset('${path}')\` should now be \`asset('${path.slice(1)}')\``);
+		}
+		path = path.slice(1);
+	}
+	return (assets || base) + '/' + path;
 }
 const pathname_prefix = hash_routing ? '#' : '';
@@ -38,7 +51,7 @@ const pathname_prefix = hash_routing ? '#' : '';
  * import { resolve } from '$app/paths';
  *
  * // using a pathname
- * const resolved = resolve(`/blog/hello-world`);
+ * const resolved = resolve(`blog/hello-world`);
  *
  * // using a route ID plus parameters
  * const resolved = resolve('/blog/[slug]', {
@@ -52,18 +65,20 @@ const pathname_prefix = hash_routing ? '#' : '';
  * @returns {ResolvedPathname}
  */
 export function resolve(...args) {
-	if (!args[0].startsWith('/')) {
-		throw new Error(
-			`Cannot use \`resolve(...)\` with a non-absolute pathname or route ID (got "${args[0]}"). ` +
-				'`resolve` is only for internal pathnames and route IDs; external URLs should be used directly.'
+	const [id, params] = /** @type {[string, Record<string, string>?]} */ (args);
+	if (id[0] === '/') {
+		// route ID
+		if (id.includes('[') && !params) {
+			throw new Error(`Missing params for dynamic route ID ${id}`);
+		}
+		return (
+			/** @type {ResolvedPathname} */ (base + pathname_prefix + resolve_route(id, params ?? {}))
 		);
 	}
-	// The type error is correct here, and if someone doesn't pass params when they should there's a runtime error,
-	// but we don't want to adjust the internal resolve_route function to accept `undefined`, hence the type cast.
-	return (
-		base + pathname_prefix + resolve_route(args[0], /** @type {Record<string, string>} */ (args[1]))
-	);
+	return /** @type {ResolvedPathname} */ (base + pathname_prefix + '/' + id);
 }
 /**
@@ -73,7 +88,7 @@ export function resolve(...args) {
  * ```js
  * import { match } from '$app/paths';
  *
- * const route = await match('/blog/hello-world');
+ * const route = await match('blog/hello-world');
  *
  * if (route?.id === '/blog/[slug]') {
  * 	const slug = route.params.slug;
@@ -83,24 +98,9 @@ export function resolve(...args) {
  * ```
  * @since 2.52.0
  *
- * @param {Pathname | URL | (string & {})} url
- * @returns {Promise<{ id: RouteId, params: Record<string, string> } | null>}
+ * @param {URL | string} url
+ * @returns {Promise<{ [K in RouteId]: { id: K; params: RouteParams<K>; } }[RouteId] | null>}
  */
-export async function match(url) {
-	if (typeof url === 'string') {
-		url = new URL(url, location.href);
-	}
-	const intent = await get_navigation_intent(url, false);
-	if (intent) {
-		return {
-			id: /** @type {RouteId} */ (intent.route.id),
-			params: intent.params
-		};
-	}
-	return null;
+export function match(url) {
+	return match_implementation(url);
 }
-export { base, assets, resolve as resolveRoute };

package/src/runtime/app/paths/index.js CHANGED Viewed

	@@ -1 +1 @@
1	- export * from '#app/paths';
1	+ export { asset, resolve, match } from '#app/paths';

package/src/runtime/app/paths/internal/client.js CHANGED Viewed

@@ -1,4 +1,36 @@
-export const base = __SVELTEKIT_PAYLOAD__?.base ?? __SVELTEKIT_PATHS_BASE__;
-export const assets = __SVELTEKIT_PAYLOAD__?.assets ?? base ?? __SVELTEKIT_PATHS_ASSETS__;
+// TODO get rid of this module — merge the contents into `../client.js`, and expose it to the
+// rest of the codebase as `#app/paths/client`, with an export condition that errors if
+// it is imported on the server
+/** @import { RouteId } from '$app/types' */
+import { payload } from '../../../client/payload.js';
+export const base = payload.base ?? __SVELTEKIT_PATHS_BASE__;
+export const assets = payload.assets ?? base ?? __SVELTEKIT_PATHS_ASSETS__;
 export const app_dir = __SVELTEKIT_APP_DIR__;
 export const hash_routing = __SVELTEKIT_HASH_ROUTING__;
+/**
+ * We make this configurable per-environment so that it's possible to import `$app/paths`
+ * into a service worker without importing the entire client
+ * @param {URL | string} _url
+ * @returns {Promise<{ [K in RouteId]: { id: K; params: import('$app/types').RouteParams<K>; } }[RouteId] | null>}
+ */
+// eslint-disable-next-line @typescript-eslint/require-await
+export let match_implementation = async (_url) => {
+	// @ts-ignore
+	if (typeof ServiceWorkerGlobalScope !== 'undefined' && self instanceof ServiceWorkerGlobalScope) {
+		throw new Error(
+			'Cannot use `match(...)` inside a service worker, as it depends on the SvelteKit client instance'
+		);
+	}
+	return null;
+};
+/**
+ * @param {typeof match_implementation} fn
+ */
+export function set_match_implementation(fn) {
+	match_implementation = fn;
+}

package/src/runtime/app/paths/internal/server.js CHANGED Viewed

@@ -1,30 +1,13 @@
-export let base = __SVELTEKIT_PATHS_BASE__;
+// TODO get rid of this module — merge the contents into `../server.js`, and expose it to the
+// rest of the codebase as `#app/paths/server`, with an export condition that errors if
+// it is imported on the client
+export const base = __SVELTEKIT_PATHS_BASE__;
 export let assets = __SVELTEKIT_PATHS_ASSETS__ || base;
 export const app_dir = __SVELTEKIT_APP_DIR__;
 export const relative = __SVELTEKIT_PATHS_RELATIVE__;
-const initial = { base, assets };
-/**
- * `base` could be overridden during rendering to be relative;
- * this one's the original non-relative base path
- */
-export const initial_base = initial.base;
-/**
- * @param {{ base: string, assets: string }} paths
- */
-export function override(paths) {
-	base = paths.base;
-	assets = paths.assets;
-}
-export function reset() {
-	base = initial.base;
-	assets = initial.assets;
-}
 /** @param {string} path */
 export function set_assets(path) {
-	assets = initial.assets = path;
+	assets = path;
 }

package/src/runtime/app/paths/internal.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import '../../../types/global-private.js';
+export * from './client.js';

package/src/runtime/app/paths/public.d.ts CHANGED Viewed

@@ -1,29 +1 @@
-import { RouteIdWithSearchOrHash, PathnameWithSearchOrHash, ResolvedPathname } from '$app/types';
-import { ResolveArgs } from './types.js';
-export { resolve, asset, match } from './client.js';
-/**
- * A string that matches [`config.kit.paths.base`](https://svelte.dev/docs/kit/configuration#paths).
- *
- * Example usage: `<a href="{base}/your-page">Link</a>`
- *
- * @deprecated Use [`resolve(...)`](https://svelte.dev/docs/kit/$app-paths#resolve) instead
- */
-export let base: '' | `/${string}`;
-/**
- * An absolute path that matches [`config.kit.paths.assets`](https://svelte.dev/docs/kit/configuration#paths).
- *
- * > [!NOTE] If a value for `config.kit.paths.assets` is specified, it will be replaced with `'/_svelte_kit_assets'` during `vite dev` or `vite preview`, since the assets don't yet live at their eventual URL.
- *
- * @deprecated Use [`asset(...)`](https://svelte.dev/docs/kit/$app-paths#asset) instead
- */
-export let assets: '' | `https://${string}` | `http://${string}` | '/_svelte_kit_assets';
-/**
- * @deprecated Use [`resolve(...)`](https://svelte.dev/docs/kit/$app-paths#resolve) instead
- */
-export function resolveRoute<T extends RouteIdWithSearchOrHash | PathnameWithSearchOrHash>(
-	...args: ResolveArgs<T>
-): ResolvedPathname;
+export { asset, resolve, match } from './client.js';

package/src/runtime/app/paths/server.js CHANGED Viewed

@@ -1,32 +1,53 @@
-import { base, assets, relative, initial_base } from './internal/server.js';
+import { base, assets, relative } from './internal/server.js';
 import { resolve_route, find_route } from '../../../utils/routing.js';
 import { decode_pathname } from '../../../utils/url.js';
+import { add_data_suffix } from '../../../pathname.js';
 import { try_get_request_store } from '@sveltejs/kit/internal/server';
-import { manifest } from '__sveltekit/server';
+import { manifest } from '../../server/internal.js';
 import { get_hooks } from '__SERVER__/internal.js';
+import { DEV } from 'esm-env';
-/** @type {import('./client.js').asset} */
+export { base, assets, app_dir } from './internal/server.js';
+/** @type {typeof import('./client.js').asset} */
 export function asset(file) {
-	// @ts-expect-error we use the `resolve` mechanism, but with the 'wrong' input
-	return assets && assets !== base ? assets + file : resolve(file);
+	// TODO 4.0 remove this
+	if (file[0] === '/') {
+		if (DEV) {
+			console.warn(`\`asset('${file}')\` should now be \`asset('${file.slice(1)}')\``);
+		}
+		file = file.slice(1);
+	}
+	return assets !== base ? `${assets}/${file}` : resolve(file);
 }
-/** @type {import('./client.js').resolve} */
+/** @type {typeof import('./client.js').resolve} */
 export function resolve(id, params) {
-	if (!id.startsWith('/')) {
-		throw new Error(
-			`Cannot use \`resolve(...)\` with a non-absolute pathname or route ID (got "${id}"). ` +
-				'`resolve` is only for internal pathnames and route IDs; external URLs should be used directly.'
-		);
-	}
+	let resolved;
-	const resolved = resolve_route(id, /** @type {Record<string, string>} */ (params));
+	if (id[0] === '/') {
+		// route ID
+		if (id.includes('[') && !params) {
+			throw new Error(`Missing params for dynamic route ID ${id}`);
+		}
+		resolved = resolve_route(id, params ?? {});
+	} else {
+		resolved = '/' + id;
+	}
 	if (relative) {
 		const store = try_get_request_store();
 		if (store && !store.state.prerendering?.fallback) {
-			const after_base = store.event.url.pathname.slice(initial_base.length);
+			// the relative path depth must reflect the URL the browser is actually at, which
+			// for a data request includes the `__data.json` suffix that was stripped during routing
+			const pathname = store.event.isDataRequest
+				? add_data_suffix(store.event.url.pathname)
+				: store.event.url.pathname;
+			const after_base = pathname.slice(base.length);
 			const segments = after_base.split('/').slice(2);
 			const prefix = segments.map(() => '..').join('/') || '.';
@@ -37,7 +58,7 @@ export function resolve(id, params) {
 	return base + resolved;
 }
-/** @type {import('./client.js').match} */
+/** @type {typeof import('./client.js').match} */
 export async function match(url) {
 	const store = try_get_request_store();
@@ -74,5 +95,3 @@ export async function match(url) {
 	return null;
 }
-export { base, assets, resolve as resolveRoute };

package/src/runtime/app/paths/types.d.ts CHANGED Viewed

@@ -1,23 +1,15 @@
-import {
-	PathnameWithSearchOrHash,
-	RouteId,
-	RouteIdWithSearchOrHash,
-	RouteParams
-} from '$app/types';
+import { RouteId, RouteParams } from '$app/types';
-type StripSearchOrHash<T extends string> = T extends `${infer Pathname}?${string}`
-	? Pathname
-	: T extends `${infer Pathname}#${string}`
-		? Pathname
+type StripSearchOrHash<T extends string> = T extends `${infer U}?${string}`
+	? U
+	: T extends `${infer U}#${string}`
+		? U
 		: T;
-export type ResolveArgs<T extends RouteIdWithSearchOrHash | PathnameWithSearchOrHash> =
-	T extends RouteId
-		? RouteParams<T> extends Record<string, never>
+export type ResolveArgs<T> = T extends `/${string}`
+	? StripSearchOrHash<T> extends infer U extends RouteId
+		? RouteParams<U> extends Record<string, never>
 			? [route: T]
-			: [route: T, params: RouteParams<T>]
-		: StripSearchOrHash<T> extends infer U extends RouteId
-			? RouteParams<U> extends Record<string, never>
-				? [route: T]
-				: [route: T, params: RouteParams<U>]
-			: [route: T];
+			: [route: T, params: RouteParams<U>]
+		: [never]
+	: [pathname: T];

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

@@ -1,5 +1,5 @@
-import { read_implementation, manifest } from '__sveltekit/server';
-import { assets } from '$app/paths/internal/server';
+import { read_implementation, manifest } from '../../server/internal.js';
+import { assets } from '#app/paths';
 import { base64_decode } from '../../utils.js';
 /**