@sveltejs/kit 2.15.2 → 2.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "2.15.2",
+  "version": "2.16.0",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -21,15 +21,14 @@
     "@types/cookie": "^0.6.0",
     "cookie": "^0.6.0",
     "devalue": "^5.1.0",
-    "esm-env": "^1.2.1",
+    "esm-env": "^1.2.2",
     "import-meta-resolve": "^4.1.0",
     "kleur": "^4.1.5",
     "magic-string": "^0.30.5",
     "mrmime": "^2.0.0",
     "sade": "^1.8.1",
     "set-cookie-parser": "^2.6.0",
-    "sirv": "^3.0.0",
-    "tiny-glob": "^0.2.9"
+    "sirv": "^3.0.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.44.1",
@@ -59,8 +58,7 @@
     "!src/core/**/fixtures",
     "!src/core/**/test",
     "types",
-    "svelte-kit.js",
-    "postinstall.js"
+    "svelte-kit.js"
   ],
   "exports": {
     "./package.json": "./package.json",
@@ -99,7 +97,6 @@
     "test:cross-platform:dev": "pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform:dev",
     "test:cross-platform:build": "pnpm test:unit && pnpm -r --workspace-concurrency 1 --filter=\"./test/**\" test:cross-platform:build",
     "test:unit": "vitest --config kit.vitest.config.js run",
-    "postinstall": "node postinstall.js",
     "generate:version": "node scripts/generate-version.js",
     "generate:types": "node scripts/generate-dts.js"
   }

package/src/core/sync/utils.js

@@ -3,15 +3,8 @@ import path from 'node:path';
 import { mkdirp } from '../../utils/filesystem.js';
 import { resolve_peer_dependency } from '../../utils/import.js';
 
-/** @type {string} */
-let VERSION;
-
-try {
-	({ VERSION } = await resolve_peer_dependency('svelte/compiler'));
-} catch {
-	// we can end up here from e.g. unit tests. this is the simplest fix
-	({ VERSION } = await import('svelte/compiler'));
-}
+/** @type {{ VERSION: string }} */
+const { VERSION } = await resolve_peer_dependency('svelte/compiler');
 
 /** @type {Map<string, string>} */
 const previous_contents = new Map();

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

@@ -270,6 +270,12 @@ function update_types(config, routes, route, to_delete = new Set()) {
 				'export type Actions<OutputData extends Record<string, any> | void = Record<string, any> | void> = Kit.Actions<RouteParams, OutputData, RouteId>'
 			);
 		}
