@sveltejs/kit 1.0.0-next.348 → 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;

package/dist/chunks/index.js

@@ -12,8 +12,6 @@ import { pathToFileURL, URL as URL$1 } from 'url';
 import { installPolyfills } from '../node/polyfills.js';
 import './write_tsconfig.js';
 import 'chokidar';
-import 'net';
-import 'child_process';
 import 'sade';
 import 'os';
 import 'node:http';
@@ -89,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));
 
@@ -105,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
@@ -126,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;
@@ -158,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
 			})
 		],
@@ -406,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 },

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 'net';
-import 'child_process';
 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;

package/dist/chunks/index4.js

@@ -1,6 +1,4 @@
 import fs__default from 'fs';
-import http from 'http';
-import https from 'https';
 import { join } from 'path';
 import { S as SVELTE_KIT_ASSETS, s as sirv } from './constants.js';
 import { pathToFileURL } from 'url';
@@ -21,8 +19,6 @@ import 'node:fs';
 import 'node:path';
 import 'crypto';
 import 'chokidar';
-import 'net';
-import 'child_process';
 import 'sade';
 import 'vite';
 import 'os';
@@ -31,216 +27,168 @@ import 'os';
 /** @typedef {import('http').ServerResponse} Res */
 /** @typedef {(req: Req, res: Res, next: () => void) => void} Handler */
 
