@sveltejs/kit 1.0.0-next.351 → 1.0.0-next.354

package/dist/cli.js

@@ -1,781 +1,11 @@
 import chokidar from 'chokidar';
 import fs__default from 'fs';
-import path__default, { join, relative } from 'path';
+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 * as url from 'url';
 import { networkInterfaces, release } from 'os';
-
-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);
-	isTTY = process.stdout && process.stdout.isTTY;
-}
-
-const $ = {
-	enabled: !NODE_DISABLE_COLORS && NO_COLOR == null && TERM !== 'dumb' && (
-		FORCE_COLOR != null && FORCE_COLOR !== '0' || isTTY
-	),
-
-	// modifiers
-	reset: init(0, 0),
-	bold: init(1, 22),
-	dim: init(2, 22),
-	italic: init(3, 23),
-	underline: init(4, 24),
-	inverse: init(7, 27),
-	hidden: init(8, 28),
-	strikethrough: init(9, 29),
-
-	// colors
-	black: init(30, 39),
-	red: init(31, 39),
-	green: init(32, 39),
-	yellow: init(33, 39),
-	blue: init(34, 39),
-	magenta: init(35, 39),
-	cyan: init(36, 39),
-	white: init(37, 39),
-	gray: init(90, 39),
-	grey: init(90, 39),
-
-	// background colors
-	bgBlack: init(40, 49),
-	bgRed: init(41, 49),
-	bgGreen: init(42, 49),
-	bgYellow: init(43, 49),
-	bgBlue: init(44, 49),
-	bgMagenta: init(45, 49),
-	bgCyan: init(46, 49),
-	bgWhite: init(47, 49)
-};
-
-function run(arr, str) {
-	let i=0, tmp, beg='', end='';
-	for (; i < arr.length; i++) {
-		tmp = arr[i];
-		beg += tmp.open;
-		end += tmp.close;
-		if (!!~str.indexOf(tmp.close)) {
-			str = str.replace(tmp.rgx, tmp.close + tmp.open);
-		}
-	}
-	return beg + str + end;
-}
-
-function chain(has, keys) {
-	let ctx = { has, keys };
-
-	ctx.reset = $.reset.bind(ctx);
-	ctx.bold = $.bold.bind(ctx);
-	ctx.dim = $.dim.bind(ctx);
-	ctx.italic = $.italic.bind(ctx);
-	ctx.underline = $.underline.bind(ctx);
-	ctx.inverse = $.inverse.bind(ctx);
-	ctx.hidden = $.hidden.bind(ctx);
-	ctx.strikethrough = $.strikethrough.bind(ctx);
-
-	ctx.black = $.black.bind(ctx);
-	ctx.red = $.red.bind(ctx);
-	ctx.green = $.green.bind(ctx);
-	ctx.yellow = $.yellow.bind(ctx);
-	ctx.blue = $.blue.bind(ctx);
-	ctx.magenta = $.magenta.bind(ctx);
-	ctx.cyan = $.cyan.bind(ctx);
-	ctx.white = $.white.bind(ctx);
-	ctx.gray = $.gray.bind(ctx);
-	ctx.grey = $.grey.bind(ctx);
-
-	ctx.bgBlack = $.bgBlack.bind(ctx);
-	ctx.bgRed = $.bgRed.bind(ctx);
-	ctx.bgGreen = $.bgGreen.bind(ctx);
-	ctx.bgYellow = $.bgYellow.bind(ctx);
-	ctx.bgBlue = $.bgBlue.bind(ctx);
-	ctx.bgMagenta = $.bgMagenta.bind(ctx);
-	ctx.bgCyan = $.bgCyan.bind(ctx);
-	ctx.bgWhite = $.bgWhite.bind(ctx);
-
-	return ctx;
-}
-
-function init(open, close) {
-	let blk = {
-		open: `\x1b[${open}m`,
-		close: `\x1b[${close}m`,
-		rgx: new RegExp(`\\x1b\\[${close}m`, 'g')
-	};
-	return function (txt) {
-		if (this !== void 0 && this.has !== void 0) {
-			!!~this.has.indexOf(open) || (this.has.push(open),this.keys.push(blk));
-			return txt === void 0 ? this : $.enabled ? run(this.keys, txt+'') : txt+'';
-		}
-		return txt === void 0 ? chain([open], [blk]) : $.enabled ? run([blk], txt+'') : txt+'';
-	};
-}
-
-const get_runtime_path = /** @param {import('types').ValidatedKitConfig} config */ (config) =>
-			posixify_path(path__default.join(config.outDir, 'runtime'))
-	;
-
-/** @param {string} str */
-function posixify_path(str) {
-	const parsed = path__default.parse(str);
-	return `/${parsed.dir.slice(parsed.root.length).split(path__default.sep).join('/')}/${parsed.base}`;
-}
-
-function noop() {}
-
-/** @param {{ verbose: boolean }} opts */
-function logger({ verbose }) {
-	/** @type {import('types').Logger} */
-	const log = (msg) => console.log(msg.replace(/^/gm, '  '));
-
-	/** @param {string} msg */
-	const err = (msg) => console.error(msg.replace(/^/gm, '  '));
-
-	log.success = (msg) => log($.green(`✔ ${msg}`));
-	log.error = (msg) => err($.bold().red(msg));
-	log.warn = (msg) => log($.bold().yellow(msg));
-
-	log.minor = verbose ? (msg) => log($.grey(msg)) : noop;
-	log.info = verbose ? log : noop;
-
-	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>} */
-	const mime = {};
-
-	manifest_data.assets.forEach((asset) => {
-		if (asset.type) {
-			const ext = path__default.extname(asset.file);
-			mime[ext] = asset.type;
-		}
-	});
-
-	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;
-}
-
-/** @typedef {import('./types').Validator} Validator */
-
-/** @type {Validator} */
-const options = object(
-	{
-		extensions: validate(['.svelte'], (input, keypath) => {
-			if (!Array.isArray(input) || !input.every((page) => typeof page === 'string')) {
-				throw new Error(`${keypath} must be an array of strings`);
-			}
-
-			input.forEach((extension) => {
-				if (extension[0] !== '.') {
-					throw new Error(`Each member of ${keypath} must start with '.' — saw '${extension}'`);
-				}
-
-				if (!/^(\.[a-z0-9]+)+$/i.test(extension)) {
-					throw new Error(`File extensions must be alphanumeric — saw '${extension}'`);
-				}
-			});
-
-			return input;
-		}),
-
-		kit: object({
-			adapter: validate(null, (input, keypath) => {
-				if (typeof input !== 'object' || !input.adapt) {
-					let message = `${keypath} should be an object with an "adapt" method`;
-
-					if (Array.isArray(input) || typeof input === 'string') {
-						// for the early adapter adopters
-						message += ', rather than the name of an adapter';
-					}
-
-					throw new Error(`${message}. See https://kit.svelte.dev/docs/adapters`);
-				}
-
-				return input;
-			}),
-
-			alias: validate({}, (input, keypath) => {
-				if (typeof input !== 'object') {
-					throw new Error(`${keypath} should be an object`);
-				}
-
-				for (const key in input) {
-					assert_string(input[key], `${keypath}.${key}`);
-				}
-
-				return input;
-			}),
-
-			// TODO: remove this for the 1.0 release
-			amp: error(
-				(keypath) =>
-					`${keypath} has been removed. See https://kit.svelte.dev/docs/seo#amp for details on how to support AMP`
-			),
-
-			appDir: validate('_app', (input, keypath) => {
-				assert_string(input, keypath);
-
-				if (input) {
-					if (input.startsWith('/') || input.endsWith('/')) {
-						throw new Error(
-							"config.kit.appDir cannot start or end with '/'. See https://kit.svelte.dev/docs/configuration"
-						);
-					}
-				} else {
-					throw new Error(`${keypath} cannot be empty`);
-				}
-
-				return input;
-			}),
-
-			browser: object({
-				hydrate: boolean(true),
-				router: boolean(true)
-			}),
-
-			csp: object({
-				mode: list(['auto', 'hash', 'nonce']),
-				directives: object({
-					'child-src': string_array(),
-					'default-src': string_array(),
-					'frame-src': string_array(),
-					'worker-src': string_array(),
-					'connect-src': string_array(),
-					'font-src': string_array(),
-					'img-src': string_array(),
-					'manifest-src': string_array(),
-					'media-src': string_array(),
-					'object-src': string_array(),
-					'prefetch-src': string_array(),
-					'script-src': string_array(),
-					'script-src-elem': string_array(),
-					'script-src-attr': string_array(),
-					'style-src': string_array(),
-					'style-src-elem': string_array(),
-					'style-src-attr': string_array(),
-					'base-uri': string_array(),
-					sandbox: string_array(),
-					'form-action': string_array(),
-					'frame-ancestors': string_array(),
-					'navigate-to': string_array(),
-					'report-uri': string_array(),
-					'report-to': string_array(),
-					'require-trusted-types-for': string_array(),
-					'trusted-types': string_array(),
-					'upgrade-insecure-requests': boolean(false),
-					'require-sri-for': string_array(),
-					'block-all-mixed-content': boolean(false),
-					'plugin-types': string_array(),
-					referrer: string_array()
-				})
-			}),
-
-			endpointExtensions: string_array(['.js', '.ts']),
-
-			files: object({
-				assets: string('static'),
-				hooks: string(join('src', 'hooks')),
-				lib: string(join('src', 'lib')),
-				params: string(join('src', 'params')),
-				routes: string(join('src', 'routes')),
-				serviceWorker: string(join('src', 'service-worker')),
-				template: string(join('src', 'app.html'))
-			}),
-
-			floc: boolean(false),
-
-			// TODO: remove this for the 1.0 release
-			headers: error(
-				(keypath) =>
-					`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
-			),
-
-			// TODO: remove this for the 1.0 release
-			host: error(
-				(keypath) =>
-					`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
-			),
-
-			// TODO remove for 1.0
-			hydrate: error((keypath) => `${keypath} has been moved to config.kit.browser.hydrate`),
-
-			inlineStyleThreshold: number(0),
-
-			methodOverride: object({
-				parameter: string('_method'),
-				allowed: validate([], (input, keypath) => {
-					if (!Array.isArray(input) || !input.every((method) => typeof method === 'string')) {
-						throw new Error(`${keypath} must be an array of strings`);
-					}
-
-					if (input.map((i) => i.toUpperCase()).includes('GET')) {
-						throw new Error(`${keypath} cannot contain "GET"`);
-					}
-
-					return input;
-				})
-			}),
-
-			outDir: string('.svelte-kit'),
-
-			package: object({
-				dir: string('package'),
-				// excludes all .d.ts and filename starting with _
-				exports: fun((filepath) => !/^_|\/_|\.d\.ts$/.test(filepath)),
-				files: fun(() => true),
-				emitTypes: boolean(true)
-			}),
-
-			paths: object({
-				base: validate('', (input, keypath) => {
-					assert_string(input, keypath);
-
-					if (input !== '' && (input.endsWith('/') || !input.startsWith('/'))) {
-						throw new Error(
-							`${keypath} option must either be the empty string or a root-relative path that starts but doesn't end with '/'. See https://kit.svelte.dev/docs/configuration#paths`
-						);
-					}
-
-					return input;
-				}),
-				assets: validate('', (input, keypath) => {
-					assert_string(input, keypath);
-
-					if (input) {
-						if (!/^[a-z]+:\/\//.test(input)) {
-							throw new Error(
-								`${keypath} option must be an absolute path, if specified. See https://kit.svelte.dev/docs/configuration#paths`
-							);
-						}
-
-						if (input.endsWith('/')) {
-							throw new Error(
-								`${keypath} option must not end with '/'. See https://kit.svelte.dev/docs/configuration#paths`
-							);
-						}
-					}
-
-					return input;
-				})
-			}),
-
-			prerender: object({
-				concurrency: number(1),
-				crawl: boolean(true),
-				createIndexFiles: error(
-					(keypath) =>
-						`${keypath} has been removed — it is now controlled by the trailingSlash option. See https://kit.svelte.dev/docs/configuration#trailingslash`
-				),
-				default: boolean(false),
-				enabled: boolean(true),
-				entries: validate(['*'], (input, keypath) => {
-					if (!Array.isArray(input) || !input.every((page) => typeof page === 'string')) {
-						throw new Error(`${keypath} must be an array of strings`);
-					}
-
-					input.forEach((page) => {
-						if (page !== '*' && page[0] !== '/') {
-							throw new Error(
-								`Each member of ${keypath} must be either '*' or an absolute path beginning with '/' — saw '${page}'`
-							);
-						}
-					});
-
-					return input;
-				}),
-
-				// TODO: remove this for the 1.0 release
-				force: validate(undefined, (input, keypath) => {
-					if (typeof input !== 'undefined') {
-						const newSetting = input ? 'continue' : 'fail';
-						const needsSetting = newSetting === 'continue';
-						throw new Error(
-							`${keypath} has been removed in favor of \`onError\`. In your case, set \`onError\` to "${newSetting}"${
-								needsSetting ? '' : ' (or leave it undefined)'
-							} to get the same behavior as you would with \`force: ${JSON.stringify(input)}\``
-						);
-					}
-				}),
-
-				onError: validate('fail', (input, keypath) => {
-					if (typeof input === 'function') return input;
-					if (['continue', 'fail'].includes(input)) return input;
-					throw new Error(
-						`${keypath} should be either a custom function or one of "continue" or "fail"`
-					);
-				}),
-
-				// TODO: remove this for the 1.0 release
-				pages: error((keypath) => `${keypath} has been renamed to \`entries\`.`)
-			}),
-
-			// TODO: remove this for the 1.0 release
-			protocol: error(
-				(keypath) =>
-					`${keypath} has been removed. See https://github.com/sveltejs/kit/pull/3384 for details`
-			),
-
-			// TODO remove for 1.0
-			router: error((keypath) => `${keypath} has been moved to config.kit.browser.router`),
-
-			routes: fun((filepath) => !/(?:(?:^_|\/_)|(?:^\.|\/\.)(?!well-known))/.test(filepath)),
-
-			serviceWorker: object({
-				register: boolean(true),
-				files: fun((filename) => !/\.DS_Store/.test(filename))
-			}),
-
-			// 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'`
-			),
-
-			// TODO remove this for 1.0
-			target: error((keypath) => `${keypath} is no longer required, and should be removed`),
-
-			trailingSlash: list(['never', 'always', 'ignore']),
-
-			version: object({
-				name: string(Date.now().toString()),
-				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;
-				}
-			)
-		})
-	},
-	true
-);
-
-/**
- * @param {Record<string, Validator>} children
- * @param {boolean} [allow_unknown]
- * @returns {Validator}
- */
-function object(children, allow_unknown) {
-	return (input, keypath) => {
-		/** @type {Record<string, any>} */
-		const output = {};
-
-		if ((input && typeof input !== 'object') || Array.isArray(input)) {
-			throw new Error(`${keypath} should be an object`);
-		}
-
-		for (const key in input) {
-			if (!(key in children)) {
-				if (allow_unknown) {
-					output[key] = input[key];
-				} else {
-					let message = `Unexpected option ${keypath}.${key}`;
-
-					// special case
-					if (keypath === 'config.kit' && key in options) {
-						message += ` (did you mean config.${key}?)`;
-					}
-
-					throw new Error(message);
-				}
-			}
-		}
-
-		for (const key in children) {
-			const validator = children[key];
-			output[key] = validator(input && input[key], `${keypath}.${key}`);
-		}
-
-		return output;
-	};
-}
-
-/**
- * @param {any} fallback
- * @param {(value: any, keypath: string) => any} fn
- * @returns {Validator}
- */
-function validate(fallback, fn) {
-	return (input, keypath) => {
-		return input === undefined ? fallback : fn(input, keypath);
-	};
-}
-
-/**
- * @param {string | null} fallback
- * @param {boolean} allow_empty
- * @returns {Validator}
- */
-function string(fallback, allow_empty = true) {
-	return validate(fallback, (input, keypath) => {
-		assert_string(input, keypath);
-
-		if (!allow_empty && input === '') {
-			throw new Error(`${keypath} cannot be empty`);
-		}
-
-		return input;
-	});
-}
-
-/**
- * @param {string[] | undefined} [fallback]
- * @returns {Validator}
- */
-function string_array(fallback) {
-	return validate(fallback, (input, keypath) => {
-		if (input === undefined) return input;
-
-		if (!Array.isArray(input) || input.some((value) => typeof value !== 'string')) {
-			throw new Error(`${keypath} must be an array of strings, if specified`);
-		}
-
-		return input;
-	});
-}
-
-/**
- * @param {number} fallback
- * @returns {Validator}
- */
-function number(fallback) {
-	return validate(fallback, (input, keypath) => {
-		if (typeof input !== 'number') {
-			throw new Error(`${keypath} should be a number, if specified`);
-		}
-		return input;
-	});
-}
-
-/**
- * @param {boolean} fallback
- * @returns {Validator}
- */
-function boolean(fallback) {
-	return validate(fallback, (input, keypath) => {
-		if (typeof input !== 'boolean') {
-			throw new Error(`${keypath} should be true or false, if specified`);
-		}
-		return input;
-	});
-}
-
-/**
- * @param {string[]} options
- * @returns {Validator}
- */
-function list(options, fallback = options[0]) {
-	return validate(fallback, (input, keypath) => {
-		if (!options.includes(input)) {
-			// prettier-ignore
-			const msg = options.length > 2
-				? `${keypath} should be one of ${options.slice(0, -1).map(input => `"${input}"`).join(', ')} or "${options[options.length - 1]}"`
-				: `${keypath} should be either "${options[0]}" or "${options[1]}"`;
-
-			throw new Error(msg);
-		}
-		return input;
-	});
-}
-
-/**
- * @param {(filename: string) => boolean} fallback
- * @returns {Validator}
- */
-function fun(fallback) {
-	return validate(fallback, (input, keypath) => {
-		if (typeof input !== 'function') {
-			throw new Error(`${keypath} should be a function, if specified`);
-		}
-		return input;
-	});
-}
-
-/**
- * @param {string} input
- * @param {string} keypath
- */
-function assert_string(input, keypath) {
-	if (typeof input !== 'string') {
-		throw new Error(`${keypath} should be a string, if specified`);
-	}
-}
-
-/** @param {(keypath?: string) => string} fn */
-function error(fn) {
-	return validate(undefined, (input, keypath) => {
-		if (input !== undefined) {
-			throw new Error(fn(keypath));
-		}
-	});
-}
-
-/**
- * Loads the template (src/app.html by default) and validates that it has the
- * required content.
- * @param {string} cwd
- * @param {import('types').ValidatedConfig} config
- */
-function load_template(cwd, config) {
-	const { template } = config.kit.files;
-	const relative = path__default.relative(cwd, template);
-
-	if (fs__default.existsSync(template)) {
-		const contents = fs__default.readFileSync(template, 'utf8');
-
-		// TODO remove this for 1.0
-		const match = /%svelte\.([a-z]+)%/.exec(contents);
-		if (match) {
-			throw new Error(
-				`%svelte.${match[1]}% in ${relative} should be replaced with %sveltekit.${match[1]}%`
-			);
-		}
-
-		const expected_tags = ['%sveltekit.head%', '%sveltekit.body%'];
-		expected_tags.forEach((tag) => {
-			if (contents.indexOf(tag) === -1) {
-				throw new Error(`${relative} is missing ${tag}`);
-			}
-		});
-	} else {
-		throw new Error(`${relative} does not exist`);
-	}
-
-	return fs__default.readFileSync(template, 'utf-8');
-}
-
-/**
- * Loads and validates svelte.config.js
- * @param {{ cwd?: string }} options
- * @returns {Promise<import('types').ValidatedConfig>}
- */
-async function load_config({ cwd = process.cwd() } = {}) {
-	const config_file = path__default.join(cwd, 'svelte.config.js');
-
-	if (!fs__default.existsSync(config_file)) {
-		throw new Error(
-			'You need to create a svelte.config.js file. See https://kit.svelte.dev/docs/configuration'
-		);
-	}
-
-	const config = await import(`${url.pathToFileURL(config_file).href}?ts=${Date.now()}`);
-
-	const validated = validate_config(config.default);
-
-	validated.kit.outDir = path__default.resolve(cwd, validated.kit.outDir);
-
-	for (const key in validated.kit.files) {
-		// @ts-expect-error this is typescript at its stupidest
-		validated.kit.files[key] = path__default.resolve(cwd, validated.kit.files[key]);
-	}
-
-	return validated;
-}
-
-/**
- * @param {import('types').Config} config
- * @returns {import('types').ValidatedConfig}
- */
-function validate_config(config) {
-	if (typeof config !== 'object') {
-		throw new Error(
-			'svelte.config.js must have a configuration object as its default export. See https://kit.svelte.dev/docs/configuration'
-		);
-	}
-
-	return options(config, 'config');
-}
-
-/**
- * Ensures the user does not override any config values that SvelteKit must control.
- * @param {string[]} conflicts - array of conflicts in dotted notation
- * @param {string=} pathPrefix - prepended in front of the path
- * @param {string=} scope - used to prefix the whole error message
- */
-function print_config_conflicts(conflicts, pathPrefix, scope) {
-	const prefix = scope ? scope + ': ' : '';
-	const log = logger({ verbose: false });
-	conflicts.forEach((conflict) => {
-		log.error(
-			`${prefix}The value for ${pathPrefix}${conflict} specified in svelte.config.js has been ignored. This option is controlled by SvelteKit.`
-		);
-	});
-}
-
-/**
- * @param {unknown} err
- * @return {Error}
- */
-function coalesce_to_error(err) {
-	return err instanceof Error ||
-		(err && /** @type {any} */ (err).name && /** @type {any} */ (err).message)
-		? /** @type {Error} */ (err)
-		: new Error(JSON.stringify(err));
-}
+import 'url';
 
 /** @param {unknown} e */
 function handle_error(e) {
@@ -811,7 +41,7 @@ async function launch(port, https, base) {
 	exec(`${cmd} ${https ? 'https' : 'http'}://localhost:${port}${base}`);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.351');
+const prog = sade('svelte-kit').version('1.0.0-next.354');
 
 prog
 	.command('dev')
@@ -830,15 +60,8 @@ prog
 		let close;
 
 		async function start() {
-			const { plugins } = await import('./chunks/plugin.js');
 			const svelte_config = await load_config();
-			const vite_config = await svelte_config.kit.vite();
-
-			/** @type {import('vite').UserConfig} */
-			const config = {
-				...vite_config,
-				plugins: [...(vite_config.plugins || []), plugins(svelte_config)]
-			};
+			const config = await get_vite_config(svelte_config);
 			config.server = config.server || {};
 
 			// optional config from command-line flags
@@ -849,7 +72,7 @@ prog
 
 			// 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 && !vite_config?.server?.https) {
+			if (https && !config?.server?.https) {
 				config.server.https = https;
 			}
 
@@ -926,31 +149,11 @@ prog
 	.action(async ({ verbose }) => {
 		try {
 			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
-			const config = await load_config();
-
-			const log = logger({ verbose });
-
-			const { build } = await import('./chunks/index.js');
-			const { build_data, prerendered } = await build(config, { log });
+			process.env.VERBOSE = verbose;
 
-			console.log(
-				`\nRun ${$.bold().cyan('npm run preview')} to preview your production build locally.`
-			);
-
-			if (config.kit.adapter) {
-				const { adapt } = await import('./chunks/index3.js');
-				await adapt(config, build_data, prerendered, { log });
-
-				// this is necessary to close any open db connections, etc
-				process.exit(0);
-			}
-
-			console.log($.bold().yellow('\nNo adapter specified'));
-
-			// prettier-ignore
-			console.log(
-				`See ${$.bold().cyan('https://kit.svelte.dev/docs/adapters')} to learn how to configure your app to run on the platform of your choosing`
-			);
+			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);
 		}
@@ -970,30 +173,18 @@ prog
 
 			process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
-			const { sveltekit_plugin } = await import('./chunks/index4.js');
 			const svelte_config = await load_config();
-			const vite_config = await svelte_config.kit.vite();
+			const vite_config = await get_vite_config(svelte_config);
 
-			/** @type {import('vite').UserConfig} */
-			const config = {
-				...vite_config,
-				plugins: [...(vite_config.plugins || []), sveltekit_plugin]
-			};
-			config.preview = config.preview || {};
+			vite_config.preview = vite_config.preview || {};
 
 			// optional config from command-line flags
 			// these should take precedence, but not print conflict warnings
-			if (host) {
-				config.preview.host = host;
-			}
-			if (https) {
-				config.preview.https = https;
-			}
-			if (port) {
-				config.preview.port = port;
-			}
+			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(config);
+			const preview_server = await vite.preview(vite_config);
 
 			welcome({ port, host, https, open, base: preview_server.config.base });
 		} catch (error) {
@@ -1008,7 +199,7 @@ prog
 	.action(async ({ watch }) => {
 		try {
 			const config = await load_config();
-			const packaging = await import('./chunks/index5.js');
+			const packaging = await import('./chunks/index.js');
 
 			await (watch ? packaging.watch(config) : packaging.build(config));
 		} catch (error) {
@@ -1027,7 +218,7 @@ prog
 
 		try {
 			const config = await load_config();
-			const sync = await import('./chunks/sync.js');
+			const sync = await import('./chunks/sync.js').then(function (n) { return n.d; });
 			sync.all(config);
 		} catch (error) {
 			handle_error(error);
@@ -1051,7 +242,7 @@ prog.parse(process.argv, { unknown: (arg) => `Unknown option: ${arg}` });
 function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	if (open) launch(port, https, base);
 
-	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.351'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.354'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';
@@ -1073,7 +264,7 @@ function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 					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 => relative(cwd, a)).join(', '))}`);
+						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')}`);
@@ -1089,4 +280,28 @@ function welcome({ port, host, https, open, base, loose, allow, cwd }) {
 	console.log('\n');
 }
 
-export { $, get_runtime_path as a, get_mime_lookup as b, coalesce_to_error as c, load_config as d, get_aliases as g, load_template as l, print_config_conflicts as p, resolve_entry as r };
+/**
+ * @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(path__default.resolve(file));
+			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 };