@sveltejs/kit 1.0.0-next.346 → 1.0.0-next.349

package/assets/server/index.js

@@ -1077,6 +1077,7 @@ const updated = {
 };
 
 /**
+ * Creates the HTML response.
  * @param {{
  *   branch: Array<import('./types').Loaded>;
  *   options: import('types').SSROptions;
@@ -2027,6 +2028,7 @@ function path_matches(path, constraint) {
 }
 
 /**
+ * Calls the user's `load` function.
  * @param {{
  *   event: import('types').RequestEvent;
  *   options: import('types').SSROptions;
@@ -2661,6 +2663,7 @@ async function respond_with_error({
  */
 
 /**
+ * Gets the nodes, calls `load` for each of them, and then calls render to build the HTML response.
  * @param {{
  *   event: import('types').RequestEvent;
  *   options: SSROptions;
@@ -3093,8 +3096,9 @@ async function respond(request, options, state) {
 	const is_data_request = decoded.endsWith(DATA_SUFFIX);
 
 	if (is_data_request) {
-		decoded = decoded.slice(0, -DATA_SUFFIX.length) || '/';
-		url = new URL(url.origin + url.pathname.slice(0, -DATA_SUFFIX.length) + url.search);
+		const data_suffix_length = DATA_SUFFIX.length - (options.trailing_slash === 'always' ? 1 : 0);
+		decoded = decoded.slice(0, -data_suffix_length) || '/';
+		url = new URL(url.origin + url.pathname.slice(0, -data_suffix_length) + url.search);
 	}
 
 	if (!state.prerendering?.fallback) {
@@ -3113,19 +3117,26 @@ async function respond(request, options, state) {
 		}
 	}
 
-	if (route?.type === 'page') {
-		const normalized = normalize_path(url.pathname, options.trailing_slash);
+	if (route) {
+		if (route.type === 'page') {
+			const normalized = normalize_path(url.pathname, options.trailing_slash);
 
-		if (normalized !== url.pathname && !state.prerendering?.fallback) {
+			if (normalized !== url.pathname && !state.prerendering?.fallback) {
+				return new Response(undefined, {
+					status: 301,
+					headers: {
+						'x-sveltekit-normalize': '1',
+						location:
+							// ensure paths starting with '//' are not treated as protocol-relative
+							(normalized.startsWith('//') ? url.origin + normalized : normalized) +
+							(url.search === '?' ? '' : url.search)
+					}
+				});
+			}
+		} else if (is_data_request) {
+			// requesting /__data.json should fail for a standalone endpoint
 			return new Response(undefined, {
-				status: 301,
-				headers: {
-					'x-sveltekit-normalize': '1',
-					location:
-						// ensure paths starting with '//' are not treated as protocol-relative
-						(normalized.startsWith('//') ? url.origin + normalized : normalized) +
-						(url.search === '?' ? '' : url.search)
-				}
+				status: 404
 			});
 		}
 	}

package/dist/chunks/constants.js

@@ -577,7 +577,7 @@ function toHeaders(name, stats, isEtag) {
 	return headers;
 }
 
-function sirv (dir, opts={}) {
+function sirv (dir, opts) {
 	dir = resolve(dir || '.');
 
 	let isNotFound = opts.onNoMatch || is404;

package/dist/chunks/index.js

@@ -12,16 +12,18 @@ import { pathToFileURL, URL as URL$1 } from 'url';
 import { installPolyfills } from '../node/polyfills.js';
 import './write_tsconfig.js';
 import 'chokidar';
-import 'child_process';
-import 'net';
 import 'sade';
 import 'os';
 import 'node:http';
 import 'node:https';
 import 'node:zlib';
 import 'node:stream';
+import 'node:buffer';
 import 'node:util';
 import 'node:url';
+import 'node:net';
+import 'node:fs';
+import 'node:path';
 import 'crypto';
 
 const absolute = /^([a-z]+:)?\/?\//;
@@ -85,7 +87,10 @@ function normalize_path(path, trailing_slash) {
  * @typedef {import('rollup').OutputAsset} OutputAsset
  */
 
