@sveltejs/kit 1.0.0-next.326 → 1.0.0-next.327

package/dist/chunks/index.js

@@ -23,6 +23,7 @@ import 'node:zlib';
 import 'node:stream';
 import 'node:util';
 import 'node:url';
+import './write_tsconfig.js';
 import 'stream';
 
 /**

package/dist/chunks/index2.js

@@ -10,6 +10,7 @@ import { n as normalize_path, d as deep_merge, r as resolve, i as is_root_relati
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import { pathToFileURL, URL as URL$1 } from 'url';
 import { installFetch } from '../install-fetch.js';
+import './write_tsconfig.js';
 import 'sade';
 import 'child_process';
 import 'net';

package/dist/chunks/index6.js

@@ -5,6 +5,7 @@ import { $ } from '../cli.js';
 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 { a as write_tsconfig } from './write_tsconfig.js';
 import 'sade';
 import 'child_process';
 import 'net';
@@ -15547,6 +15548,9 @@ async function build(config, cwd = process.cwd()) {
 	rimraf(dir);
 	mkdirp(dir);
 
+	// Make sure generated tsconfig is up-to-date
+	write_tsconfig(config);
+
 	const files = scan(config);
 
 	if (config.kit.package.emitTypes) {

package/dist/chunks/sync.js

@@ -1,9 +1,10 @@
 import path__default from 'path';
 import fs__default from 'fs';
-import { g as get_runtime_path, $ } from '../cli.js';
-import { p as posixify, c as copy, m as mkdirp } from './filesystem.js';
+import { g as get_runtime_path } from '../cli.js';
+import { p as posixify, c as copy } from './filesystem.js';
 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_tsconfig } from './write_tsconfig.js';
 import 'sade';
 import 'child_process';
 import 'net';
@@ -581,28 +582,6 @@ function copy_assets(dest) {
 	} while (true); // eslint-disable-line
 }
 
-/** @type {Map<string, string>} */
-const previous_contents = new Map();
-
-/**
- * @param {string} file
- * @param {string} code
- */
-function write_if_changed(file, code) {
-	if (code !== previous_contents.get(file)) {
-		previous_contents.set(file, code);
-		mkdirp(path__default.dirname(file));
-		fs__default.writeFileSync(file, code);
-	}
-}
-
-/** @param {string} str */
-function trim(str) {
-	const indentation = /** @type {RegExpExecArray} */ (/\n?(\s*)/.exec(str))[1];
-	const pattern = new RegExp(`^${indentation}`, 'gm');
-	return str.replace(pattern, '').trim();
-}
-
 /**
  * @param {import('types').ManifestData} manifest_data
  * @param {string} base
@@ -763,128 +742,6 @@ function write_root(manifest_data, output) {
 	);
 }
 
-/** @param {string} file */
-const exists = (file) => fs__default.existsSync(file) && file;
-
-/** @param {import('types').ValidatedConfig} config */
-function write_tsconfig(config) {
-	const out = path__default.join(config.kit.outDir, 'tsconfig.json');
-	const user_file = exists('tsconfig.json') || exists('jsconfig.json');
-
-	if (user_file) validate(config, out, user_file);
-
-	/** @param {string} file */
-	const project_relative = (file) => posixify(path__default.relative('.', file));
-
-	/** @param {string} file */
-	const config_relative = (file) => posixify(path__default.relative(config.kit.outDir, file));
-
-	const dirs = new Set([
-		project_relative(path__default.dirname(config.kit.files.routes)),
-		project_relative(path__default.dirname(config.kit.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`));
-	});
-
-	write_if_changed(
-		out,
-		JSON.stringify(
-			{
-				compilerOptions: {
-					// generated options
-					baseUrl: config_relative('.'),
-					paths: fs__default.existsSync(config.kit.files.lib)
-						? {
-								$lib: [project_relative(config.kit.files.lib)],
-								'$lib/*': [project_relative(config.kit.files.lib + '/*')]
-						  }
-						: {},
-					rootDirs: [config_relative('.'), './types'],
-
-					// essential options
-					// svelte-preprocess cannot figure out whether you have a value or a type, so tell TypeScript
-					// to enforce using \`import type\` instead of \`import\` for Types.
-					importsNotUsedAsValues: 'error',
-					// Vite compiles modules one at a time
-					isolatedModules: true,
-					// TypeScript doesn't know about import usages in the template because it only sees the
-					// script of a Svelte file. Therefore preserve all value imports. Requires TS 4.5 or higher.
-					preserveValueImports: true,
-
-					// This is required for svelte-kit package to work as expected
-					// Can be overwritten
-					lib: ['esnext', 'DOM'],
-					moduleResolution: 'node',
-					module: 'esnext',
-					target: 'esnext'
-				},
-				include,
-				exclude: [config_relative('node_modules/**'), './**']
-			},
-			null,
-			'\t'
-		)
-	);
-}
-
-/**
- * @param {import('types').ValidatedConfig} config
- * @param {string} out
- * @param {string} user_file
- */
-function validate(config, out, user_file) {
-	// we have to eval the file, since it's not parseable as JSON (contains comments)
-	const user_tsconfig_json = fs__default.readFileSync(user_file, 'utf-8');
-	const user_tsconfig = (0, eval)(`(${user_tsconfig_json})`);
-
-	// we need to check that the user's tsconfig extends the framework config
-	const extend = user_tsconfig.extends;
-	const extends_framework_config = extend && path__default.resolve('.', extend) === out;
-
-	if (extends_framework_config) {
-		const { paths: user_paths } = user_tsconfig.compilerOptions || {};
-
-		if (user_paths && fs__default.existsSync(config.kit.files.lib)) {
-			/** @type {string[]} */
-			const lib = user_paths['$lib'] || [];
-			/** @type {string[]} */
-			const lib_ = user_paths['$lib/*'] || [];
-
-			const missing_lib_paths =
-				!lib.some((relative) => path__default.resolve('.', relative) === config.kit.files.lib) ||
-				!lib_.some(
-					(relative) => path__default.resolve('.', relative) === path__default.join(config.kit.files.lib, '/*')
-				);
-
-			if (missing_lib_paths) {
-				console.warn(
-					$
-						.bold()
-						.yellow(`Your compilerOptions.paths in ${user_file} should include the following:`)
-				);
-				const relative = posixify(path__default.relative('.', config.kit.files.lib));
-				console.warn(`{\n  "$lib":["${relative}"],\n  "$lib/*":["${relative}/*"]\n}`);
-			}
-		}
-	} else {
-		let relative = posixify(path__default.relative('.', out));
-		if (!relative.startsWith('./')) relative = './' + relative;
-
-		console.warn(
-			$
-				.bold()
-				.yellow(`Your ${user_file} should extend the configuration generated by SvelteKit:`)
-		);
-		console.warn(`{\n  "extends": "${relative}"\n}`);
-	}
-}
-
 /** @param {string} imports */
 const header = (imports) => `
 // this file is auto-generated

package/dist/chunks/write_tsconfig.js

@@ -0,0 +1,150 @@
+import fs__default from 'fs';
+import path__default from 'path';
+import { $ } from '../cli.js';
+import { m as mkdirp, p as posixify } from './filesystem.js';
+
+/** @type {Map<string, string>} */
+const previous_contents = new Map();
+
+/**
+ * @param {string} file
+ * @param {string} code
+ */
+function write_if_changed(file, code) {
+	if (code !== previous_contents.get(file)) {
+		previous_contents.set(file, code);
+		mkdirp(path__default.dirname(file));
+		fs__default.writeFileSync(file, code);
+	}
+}
+
+/** @param {string} str */
+function trim(str) {
+	const indentation = /** @type {RegExpExecArray} */ (/\n?(\s*)/.exec(str))[1];
+	const pattern = new RegExp(`^${indentation}`, 'gm');
+	return str.replace(pattern, '').trim();
+}
+
+/** @param {string} file */
+const exists = (file) => fs__default.existsSync(file) && file;
+
+/** @param {import('types').ValidatedConfig} config */
+function write_tsconfig(config) {
+	const out = path__default.join(config.kit.outDir, 'tsconfig.json');
+	const user_file = exists('tsconfig.json') || exists('jsconfig.json');
+
+	if (user_file) validate(config, out, user_file);
+
+	/** @param {string} file */
+	const project_relative = (file) => posixify(path__default.relative('.', file));
+
+	/** @param {string} file */
+	const config_relative = (file) => posixify(path__default.relative(config.kit.outDir, file));
+
+	const dirs = new Set([
+		project_relative(path__default.dirname(config.kit.files.routes)),
+		project_relative(path__default.dirname(config.kit.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`));
+	});
+
+	write_if_changed(
+		out,
+		JSON.stringify(
+			{
+				compilerOptions: {
+					// generated options
+					baseUrl: config_relative('.'),
+					paths: fs__default.existsSync(config.kit.files.lib)
+						? {
+								$lib: [project_relative(config.kit.files.lib)],
+								'$lib/*': [project_relative(config.kit.files.lib + '/*')]
+						  }
+						: {},
+					rootDirs: [config_relative('.'), './types'],
+
+					// essential options
+					// svelte-preprocess cannot figure out whether you have a value or a type, so tell TypeScript
+					// to enforce using \`import type\` instead of \`import\` for Types.
+					importsNotUsedAsValues: 'error',
+					// Vite compiles modules one at a time
+					isolatedModules: true,
+					// TypeScript doesn't know about import usages in the template because it only sees the
+					// script of a Svelte file. Therefore preserve all value imports. Requires TS 4.5 or higher.
+					preserveValueImports: true,
+
+					// This is required for svelte-kit package to work as expected
+					// Can be overwritten
+					lib: ['esnext', 'DOM'],
+					moduleResolution: 'node',
+					module: 'esnext',
+					target: 'esnext'
+				},
+				include,
+				exclude: [config_relative('node_modules/**'), './**']
+			},
+			null,
+			'\t'
+		)
+	);
+}
+
+/**
+ * @param {import('types').ValidatedConfig} config
+ * @param {string} out
+ * @param {string} user_file
+ */
+function validate(config, out, user_file) {
+	// we have to eval the file, since it's not parseable as JSON (contains comments)
+	const user_tsconfig_json = fs__default.readFileSync(user_file, 'utf-8');
+	const user_tsconfig = (0, eval)(`(${user_tsconfig_json})`);
+
+	// we need to check that the user's tsconfig extends the framework config
+	const extend = user_tsconfig.extends;
+	const extends_framework_config = extend && path__default.resolve('.', extend) === out;
+
+	if (extends_framework_config) {
+		const { paths: user_paths } = user_tsconfig.compilerOptions || {};
+
+		if (user_paths && fs__default.existsSync(config.kit.files.lib)) {
+			/** @type {string[]} */
+			const lib = user_paths['$lib'] || [];
+			/** @type {string[]} */
+			const lib_ = user_paths['$lib/*'] || [];
+
+			const missing_lib_paths =
+				!lib.some((relative) => path__default.resolve('.', relative) === config.kit.files.lib) ||
+				!lib_.some(
+					(relative) => path__default.resolve('.', relative) === path__default.join(config.kit.files.lib, '/*')
+				);
+
+			if (missing_lib_paths) {
+				console.warn(
+					$
+						.bold()
+						.yellow(`Your compilerOptions.paths in ${user_file} should include the following:`)
+				);
+				const relative = posixify(path__default.relative('.', config.kit.files.lib));
+				console.warn(`{\n  "$lib":["${relative}"],\n  "$lib/*":["${relative}/*"]\n}`);
+			}
+		}
+	} else {
+		let relative = posixify(path__default.relative('.', out));
+		if (!relative.startsWith('./')) relative = './' + relative;
+
+		console.warn(
+			$
+				.bold()
+				.yellow(`Your ${user_file} should extend the configuration generated by SvelteKit:`)
+		);
+		console.warn(`{\n  "extends": "${relative}"\n}`);
+	}
+}
+
+export { write_tsconfig as a, trim as t, write_if_changed as w };

package/dist/cli.js

@@ -870,7 +870,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.326');
+const prog = sade('svelte-kit').version('1.0.0-next.327');
 
 prog
 	.command('dev')
@@ -1049,7 +1049,7 @@ async function check_port(port) {
 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.326'}\n`));
+	console.log($.bold().cyan(`\n  SvelteKit v${'1.0.0-next.327'}\n`));
 
 	const protocol = https ? 'https:' : 'http:';
 	const exposed = typeof host !== 'undefined' && host !== 'localhost' && host !== '127.0.0.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.326",
+  "version": "1.0.0-next.327",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/types/ambient.d.ts

@@ -151,7 +151,7 @@ declare module '$app/navigation' {
  */
 declare module '$app/paths' {
 	/**
-	 * A string that matches [`config.kit.paths.base`](/docs/configuration#paths). It must begin, but not end, with a `/`.
+	 * A string that matches [`config.kit.paths.base`](/docs/configuration#paths). It must start, but not end with `/` (e.g. `/base-path`), unless it is the empty string.
 	 */
 	export const base: `/${string}`;
 	/**