@sveltejs/kit 1.0.0-next.356 → 1.0.0-next.359

package/assets/server/index.js

@@ -3097,7 +3097,12 @@ async function respond(request, options, state) {
 		}
 	}
 
-	let decoded = decodeURI(url.pathname);
+	let decoded;
+	try {
+		decoded = decodeURI(url.pathname);
+	} catch {
+		return new Response('Malformed URI', { status: 400 });
+	}
 
 	/** @type {import('types').SSRRoute | null} */
 	let route = null;
@@ -3107,7 +3112,7 @@ async function respond(request, options, state) {
 
 	if (options.paths.base && !state.prerendering?.fallback) {
 		if (!decoded.startsWith(options.paths.base)) {
-			return new Response(undefined, { status: 404 });
+			return new Response('Not found', { status: 404 });
 		}
 		decoded = decoded.slice(options.paths.base.length) || '/';
 	}

package/dist/chunks/error.js

@@ -4,7 +4,7 @@ import * as url from 'url';
 
 let FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM, isTTY=true;
 if (typeof process !== 'undefined') {
-	({ FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM } = process.env);
+	({ FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM } = process.env || {});
 	isTTY = process.stdout && process.stdout.isTTY;
 }
 
@@ -224,7 +224,10 @@ const options = object(
 				})
 			}),
 
-			endpointExtensions: string_array(['.js', '.ts']),
+			// TODO: remove this for the 1.0 release
+			endpointExtensions: error(
+				(keypath) => `${keypath} has been renamed to config.kit.moduleExtensions`
+			),
 
 			files: object({
 				assets: string('static'),
@@ -270,6 +273,8 @@ const options = object(
 				})
 			}),
 
+			moduleExtensions: string_array(['.js', '.ts']),
+
 			outDir: string('.svelte-kit'),
 
 			package: object({
@@ -382,7 +387,7 @@ const options = object(
 			// TODO remove this for 1.0
 			ssr: error(
 				(keypath) =>
-					`${keypath} has been removed — use the handle hook instead: https://kit.svelte.dev/docs/hooks#handle'`
+					`${keypath} has been removed — use the handle hook instead: https://kit.svelte.dev/docs/hooks#handle`
 			),
 
 			// TODO remove this for 1.0
@@ -395,23 +400,8 @@ const options = object(
 				pollInterval: number(0)
 			}),
 
-			vite: validate(
-				() => ({}),
-				(input, keypath) => {
-					if (typeof input === 'object') {
-						const config = input;
-						input = () => config;
-					}
-
-					if (typeof input !== 'function') {
-						throw new Error(
-							`${keypath} must be a Vite config object (https://vitejs.dev/config) or a function that returns one`
-						);
-					}
-
-					return input;
-				}
-			)
+			// TODO remove this for 1.0
+			vite: error((keypath) => `${keypath} has been removed — use vite.config.js instead`)
 		})
 	},
 	true

package/dist/chunks/index2.js

@@ -31,8 +31,8 @@ import 'node:https';
 import 'node:zlib';
 import 'node:stream';
 import 'node:buffer';
-import 'node:url';
 import 'node:util';
+import 'node:url';
 import 'node:net';
 import 'node:fs';
 import 'node:path';

package/dist/chunks/multipart-parser.js

@@ -6,9 +6,9 @@ import 'node:https';
 import 'node:zlib';
 import 'node:stream';
 import 'node:buffer';
-import 'node:url';
 import 'node:util';
 import './_commonjsHelpers.js';
+import 'node:url';
 import 'node:net';
 import 'stream';
 

package/dist/chunks/sync.js

@@ -137,35 +137,6 @@ function logger({ verbose }) {
 	return log;
 }
 
