@sveltejs/kit 1.2.10 → 1.3.1

package/src/core/sync/write_tsconfig.js

@@ -3,6 +3,7 @@ import path from 'path';
 import colors from 'kleur';
 import { posixify } from '../../utils/filesystem.js';
 import { write_if_changed } from './utils.js';
+import { ts } from './ts.js';
 
 /**
  * @param {string} cwd
@@ -34,7 +35,7 @@ function remove_trailing_slashstar(file) {
 }
 
 /**
- * Writes the tsconfig that the user's tsconfig inherits from.
+ * Generates the tsconfig that the user's tsconfig inherits from.
  * @param {import('types').ValidatedKitConfig} kit
  */
 export function write_tsconfig(kit, cwd = process.cwd()) {
@@ -72,6 +73,15 @@ export function write_tsconfig(kit, cwd = process.cwd()) {
 		}
 	}
 
+	write_if_changed(out, JSON.stringify(get_tsconfig(kit, include_base_url), null, '\t'));
+}
+
+/**
+ * Generates the tsconfig that the user's tsconfig inherits from.
+ * @param {import('types').ValidatedKitConfig} kit
+ * @param {boolean} include_base_url
+ */
+export function get_tsconfig(kit, include_base_url) {
 	/** @param {string} file */
 	const config_relative = (file) => posixify(path.relative(kit.outDir, file));
 
@@ -98,40 +108,38 @@ export function write_tsconfig(kit, cwd = process.cwd()) {
 		exclude.push(config_relative(`${kit.files.serviceWorker}.d.ts`));
 	}
 
-	write_if_changed(
-		out,
-		JSON.stringify(
-			{
-				compilerOptions: {
-					// generated options
-					baseUrl: include_base_url ? config_relative('.') : undefined,
-					paths: get_tsconfig_paths(kit, include_base_url),
-					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-package to work as expected
-					// Can be overwritten
-					lib: ['esnext', 'DOM', 'DOM.Iterable'],
-					moduleResolution: 'node',
-					module: 'esnext',
-					target: 'esnext'
-				},
-				include,
-				exclude
-			},
-			null,
-			'\t'
-		)
-	);
+	const config = {
+		compilerOptions: {
+			// generated options
+			baseUrl: include_base_url ? config_relative('.') : undefined,
+			paths: get_tsconfig_paths(kit, include_base_url),
+			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-package to work as expected
+			// Can be overwritten
+			lib: ['esnext', 'DOM', 'DOM.Iterable'],
+			moduleResolution: 'node',
+			module: 'esnext',
+			target: 'esnext',
+
+			// TODO(v2): use the new flag verbatimModuleSyntax instead (requires support by Vite/Esbuild)
+			ignoreDeprecations: ts && Number(ts.version.split('.')[0]) >= 5 ? '5.0' : undefined
+		},
+		include,
+		exclude
+	};
+
+	return kit.typescript.config(config) ?? config;
 }
 
 /** @param {string} cwd */
@@ -212,7 +220,7 @@ const value_regex = /^(.*?)((\/\*)|(\.\w+))?$/;
  * @param {import('types').ValidatedKitConfig} config
  * @param {boolean} include_base_url
  */