-/** @param {import('vite').UserConfig} config */
+/**
+ * Invokes Vite.
+ * @param {import('vite').UserConfig} config
+ */
 async function create_build(config) {
 	const { output } = /** @type {RollupOutput} */ (await vite.build(config));
 
@@ -101,6 +106,7 @@ async function create_build(config) {
 }
 
 /**
+ * Adds transitive JS and CSS dependencies to the js and css inputs.
  * @param {string} file
  * @param {import('vite').Manifest} manifest
  * @param {Set<string>} css
@@ -122,6 +128,7 @@ function find_deps(file, manifest, js, css) {
 }
 
 /**
+ * The Vite configuration that we use by default.
  * @param {{
  *   client_out_dir?: string;
  *   config: import('types').ValidatedConfig;
@@ -133,7 +140,7 @@ function find_deps(file, manifest, js, css) {
  */
 const get_default_config = function ({ client_out_dir, config, input, output_dir, ssr }) {
 	return {
-		base: assets_base(config),
+		base: assets_base(config.kit),
 		build: {
 			cssCodeSplit: true,
 			manifest: true,
@@ -154,10 +161,6 @@ const get_default_config = function ({ client_out_dir, config, input, output_dir
 		plugins: [
 			svelte({
 				...config,
-				compilerOptions: {
-					...config.compilerOptions,
-					hydratable: !!config.kit.browser.hydrate
-				},
 				configFile: false
 			})
 		],
@@ -165,21 +168,21 @@ const get_default_config = function ({ client_out_dir, config, input, output_dir
 		// if it happens to be 'public' instead of 'static'
 		publicDir: false,
 		resolve: {
-			alias: get_aliases(config)
+			alias: get_aliases(config.kit)
 		}
 	};
 };
 
 /**
- * @param {import('types').ValidatedConfig} config
+ * @param {import('types').ValidatedKitConfig} config
  * @returns {string}
  */
 function assets_base(config) {
 	// TODO this is so that Vite's preloading works. Unfortunately, it fails
 	// during `svelte-kit preview`, because we use a local asset path. This
 	// may be fixed in Vite 3: https://github.com/vitejs/vite/issues/2009
-	const { base, assets } = config.kit.paths;
-	return `${assets || base}/${config.kit.appDir}/immutable/`;
+	const { base, assets } = config.paths;
+	return `${assets || base}/${config.appDir}/immutable/`;
 }
 
 /**
@@ -244,7 +247,7 @@ async function build_service_worker(
 
 	/** @type {[any, string[]]} */
 	const [merged_config, conflicts] = deep_merge(await config.kit.vite(), {
-		base: assets_base(config),
+		base: assets_base(config.kit),
 		build: {
 			lib: {
 				entry: service_worker_entry_file,
@@ -402,7 +405,7 @@ export class Server {
 				error.stack = this.options.get_stack(error);
 			},
 			hooks: null,
-			hydrate: ${s(config.kit.browser.hydrate)},
+			hydrate: ${s(config.compilerOptions.hydratable)},
 			manifest,
 			method_override: ${s(config.kit.methodOverride)},
 			paths: { base, assets },
@@ -507,7 +510,7 @@ async function build_server(options, client) {
 			config,
 			hooks: app_relative(hooks_file),
 			has_service_worker: config.kit.serviceWorker.register && !!service_worker_entry_file,
-			runtime: get_runtime_path(config),
+			runtime: get_runtime_path(config.kit),
 			template: load_template(cwd, config)
 		})
 	);
@@ -1027,7 +1030,7 @@ const REDIRECT = 3;
 
 /**
  * @param {{
- *   config: import('types').ValidatedConfig;
+ *   config: import('types').ValidatedKitConfig;
  *   entries: string[];
  *   files: Set<string>;
  *   log: Logger;
@@ -1042,36 +1045,36 @@ async function prerender({ config, entries, files, log }) {
 		paths: []
 	};
 
-	if (!config.kit.prerender.enabled) {
+	if (!config.prerender.enabled) {
 		return prerendered;
 	}
 
 	installPolyfills();
 
-	const server_root = join(config.kit.outDir, 'output');
+	const server_root = join(config.outDir, 'output');
 
 	/** @type {import('types').ServerModule} */
 	const { Server, override } = await import(pathToFileURL(`${server_root}/server/index.js`).href);
 	const { manifest } = await import(pathToFileURL(`${server_root}/server/manifest.js`).href);
 
 	override({
-		paths: config.kit.paths,
+		paths: config.paths,
 		prerendering: true,
-		read: (file) => readFileSync(join(config.kit.files.assets, file))
+		read: (file) => readFileSync(join(config.files.assets, file))
 	});
 
 	const server = new Server(manifest);
 
-	const error = normalise_error_handler(log, config.kit.prerender.onError);
+	const error = normalise_error_handler(log, config.prerender.onError);
 
-	const q = queue(config.kit.prerender.concurrency);
+	const q = queue(config.prerender.concurrency);
 
 	/**
 	 * @param {string} path
 	 * @param {boolean} is_html
 	 */
 	function output_filename(path, is_html) {
-		const file = path.slice(config.kit.paths.base.length + 1);
+		const file = path.slice(config.paths.base.length + 1);
 
 		if (file === '') {
 			return 'index.html';
@@ -1096,7 +1099,7 @@ async function prerender({ config, entries, files, log }) {
 		if (seen.has(decoded)) return;
 		seen.add(decoded);
 
-		const file = decoded.slice(config.kit.paths.base.length + 1);
+		const file = decoded.slice(config.paths.base.length + 1);
 		if (files.has(file)) return;
 
 		return q.add(() => visit(decoded, encoded || encodeURI(decoded), referrer));
@@ -1108,7 +1111,7 @@ async function prerender({ config, entries, files, log }) {
 	 * @param {string?} referrer
 	 */
 	async function visit(decoded, encoded, referrer) {
-		if (!decoded.startsWith(config.kit.paths.base)) {
+		if (!decoded.startsWith(config.paths.base)) {
 			error({ status: 404, path: decoded, referrer, referenceType: 'linked' });
 			return;
 		}
@@ -1145,7 +1148,7 @@ async function prerender({ config, entries, files, log }) {
 			);
 		}
 
-		if (config.kit.prerender.crawl && response.headers.get('content-type') === 'text/html') {
+		if (config.prerender.crawl && response.headers.get('content-type') === 'text/html') {
 			for (const href of crawl(text)) {
 				if (href.startsWith('data:') || href.startsWith('#')) continue;
 
@@ -1174,7 +1177,7 @@ async function prerender({ config, entries, files, log }) {
 		const is_html = response_type === REDIRECT || type === 'text/html';
 
 		const file = output_filename(decoded, is_html);
-		const dest = `${config.kit.outDir}/output/prerendered/${category}/${file}`;
+		const dest = `${config.outDir}/output/prerendered/${category}/${file}`;
 
 		if (written.has(file)) return;
 
@@ -1238,14 +1241,14 @@ async function prerender({ config, entries, files, log }) {
 		}
 	}
 
-	if (config.kit.prerender.enabled) {
-		for (const entry of config.kit.prerender.entries) {
+	if (config.prerender.enabled) {
+		for (const entry of config.prerender.entries) {
 			if (entry === '*') {
 				for (const entry of entries) {
-					enqueue(null, config.kit.paths.base + entry); // TODO can we pre-normalize these?
+					enqueue(null, config.paths.base + entry); // TODO can we pre-normalize these?
 				}
 			} else {
-				enqueue(null, config.kit.paths.base + entry);
+				enqueue(null, config.paths.base + entry);
 			}
 		}
 
@@ -1260,7 +1263,7 @@ async function prerender({ config, entries, files, log }) {
 		}
 	});
 
-	const file = `${config.kit.outDir}/output/prerendered/fallback.html`;
+	const file = `${config.outDir}/output/prerendered/fallback.html`;
 	mkdirp(dirname(file));
 	writeFileSync(file, await rendered.text());
 
@@ -1295,7 +1298,7 @@ async function build(config, { log }) {
 		build_dir,
 		manifest_data,
 		output_dir,
-		client_entry_file: path__default.relative(cwd, `${get_runtime_path(config)}/client/start.js`),
+		client_entry_file: path__default.relative(cwd, `${get_runtime_path(config.kit)}/client/start.js`),
 		service_worker_entry_file: resolve_entry(config.kit.files.serviceWorker)
 	};
 
@@ -1334,7 +1337,7 @@ async function build(config, { log }) {
 	});
 
 	const prerendered = await prerender({
-		config,
+		config: config.kit,
 		entries: options.manifest_data.routes
 			.map((route) => (route.type === 'page' ? route.path : ''))
 			.filter(Boolean),

package/dist/chunks/index2.js

@@ -2,6 +2,8 @@ import { s, p as parse_route_id } from './misc.js';
 import { b as get_mime_lookup } from '../cli.js';
 
 /**
+ * Generates the data used to write the server-side manifest.js file. This data is used in the Vite
+ * build process, to power routing, etc.
  * @param {{
  *   build_data: import('types').BuildData;
  *   relative_path: string;

package/dist/chunks/index3.js

@@ -4,8 +4,6 @@ import { g as generate_manifest } from './index2.js';
 import 'chokidar';
 import 'fs';
 import 'path';
-import 'child_process';
-import 'net';
 import 'sade';
 import 'vite';
 import 'url';
@@ -13,6 +11,7 @@ import 'os';
 import './misc.js';
 
 /**
+ * Creates the Builder which is passed to adapters for building the application.
  * @param {{
  *   config: import('types').ValidatedConfig;
  *   build_data: import('types').BuildData;