@sveltejs/kit 1.0.0-next.392 → 1.0.0-next.393

package/assets/client/start.js

@@ -569,6 +569,9 @@ function create_client({ target, session, base, trailing_slash }) {
 		if (!ready) return;
 		session_id += 1;
 
+		const current_load_uses_session = current.branch.some((node) => node?.uses.session);
+		if (!current_load_uses_session) return;
+
 		update(new URL(location.href), [], true);
 	});
 	ready = true;
@@ -876,8 +879,11 @@ function create_client({ target, session, base, trailing_slash }) {
 		};
 
 		for (let i = 0; i < filtered.length; i += 1) {
-			const loaded = filtered[i].loaded;
-			result.props[`props_${i}`] = loaded ? await loaded.props : null;
+			// Only set props if the node actually updated. This prevents needless rerenders.
+			if (!current.branch.some((node) => node === filtered[i])) {
+				const loaded = filtered[i].loaded;
+				result.props[`props_${i}`] = loaded ? await loaded.props : null;
+			}
 		}
 
 		const page_changed =

package/dist/cli.js

@@ -18,7 +18,7 @@ function handle_error(e) {
 	process.exit(1);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.392');
+const prog = sade('svelte-kit').version('1.0.0-next.393');
 
 prog
 	.command('package')

package/dist/vite.js

@@ -38,15 +38,22 @@ import 'node:path';
 import 'crypto';
 
 /**
+ * @param {import('vite').ResolvedConfig} config
  * @param {import('vite').ConfigEnv} config_env
  * @return {Promise<import('vite').UserConfig>}
  */
-async function get_vite_config(config_env) {
-	const config = (await loadConfigFromFile(config_env))?.config;
-	if (!config) {
+async function get_vite_config(config, config_env) {
+	const loaded = await loadConfigFromFile(
+		config_env,
+		config.configFile,
+		undefined,
+		config.logLevel
+	);
+
+	if (!loaded) {
 		throw new Error('Could not load Vite config');
 	}
-	return { ...config, mode: config_env.mode };
+	return { ...loaded.config, mode: config_env.mode };
 }
 
 /**
@@ -436,6 +443,7 @@ export class Server {
  * @param {{
  *   cwd: string;
  *   config: import('types').ValidatedConfig;
+ *   vite_config: import('vite').ResolvedConfig;
  *   vite_config_env: import('vite').ConfigEnv;
  *   manifest_data: import('types').ManifestData;
  *   build_dir: string;
@@ -448,6 +456,7 @@ async function build_server(options, client) {
 	const {
 		cwd,
 		config,
+		vite_config,
 		vite_config_env,
 		manifest_data,
 		build_dir,
@@ -512,11 +521,9 @@ async function build_server(options, client) {
 		})
 	);
 
-	const vite_config = await get_vite_config(vite_config_env);
-
 	const merged_config = merge_vite_configs(
 		get_default_config({ config, input, ssr: true, outDir: `${output_dir}/server` }),
-		vite_config
+		await get_vite_config(vite_config, vite_config_env)
 	);
 
 	remove_svelte_kit(merged_config);
@@ -613,6 +620,7 @@ function get_methods(cwd, output, manifest_data) {
 /**
  * @param {{
  *   config: import('types').ValidatedConfig;
+ *   vite_config: import('vite').ResolvedConfig;
  *   vite_config_env: import('vite').ConfigEnv;
  *   manifest_data: import('types').ManifestData;
  *   output_dir: string;
@@ -622,7 +630,7 @@ function get_methods(cwd, output, manifest_data) {
  * @param {import('vite').Manifest} client_manifest
  */
 async function build_service_worker(
-	{ config, vite_config_env, manifest_data, output_dir, service_worker_entry_file },
+	{ config, vite_config, vite_config_env, manifest_data, output_dir, service_worker_entry_file },
 	prerendered,
 	client_manifest
 ) {
@@ -669,8 +677,7 @@ async function build_service_worker(
 			.trim()
 	);
 
-	const vite_config = await get_vite_config(vite_config_env);
-	const merged_config = merge_vite_configs(vite_config, {
+	const merged_config = merge_vite_configs(await get_vite_config(vite_config, vite_config_env), {
 		base: assets_base(config.kit),
 		build: {
 			lib: {
@@ -3109,6 +3116,7 @@ function kit() {
 			const options = {
 				cwd,
 				config: svelte_config,
+				vite_config,
 				vite_config_env,
 				build_dir: paths.build_dir, // TODO just pass `paths`
 				manifest_data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.392",
+  "version": "1.0.0-next.393",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",