@sveltejs/kit 2.63.1 → 2.65.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "2.63.1",
+  "version": "2.65.0",
   "description": "SvelteKit is the fastest way to build Svelte apps",
   "keywords": [
     "framework",
@@ -41,7 +41,7 @@
     "dts-buddy": "^0.8.0",
     "jsdom": "^26.1.0",
     "rollup": "^4.59.0",
-    "svelte": "^5.55.7",
+    "svelte": "^5.56.3",
     "typescript": "^5.3.3",
     "vite": "^6.4.2",
     "vitest": "^4.1.7"

package/src/core/postbuild/analyse.js

@@ -11,7 +11,6 @@ import { has_server_load, resolve_route } from '../../utils/routing.js';
 import { check_feature } from '../../utils/features.js';
 import { createReadableStream } from '@sveltejs/kit/node';
 import { PageNodes } from '../../utils/page_nodes.js';
-import { build_server_nodes } from '../../exports/vite/build/build_server.js';
 
 export default forked(import.meta.url, analyse);
 
@@ -34,7 +33,6 @@ async function analyse({
 	server_manifest,
 	tracked_features,
 	env,
-	out,
 	remotes
 }) {
 	/** @type {import('@sveltejs/kit').SSRManifest} */
@@ -64,9 +62,6 @@ async function analyse({
 	internal.set_manifest(manifest);
 	internal.set_read_implementation((file) => createReadableStream(`${server_root}/server/${file}`));
 
-	// first, build server nodes without the client manifest so we can analyse it
-	build_server_nodes(out, config, manifest_data, server_manifest, null, null, null);
-
 	/** @type {import('types').ServerMetadata} */
 	const metadata = {
 		nodes: [],

package/src/core/postbuild/prerender.js

@@ -204,6 +204,8 @@ async function prerender({ hash, out, manifest_path, metadata, verbose, env }) {
 
 	const seen = new Set();
 	const written = new Set();
+
+	/** @type {Map<string, Promise<any>>} */
 	const remote_responses = new Map();
 
 	/** @type {Map<string, Set<string>>} */

package/src/exports/public.d.ts

@@ -1696,7 +1696,7 @@ export interface SSRManifest {
 
 	/** private fields */
 	_: {
-		client: NonNullable<BuildData['client']>;
+		client: BuildData['client'];
 		nodes: SSRNodeLoader[];
 		/** hashed filename -> import to that file */
 		remotes: Record<string, () => Promise<any>>;

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

@@ -15,36 +15,14 @@ import { basename } from 'node:path';
 import { fix_css_urls } from '../../../utils/css.js';
 import { escape_for_interpolation } from '../../../utils/escape.js';
 
-/**
- * @overload Build without the client manifest so we can analyse the nodes.
- * @param {string} out
- * @param {ValidatedKitConfig} kit
- * @param {ManifestData} manifest_data
- * @param {Manifest} server_manifest
- * @param {null} client_manifest
- * @param {null} assets_path
- * @param {null} client_chunks
- * @returns {void}
- */
-/**
- * @overload Or build with the client manifest
- * @param {string} out
- * @param {ValidatedKitConfig} kit
- * @param {ManifestData} manifest_data
- * @param {Manifest} server_manifest
- * @param {Manifest} client_manifest
- * @param {string} assets_path
- * @param {Rollup.RollupOutput['output']} client_chunks
- * @returns {void}
- */
 /**
  * @param {string} out
  * @param {ValidatedKitConfig} kit
  * @param {ManifestData} manifest_data
  * @param {Manifest} server_manifest
  * @param {Manifest | null} client_manifest
- * @param {string | null} assets_path
- * @param {Rollup.RollupOutput['output'] | null} client_chunks
+ * @param {string} assets_path
+ * @param {(Rollup.OutputAsset | Rollup.OutputChunk)[]} chunks
  * @returns {void}
  */
 export function build_server_nodes(
@@ -54,7 +32,7 @@ export function build_server_nodes(
 	server_manifest,
 	client_manifest,
 	assets_path,
-	client_chunks
+	chunks
 ) {
 	mkdirp(`${out}/server/nodes`);
 	mkdirp(`${out}/server/stylesheets`);
@@ -72,8 +50,8 @@ export function build_server_nodes(
 	 */
 	let prepare_css_for_inlining = (css) => s(css);
 
-	if (client_chunks && kit.inlineStyleThreshold > 0 && kit.output.bundleStrategy === 'split') {
-		for (const chunk of client_chunks) {
+	if (chunks && kit.inlineStyleThreshold > 0 && kit.output.bundleStrategy === 'split') {
+		for (const chunk of chunks) {
 			if (chunk.type !== 'asset' || !chunk.fileName.endsWith('.css')) {
 				continue;
 			}
@@ -129,6 +107,9 @@ export function build_server_nodes(
 		}
 	}
 
+	/** path to the `.svelte-kit` directory */
+	const out_dir = normalizePath(kit.outDir);
+
 	for (let i = 0; i < manifest_data.nodes.length; i++) {
 		const node = manifest_data.nodes[i];
 
@@ -152,7 +133,11 @@ export function build_server_nodes(
 		/** @type {Set<string>} */
 		const eager_assets = new Set();
 
-		if (node.component && client_manifest) {
+		const uses_server_component = node.child_pages
+			? node.child_pages.some((child) => child.page_options?.ssr !== false)
+			: node.page_options?.ssr !== false;
+
+		if (node.component && uses_server_component) {
 			exports.push(
 				'let component_cache;',
 				`export const component = async () => component_cache ??= (await import('../${
@@ -182,18 +167,7 @@ export function build_server_nodes(
 			exports.push(`export const server_id = ${s(node.server)};`);
 		}
 
-		if (
-			client_manifest &&
-			(node.universal || node.component) &&
-			kit.output.bundleStrategy === 'split'
-		) {
-			const entry_path = `${normalizePath(kit.outDir)}/generated/client-optimized/nodes/${i}.js`;
-			const entry = find_deps(client_manifest, entry_path, true);
-
-			// Eagerly load client stylesheets and fonts imported by the SSR-ed page to avoid FOUC.
-			// However, if it is not used during SSR (not present in the server manifest),
-			// then it can be lazily loaded in the browser.
-
+		if ((node.universal || node.component) && kit.output.bundleStrategy === 'split') {
 			/** @type {AssetDependencies | undefined} */
 			let component;
 			if (node.component) {
@@ -206,25 +180,41 @@ export function build_server_nodes(
 				universal = find_deps(server_manifest, node.universal, true);
 			}
 
-			/** @type {Set<string>} */
-			const eager_css = new Set();
+			if (client_manifest) {
+				const entry_path = `${out_dir}/generated/client-optimized/nodes/${i}.js`;
+				const entry = find_deps(client_manifest, entry_path, true);
 
-			entry.stylesheet_map.forEach((value, filepath) => {
-				// pages and layouts are renamed to node indexes when optimised for the client
-				// so we use the original filename instead to check against the server manifest
-				if (filepath === entry_path) {
-					filepath = node.component ?? filepath;
-				}
+				// Eagerly load client stylesheets and fonts imported by the SSR-ed page to avoid FOUC.
+				// However, if it is not used during SSR (not present in the server manifest),
+				// then it can be lazily loaded in the browser.
 
-				if (component?.stylesheet_map.has(filepath) || universal?.stylesheet_map.has(filepath)) {
-					value.css.forEach((file) => eager_css.add(file));
-					value.assets.forEach((file) => eager_assets.add(file));
-				}
-			});
+				/** @type {Set<string>} */
+				const eager_css = new Set();
+
+				entry.stylesheet_map.forEach((value, filepath) => {
+					// pages and layouts are renamed to node indexes when optimised for the client
+					// so we use the original filename instead to check against the server manifest
+					if (filepath === entry_path) {
+						filepath = node.component ?? filepath;
+					}
+
+					if (component?.stylesheet_map.has(filepath) || universal?.stylesheet_map.has(filepath)) {
+						value.css.forEach((file) => eager_css.add(file));
+						value.assets.forEach((file) => eager_assets.add(file));
+					}
+				});
 
-			imported = entry.imports;
-			stylesheets = Array.from(eager_css);
-			fonts = filter_fonts(Array.from(eager_assets));
+				imported = entry.imports;
+				stylesheets = Array.from(eager_css);
+				fonts = filter_fonts(Array.from(eager_assets));
+			} else {
+				for (const entry of [component, universal]) {
+					if (!entry) continue;
+					imported.push(...entry.imports);
+					stylesheets.push(...entry.stylesheets);
+					fonts.push(...entry.fonts);
+				}
+			}
 		}
 
 		exports.push(
@@ -241,7 +231,7 @@ export function build_server_nodes(
 
 		// Keep track of Vite asset filenames so that we avoid touching unrelated ones
 		// when adjusting the inlined CSS
-		if (stylesheets_to_inline.size && assets_path && eager_assets.size) {
+		if (stylesheets_to_inline.size && eager_assets.size) {
 			vite_assets = new Set(
 				Array.from(eager_assets).map((asset) => {
 					return decodeURIComponent(asset.replace(`${assets_path}/`, ''));

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

@@ -122,14 +122,6 @@ export function filter_fonts(assets) {
 	return assets.filter((asset) => /\.(woff2?|ttf|otf)$/.test(asset));
 }
 
-/**
- * @param {import('types').ValidatedKitConfig} config
- * @returns {string}
- */
-export function assets_base(config) {
-	return (config.paths.assets || config.paths.base || '.') + '/';
-}
-
 /**
  * Writes a function with arguments used by a template literal.
  * This helps us store strings in a module and inject values at runtime.