-export function get_tsconfig_paths(config, include_base_url) {
+function get_tsconfig_paths(config, include_base_url) {
 	/** @param {string} file */
 	const config_relative = (file) => posixify(path.relative(config.outDir, file));
 

package/src/core/sync/write_types/index.js

@@ -3,6 +3,7 @@ import path from 'path';
 import MagicString from 'magic-string';
 import { posixify, rimraf, walk } from '../../../utils/filesystem.js';
 import { compact } from '../../../utils/array.js';
+import { ts } from '../ts.js';
 
 /**
  *  @typedef {{
@@ -20,13 +21,6 @@ import { compact } from '../../../utils/array.js';
  *  @typedef {Map<import('types').PageNode, {route: import('types').RouteData, proxies: Proxies}>} RoutesMap
  */
 
-/** @type {import('typescript')} */
-// @ts-ignore
-let ts = undefined;
-try {
-	ts = (await import('typescript')).default;
-} catch {}
-
 const cwd = process.cwd();
 
 /**

package/src/exports/vite/build/build_server.js

@@ -1,61 +1,33 @@
 import fs from 'node:fs';
-import path from 'node:path';
-import * as vite from 'vite';
-import { mkdirp, posixify } from '../../../utils/filesystem.js';
-import { find_deps, is_http_method, resolve_symlinks } from './utils.js';
+import { mkdirp } from '../../../utils/filesystem.js';
+import { find_deps, resolve_symlinks } from './utils.js';
 import { s } from '../../../utils/misc.js';
 
 /**
- * @param {{
- *   config: import('types').ValidatedConfig;
- *   vite_config: import('vite').ResolvedConfig;
- *   vite_config_env: import('vite').ConfigEnv;
- *   manifest_data: import('types').ManifestData;
- *   output_dir: string;
- * }} options
- * @param {{ vite_manifest: import('vite').Manifest, assets: import('rollup').OutputAsset[] }} client
+ * @param {string} out
+ * @param {import('types').ValidatedKitConfig} kit
+ * @param {import('types').ManifestData} manifest_data
+ * @param {import('vite').Manifest} server_manifest
+ * @param {import('vite').Manifest | null} client_manifest
+ * @param {import('rollup').OutputAsset[] | null} css
  */
-export async function build_server(options, client) {
-	const { config, vite_config, vite_config_env, manifest_data, output_dir } = options;
-
-	const { output } = /** @type {import('rollup').RollupOutput} */ (
-		await vite.build({
-			// CLI args
-			configFile: vite_config.configFile,
-			mode: vite_config_env.mode,
-			logLevel: config.logLevel,
-			clearScreen: config.clearScreen,
-			build: {
-				ssr: true
-			}
-		})
-	);
-
-	const chunks = /** @type {import('rollup').OutputChunk[]} */ (
-		output.filter((chunk) => chunk.type === 'chunk')
-	);
-
-	/** @type {import('vite').Manifest} */
-	const vite_manifest = JSON.parse(
-		fs.readFileSync(`${output_dir}/server/${vite_config.build.manifest}`, 'utf-8')
-	);
-
-	mkdirp(`${output_dir}/server/nodes`);
-	mkdirp(`${output_dir}/server/stylesheets`);
+export function build_server_nodes(out, kit, manifest_data, server_manifest, client_manifest, css) {
+	mkdirp(`${out}/server/nodes`);
+	mkdirp(`${out}/server/stylesheets`);
 
 	const stylesheet_lookup = new Map();
 
-	client.assets.forEach((asset) => {
-		if (asset.fileName.endsWith('.css')) {
-			if (asset.source.length < config.kit.inlineStyleThreshold) {
+	if (css) {
+		css.forEach((asset) => {
+			if (asset.source.length < kit.inlineStyleThreshold) {
 				const index = stylesheet_lookup.size;
-				const file = `${output_dir}/server/stylesheets/${index}.js`;
+				const file = `${out}/server/stylesheets/${index}.js`;
 
 				fs.writeFileSync(file, `// ${asset.fileName}\nexport default ${s(asset.source)};`);
 				stylesheet_lookup.set(asset.fileName, index);
 			}
-		}
-	});
+		});
+	}
 
 	manifest_data.nodes.forEach((node, i) => {
 		/** @type {string[]} */
@@ -75,8 +47,8 @@ export async function build_server(options, client) {
 		/** @type {string[]} */
 		const fonts = [];
 
-		if (node.component) {
-			const entry = find_deps(client.vite_manifest, node.component, true);
+		if (node.component && client_manifest) {
+			const entry = find_deps(client_manifest, node.component, true);
 
 			imported.push(...entry.imports);
 			stylesheets.push(...entry.stylesheets);
@@ -84,25 +56,27 @@ export async function build_server(options, client) {
 
 			exports.push(
 				`export const component = async () => (await import('../${
-					resolve_symlinks(vite_manifest, node.component).chunk.file
+					resolve_symlinks(server_manifest, node.component).chunk.file
 				}')).default;`,
 				`export const file = '${entry.file}';` // TODO what is this?
 			);
 		}
 
 		if (node.universal) {
-			const entry = find_deps(client.vite_manifest, node.universal, true);
+			if (client_manifest) {
+				const entry = find_deps(client_manifest, node.universal, true);
 
-			imported.push(...entry.imports);
-			stylesheets.push(...entry.stylesheets);
-			fonts.push(...entry.fonts);
+				imported.push(...entry.imports);
+				stylesheets.push(...entry.stylesheets);
+				fonts.push(...entry.fonts);
+			}
 
-			imports.push(`import * as universal from '../${vite_manifest[node.universal].file}';`);
+			imports.push(`import * as universal from '../${server_manifest[node.universal].file}';`);
 			exports.push(`export { universal };`);
 		}
 
 		if (node.server) {
-			imports.push(`import * as server from '../${vite_manifest[node.server].file}';`);
+			imports.push(`import * as server from '../${server_manifest[node.server].file}';`);
 			exports.push(`export { server };`);
 		}
 
@@ -128,45 +102,9 @@ export async function build_server(options, client) {
 			exports.push(`export const inline_styles = () => ({\n${styles.join(',\n')}\n});`);
 		}
 
-		const out = `${output_dir}/server/nodes/${i}.js`;
-		fs.writeFileSync(out, `${imports.join('\n')}\n\n${exports.join('\n')}\n`);
-	});
-
-	return {
-		chunks,
-		vite_manifest,
-		methods: get_methods(chunks, manifest_data)
-	};
-}
-
-/**
- * @param {import('rollup').OutputChunk[]} output
- * @param {import('types').ManifestData} manifest_data
- */
-function get_methods(output, manifest_data) {
-	/** @type {Record<string, string[]>} */
-	const lookup = {};
-	output.forEach((chunk) => {
-		if (!chunk.facadeModuleId) return;
-		const id = posixify(path.relative('.', chunk.facadeModuleId));
-		lookup[id] = chunk.exports;
-	});
-
-	/** @type {Record<string, import('types').HttpMethod[]>} */
-	const methods = {};
-	manifest_data.routes.forEach((route) => {
-		if (route.endpoint) {
-			if (lookup[route.endpoint.file]) {
-				methods[route.endpoint.file] = lookup[route.endpoint.file].filter(is_http_method);
-			}
-		}
-
-		if (route.leaf?.server) {
-			if (lookup[route.leaf.server]) {
-				methods[route.leaf.server] = lookup[route.leaf.server].filter(is_http_method);
-			}
-		}
+		fs.writeFileSync(
+			`${out}/server/nodes/${i}.js`,
+			`${imports.join('\n')}\n\n${exports.join('\n')}\n`
+		);
 	});
-
-	return methods;
 }

package/src/exports/vite/build/build_service_worker.js

@@ -5,19 +5,19 @@ import { get_config_aliases } from '../utils.js';
 import { assets_base } from './utils.js';
 
 /**
- * @param {{
- *   config: import('types').ValidatedConfig;
- *   vite_config: import('vite').ResolvedConfig;
- *   vite_config_env: import('vite').ConfigEnv;
- *   manifest_data: import('types').ManifestData;
- *   output_dir: string;
- * }} options
+ * @param {string} out
+ * @param {import('types').ValidatedKitConfig} kit
+ * @param {import('vite').ResolvedConfig} vite_config
+ * @param {import('types').ManifestData} manifest_data
  * @param {string} service_worker_entry_file
  * @param {import('types').Prerendered} prerendered
  * @param {import('vite').Manifest} client_manifest
  */
 export async function build_service_worker(
-	{ config, vite_config, manifest_data, output_dir },
+	out,
+	kit,
+	vite_config,
+	manifest_data,
 	service_worker_entry_file,
 	prerendered,
 	client_manifest
@@ -30,21 +30,21 @@ export async function build_service_worker(
 		assets.forEach((file) => build.add(file));
 	}
 
-	const service_worker = `${config.kit.outDir}/generated/service-worker.js`;
+	const service_worker = `${kit.outDir}/generated/service-worker.js`;
 
 	fs.writeFileSync(
 		service_worker,
 		`
 			export const build = [
 				${Array.from(build)
-					.map((file) => `${s(`${config.kit.paths.base}/${file}`)}`)
+					.map((file) => `${s(`${kit.paths.base}/${file}`)}`)
 					.join(',\n\t\t\t\t')}
 			];
 
 			export const files = [
 				${manifest_data.assets
-					.filter((asset) => config.kit.serviceWorker.files(asset.file))
-					.map((asset) => `${s(`${config.kit.paths.base}/${asset.file}`)}`)
+					.filter((asset) => kit.serviceWorker.files(asset.file))
+					.map((asset) => `${s(`${kit.paths.base}/${asset.file}`)}`)
 					.join(',\n\t\t\t\t')}
 			];
 
@@ -52,14 +52,14 @@ export async function build_service_worker(
 				${prerendered.paths.map((path) => s(path)).join(',\n\t\t\t\t')}
 			];
 
-			export const version = ${s(config.kit.version.name)};
+			export const version = ${s(kit.version.name)};
 		`
 			.replace(/^\t{3}/gm, '')
 			.trim()
 	);
 
 	await vite.build({
-		base: assets_base(config.kit),
+		base: assets_base(kit),
 		build: {
 			lib: {
 				entry: /** @type {string} */ (service_worker_entry_file),
@@ -71,16 +71,13 @@ export async function build_service_worker(
 					entryFileNames: 'service-worker.js'
 				}
 			},
-			outDir: `${output_dir}/client`,
+			outDir: `${out}/client`,
 			emptyOutDir: false
 		},
 		define: vite_config.define,
 		configFile: false,
 		resolve: {
-			alias: [
-				...get_config_aliases(config.kit),
-				{ find: '$service-worker', replacement: service_worker }
-			]
+			alias: [...get_config_aliases(kit), { find: '$service-worker', replacement: service_worker }]
 		}
 	});
 }