+
+		if (route.leaf.server) {
+			exports.push('export type PageProps = { data: PageData; form: ActionData }');
+		} else {
+			exports.push('export type PageProps = { data: PageData }');
+		}
 	}
 
 	if (route.layout) {
@@ -333,6 +339,10 @@ function update_types(config, routes, route, to_delete = new Set()) {
 
 		if (proxies.server?.modified) to_delete.delete(proxies.server.file_name);
 		if (proxies.universal?.modified) to_delete.delete(proxies.universal.file_name);
+
+		exports.push(
+			'export type LayoutProps = { data: LayoutData; children: import("svelte").Snippet }'
+		);
 	}
 
 	if (route.endpoint) {
@@ -585,7 +595,7 @@ function replace_ext_with_js(file_path) {
 function generate_params_type(params, outdir, config) {
 	/** @param {string} matcher */
 	const path_to_matcher = (matcher) =>
-		posixify(path.relative(outdir, path.join(config.kit.files.params, matcher)));
+		posixify(path.relative(outdir, path.join(config.kit.files.params, matcher + '.js')));
 
 	return `{ ${params
 		.map(

package/src/exports/index.js

@@ -84,6 +84,14 @@ export function isHttpError(e, status) {
 /**
  * Redirect a request. When called during request handling, SvelteKit will return a redirect response.
  * Make sure you're not catching the thrown redirect, which would prevent SvelteKit from handling it.
+ *
+ * Most common status codes:
+ *  * `303 See Other`: redirect as a GET request (often used after a form POST request)
+ *  * `307 Temporary Redirect`: redirect will keep the request method
+ *  * `308 Permanent Redirect`: redirect will keep the request method, SEO will be transferred to the new page
+ *
+ * [See all redirect status codes](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages)
+ *
  * @param {300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308 | ({} & number)} status The [HTTP status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#redirection_messages). Must be in the range 300-308.
  * @param {string | URL} location The location to redirect to.
  * @throws {Redirect} This error instructs SvelteKit to redirect to the specified location.

package/src/exports/public.d.ts

@@ -34,7 +34,7 @@ export interface Adapter {
 	 * This function is called after SvelteKit has built your app.
 	 * @param builder An object provided by SvelteKit that contains methods for adapting the app
 	 */
-	adapt(builder: Builder): MaybePromise<void>;
+	adapt: (builder: Builder) => MaybePromise<void>;
 	/**
 	 * Checks called during dev and build to determine whether specific features will work in production with this adapter
 	 */
@@ -49,7 +49,7 @@ export interface Adapter {
 	 * Creates an `Emulator`, which allows the adapter to influence the environment
 	 * during dev, build and prerendering
 	 */
-	emulate?(): MaybePromise<Emulator>;
+	emulate?: () => MaybePromise<Emulator>;
 }
 
 export type LoadProperties<input extends Record<string, any> | void> = input extends void
@@ -94,9 +94,9 @@ export interface Builder {
 	/** Print messages to the console. `log.info` and `log.minor` are silent unless Vite's `logLevel` is `info`. */
 	log: Logger;
 	/** Remove `dir` and all its contents. */
-	rimraf(dir: string): void;
+	rimraf: (dir: string) => void;
 	/** Create `dir` and any required parent directories. */
-	mkdirp(dir: string): void;
+	mkdirp: (dir: string) => void;
 
 	/** The fully resolved `svelte.config.js`. */
 	config: ValidatedConfig;
@@ -111,59 +111,59 @@ export interface Builder {
 	 * @param fn A function that groups a set of routes into an entry point
 	 * @deprecated Use `builder.routes` instead
 	 */
-	createEntries(fn: (route: RouteDefinition) => AdapterEntry): Promise<void>;
+	createEntries: (fn: (route: RouteDefinition) => AdapterEntry) => Promise<void>;
 
 	/**
 	 * Find all the assets imported by server files belonging to `routes`
 	 */
-	findServerAssets(routes: RouteDefinition[]): string[];
+	findServerAssets: (routes: RouteDefinition[]) => string[];
 
 	/**
 	 * Generate a fallback page for a static webserver to use when no route is matched. Useful for single-page apps.
 	 */
-	generateFallback(dest: string): Promise<void>;
+	generateFallback: (dest: string) => Promise<void>;
 
 	/**
 	 * Generate a module exposing build-time environment variables as `$env/dynamic/public`.
 	 */
-	generateEnvModule(): void;
+	generateEnvModule: () => void;
 
 	/**
 	 * Generate a server-side manifest to initialise the SvelteKit [server](https://svelte.dev/docs/kit/@sveltejs-kit#Server) with.
 	 * @param opts a relative path to the base directory of the app and optionally in which format (esm or cjs) the manifest should be generated
 	 */
-	generateManifest(opts: { relativePath: string; routes?: RouteDefinition[] }): string;
+	generateManifest: (opts: { relativePath: string; routes?: RouteDefinition[] }) => string;
 
 	/**
 	 * Resolve a path to the `name` directory inside `outDir`, e.g. `/path/to/.svelte-kit/my-adapter`.
 	 * @param name path to the file, relative to the build directory
 	 */
-	getBuildDirectory(name: string): string;
+	getBuildDirectory: (name: string) => string;
 	/** Get the fully resolved path to the directory containing client-side assets, including the contents of your `static` directory. */
-	getClientDirectory(): string;
+	getClientDirectory: () => string;
 	/** Get the fully resolved path to the directory containing server-side code. */
-	getServerDirectory(): string;
+	getServerDirectory: () => string;
 	/** Get the application path including any configured `base` path, e.g. `my-base-path/_app`. */
-	getAppPath(): string;
+	getAppPath: () => string;
 
 	/**
 	 * Write client assets to `dest`.
 	 * @param dest the destination folder
 	 * @returns an array of files written to `dest`
 	 */
-	writeClient(dest: string): string[];
+	writeClient: (dest: string) => string[];
 	/**
 	 * Write prerendered files to `dest`.
 	 * @param dest the destination folder
 	 * @returns an array of files written to `dest`
 	 */
-	writePrerendered(dest: string): string[];
+	writePrerendered: (dest: string) => string[];
 	/**
 	 * Write server-side code to `dest`.
 	 * @param dest the destination folder
 	 * @returns an array of files written to `dest`
 	 */
-	writeServer(dest: string): string[];
+	writeServer: (dest: string) => string[];
 	/**
 	 * Copy a file or directory.
 	 * @param from the source file or directory
@@ -172,20 +172,20 @@ export interface Builder {
 	 * @param opts.replace a map of strings to replace
 	 * @returns an array of files that were copied
 	 */
-	copy(
+	copy: (
 		from: string,
 		to: string,
 		opts?: {
 			filter?(basename: string): boolean;
 			replace?: Record<string, string>;
 		}
-	): string[];
+	) => string[];
 
 	/**
 	 * Compress files in `directory` with gzip and brotli, where appropriate. Generates `.gz` and `.br` files alongside the originals.
 	 * @param {string} directory The directory containing the files to be compressed
 	 */
-	compress(directory: string): Promise<void>;
+	compress: (directory: string) => Promise<void>;
 }
 
 export interface Config {
@@ -215,13 +215,13 @@ export interface Cookies {
 	 * @param name the name of the cookie
 	 * @param opts the options, passed directly to `cookie.parse`. See documentation [here](https://github.com/jshttp/cookie#cookieparsestr-options)
 	 */
-	get(name: string, opts?: import('cookie').CookieParseOptions): string | undefined;
+	get: (name: string, opts?: import('cookie').CookieParseOptions) => string | undefined;
 
 	/**
 	 * Gets all cookies that were previously set with `cookies.set`, or from the request headers.
 	 * @param opts the options, passed directly to `cookie.parse`. See documentation [here](https://github.com/jshttp/cookie#cookieparsestr-options)
 	 */
-	getAll(opts?: import('cookie').CookieParseOptions): Array<{ name: string; value: string }>;
+	getAll: (opts?: import('cookie').CookieParseOptions) => Array<{ name: string; value: string }>;
 
 	/**
 	 * Sets a cookie. This will add a `set-cookie` header to the response, but also make the cookie available via `cookies.get` or `cookies.getAll` during the current request.
@@ -233,11 +233,11 @@ export interface Cookies {
 	 * @param value the cookie value
 	 * @param opts the options, passed directly to `cookie.serialize`. See documentation [here](https://github.com/jshttp/cookie#cookieserializename-value-options)
 	 */
-	set(
+	set: (
 		name: string,
 		value: string,
 		opts: import('cookie').CookieSerializeOptions & { path: string }
-	): void;
+	) => void;
 
 	/**
 	 * Deletes a cookie by setting its value to an empty string and setting the expiry date in the past.
@@ -246,7 +246,7 @@ export interface Cookies {
 	 * @param name the name of the cookie
 	 * @param opts the options, passed directly to `cookie.serialize`. The `path` must match the path of the cookie you want to delete. See documentation [here](https://github.com/jshttp/cookie#cookieserializename-value-options)
 	 */
-	delete(name: string, opts: import('cookie').CookieSerializeOptions & { path: string }): void;
+	delete: (name: string, opts: import('cookie').CookieSerializeOptions & { path: string }) => void;
 
 	/**
 	 * Serialize a cookie name-value pair into a `Set-Cookie` header string, but don't apply it to the response.
@@ -259,11 +259,11 @@ export interface Cookies {
 	 * @param value the cookie value
 	 * @param opts the options, passed directly to `cookie.serialize`. See documentation [here](https://github.com/jshttp/cookie#cookieserializename-value-options)
 	 */
-	serialize(
+	serialize: (
 		name: string,
 		value: string,
 		opts: import('cookie').CookieSerializeOptions & { path: string }
-	): string;
+	) => string;
 }
 
 /**
@@ -499,11 +499,41 @@ export interface KitConfig {
 		 */
 		preloadStrategy?: 'modulepreload' | 'preload-js' | 'preload-mjs';
 		/**
+		 * The bundle strategy option affects how your app's JavaScript and CSS files are loaded.
 		 * - If `'split'`, splits the app up into multiple .js/.css files so that they are loaded lazily as the user navigates around the app. This is the default, and is recommended for most scenarios.
 		 * - If `'single'`, creates just one .js bundle and one .css file containing code for the entire app.
 		 * - If `'inline'`, inlines all JavaScript and CSS of the entire app into the HTML. The result is usable without a server (i.e. you can just open the file in your browser).
 		 *
-		 * When using `'split'`, you can also adjust the bundling behaviour by setting [`output.experimentalMinChunkSize`](https://rollupjs.org/configuration-options/#output-experimentalminchunksize) and [`output.manualChunks`](https://rollupjs.org/configuration-options/#output-manualchunks)inside your Vite config's [`build.rollupOptions`](https://vite.dev/config/build-options.html#build-rollupoptions).
+		 * When using `'split'`, you can also adjust the bundling behaviour by setting [`output.experimentalMinChunkSize`](https://rollupjs.org/configuration-options/#output-experimentalminchunksize) and [`output.manualChunks`](https://rollupjs.org/configuration-options/#output-manualchunks) inside your Vite config's [`build.rollupOptions`](https://vite.dev/config/build-options.html#build-rollupoptions).
+		 *
+		 * If you want to inline your assets, you'll need to set Vite's [`build.assetsInlineLimit`](https://vite.dev/config/build-options.html#build-assetsinlinelimit) option to an appropriate size then import your assets through Vite.
+		 *
+		 * ```js
+		 * /// file: vite.config.js
+		 * import { sveltekit } from '@sveltejs/kit/vite';
+		 * import { defineConfig } from 'vite';
+		 *
+		 * export default defineConfig({
+		 *   plugins: [sveltekit()],
+		 *   build: {
+		 *     // inline all imported assets
+		 *     assetsInlineLimit: Infinity
+		 *   }
+		 * });
+		 * ```
+		 *
+		 * ```svelte
+		 * /// file: src/routes/+layout.svelte
+		 * <script>
+		 *   // import the asset through Vite
+		 *   import favicon from './favicon.png';
+		 * </script>
+		 *
+		 * <svelte:head>
+		 *   <!-- this asset will be inlined as a base64 URL -->
+		 *   <link rel="icon" href={favicon} />
+		 * </svelte:head>
+		 * ```
 		 * @default 'split'
 		 * @since 2.13.0
 		 */
@@ -623,7 +653,7 @@ export interface KitConfig {
 		 * What type of client-side router to use.
 		 * - `'pathname'` is the default and means the current URL pathname determines the route
 		 * - `'hash'` means the route is determined by `location.hash`. In this case, SSR and prerendering are disabled. This is only recommended if `pathname` is not an option, for example because you don't control the webserver where your app is deployed.
-		 *   It comes with some caveats: you can't use server-side rendering (or indeed any server logic), and you have to make sure that the links in your app all start with /#/, or they won't work. Beyond that, everything works exactly like a normal SvelteKit app.
+		 *   It comes with some caveats: you can't use server-side rendering (or indeed any server logic), and you have to make sure that the links in your app all start with #/, or they won't work. Beyond that, everything works exactly like a normal SvelteKit app.
 		 *
 		 * @default "pathname"
 		 * @since 2.14.0
@@ -708,7 +738,7 @@ export interface KitConfig {
  */
 export type Handle = (input: {
 	event: RequestEvent;
-	resolve(event: RequestEvent, opts?: ResolveOptions): MaybePromise<Response>;
+	resolve: (event: RequestEvent, opts?: ResolveOptions) => MaybePromise<Response>;
 }) => MaybePromise<Response>;
 
 /**
@@ -863,14 +893,14 @@ export interface LoadEvent<
 	 *
 	 * `setHeaders` has no effect when a `load` function runs in the browser.
 	 */
-	setHeaders(headers: Record<string, string>): void;
+	setHeaders: (headers: Record<string, string>) => void;
 	/**
 	 * `await parent()` returns data from parent `+layout.js` `load` functions.
 	 * Implicitly, a missing `+layout.js` is treated as a `({ data }) => data` function, meaning that it will return and forward data from parent `+layout.server.js` files.
 	 *
 	 * Be careful not to introduce accidental waterfalls when using `await parent()`. If for example you only want to merge parent data into the returned output, call it _after_ fetching your other data.
 	 */
-	parent(): Promise<ParentData>;
+	parent: () => Promise<ParentData>;
 	/**
 	 * This function declares that the `load` function has a _dependency_ on one or more URLs or custom identifiers, which can subsequently be used with [`invalidate()`](https://svelte.dev/docs/kit/$app-navigation#invalidate) to cause `load` to rerun.
 	 *
@@ -908,7 +938,7 @@ export interface LoadEvent<
 	 * <button on:click={increase}>Increase Count</button>
 	 * ```
 	 */
-	depends(...deps: Array<`${string}:${string}`>): void;
+	depends: (...deps: Array<`${string}:${string}`>) => void;
 	/**
 	 * Use this function to opt out of dependency tracking for everything that is synchronously called within the callback. Example:
 	 *
@@ -922,7 +952,7 @@ export interface LoadEvent<
 	 * }
 	 * ```
 	 */
-	untrack<T>(fn: () => T): T;
+	untrack: <T>(fn: () => T) => T;
 }
 
 export interface NavigationEvent<
@@ -1017,7 +1047,7 @@ export interface BeforeNavigate extends Navigation {
 	/**
 	 * Call this to prevent the navigation from starting.
 	 */
-	cancel(): void;
+	cancel: () => void;
 }
 
 /**
@@ -1131,7 +1161,7 @@ export interface RequestEvent<
 	/**
 	 * The client's IP address, set by the adapter.
 	 */
-	getClientAddress(): string;
+	getClientAddress: () => string;
 	/**
 	 * Contains custom data that was added to the request within the [`server handle hook`](https://svelte.dev/docs/kit/hooks#Server-hooks-handle).
 	 */
@@ -1179,7 +1209,7 @@ export interface RequestEvent<
 	 *
 	 * You cannot add a `set-cookie` header with `setHeaders` — use the [`cookies`](https://svelte.dev/docs/kit/@sveltejs-kit#Cookies) API instead.
 	 */
-	setHeaders(headers: Record<string, string>): void;
+	setHeaders: (headers: Record<string, string>) => void;
 	/**
 	 * The requested URL.
 	 */
@@ -1212,20 +1242,20 @@ export interface ResolveOptions {
 	 * but they will always be split at sensible boundaries such as `%sveltekit.head%` or layout/page components.
 	 * @param input the html chunk and the info if this is the last chunk
 	 */
-	transformPageChunk?(input: { html: string; done: boolean }): MaybePromise<string | undefined>;
+	transformPageChunk?: (input: { html: string; done: boolean }) => MaybePromise<string | undefined>;
 	/**
 	 * Determines which headers should be included in serialized responses when a `load` function loads a resource with `fetch`.
 	 * By default, none will be included.
 	 * @param name header name
 	 * @param value header value
 	 */
-	filterSerializedResponseHeaders?(name: string, value: string): boolean;
+	filterSerializedResponseHeaders?: (name: string, value: string) => boolean;
 	/**
 	 * Determines what should be added to the `<head>` tag to preload it.
 	 * By default, `js` and `css` files will be preloaded.
 	 * @param input the type of the file and its path
 	 */
-	preload?(input: { type: 'font' | 'css' | 'js' | 'asset'; path: string }): boolean;
+	preload?: (input: { type: 'font' | 'css' | 'js' | 'asset'; path: string }) => boolean;
 }
 
 export interface RouteDefinition<Config = any> {
@@ -1267,7 +1297,7 @@ export interface SSRManifest {
 		client: NonNullable<BuildData['client']>;
 		nodes: SSRNodeLoader[];
 		routes: SSRRoute[];
-		matchers(): Promise<Record<string, ParamMatcher>>;
+		matchers: () => Promise<Record<string, ParamMatcher>>;
 		/** A `[file]: size` map of all assets imported by server code */
 		server_assets: Record<string, number>;
 	};
@@ -1294,7 +1324,7 @@ export interface ServerLoadEvent<
 	 *
 	 * Be careful not to introduce accidental waterfalls when using `await parent()`. If for example you only want to merge parent data into the returned output, call it _after_ fetching your other data.
 	 */
-	parent(): Promise<ParentData>;
+	parent: () => Promise<ParentData>;
 	/**
 	 * This function declares that the `load` function has a _dependency_ on one or more URLs or custom identifiers, which can subsequently be used with [`invalidate()`](https://svelte.dev/docs/kit/$app-navigation#invalidate) to cause `load` to rerun.
 	 *
@@ -1332,7 +1362,7 @@ export interface ServerLoadEvent<
 	 * <button on:click={increase}>Increase Count</button>
 	 * ```
 	 */
-	depends(...deps: string[]): void;
+	depends: (...deps: string[]) => void;
 	/**
 	 * Use this function to opt out of dependency tracking for everything that is synchronously called within the callback. Example:
 	 *
@@ -1346,7 +1376,7 @@ export interface ServerLoadEvent<
 	 * }
 	 * ```
 	 */
-	untrack<T>(fn: () => T): T;
+	untrack: <T>(fn: () => T) => T;
 }
 
 /**
@@ -1417,7 +1447,7 @@ export type SubmitFunction<
 	formElement: HTMLFormElement;
 	controller: AbortController;
 	submitter: HTMLElement | null;
-	cancel(): void;
+	cancel: () => void;
 }) => MaybePromise<
 	| void
 	| ((opts: {
@@ -1430,7 +1460,7 @@ export type SubmitFunction<
 			 * @param options Set `reset: false` if you don't want the `<form>` values to be reset after a successful submission.
 			 * @param invalidateAll Set `invalidateAll: false` if you don't want the action to call `invalidateAll` after submission.
 			 */
-			update(options?: { reset?: boolean; invalidateAll?: boolean }): Promise<void>;
+			update: (options?: { reset?: boolean; invalidateAll?: boolean }) => Promise<void>;
 	  }) => void)
 >;
 

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

@@ -3,6 +3,7 @@ import { mkdirp } from '../../../utils/filesystem.js';
 import { find_deps, resolve_symlinks } from './utils.js';
 import { s } from '../../../utils/misc.js';
 import { normalizePath } from 'vite';
+import { basename } from 'node:path';
 
 /**
  * @param {string} out
@@ -17,18 +18,47 @@ export function build_server_nodes(out, kit, manifest_data, server_manifest, cli
 	mkdirp(`${out}/server/nodes`);
 	mkdirp(`${out}/server/stylesheets`);
 
+	/** @type {Map<string, string>} */
 	const stylesheet_lookup = new Map();
 
 	if (css) {
-		css.forEach((asset) => {
-			if (asset.source.length < kit.inlineStyleThreshold) {
-				const index = stylesheet_lookup.size;
-				const file = `${out}/server/stylesheets/${index}.js`;
+		/** @type {Set<string>} */
+		const client_stylesheets = new Set();
+		for (const key in client_manifest) {
+			const file = client_manifest[key];
+			if (file.css?.[0]) {
+				client_stylesheets.add(file.css[0]);
+			}
+		}
+
+		/** @type {Map<number, string>} */
+		const server_stylesheets = new Map();
+
+		const component_stylesheet_map = new Map(Object.values(server_manifest).map((file) => [file.src, file.css?.[0]]));
 
-				fs.writeFileSync(file, `// ${asset.fileName}\nexport default ${s(asset.source)};`);
-				stylesheet_lookup.set(asset.fileName, index);
+		manifest_data.nodes.forEach((node, i) => {
+			const server_stylesheet = component_stylesheet_map.get(node.component);
+			if (node.component && server_stylesheet) {
+				server_stylesheets.set(i, server_stylesheet);
 			}
 		});
+
+		// ignore dynamically imported stylesheets since we can't inline those
+		css.filter(asset => client_stylesheets.has(asset.fileName))
+			.forEach((asset) => {
+				if (asset.source.length < kit.inlineStyleThreshold) {
+					const [index] = basename(asset.fileName).split('.');
+					const server_stylesheet = server_stylesheets.get(+index);
+					const file = `${out}/server/stylesheets/${index}.js`;
+
+					// we need to inline the server stylesheet instead of the client one
+					// so that asset paths are correct on document load
+					const source = fs.readFileSync(`${out}/server/${server_stylesheet}`, 'utf-8');
+
+					fs.writeFileSync(file, `// ${server_stylesheet}\nexport default ${s(source)};`);
+					stylesheet_lookup.set(asset.fileName, index);
+				}
+			});
 	}
 
 	manifest_data.nodes.forEach((node, i) => {
@@ -59,13 +89,19 @@ export function build_server_nodes(out, kit, manifest_data, server_manifest, cli
 		}
 
 		if (node.universal) {
-			imports.push(`import * as universal from '../${server_manifest[node.universal].file}';`);
+			imports.push(
+				`import * as universal from '../${
+					resolve_symlinks(server_manifest, node.universal).chunk.file
+				}';`
+			);
 			exports.push('export { universal };');
 			exports.push(`export const universal_id = ${s(node.universal)};`);
 		}
 
 		if (node.server) {
-			imports.push(`import * as server from '../${server_manifest[node.server].file}';`);
+			imports.push(
+				`import * as server from '../${resolve_symlinks(server_manifest, node.server).chunk.file}';`
+			);
 			exports.push('export { server };');
 			exports.push(`export const server_id = ${s(node.server)};`);
 		}

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

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import * as vite from 'vite';
 import { dedent } from '../../../core/sync/utils.js';
 import { s } from '../../../utils/misc.js';
-import { get_config_aliases, strip_virtual_prefix, get_env } from '../utils.js';
+import { get_config_aliases, strip_virtual_prefix, get_env, normalize_id } from '../utils.js';
 import { create_static_module } from '../../../core/env.js';
 import { env_static_public, service_worker } from '../module_ids.js';
 
@@ -68,7 +68,8 @@ export async function build_service_worker(
 		name: 'service-worker-build-virtual-modules',
 		resolveId(id) {
 			if (id.startsWith('$env/') || id.startsWith('$app/') || id === '$service-worker') {
-				return `\0virtual:${id}`;
+				// ids with :$ don't work with reverse proxies like nginx
+				return `\0virtual:${id.substring(1)}`;
 			}
 		},
 
@@ -83,7 +84,10 @@ export async function build_service_worker(
 				return create_static_module('$env/static/public', env.public);
 			}
 
-			const stripped = strip_virtual_prefix(id);
+			const normalized_cwd = vite.normalizePath(process.cwd());
+			const normalized_lib = vite.normalizePath(kit.files.lib);
+			const relative = normalize_id(id, normalized_lib, normalized_cwd);
+			const stripped = strip_virtual_prefix(relative);
 			throw new Error(
 				`Cannot import ${stripped} into service-worker code. Only the modules $service-worker and $env/static/public are available in service workers.`
 			);

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

@@ -462,7 +462,7 @@ export async function dev(vite, vite_config, svelte_config) {
 						res.writeHead(200, {
 							'content-type': 'application/javascript'
 						});
-						res.end(`import '${to_fs(resolved)}';`);
+						res.end(`import '${svelte_config.kit.paths.base}${to_fs(resolved)}';`);
 					} else {
 						res.writeHead(404);
 						res.end('not found');

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

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { posixify } from '../../../utils/filesystem.js';
-import { strip_virtual_prefix } from '../utils.js';
+import { normalize_id, strip_virtual_prefix } from '../utils.js';
 import { app_server, env_dynamic_private, env_static_private } from '../module_ids.js';
 
 const ILLEGAL_IMPORTS = new Set([env_dynamic_private, env_static_private, app_server]);
@@ -85,25 +85,3 @@ export function module_guard(context, { cwd, lib }) {
 		}
 	};
 }
-
-/**
- * Removes cwd/lib path from the start of the id
- * @param {string} id
- * @param {string} lib
- * @param {string} cwd
- */
-export function normalize_id(id, lib, cwd) {
-	if (id.startsWith(lib)) {
-		id = id.replace(lib, '$lib');
-	}
-
-	if (id.startsWith(cwd)) {
-		id = path.relative(cwd, id);
-	}
-
-	if (id === app_server) {
-		return '$app/server';
-	}
-
-	return posixify(id);
-}