@sveltejs/kit 1.0.0-next.291 → 1.0.0-next.294

package/assets/client/start.js

@@ -1,6 +1,6 @@
 import { onMount, tick } from 'svelte';
 import { writable } from 'svelte/store';
-import { base, set_paths } from '../paths.js';
+import { assets, set_paths } from '../paths.js';
 import Root from '__GENERATED__/root.svelte';
 import { routes, fallback } from '__GENERATED__/manifest.js';
 import { init } from './singletons.js';
@@ -198,7 +198,7 @@ function create_updated_store() {
 
 		const file = import.meta.env.VITE_SVELTEKIT_APP_VERSION_FILE;
 
-		const res = await fetch(`${base}/${file}`, {
+		const res = await fetch(`${assets}/${file}`, {
 			headers: {
 				pragma: 'no-cache',
 				'cache-control': 'no-cache'
@@ -421,7 +421,7 @@ function create_client({ target, session, base, trailing_slash }) {
 	 * @param {import('./types').NavigationIntent} intent
 	 * @param {string[]} redirect_chain
 	 * @param {boolean} no_cache
-	 * @param {{hash?: string, scroll: { x: number, y: number } | null, keepfocus: boolean}} [opts]
+	 * @param {{hash?: string, scroll: { x: number, y: number } | null, keepfocus: boolean, details: { replaceState: boolean, state: any } | null}} [opts]
 	 */
 	async function update(intent, redirect_chain, no_cache, opts) {
 		const current_token = (token = {});
@@ -478,6 +478,13 @@ function create_client({ target, session, base, trailing_slash }) {
 
 		updating = true;
 
+		if (opts && opts.details) {
+			const { details } = opts;
+			const change = details.replaceState ? 0 : 1;
+			details.state[INDEX_KEY] = current_history_index += change;
+			history[details.replaceState ? 'replaceState' : 'pushState'](details.state, '', intent.url);
+		}
+
 		if (started) {
 			current = navigation_result.state;
 
@@ -794,7 +801,7 @@ function create_client({ target, session, base, trailing_slash }) {
 			if (cached) return cached;
 		}
 
-		const [pattern, a, b, get_params, has_shadow] = route;
+		const [pattern, a, b, get_params, shadow_key] = route;
 		const params = get_params
 			? // the pattern is for the route which we've already matched to this path
 			  get_params(/** @type {RegExpExecArray}  */ (pattern.exec(path)))
@@ -845,18 +852,23 @@ function create_client({ target, session, base, trailing_slash }) {
 					/** @type {Record<string, any>} */
 					let props = {};
 
-					const is_shadow_page = has_shadow && i === a.length - 1;
+					const is_shadow_page = shadow_key !== undefined && i === a.length - 1;
 
 					if (is_shadow_page) {
 						const res = await fetch(
 							`${url.pathname}${url.pathname.endsWith('/') ? '' : '/'}__data.json${url.search}`,
 							{
 								headers: {
-									'x-sveltekit-load': 'true'
+									'x-sveltekit-load': /** @type {string} */ (shadow_key)
 								}
 							}
 						);
 
+						if (res.status === 204) {
+							// fallthrough
+							return;
+						}
+
 						if (res.ok) {
 							const redirect = res.headers.get('x-sveltekit-location');
 
@@ -1105,7 +1117,8 @@ function create_client({ target, session, base, trailing_slash }) {
 
 		await update(intent, redirect_chain, false, {
 			scroll,
-			keepfocus
+			keepfocus,
+			details
 		});
 
 		navigating--;
@@ -1119,12 +1132,6 @@ function create_client({ target, session, base, trailing_slash }) {
 
 			stores.navigating.set(null);
 		}
-
-		if (details) {
-			const change = details.replaceState ? 0 : 1;
-			details.state[INDEX_KEY] = current_history_index += change;
-			history[details.replaceState ? 'replaceState' : 'pushState'](details.state, '', intent.url);
-		}
 	}
 
 	/**

package/assets/server/index.js

@@ -2184,12 +2184,16 @@ async function respond$1(opts) {
 
 	let page_config = get_page_config(leaf, options);
 
-	if (!leaf.prerender && state.prerender && !state.prerender.all) {
-		// if the page has `export const prerender = true`, continue,
-		// otherwise bail out at this point
-		return new Response(undefined, {
-			status: 204
-		});
+	if (state.prerender) {
+		// if the page isn't marked as prerenderable (or is explicitly
+		// marked NOT prerenderable, if `prerender.default` is `true`),
+		// then bail out at this point
+		const should_prerender = leaf.prerender ?? state.prerender.default;
+		if (!should_prerender) {
+			return new Response(undefined, {
+				status: 204
+			});
+		}
 	}
 
 	/** @type {Array<Loaded>} */
@@ -2637,7 +2641,17 @@ async function respond(request, options, state = {}) {
 					event.url = new URL(event.url.origin + normalized + event.url.search);
 				}
 
+				// `key` will be set if this request came from a client-side navigation
+				// to a page with a matching endpoint
+				const key = request.headers.get('x-sveltekit-load');
+
 				for (const route of options.manifest._.routes) {
+					if (key) {
+						// client is requesting data for a specific endpoint
+						if (route.type !== 'page') continue;
+						if (route.key !== key) continue;
+					}
+
 					const match = route.pattern.exec(decoded);
 					if (!match) continue;
 
@@ -2650,7 +2664,7 @@ async function respond(request, options, state = {}) {
 						response = await render_endpoint(event, await route.shadow());
 
 						// loading data for a client-side transition is a special case
-						if (request.headers.get('x-sveltekit-load') === 'true') {
+						if (key) {
 							if (response) {
 								// since redirects are opaque to the browser, we need to repackage
 								// 3xx responses as 200s with a custom header
@@ -2667,9 +2681,9 @@ async function respond(request, options, state = {}) {
 									}
 								}
 							} else {
-								// TODO ideally, the client wouldn't request this data
-								// in the first place (at least in production)
-								response = new Response('{}', {
+								// fallthrough
+								response = new Response(undefined, {
+									status: 204,
 									headers: {
 										'content-type': 'application/json'
 									}

package/dist/chunks/filesystem.js

@@ -0,0 +1,110 @@
+import fs__default from 'fs';
+import path__default from 'path';
+
+/** @param {string} dir */
+function mkdirp(dir) {
+	try {
+		fs__default.mkdirSync(dir, { recursive: true });
+	} catch (/** @type {any} */ e) {
+		if (e.code === 'EEXIST') return;
+		throw e;
+	}
+}
+
+/** @param {string} path */
+function rimraf(path) {
+	(fs__default.rmSync || fs__default.rmdirSync)(path, { recursive: true, force: true });
+}
+
+/**
+ * @param {string} source
+ * @param {string} target
+ * @param {{
+ *   filter?: (basename: string) => boolean;
+ *   replace?: Record<string, string>;
+ * }} opts
+ */
+function copy(source, target, opts = {}) {
+	if (!fs__default.existsSync(source)) return [];
+
+	/** @type {string[]} */
+	const files = [];
+
+	const prefix = posixify(target) + '/';
+
+	const regex = opts.replace
+		? new RegExp(`\\b(${Object.keys(opts.replace).join('|')})\\b`, 'g')
+		: null;
+
+	/**
+	 * @param {string} from
+	 * @param {string} to
+	 */
+	function go(from, to) {
+		if (opts.filter && !opts.filter(path__default.basename(from))) return;
+
+		const stats = fs__default.statSync(from);
+
+		if (stats.isDirectory()) {
+			fs__default.readdirSync(from).forEach((file) => {
+				go(path__default.join(from, file), path__default.join(to, file));
+			});
+		} else {
+			mkdirp(path__default.dirname(to));
+
+			if (opts.replace) {
+				const data = fs__default.readFileSync(from, 'utf-8');
+				fs__default.writeFileSync(
+					to,
+					data.replace(
+						/** @type {RegExp} */ (regex),
+						(match, key) => /** @type {Record<string, string>} */ (opts.replace)[key]
+					)
+				);
+			} else {
+				fs__default.copyFileSync(from, to);
+			}
+
+			files.push(to === target ? posixify(path__default.basename(to)) : posixify(to).replace(prefix, ''));
+		}
+	}
+
+	go(source, target);
+
+	return files;
+}
+
+/**
+ * Get a list of all files in a directory
+ * @param {string} cwd - the directory to walk
+ * @param {boolean} [dirs] - whether to include directories in the result
+ */
+function walk(cwd, dirs = false) {
+	/** @type {string[]} */
+	const all_files = [];
+
+	/** @param {string} dir */
+	function walk_dir(dir) {
+		const files = fs__default.readdirSync(path__default.join(cwd, dir));
+
+		for (const file of files) {
+			const joined = path__default.join(dir, file);
+			const stats = fs__default.statSync(path__default.join(cwd, joined));
+			if (stats.isDirectory()) {
+				if (dirs) all_files.push(joined);
+				walk_dir(joined);
+			} else {
+				all_files.push(joined);
+			}
+		}
+	}
+
+	return walk_dir(''), all_files;
+}
+
+/** @param {string} str */
+function posixify(str) {
+	return str.replace(/\\/g, '/');
+}
+
+export { copy as c, mkdirp as m, posixify as p, rimraf as r, walk as w };

package/dist/chunks/index.js

@@ -1,15 +1,16 @@
 import path__default from 'path';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import vite from 'vite';
-import { c as create_manifest_data, a as create_app, g as generate_tsconfig, d as deep_merge } from './tsconfig.js';
-import { g as get_runtime_path, r as resolve_entry, $, p as posixify, l as load_template, c as coalesce_to_error, a as get_mime_lookup, b as copy_assets, d as get_aliases, e as print_config_conflicts } from '../cli.js';
+import { d as deep_merge } from './object.js';
+import { g as get_runtime_path, r as resolve_entry, $, l as load_template, c as coalesce_to_error, a as get_mime_lookup, b as get_aliases, p as print_config_conflicts } from '../cli.js';
 import fs__default from 'fs';
 import { URL } from 'url';
 import { S as SVELTE_KIT_ASSETS, s as sirv } from './constants.js';
 import { installFetch } from '../install-fetch.js';
+import { update, init } from './sync.js';
 import { getRequest, setResponse } from '../node.js';
 import { sequence } from '../hooks.js';
-import './misc.js';
+import { p as posixify } from './filesystem.js';
 import 'sade';
 import 'child_process';
 import 'net';
@@ -21,6 +22,7 @@ import 'node:zlib';
 import 'node:stream';
 import 'node:util';
 import 'node:url';
+import './misc.js';
 import 'stream';
 
 /**
@@ -54,9 +56,7 @@ async function create_plugin(config, cwd) {
 			let manifest;
 
 			function update_manifest() {
-				const manifest_data = create_manifest_data({ config, cwd });
-
-				create_app({ config, manifest_data, cwd });
+				const { manifest_data } = update(config);
 
 				manifest = {
 					appDir: config.kit.appDir,
@@ -119,6 +119,7 @@ async function create_plugin(config, cwd) {
 							if (route.type === 'page') {
 								return {
 									type: 'page',
+									key: route.key,
 									pattern: route.pattern,
 									params: get_params(route.params),
 									shadow: route.shadow
@@ -416,9 +417,7 @@ function find_deps(node, deps) {
 
 /** @param {Options} opts */
 async function dev({ cwd, port, host, https, config }) {
-	copy_assets(path__default.join(config.kit.outDir, 'runtime'));
-
-	generate_tsconfig(config);
+	init(config);
 
 	const [vite_config] = deep_merge(
 		{