@sveltejs/kit 3.0.0-next.23 → 3.0.0-next.24

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

@@ -94,7 +94,7 @@ export function find_deps(manifest, entry, add_dynamic_css, root) {
 		imports: Array.from(imports),
 		stylesheets: Array.from(stylesheets),
 		// TODO do we need this separately?
-		fonts: filter_fonts(assets),
+		fonts: filter_fonts(assets, manifest, root),
 		stylesheet_map
 	};
 }
@@ -116,12 +116,56 @@ export function resolve_symlinks(manifest, file, root) {
 	return { chunk, file };
 }
 
+/** @type {WeakMap<import('vite').Manifest, Map<string, string>>} */
+const source_maps = new WeakMap();
+
 /**
  * @param {string[]} assets
- * @returns {string[]}
+ * @param {import('vite').Manifest} manifest
+ * @param {string} root
+ * @returns {import('types').FontDependency[]}
  */
-export function filter_fonts(assets) {
-	return assets.filter((asset) => /\.(woff2?|ttf|otf)$/.test(asset));
+export function filter_fonts(assets, manifest, root) {
+	let sources = source_maps.get(manifest);
+
+	if (!sources) {
+		sources = new Map();
+		source_maps.set(manifest, sources);
+
+		// identical files are emitted once but can have several sources — keep the first
+		for (const key of Object.keys(manifest).sort()) {
+			const { file, src } = manifest[key];
+			if (src && !sources.has(file)) {
+				sources.set(file, src);
+			}
+		}
+	}
+
+	return assets
+		.filter((asset) => /\.(woff2?|ttf|otf)$/.test(asset))
+		.map((file) => {
+			const src = sources.get(file) ?? file;
+			const marker = '/node_modules/';
+			const index = src.lastIndexOf(marker);
+
+			// Vite follows package manager symlinks when generating the manifest. Prefer the
+			// project-local node_modules path when it points to the same file.
+			if (index !== -1) {
+				const filename = `node_modules/${src.slice(index + marker.length)}`;
+				const source = path.resolve(root, src);
+				const unresolved = path.resolve(root, filename);
+
+				if (
+					fs.existsSync(source) &&
+					fs.existsSync(unresolved) &&
+					fs.realpathSync(unresolved) === fs.realpathSync(source)
+				) {
+					return { file, filename };
+				}
+			}
+
+			return { file, filename: normalizePath(path.relative(root, path.resolve(root, src))) };
+		});
 }
 
 /**

package/src/exports/vite/dev/index.js

@@ -25,6 +25,9 @@ import { SCHEME } from '../../../utils/url.js';
 import { check_feature } from '../../../utils/features.js';
 import { escape_html } from '../../../utils/escape.js';
 import { get_runner } from '../../../runner.js';
+import { write_server } from '../../../core/sync/write_server.js';
+import { write_tsconfig } from '../../../core/sync/write_tsconfig/index.js';
+import create_manifest_data from '../../../core/sync/create_manifest_data/index.js';
 
 // vite-specifc queries that we should skip handling for css urls
 const vite_css_query_regex = /(?:\?|&)(?:raw|url|inline)(?:&|$)/;
@@ -74,7 +77,7 @@ export async function dev(
 		return fetch(info, init);
 	};
 
-	sync.init(svelte_config, root);
+	write_tsconfig(svelte_config, root);
 
 	/** @type {ManifestData} */
 	let manifest_data;
@@ -135,7 +138,8 @@ export async function dev(
 
 	async function update_manifest() {
 		try {
-			({ manifest_data } = sync.create(svelte_config, root));
+			manifest_data = create_manifest_data(svelte_config, root);
+			sync.create(svelte_config, root, manifest_data, false);
 			set_manifest_data(manifest_data);
 
 			await load_and_validate_params({
@@ -172,7 +176,7 @@ export async function dev(
 			_: {
 				client: {
 					start: `${get_runtime_base(root)}/client/entry.js`,
-					app: `${to_fs(svelte_config.outDir)}/generated/client/app.js`,
+					app: `${to_fs(svelte_config.outDir)}/generated/dev/client/app.js`,
 					imports: [],
 					stylesheets: [],
 					fonts: [],
@@ -182,7 +186,7 @@ export async function dev(
 							? undefined
 							: manifest_data.nodes.map((node, i) => {
 									if (node.component || node.universal) {
-										return `${svelte_config.paths.base}${to_fs(svelte_config.outDir)}/generated/client/nodes/${i}.js`;
+										return `${svelte_config.paths.base}${to_fs(svelte_config.outDir)}/generated/dev/client/nodes/${i}.js`;
 									}
 								}),
 					// `css` is not necessary in dev, as the JS file from `nodes` will reference the CSS file
@@ -450,7 +454,7 @@ export async function dev(
 			file.startsWith(serviceWorker) ||
 			file.startsWith(hooks.server)
 		) {
-			sync.server(svelte_config, root);
+			write_server(svelte_config, path.join(svelte_config.outDir, 'generated', 'dev'), root);
 		}
 	});
 
@@ -593,7 +597,8 @@ export async function dev(
 
 				const request = getRequest({
 					base,
-					request: req
+					request: req,
+					response: res
 				});
 
 				if (manifest_error) {
@@ -736,19 +741,3 @@ function has_correct_case(file, assets) {
 
 	return false;
 }
-
-/**
- * Invalidates a module in all environments.
- * @param {ViteDevServer} server
- * @param {string} id
- * @returns {void}
- */
-export function invalidate_module(server, id) {
-	for (const environment in server.environments) {
-		const module = server.environments[environment].moduleGraph.getModuleById(id);
-		if (module) {
-			server.environments[environment].moduleGraph.invalidateModule(module);
-			void server.environments[environment].reloadModule(module);
-		}
-	}
-}