@sveltejs/kit 1.27.2 → 1.27.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.27.2",
+  "version": "1.27.4",
   "description": "The fastest way to build Svelte apps",
   "repository": {
     "type": "git",
@@ -11,7 +11,7 @@
   "homepage": "https://kit.svelte.dev",
   "type": "module",
   "dependencies": {
-    "@sveltejs/vite-plugin-svelte": "^2.4.1",
+    "@sveltejs/vite-plugin-svelte": "^2.5.0",
     "@types/cookie": "^0.5.1",
     "cookie": "^0.5.0",
     "devalue": "^4.3.1",
@@ -33,7 +33,7 @@
     "@types/set-cookie-parser": "^2.4.2",
     "dts-buddy": "^0.2.4",
     "marked": "^9.0.0",
-    "rollup": "^3.7.0",
+    "rollup": "^3.29.4",
     "svelte": "^4.2.2",
     "svelte-preprocess": "^5.0.4",
     "typescript": "^4.9.4",
@@ -41,7 +41,7 @@
     "vitest": "^0.34.5"
   },
   "peerDependencies": {
-    "svelte": "^3.54.0 || ^4.0.0-next.0",
+    "svelte": "^3.54.0 || ^4.0.0-next.0 || ^5.0.0-next.0",
     "vite": "^4.0.0"
   },
   "bin": {

package/src/core/adapt/builder.js

@@ -24,6 +24,7 @@ const extensions = ['.html', '.js', '.mjs', '.json', '.css', '.svg', '.xml', '.w
  *   prerendered: import('types').Prerendered;
  *   prerender_map: import('types').PrerenderMap;
  *   log: import('types').Logger;
+ *   vite_config: import('vite').ResolvedConfig;
  * }} opts
  * @returns {import('@sveltejs/kit').Builder}
  */
@@ -34,7 +35,8 @@ export function create_builder({
 	route_data,
 	prerendered,
 	prerender_map,
-	log
+	log,
+	vite_config
 }) {
 	/** @type {Map<import('@sveltejs/kit').RouteDefinition, import('types').RouteData>} */
 	const lookup = new Map();
@@ -144,7 +146,7 @@ export function create_builder({
 
 		async generateFallback(dest) {
 			const manifest_path = `${config.kit.outDir}/output/server/manifest-full.js`;
-			const env = get_env(config.kit.env, 'production');
+			const env = get_env(config.kit.env, vite_config.mode);
 
 			const fallback = await generate_fallback({
 				manifest_path,

package/src/core/adapt/index.js

@@ -8,8 +8,17 @@ import { create_builder } from './builder.js';
  * @param {import('types').Prerendered} prerendered
  * @param {import('types').PrerenderMap} prerender_map
  * @param {import('types').Logger} log
+ * @param {import('vite').ResolvedConfig} vite_config
  */
-export async function adapt(config, build_data, server_metadata, prerendered, prerender_map, log) {
+export async function adapt(
+	config,
+	build_data,
+	server_metadata,
+	prerendered,
+	prerender_map,
+	log,
+	vite_config
+) {
 	const { name, adapt } = config.kit.adapter;
 
 	console.log(colors.bold().cyan(`\n> Using ${name}`));
@@ -21,8 +30,10 @@ export async function adapt(config, build_data, server_metadata, prerendered, pr
 		route_data: build_data.manifest_data.routes.filter((route) => route.page || route.endpoint),
 		prerendered,
 		prerender_map,
-		log
+		log,
+		vite_config
 	});
+
 	await adapt(builder);
 
 	log.success('done');

package/src/core/sync/utils.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { VERSION } from 'svelte/compiler';
 import { mkdirp } from '../../utils/filesystem.js';
 
 /** @type {Map<string, string>} */
@@ -68,3 +69,7 @@ export function dedent(strings, ...values) {
 
 	return str;
 }
+
+export function isSvelte5Plus() {
+	return Number(VERSION[0]) >= 5;
+}

package/src/core/sync/write_client_manifest.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { relative_path, resolve_entry } from '../../utils/filesystem.js';
 import { s } from '../../utils/misc.js';
-import { dedent, write_if_changed } from './utils.js';
+import { dedent, isSvelte5Plus, write_if_changed } from './utils.js';
 import colors from 'kleur';
 
 /**
@@ -143,7 +143,7 @@ export function write_client_manifest(kit, manifest_data, output, metadata) {
 				}(({ error }) => { console.error(error) }),
 			};
 
-			export { default as root } from '../root.svelte';
+			export { default as root } from '../root.${isSvelte5Plus() ? 'js' : 'svelte'}';
 		`
 	);
 

package/src/core/sync/write_root.js

@@ -1,4 +1,4 @@
-import { dedent, write_if_changed } from './utils.js';
+import { dedent, isSvelte5Plus, write_if_changed } from './utils.js';
 
 /**
  * @param {import('types').ManifestData} manifest_data
@@ -89,4 +89,15 @@ export function write_root(manifest_data, output) {
 			{/if}
 		`
 	);
+
+	if (isSvelte5Plus()) {
+		write_if_changed(
+			`${output}/root.js`,
+			dedent`
+			import { asClassComponent } from 'svelte/legacy';
+			import Root from './root.svelte';
+			export default asClassComponent(Root);
+		`
+		);
+	}
 }

package/src/core/sync/write_server.js

@@ -4,7 +4,7 @@ import { posixify, resolve_entry } from '../../utils/filesystem.js';
 import { s } from '../../utils/misc.js';
 import { load_error_page, load_template } from '../config/index.js';
 import { runtime_directory } from '../utils.js';
-import { write_if_changed } from './utils.js';
+import { isSvelte5Plus, write_if_changed } from './utils.js';
 import colors from 'kleur';
 
 /**
@@ -25,7 +25,7 @@ const server_template = ({
 	template,
 	error_page
 }) => `
-import root from '../root.svelte';
+import root from '../root.${isSvelte5Plus() ? 'js' : 'svelte'}';
 import { set_building } from '__sveltekit/environment';
 import { set_assets } from '__sveltekit/paths';
 import { set_private_env, set_public_env } from '${runtime_directory}/shared-server.js';

package/src/exports/vite/index.js

@@ -24,7 +24,7 @@ import prerender from '../../core/postbuild/prerender.js';
 import analyse from '../../core/postbuild/analyse.js';
 import { s } from '../../utils/misc.js';
 import { hash } from '../../runtime/hash.js';
-import { dedent } from '../../core/sync/utils.js';
+import { dedent, isSvelte5Plus } from '../../core/sync/utils.js';
 
 export { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
@@ -136,7 +136,7 @@ export async function sveltekit() {
 		onwarn: svelte_config.onwarn,
 		compilerOptions: {
 			// @ts-expect-error SvelteKit requires hydratable true by default
-			hydratable: true,
+			hydratable: isSvelte5Plus() ? undefined : true,
 			...svelte_config.compilerOptions
 		},
 		...svelte_config.vitePlugin
@@ -807,7 +807,15 @@ function kit({ svelte_config }) {
 
 					if (kit.adapter) {
 						const { adapt } = await import('../../core/adapt/index.js');
-						await adapt(svelte_config, build_data, metadata, prerendered, prerender_map, log);
+						await adapt(
+							svelte_config,
+							build_data,
+							metadata,
+							prerendered,
+							prerender_map,
+							log,
+							vite_config
+						);
 					} else {
 						console.log(colors.bold().yellow('\nNo adapter specified'));
 

package/src/runtime/client/types.d.ts

@@ -90,7 +90,8 @@ export type NavigationFinished = {
 	type: 'loaded';
 	state: NavigationState;
 	props: {
-		components: Array<typeof SvelteComponent>;
+		constructors: Array<typeof SvelteComponent>;
+		components?: Array<SvelteComponent>;
 		page?: Page;
 		form?: Record<string, any> | null;
 		[key: `data_${number}`]: Record<string, any>;

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

@@ -99,7 +99,7 @@ export async function render_page(event, page, options, manifest, state, resolve
 		/** @type {import('./types').Fetched[]} */
 		const fetched = [];
 
-		if (get_option(nodes, 'ssr') === false) {
+		if (get_option(nodes, 'ssr') === false && !state.prerendering) {
 			return await render_response({
 				branch: [],
 				fetched,

package/src/version.js

@@ -1,4 +1,4 @@
 // generated during release, do not modify
 
 /** @type {string} */
-export const VERSION = '1.27.2';
+export const VERSION = '1.27.4';