@sveltejs/kit 2.62.0 → 3.0.0-next.0

package/src/runtime/shared.js

@@ -1,7 +1,6 @@
 /** @import { Transport } from '@sveltejs/kit' */
 import * as devalue from 'devalue';
 import { base64_decode, base64_encode, text_encoder } from './utils.js';
-import * as svelte from 'svelte';
 
 /**
  * @param {string} route_id
@@ -305,17 +304,3 @@ export function split_remote_key(key) {
 		payload: key.slice(i + 1)
 	};
 }
-
-/**
- * @template T
- * @param {string} key
- * @param {() => T} fn
- * @returns {T}
- * @deprecated TODO remove in SvelteKit 3.0
- */
-export function unfriendly_hydratable(key, fn) {
-	if (!svelte.hydratable) {
-		throw new Error('Remote functions require Svelte 5.44.0 or later');
-	}
-	return svelte.hydratable(key, fn);
-}

package/src/types/ambient-private.d.ts

@@ -1,12 +1,3 @@
-/** Internal version of $app/environment */
-declare module '__sveltekit/environment' {
-	export const building: boolean;
-	export const prerendering: boolean;
-	export const version: string;
-	export function set_building(): void;
-	export function set_prerendering(): void;
-}
-
 /** Internal version of $app/paths */
 declare module '__sveltekit/paths' {
 	export let base: '' | `/${string}`;
@@ -27,3 +18,28 @@ declare module '__sveltekit/server' {
 	export function set_manifest(manifest: SSRManifest): void;
 	export function set_read_implementation(fn: (path: string) => ReadableStream): void;
 }
+
+declare module '__sveltekit/env' {
+	// exported environment variables are defined in env.d.ts
+
+	/** Populate exported environment variables */
+	export function set_env(environment: Record<string, string>): void;
+
+	/** public env vars */
+	export const explicit_public_env: Record<string, any>;
+
+	/** public env vars that should be inlined when a page is rendered */
+	export const rendered_env: Record<string, any>;
+}
+
+declare module '__sveltekit/env/private' {
+	// exported environment variables are defined in env.d.ts
+}
+
+declare module '__sveltekit/env/public/client' {
+	// exported environment variables are defined in env.d.ts
+}
+
+declare module '__sveltekit/env/public/server' {
+	// exported environment variables are defined in env.d.ts
+}

package/src/types/global-private.d.ts

@@ -1,6 +1,7 @@
 declare global {
 	const __SVELTEKIT_ADAPTER_NAME__: string;
 	const __SVELTEKIT_APP_DIR__: string;
+	const __SVELTEKIT_APP_VERSION__: string;
 	const __SVELTEKIT_APP_VERSION_FILE__: string;
 	const __SVELTEKIT_APP_VERSION_POLL_INTERVAL__: number;
 	/**
@@ -47,6 +48,11 @@ declare global {
 		/** Resolve a placeholder promise */
 		resolve?: (data: { id: number; data: any; error: any }) => void;
 	};
+	/**
+	 * The Vite `root` setting used to construct paths to nodes and components
+	 * for the SSR manifest during development
+	 */
+	const __SVELTEKIT_ROOT__: string;
 	/**
 	 * This makes the use of specific features visible at both dev and build time, in such a
 	 * way that we can error when they are not supported by the target platform.

package/src/types/internal.d.ts

@@ -44,10 +44,9 @@ export interface ServerModule {
 export interface ServerInternalModule {
 	set_assets(path: string): void;
 	set_building(): void;
+	set_env(environment: Record<string, string>): void;
 	set_manifest(manifest: SSRManifest): void;
 	set_prerendering(): void;
-	set_private_env(environment: Record<string, string>): void;
-	set_public_env(environment: Record<string, string>): void;
 	set_read_implementation(implementation: (path: string) => ReadableStream): void;
 	set_version(version: string): void;
 	set_fix_stack_trace(fix_stack_trace: (error: unknown) => string): void;
@@ -500,11 +499,9 @@ export interface SSROptions {
 	csrf_check_origin: boolean;
 	csrf_trusted_origins: string[];
 	embedded: boolean;
-	env_public_prefix: string;
-	env_private_prefix: string;
 	hash_routing: boolean;
 	hooks: ServerHooks;
-	preload_strategy: ValidatedConfig['kit']['output']['preloadStrategy'];
+	link_header_preload: ValidatedConfig['kit']['output']['linkHeaderPreload'];
 	root: SSRComponent['default'];
 	service_worker: boolean;
 	service_worker_options: RegistrationOptions;
@@ -606,9 +603,8 @@ export type ValidatedConfig = Config & {
 	extensions: string[];
 };
 
-export type ValidatedKitConfig = Omit<RecursiveRequired<KitConfig>, 'adapter'> & {
-	adapter?: Adapter;
-};
+// TODO: remove the omit in 4.0
+export type ValidatedKitConfig = Omit<RecursiveRequired<KitConfig>, 'adapter'>;
 
 export type BinaryFormMeta = {
 	remote_refreshes?: string[];

package/src/utils/css.js

@@ -1,19 +1,10 @@
 import MagicString from 'magic-string';
-import * as svelte from 'svelte/compiler';
+import { parseCss } from 'svelte/compiler';
 
-/** @typedef {ReturnType<typeof import('svelte/compiler').parseCss>['children']} StyleSheetChildren */
+/** @typedef {ReturnType<typeof parseCss>['children']} StyleSheetChildren */
 
 /** @typedef {{ property: string; value: string; start: number; end: number; type: 'Declaration' }} Declaration */
 
-const parse = svelte.parseCss
-	? svelte.parseCss
-	: /** @param {string} css */
-		(css) => {
-			return /** @type {{ css: { children: StyleSheetChildren } }} */ (
-				svelte.parse(`<style>${css}</style>`)
-			).css;
-		};
-
 const SKIP_PARSING_REGEX = /url\(/i;
 
 /** Capture a single url(...) so we can process them one at a time */
@@ -31,8 +22,6 @@ const HASH_OR_QUERY_REGEX = /[#?]/;
  */
 const VITE_ASSET_PREFIX = './';
 
-const AST_OFFSET = '<style>'.length;
-
 /**
  * We need to fix the asset URLs in the CSS before we inline them into a document
  * because they are now relative to the document instead of the CSS file.
@@ -70,7 +59,7 @@ export function fix_css_urls({
 
 	const s = new MagicString(css);
 
-	const parsed = parse(css);
+	const parsed = parseCss(css);
 
 	for (const child of parsed.children) {
 		find_declarations(child, (declaration) => {
@@ -128,11 +117,6 @@ export function fix_css_urls({
 
 			if (declaration.value === new_value) return;
 
-			if (!svelte.parseCss) {
-				declaration.start = declaration.start - AST_OFFSET;
-				declaration.end = declaration.end - AST_OFFSET;
-			}
-
 			s.update(declaration.start, declaration.end, `${declaration.property}: ${new_value}`);
 		});
 	}

package/src/utils/filesystem.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { posixify } from './os.js';
 
 /** @param {string} dir */
 export function mkdirp(dir) {
@@ -110,11 +111,6 @@ export function walk(cwd, dirs = false) {
 	return (walk_dir(''), all_files);
 }
 
-/** @param {string} str */
-export function posixify(str) {
-	return str.replace(/\\/g, '/');
-}
-
 /**
  * Like `path.join`, but posixified and with a leading `./` if necessary
  * @param {string[]} str
@@ -138,31 +134,6 @@ export function relative_path(from, to) {
 	return join_relative(path.relative(from, to));
 }
 
-/**
- * Prepend given path with `/@fs` prefix
- * @param {string} str
- */
-export function to_fs(str) {
-	str = posixify(str);
-	return `/@fs${
-		// Windows/Linux separation - Windows starts with a drive letter, we need a / in front there
-		str.startsWith('/') ? '' : '/'
-	}${str}`;
-}
-
-/**
- * Removes `/@fs` prefix from given path and posixifies it
- * @param {string} str
- */
-export function from_fs(str) {
-	str = posixify(str);
-	if (!str.startsWith('/@fs')) return str;
-
-	str = str.slice(4);
-	// Windows/Linux separation - Windows starts with a drive letter, we need to strip the additional / here
-	return str[2] === ':' && /[A-Z]/.test(str[1]) ? str.slice(1) : str;
-}
-
 /**
  * Given an entry point like [cwd]/src/hooks, returns a filename like [cwd]/src/hooks.js or [cwd]/src/hooks/index.js
  * @param {string} entry

package/src/utils/http.js

@@ -1,4 +1,3 @@
-import * as set_cookie_parser from 'set-cookie-parser';
 import { BINARY_FORM_CONTENT_TYPE } from '../runtime/form-utils.js';
 
 /**
@@ -57,26 +56,6 @@ export function negotiate(accept, types) {
 	return accepted;
 }
 
-/**
- * Reads all `Set-Cookie` headers as separate values. `Headers.get('set-cookie')`
- * collapses them into a single comma-joined string that browsers cannot parse, so
- * we use `Headers.getSetCookie()` where available and fall back to splitting the
- * joined string otherwise.
- *
- * TODO 3.0 `getSetCookie` is available in Node 19.7+; once we drop support for
- * older versions we can use it directly and remove the `splitCookiesString` fallback
- * @param {Headers} headers
- * @returns {string[]}
- */
-export function get_set_cookies(headers) {
-	if (typeof headers.getSetCookie === 'function') {
-		return headers.getSetCookie();
-	}
-
-	const set_cookie = headers.get('set-cookie');
-	return set_cookie ? set_cookie_parser.splitCookiesString(set_cookie) : [];
-}
-
 /**
  * Returns `true` if the request contains a `content-type` header with the given type
  * @param {Request} request

package/src/utils/import.js

@@ -1,16 +1,16 @@
-import process from 'node:process';
 import fs from 'node:fs';
 import path from 'node:path';
 
 /**
- * Resolves a peer dependency relative to the current CWD. Duplicated with `packages/adapter-auto`
+ * Resolves a peer dependency relative to the current working directory. Duplicated with `packages/adapter-auto`
  * @param {string} dependency
+ * @param {string} root
  */
-function resolve_peer(dependency) {
+function resolve_peer(dependency, root) {
 	let [name, ...parts] = dependency.split('/');
 	if (name[0] === '@') name += `/${parts.shift()}`;
 
-	let dir = process.cwd();
+	let dir = root;
 
 	while (!fs.existsSync(`${dir}/node_modules/${name}/package.json`)) {
 		if (dir === (dir = path.dirname(dir))) {
@@ -42,11 +42,12 @@ function resolve_peer(dependency) {
  * Resolve a dependency relative to the current working directory,
  * rather than relative to this package (but falls back to trying that, if necessary)
  * @param {string} dependency
+ * @param {string} root
  */
-export async function import_peer(dependency) {
+export async function import_peer(dependency, root) {
 	try {
-		return await import(resolve_peer(dependency));
+		return await import(/* @vite-ignore */ resolve_peer(dependency, root));
 	} catch {
-		return await import(dependency);
+		return await import(/* @vite-ignore */ dependency);
 	}
 }

package/src/utils/os.js

@@ -0,0 +1,7 @@
+// this file needs to remain node-agnostic because it could be imported into an
+// environment without access to `node:*`
+
+/** @param {string} str */
+export function posixify(str) {
+	return str.replace(/\\/g, '/');
+}

package/src/utils/path.js

@@ -0,0 +1,23 @@
+// This file contains Node-agnostic path utilities so that it can be used in
+// environments that do not have access to `node:path` (e.g. Cloudflare Workers).
+
+/**
+ * @param {string} from
+ * @param {string} to
+ * @returns {string}
+ */
+export function relative(from, to) {
+	const from_parts = from.split('/').filter(Boolean);
+	const to_parts = to.split('/').filter(Boolean);
+	let i = 0;
+	while (i < from_parts.length && i < to_parts.length && from_parts[i] === to_parts[i]) i++;
+	return [...Array(from_parts.length - i).fill('..'), ...to_parts.slice(i)].join('/') || '.';
+}
+
+/**
+ * @param  {...string} parts
+ * @returns {string}
+ */
+export function join(...parts) {
+	return parts.join('/');
+}

package/src/utils/shared-iterator.js

@@ -205,6 +205,9 @@ export class SharedIterator {
 			},
 			[Symbol.asyncIterator]() {
 				return iterator;
+			},
+			async [Symbol.asyncDispose]() {
+				// TODO: investigate if this needs to be implemented
 			}
 		};
 

package/src/utils/streaming.js

@@ -1,5 +1,3 @@
-import { with_resolvers } from './promise.js';
-
 /**
  * Create an async iterator and a function to push values into it
  * @template T
@@ -12,7 +10,7 @@ export function create_async_iterator() {
 	let resolved = -1;
 	let returned = -1;
 
-	/** @type {import('./promise.js').PromiseWithResolvers<T>[]} */
+	/** @type {PromiseWithResolvers<T>[]} */
 	const deferred = [];
 
 	return {
@@ -32,7 +30,7 @@ export function create_async_iterator() {
 			};
 		},
 		add: (promise) => {
-			deferred.push(with_resolvers());
+			deferred.push(Promise.withResolvers());
 			void promise.then((value) => {
 				deferred[++resolved].resolve(value);
 			});

package/src/utils/url.js

@@ -6,7 +6,7 @@ import { BROWSER, DEV } from 'esm-env';
  */
 export const SCHEME = /^[a-z][a-z\d+\-.]+:/i;
 
-const internal = new URL('sveltekit-internal://');
+const internal = new URL('a://');
 
 /**
  * @param {string} base

package/src/utils/vite.js

@@ -0,0 +1,28 @@
+// this file needs to be runtime agnostic and avoid importing from `node:*` since
+// it may not be available in edge environments
+import { posixify } from './os.js';
+
+/**
+ * Prepend given path with `/@fs` prefix
+ * @param {string} str
+ */
+export function to_fs(str) {
+	str = posixify(str);
+	return `/@fs${
+		// Windows/Linux separation - Windows starts with a drive letter, we need a / in front there
+		str.startsWith('/') ? '' : '/'
+	}${str}`;
+}
+
+/**
+ * Removes `/@fs` prefix from given path and posixifies it
+ * @param {string} str
+ */
+export function from_fs(str) {
+	str = posixify(str);
+	if (!str.startsWith('/@fs')) return str;
+
+	str = str.slice(4);
+	// Windows/Linux separation - Windows starts with a drive letter, we need to strip the additional / here
+	return str[2] === ':' && /[A-Z]/.test(str[1]) ? str.slice(1) : str;
+}

package/src/version.js

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