@sveltejs/kit 1.0.0-next.392 → 1.0.0-next.395

package/dist/chunks/utils.js

@@ -0,0 +1,66 @@
+import path__default from 'path';
+import { $ } from './index.js';
+import 'url';
+
+/**
+ * Get the prefix for the `runtime` directory, for use with import declarations
+ * @param {import('types').ValidatedKitConfig} config
+ */
+function get_runtime_prefix(config) {
+	{
+		return posixify_path(path__default.join(config.outDir, 'runtime'));
+	}
+}
+
+/**
+ * Get the resolved path of the `runtime` directory
+ * @param {import('types').ValidatedKitConfig} config
+ */
+function get_runtime_directory(config) {
+	{
+		return 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;
+}
+
+/** @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;
+}
+
+export { get_runtime_prefix as a, get_mime_lookup as b, get_runtime_directory as g, logger as l };

package/dist/chunks/write_tsconfig.js

@@ -1,112 +1,7 @@
 import fs__default from 'fs';
 import path__default from 'path';
-import { $ } from './error.js';
-
-/** @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(path, { force: true, recursive: 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, '/');
-}
+import { $ } from './index.js';
+import { m as mkdirp, p as posixify } from './filesystem.js';
 
 /** @type {Map<string, string>} */
 const previous_contents = new Map();
@@ -138,6 +33,59 @@ function trim(str) {
 	return str.replace(pattern, '').trim();
 }
 
+const reserved = new Set([
+	'do',
+	'if',
+	'in',
+	'for',
+	'let',
+	'new',
+	'try',
+	'var',
+	'case',
+	'else',
+	'enum',
+	'eval',
+	'null',
+	'this',
+	'true',
+	'void',
+	'with',
+	'await',
+	'break',
+	'catch',
+	'class',
+	'const',
+	'false',
+	'super',
+	'throw',
+	'while',
+	'yield',
+	'delete',
+	'export',
+	'import',
+	'public',
+	'return',
+	'static',
+	'switch',
+	'typeof',
+	'default',
+	'extends',
+	'finally',
+	'package',
+	'private',
+	'continue',
+	'debugger',
+	'function',
+	'arguments',
+	'interface',
+	'protected',
+	'implements',
+	'instanceof'
+]);
+
+const valid_identifier = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+
 /** @param {string} file */
 const exists = (file) => fs__default.existsSync(file) && file;
 
@@ -158,18 +106,13 @@ function write_tsconfig(config, cwd = process.cwd()) {
 	/** @param {string} file */
 	const config_relative = (file) => posixify(path__default.relative(config.outDir, file));
 
-	const dirs = new Set([
-		project_relative(path__default.dirname(config.files.routes)),
-		project_relative(path__default.dirname(config.files.lib))
-	]);
-
-	/** @type {string[]} */
-	const include = [];
-	dirs.forEach((dir) => {
-		include.push(config_relative(`${dir}/**/*.js`));
-		include.push(config_relative(`${dir}/**/*.ts`));
-		include.push(config_relative(`${dir}/**/*.svelte`));
-	});
+	const include = ['ambient.d.ts'];
+	for (const dir of [config.files.routes, config.files.lib]) {
+		const relative = project_relative(path__default.dirname(dir));
+		include.push(config_relative(`${relative}/**/*.js`));
+		include.push(config_relative(`${relative}/**/*.ts`));
+		include.push(config_relative(`${relative}/**/*.svelte`));
+	}
 
 	/** @type {Record<string, string[]>} */
 	const paths = {};
@@ -212,7 +155,7 @@ function write_tsconfig(config, cwd = process.cwd()) {
 					target: 'esnext'
 				},
 				include,
-				exclude: [config_relative('node_modules/**'), './**']
+				exclude: [config_relative('node_modules/**'), './[!ambient.d.ts]**']
 			},
 			null,
 			'\t'
@@ -271,4 +214,4 @@ function validate(config, cwd, out, user_file) {
 	}
 }
 
-export { write_if_changed as a, write as b, copy as c, write_tsconfig as d, mkdirp as m, posixify as p, rimraf as r, trim as t, walk as w };
+export { write as a, write_tsconfig as b, reserved as r, trim as t, valid_identifier as v, write_if_changed as w };

package/dist/cli.js

@@ -1,6 +1,7 @@
 import fs__default from 'fs';
-import { l as load_config, $, c as coalesce_to_error } from './chunks/error.js';
+import { l as load_config, $ } from './chunks/index.js';
 import sade from 'sade';
+import { c as coalesce_to_error } from './chunks/error.js';
 import 'path';
 import 'url';
 
@@ -18,7 +19,7 @@ function handle_error(e) {
 	process.exit(1);
 }
 
-const prog = sade('svelte-kit').version('1.0.0-next.392');
+const prog = sade('svelte-kit').version('1.0.0-next.395');
 
 prog
 	.command('package')
@@ -27,7 +28,7 @@ prog
 	.action(async ({ watch }) => {
 		try {
 			const config = await load_config();
-			const packaging = await import('./chunks/index.js');
+			const packaging = await import('./chunks/index2.js');
 
 			await (watch ? packaging.watch(config) : packaging.build(config));
 		} catch (error) {
@@ -38,7 +39,8 @@ prog
 prog
 	.command('sync')
 	.describe('Synchronise generated files')
-	.action(async () => {
+	.option('--mode', 'Specify a mode for loading environment variables', 'development')
+	.action(async ({ mode }) => {
 		if (!fs__default.existsSync('svelte.config.js')) {
 			console.warn('Missing svelte.config.js — skipping');
 			return;
@@ -46,8 +48,8 @@ prog
 
 		try {
 			const config = await load_config();
-			const sync = await import('./chunks/sync.js').then(function (n) { return n.d; });
-			sync.all(config);
+			const sync = await import('./chunks/sync.js').then(function (n) { return n.f; });
+			sync.all(config, mode);
 		} catch (error) {
 			handle_error(error);
 		}