-/**
- * @param {string} dir
- * @returns {Handler}
- */
-const mutable = (dir) =>
-	fs__default.existsSync(dir)
-		? sirv(dir, {
-				etag: true,
-				maxAge: 0
-		  })
-		: (req, res, next) => next();
+/** @type {import('types').ValidatedConfig} */
+let config;
+
+/** @type {boolean} */
+let https;
+
+/** @type {import('vite').Plugin} */
+const sveltekit_plugin = {
+	name: 'vite-plugin-svelte-kit',
+	async config(vite_config) {
+		// defaults
+		vite_config.preview = vite_config.preview || {};
+		vite_config.preview.strictPort = vite_config.preview.strictPort ?? true;
+
+		config = await load_config();
+	},
+	async configResolved(vite_config) {
+		https = !!vite_config.preview.https;
+	},
+	async configurePreviewServer(vite) {
+		installPolyfills();
+
+		const { paths } = config.kit;
+		const base = paths.base;
+		const assets = paths.assets ? SVELTE_KIT_ASSETS : paths.base;
+
+		const etag = `"${Date.now()}"`;
+
+		const index_file = join(config.kit.outDir, 'output/server/index.js');
+		const manifest_file = join(config.kit.outDir, 'output/server/manifest.js');
+
+		/** @type {import('types').ServerModule} */
+		const { Server, override } = await import(pathToFileURL(index_file).href);
+		const { manifest } = await import(pathToFileURL(manifest_file).href);
+
+		override({
+			paths: { base, assets },
+			prerendering: false,
+			protocol: https ? 'https' : 'http',
+			read: (file) => fs__default.readFileSync(join(config.kit.files.assets, file))
+		});
 
-/**
- * @param {{
- *   port: number;
- *   host?: string;
- *   https?: boolean;
- *   cwd?: string;
- * }} opts
- */
-async function preview({ port, host, https: use_https = false }) {
-	installPolyfills();
-
-	const config = await load_config();
-	const { paths } = config.kit;
-	const base = paths.base;
-	const assets = paths.assets ? SVELTE_KIT_ASSETS : paths.base;
-
-	const etag = `"${Date.now()}"`;
-
-	const index_file = join(config.kit.outDir, 'output/server/index.js');
-	const manifest_file = join(config.kit.outDir, 'output/server/manifest.js');
-
-	/** @type {import('types').ServerModule} */
-	const { Server, override } = await import(pathToFileURL(index_file).href);
-	const { manifest } = await import(pathToFileURL(manifest_file).href);
-
-	override({
-		paths: { base, assets },
-		prerendering: false,
-		protocol: use_https ? 'https' : 'http',
-		read: (file) => fs__default.readFileSync(join(config.kit.files.assets, file))
-	});
-
-	const server = new Server(manifest);
-
-	const handle = compose([
-		// files in `static`
-		scoped(assets, mutable(config.kit.files.assets)),
-
-		// immutable generated client assets
-		scoped(
-			assets,
-			sirv(join(config.kit.outDir, 'output/client'), {
-				setHeaders: (res, pathname) => {
-					// only apply to build directory, not e.g. version.json
-					if (pathname.startsWith(`/${config.kit.appDir}/immutable`)) {
-						res.setHeader('cache-control', 'public,max-age=31536000,immutable');
-					}
+		const server = new Server(manifest);
+
+		return () => {
+			// files in `static`
+			vite.middlewares.use(scoped(assets, mutable(config.kit.files.assets)));
+
+			// immutable generated client assets
+			vite.middlewares.use(
+				scoped(
+					assets,
+					sirv(join(config.kit.outDir, 'output/client'), {
+						setHeaders: (res, pathname) => {
+							// only apply to build directory, not e.g. version.json
+							if (pathname.startsWith(`/${config.kit.appDir}/immutable`)) {
+								res.setHeader('cache-control', 'public,max-age=31536000,immutable');
+							}
+						}
+					})
+				)
+			);
+
+			vite.middlewares.use((req, res, next) => {
+				const original_url = /** @type {string} */ (req.url);
+				const { pathname } = new URL(original_url, 'http://dummy');
+
+				if (pathname.startsWith(base)) {
+					next();
+				} else {
+					res.statusCode = 404;
+					res.end(`Not found (did you mean ${base + pathname}?)`);
 				}
-			})
-		),
+			});
 
-		(req, res, next) => {
-			const original_url = /** @type {string} */ (req.url);
-			const { pathname } = new URL(original_url, 'http://dummy');
+			// prerendered dependencies
+			vite.middlewares.use(
+				scoped(base, mutable(join(config.kit.outDir, 'output/prerendered/dependencies')))
+			);
 
-			if (pathname.startsWith(base)) {
-				next();
-			} else {
-				res.statusCode = 404;
-				res.end(`Not found (did you mean ${base + pathname}?)`);
-			}
-		},
-
-		// prerendered dependencies
-		scoped(base, mutable(join(config.kit.outDir, 'output/prerendered/dependencies'))),
-
-		// prerendered pages (we can't just use sirv because we need to
-		// preserve the correct trailingSlash behaviour)
-		scoped(base, (req, res, next) => {
-			let if_none_match_value = req.headers['if-none-match'];
-
-			if (if_none_match_value?.startsWith('W/"')) {
-				if_none_match_value = if_none_match_value.substring(2);
-			}
-
-			if (if_none_match_value === etag) {
-				res.statusCode = 304;
-				res.end();
-				return;
-			}
-
-			const { pathname } = new URL(/** @type {string} */ (req.url), 'http://dummy');
-
-			// only treat this as a page if it doesn't include an extension
-			if (pathname === '/' || /\/[^./]+\/?$/.test(pathname)) {
-				const file = join(
-					config.kit.outDir,
-					'output/prerendered/pages' + pathname + (pathname.endsWith('/') ? 'index.html' : '.html')
-				);
+			// prerendered pages (we can't just use sirv because we need to
+			// preserve the correct trailingSlash behaviour)
+			vite.middlewares.use(
+				scoped(base, (req, res, next) => {
+					let if_none_match_value = req.headers['if-none-match'];
 
-				if (fs__default.existsSync(file)) {
-					res.writeHead(200, {
-						'content-type': 'text/html',
-						etag
-					});
+					if (if_none_match_value?.startsWith('W/"')) {
+						if_none_match_value = if_none_match_value.substring(2);
+					}
 
-					fs__default.createReadStream(file).pipe(res);
-					return;
-				}
-			}
+					if (if_none_match_value === etag) {
+						res.statusCode = 304;
+						res.end();
+						return;
+					}
 
-			next();
-		}),
-
-		// SSR
-		async (req, res) => {
-			const protocol = use_https ? 'https' : 'http';
-			const host = req.headers['host'];
-
-			let request;
-
-			try {
-				request = await getRequest(`${protocol}://${host}`, req);
-			} catch (/** @type {any} */ err) {
-				res.statusCode = err.status || 400;
-				return res.end(err.reason || 'Invalid request body');
-			}
-
-			setResponse(
-				res,
-				await server.respond(request, {
-					getClientAddress: () => {
-						const { remoteAddress } = req.socket;
-						if (remoteAddress) return remoteAddress;
-						throw new Error('Could not determine clientAddress');
+					const { pathname } = new URL(/** @type {string} */ (req.url), 'http://dummy');
+
+					// only treat this as a page if it doesn't include an extension
+					if (pathname === '/' || /\/[^./]+\/?$/.test(pathname)) {
+						const file = join(
+							config.kit.outDir,
+							'output/prerendered/pages' +
+								pathname +
+								(pathname.endsWith('/') ? 'index.html' : '.html')
+						);
+
+						if (fs__default.existsSync(file)) {
+							res.writeHead(200, {
+								'content-type': 'text/html',
+								etag
+							});
+
+							fs__default.createReadStream(file).pipe(res);
+							return;
+						}
 					}
+
+					next();
 				})
 			);
-		}
-	]);
 
-	const vite_config = (config.kit.vite && (await config.kit.vite())) || {};
+			// SSR
+			vite.middlewares.use(async (req, res) => {
+				const protocol = https ? 'https' : 'http';
+				const host = req.headers['host'];
 
-	const http_server = await get_server(use_https, vite_config, (req, res) => {
-		if (req.url == null) {
-			throw new Error('Invalid request url');
-		}
+				let request;
 
-		handle(req, res);
-	});
+				try {
+					request = await getRequest(`${protocol}://${host}`, req);
+				} catch (/** @type {any} */ err) {
+					res.statusCode = err.status || 400;
+					return res.end(err.reason || 'Invalid request body');
+				}
 
-	return new Promise((fulfil) => {
-		http_server.listen(port, host, () => {
-			fulfil({ server: http_server, config });
-		});
-	});
-}
+				setResponse(
+					res,
+					await server.respond(request, {
+						getClientAddress: () => {
+							const { remoteAddress } = req.socket;
+							if (remoteAddress) return remoteAddress;
+							throw new Error('Could not determine clientAddress');
+						}
+					})
+				);
+			});
+		};
+	}
+};
 
 /**
- * @param {boolean} use_https
- * @param {import('vite').UserConfig} user_config
- * @param {(req: http.IncomingMessage, res: http.ServerResponse) => void} handler
- * @returns {Promise<import('net').Server>}
+ * @param {string} dir
+ * @returns {Handler}
  */
-async function get_server(use_https, user_config, handler) {
-	/** @type {https.ServerOptions} */
-	const https_options = {};
-
-	if (use_https) {
-		const secure_opts = user_config.server
-			? /** @type {import('tls').SecureContextOptions} */ (user_config.server.https)
-			: {};
-
-		if (secure_opts.key && secure_opts.cert) {
-			https_options.key = secure_opts.key.toString();
-			https_options.cert = secure_opts.cert.toString();
-		} else {
-			https_options.key = https_options.cert = (await import('./cert.js')).createCertificate();
-		}
-	}
-
-	return use_https
-		? https.createServer(/** @type {https.ServerOptions} */ (https_options), handler)
-		: http.createServer(handler);
-}
-
-/** @param {Handler[]} handlers */
-function compose(handlers) {
-	/**
-	 * @param {Req} req
-	 * @param {Res} res
-	 */
-	return (req, res) => {
-		/** @param {number} i */
-		function next(i) {
-			const handler = handlers[i];
-
-			if (handler) {
-				handler(req, res, () => next(i + 1));
-			} else {
-				res.statusCode = 404;
-				res.end('Not found');
-			}
-		}
-
-		next(0);
-	};
-}
+const mutable = (dir) =>
+	fs__default.existsSync(dir)
+		? sirv(dir, {
+				etag: true,
+				maxAge: 0
+		  })
+		: (req, res, next) => next();
 
 /**
  * @param {string} scope
@@ -264,4 +212,4 @@ function scoped(scope, handler) {
 	};
 }
 
-export { preview };
+export { sveltekit_plugin };

package/dist/chunks/index5.js

@@ -6,8 +6,6 @@ import chokidar from 'chokidar';
 import { w as walk$1, m as mkdirp, p as posixify, r as rimraf, c as copy } from './filesystem.js';
 import { createRequire } from 'module';
 import { b as write_tsconfig } from './write_tsconfig.js';
-import 'net';
-import 'child_process';
 import 'sade';
 import 'vite';
 import 'url';

package/dist/chunks/plugin.js

@@ -12,8 +12,6 @@ import { p as posixify } from './filesystem.js';
 import { p as parse_route_id } from './misc.js';
 import { d as deep_merge } from './object.js';
 import 'chokidar';
-import 'net';
-import 'child_process';
 import 'sade';
 import 'os';
 import 'querystring';
@@ -390,7 +388,7 @@ const sveltekit = function (svelte_config) {
 									});
 								},
 								hooks,
-								hydrate: svelte_config.kit.browser.hydrate,
+								hydrate: svelte_config.compilerOptions.hydratable,
 								manifest,
 								method_override: svelte_config.kit.methodOverride,
 								paths: {
@@ -538,10 +536,6 @@ function has_correct_case(file, assets) {
 const svelte = function (svelte_config) {
 	return svelte$1({
 		...svelte_config,
-		compilerOptions: {
-			...svelte_config.compilerOptions,
-			hydratable: !!svelte_config.kit.browser.hydrate
-		},
 		configFile: false
 	});
 };

package/dist/chunks/sync.js

@@ -6,8 +6,6 @@ import { p as parse_route_id, s } from './misc.js';
 import { fileURLToPath } from 'url';
 import { w as write_if_changed, t as trim, a as write, b as write_tsconfig } from './write_tsconfig.js';
 import 'chokidar';
-import 'net';
-import 'child_process';
 import 'sade';
 import 'vite';
 import 'os';
@@ -589,6 +587,8 @@ function copy_assets(dest) {
 }
 
 /**
+ * Writes the client manifest to disk. The manifest is used to power the router. It contains the
+ * list of routes and corresponding Svelte components (i.e. pages and layouts).
  * @param {import('types').ManifestData} manifest_data
  * @param {string} base
  * @param {string} output

package/dist/chunks/write_tsconfig.js

@@ -36,7 +36,10 @@ function trim(str) {
 /** @param {string} file */
 const exists = (file) => fs__default.existsSync(file) && file;
 
-/** @param {import('types').ValidatedKitConfig} config */
+/**
+ * Writes the tsconfig that the user's tsconfig inherits from.
+ * @param {import('types').ValidatedKitConfig} config
+ */
 function write_tsconfig(config, cwd = process.cwd()) {
 	const out = path__default.join(config.outDir, 'tsconfig.json');
 	const user_file =