-/**
- * Given an entry point like [cwd]/src/hooks, returns a filename like [cwd]/src/hooks.js or [cwd]/src/hooks/index.js
- * @param {string} entry
- * @returns {string|null}
- */
-function resolve_entry(entry) {
-	if (fs__default.existsSync(entry)) {
-		const stats = fs__default.statSync(entry);
-		if (stats.isDirectory()) {
-			return resolve_entry(path__default.join(entry, 'index'));
-		}
-
-		return entry;
-	} else {
-		const dir = path__default.dirname(entry);
-
-		if (fs__default.existsSync(dir)) {
-			const base = path__default.basename(entry);
-			const files = fs__default.readdirSync(dir);
-
-			const found = files.find((file) => file.replace(/\.[^.]+$/, '') === base);
-
-			if (found) return path__default.join(dir, found);
-		}
-	}
-
-	return null;
-}
-
 /** @param {import('types').ManifestData} manifest_data */
 function get_mime_lookup(manifest_data) {
 	/** @type {Record<string, string>} */
@@ -181,25 +152,6 @@ function get_mime_lookup(manifest_data) {
 	return mime;
 }
 
-/** @param {import('types').ValidatedKitConfig} config */
-function get_aliases(config) {
-	/** @type {Record<string, string>} */
-	const alias = {
-		__GENERATED__: path__default.posix.join(config.outDir, 'generated'),
-		$app: `${get_runtime_path(config)}/app`,
-
-		// For now, we handle `$lib` specially here rather than make it a default value for
-		// `config.kit.alias` since it has special meaning for packaging, etc.
-		$lib: config.files.lib
-	};
-
-	for (const [key, value] of Object.entries(config.alias)) {
-		alias[key] = path__default.resolve(value);
-	}
-
-	return alias;
-}
-
 const param_pattern = /^(\.\.\.)?(\w+)(?:=(\w+))?$/;
 
 /** @param {string} id */
@@ -352,7 +304,7 @@ function create_manifest_data({
 	});
 
 	const routes_base = posixify(path__default.relative(cwd, config.kit.files.routes));
-	const valid_extensions = [...config.extensions, ...config.kit.endpointExtensions];
+	const valid_extensions = [...config.extensions, ...config.kit.moduleExtensions];
 
 	if (fs__default.existsSync(config.kit.files.routes)) {
 		list_files(config.kit.files.routes).forEach((file) => {
@@ -537,6 +489,7 @@ function create_manifest_data({
 	if (fs__default.existsSync(config.kit.files.params)) {
 		for (const file of fs__default.readdirSync(config.kit.files.params)) {
 			const ext = path__default.extname(file);
+			if (!config.kit.moduleExtensions.includes(ext)) continue;
 			const type = file.slice(0, -ext.length);
 
 			if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(type)) {
@@ -728,8 +681,8 @@ function list_files(dir, path = '', files = []) {
 	return files;
 }
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path__default.dirname(__filename);
+const filename = fileURLToPath(import.meta.url);
+const dirname = path__default.dirname(filename);
 
 /** @param {string} dest */
 function copy_assets(dest) {
@@ -737,7 +690,7 @@ function copy_assets(dest) {
 	do {
 		// we jump through these hoops so that this function
 		// works whether or not it's been bundled
-		const resolved = path__default.resolve(__dirname, `${prefix}/assets`);
+		const resolved = path__default.resolve(dirname, `${prefix}/assets`);
 
 		if (fs__default.existsSync(resolved)) {
 			copy(resolved, dest);
@@ -943,7 +896,7 @@ function write_types(config, manifest_data) {
 
 		if (file) {
 			const ext = /** @type {string} */ (
-				config.kit.endpointExtensions.find((ext) => file.endsWith(ext))
+				config.kit.moduleExtensions.find((ext) => file.endsWith(ext))
 			);
 			const key = file.slice(0, -ext.length);
 			shadow_types.set(key, {
@@ -1024,4 +977,4 @@ var sync = /*#__PURE__*/Object.freeze({
   all: all
 });
 
-export { get_runtime_path as a, get_mime_lookup as b, all as c, sync as d, get_aliases as g, init as i, logger as l, parse_route_id as p, resolve_entry as r, s, update as u };
+export { get_mime_lookup as a, all as b, sync as c, get_runtime_path as g, init as i, logger as l, parse_route_id as p, s, update as u };

package/dist/cli.js

@@ -1,11 +1,8 @@
-import chokidar from 'chokidar';
 import fs__default from 'fs';
-import path__default from 'path';
 import { l as load_config, $, c as coalesce_to_error } from './chunks/error.js';
 import sade from 'sade';
-import * as vite from 'vite';
-import { networkInterfaces, release } from 'os';
-import { pathToFileURL } from 'url';
+import 'path';
+import 'url';
 
 /** @param {unknown} e */
 function handle_error(e) {
@@ -21,176 +18,7 @@ function handle_error(e) {
 	process.exit(1);
 }
 
-/**
- * @param {number} port
- * @param {boolean} https
- * @param {string} base
- */
-async function launch(port, https, base) {
-	const { exec } = await import('child_process');
-	let cmd = 'open';
-	if (process.platform == 'win32') {
-		cmd = 'start';
-	} else if (process.platform == 'linux') {
-		if (/microsoft/i.test(release())) {
-			cmd = 'cmd.exe /c start';
-		} else {
-			cmd = 'xdg-open';
-		}
-	}
-	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}${base}`);
-}
-
-const prog = sade('svelte-kit').version('1.0.0-next.356');
-
-prog
-	.command('dev')
-	.describe('Start a development server')
-	.option('-p, --port', 'Port')
-	.option('-o, --open', 'Open a browser tab')
-	.option('--host', 'Host (only use this on trusted networks)')
-	.option('--https', 'Use self-signed HTTPS certificate')
-	.option('-H', 'no longer supported, use --https instead') // TODO remove for 1.0
-	.action(async ({ port, host, https, open, H }) => {
-		let first = true;
-		let relaunching = false;
-		let uid = 1;
-
-		/** @type {() => Promise<void>} */
-		let close;
-
-		async function start() {
-			const svelte_config = await load_config();
-			const config = await get_vite_config(svelte_config);
-			config.server = config.server || {};
-
-			// optional config from command-line flags
-			// these should take precedence, but not print conflict warnings
-			if (host) {
-				config.server.host = host;
-			}
-
-			// if https is already enabled then do nothing. it could be an object and we
-			// don't want to overwrite with a boolean
-			if (https && !config?.server?.https) {
-				config.server.https = https;
-			}
-
-			if (port) {
-				config.server.port = port;
-			}
-
-			const server = await vite.createServer(config);
-			await server.listen(port);
-
-			const address_info = /** @type {import('net').AddressInfo} */ (
-				/** @type {import('http').Server} */ (server.httpServer).address()
-			);
-
-			const resolved_config = server.config;
-
-			welcome({
-				port: address_info.port,
-				host: address_info.address,
-				https: !!(https || resolved_config.server.https),
-				open: first && (open || !!resolved_config.server.open),
-				base: svelte_config.kit.paths.base,
-				loose: resolved_config.server.fs.strict === false,
-				allow: resolved_config.server.fs.allow
-			});
-
-			first = false;
-
-			return server.close;
-		}
-
-		// TODO: we should probably replace this with something like vite-plugin-restart
-		async function relaunch() {
-			const id = uid;
-			relaunching = true;
-
-			try {
-				await close();
-				close = await start();
-
-				if (id !== uid) relaunch();
-			} catch (e) {
-				const error = /** @type {Error} */ (e);
-
-				console.error($.bold().red(`> ${error.message}`));
-				if (error.stack) {
-					console.error($.gray(error.stack.split('\n').slice(1).join('\n')));
-				}
-			}
-
-			relaunching = false;
-		}
-
-		try {
-			if (H) throw new Error('-H is no longer supported — use --https instead');
-
-			process.env.NODE_ENV = process.env.NODE_ENV || 'development';
-
-			close = await start();
-
-			chokidar.watch('svelte.config.js', { ignoreInitial: true }).on('change', () => {
-				if (relaunching) uid += 1;
-				else relaunch();
-			});
-		} catch (error) {
-			handle_error(error);
-		}
-	});
-
-prog
-	.command('build')
-	.describe('Create a production build of your app')
-	.option('--verbose', 'Log more stuff', false)
-	.action(async ({ verbose }) => {
-		try {
-			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-			process.env.VERBOSE = verbose;
-
-			const svelte_config = await load_config();
-			const vite_config = await get_vite_config(svelte_config);
-			await vite.build(vite_config); // TODO when we get rid of config.kit.vite, this can just be vite.build()
-		} catch (error) {
-			handle_error(error);
-		}
-	});
-
-prog
-	.command('preview')
-	.describe('Serve an already-built app')
-	.option('-p, --port', 'Port', 3000)
-	.option('-o, --open', 'Open a browser tab', false)
-	.option('--host', 'Host (only use this on trusted networks)', 'localhost')
-	.option('--https', 'Use self-signed HTTPS certificate', false)
-	.option('-H', 'no longer supported, use --https instead') // TODO remove for 1.0
-	.action(async ({ port, host, https, open, H }) => {
-		try {
-			if (H) throw new Error('-H is no longer supported — use --https instead');
-
-			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-
-			const svelte_config = await load_config();
-			const vite_config = await get_vite_config(svelte_config);
-
-			vite_config.preview = vite_config.preview || {};
-
-			// optional config from command-line flags
-			// these should take precedence, but not print conflict warnings
-			if (host) vite_config.preview.host = host;
-			if (https) vite_config.preview.https = https;
-			if (port) vite_config.preview.port = port;
-
-			const preview_server = await vite.preview(vite_config);
-
-			welcome({ port, host, https, open, base: preview_server.config.base });
-		} catch (error) {
-			handle_error(error);
-		}
-	});
+const prog = sade('svelte-kit').version('1.0.0-next.359');
 
 prog
 	.command('package')
@@ -218,90 +46,53 @@ prog
 
 		try {
 			const config = await load_config();
-			const sync = await import('./chunks/sync.js').then(function (n) { return n.d; });
+			const sync = await import('./chunks/sync.js').then(function (n) { return n.c; });
 			sync.all(config);
 		} catch (error) {
 			handle_error(error);
 		}
 	});
 
-prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
+// TODO remove for 1.0
+replace('dev');
+replace('build');
+replace('preview');
 
-/**
- * @param {{
- *   open: boolean;
- *   host: string;
- *   https: boolean;
- *   port: number;
- *   base: string;
- *   loose?: boolean;
- *   allow?: string[];
- *   cwd?: string;
- * }} param0
- */
-function welcome({ port, host, https, open, base, loose, allow, cwd }) {
-	if (open) launch(port, https, base);
+prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.356'}\n`));
+/** @param {string} command */
+function replace(command) {
+	prog
+		.command(command)
+		.describe(`No longer available — use vite ${command} instead`)
+		.action(async () => {
+			const message = `\n> svelte-kit ${command} is no longer available — use vite ${command} instead`;
+			console.error($.bold().red(message));
+
+			const steps = [
+				'Install vite as a devDependency with npm/pnpm/etc',
+				'Create a vite.config.js with the @sveltejs/kit/vite plugin (see below)',
+				`Update your package.json scripts to reference \`vite ${command}\` instead of \`svelte-kit ${command}\``
+			];
+
+			steps.forEach((step, i) => {
+				console.error(`  ${i + 1}. ${$.cyan(step)}`);
+			});
 
-	const protocol = https ? 'https:' : 'http:';
-	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
+			console.error(
+				`
+				${$.grey('// vite.config.js')}
+				import { sveltekit } from '@sveltejs/kit/vite';
 
-	Object.values(networkInterfaces()).forEach((interfaces) => {
-		if (!interfaces) return;
-		interfaces.forEach((details) => {
-			// @ts-ignore node18 returns a number
-			if (details.family !== 'IPv4' && details.family !== 4) return;
+				/** @type {import('vite').UserConfig} */
+				const config = {
+					plugins: [sveltekit()]
+				};
 
-			// prettier-ignore
-			if (details.internal) {
-				console.log(`  ${$.gray('local:  ')} ${protocol}//${$.bold(`localhost:${port}`)}`);
-			} else {
-				if (details.mac === '00:00:00:00:00:00') return;
+				export default config;
 
-				if (exposed) {
-					console.log(`  ${$.gray('network:')} ${protocol}//${$.bold(`${details.address}:${port}`)}`);
-					if (loose) {
-						console.log(`\n  ${$.yellow('Serving with vite.server.fs.strict: false. Note that all files on your machine will be accessible to anyone on your network.')}`);
-					} else if (allow?.length && cwd) {
-						console.log(`\n  ${$.yellow('Note that all files in the following directories will be accessible to anyone on your network: ' + allow.map(a => path__default.relative(cwd, a)).join(', '))}`);
-					}
-				} else {
-					console.log(`  ${$.gray('network: not exposed')}`);
-				}
-			}
+				`.replace(/^\t{4}/gm, '')
+			);
+			process.exit(1);
 		});
-	});
-
-	if (!exposed) {
-		console.log('\n  Use --host to expose server to other devices on this network');
-	}
-
-	console.log('\n');
 }
-
-/**
- * @param {import('types').ValidatedConfig} svelte_config
- * @return {Promise<import('vite').UserConfig>}
- */
-async function get_vite_config(svelte_config) {
-	for (const file of ['vite.config.js', 'vite.config.mjs', 'vite.config.cjs']) {
-		if (fs__default.existsSync(file)) {
-			// TODO warn here if config.kit.vite was specified
-			const module = await import(pathToFileURL(file).toString());
-			return {
-				...module.default,
-				configFile: false
-			};
-		}
-	}
-
-	const { sveltekit } = await import('./vite.js').then(function (n) { return n.i; });
-
-	// TODO: stop reading Vite config from SvelteKit config or move to CLI
-	const vite_config = await svelte_config.kit.vite();
-	vite_config.plugins = [...(vite_config.plugins || []), ...sveltekit()];
-	return vite_config;
-}
-
-export { get_vite_config };