@sveltejs/vite-plugin-svelte 1.0.0-next.33 → 1.0.0-next.34

package/src/utils/optimizer.ts

@@ -0,0 +1,43 @@
+import fs from 'fs';
+import path from 'path';
+import { optimizeDeps, ResolvedConfig } from 'vite';
+import { ResolvedOptions } from './options';
+
+// List of options that changes the prebundling result
+const PREBUNDLE_SENSITIVE_OPTIONS: (keyof ResolvedOptions)[] = [
+	'compilerOptions',
+	'configFile',
+	'experimental',
+	'extensions',
+	'ignorePluginPreprocessors',
+	'preprocess'
+];
+
+export async function handleOptimizeDeps(options: ResolvedOptions, viteConfig: ResolvedConfig) {
+	if (!options.experimental.prebundleSvelteLibraries || !viteConfig.cacheDir) return;
+
+	const viteMetadataPath = path.resolve(viteConfig.cacheDir, '_metadata.json');
+
+	if (!fs.existsSync(viteMetadataPath)) return;
+
+	const svelteMetadataPath = path.resolve(viteConfig.cacheDir, '_svelte_metadata.json');
+	const currentSvelteMetadata = JSON.stringify(generateSvelteMetadata(options), (_, value) => {
+		return typeof value === 'function' ? value.toString() : value;
+	});
+
+	if (fs.existsSync(svelteMetadataPath)) {
+		const existingSvelteMetadata = fs.readFileSync(svelteMetadataPath, 'utf8');
+		if (existingSvelteMetadata === currentSvelteMetadata) return;
+	}
+
+	await optimizeDeps(viteConfig, true);
+	fs.writeFileSync(svelteMetadataPath, currentSvelteMetadata);
+}
+
+function generateSvelteMetadata(options: ResolvedOptions) {
+	const metadata: Record<string, any> = {};
+	for (const key of PREBUNDLE_SENSITIVE_OPTIONS) {
+		metadata[key] = options[key];
+	}
+	return metadata;
+}

package/src/utils/options.ts

@@ -112,6 +112,7 @@ export function resolveOptions(
 			...defaultOptions.compilerOptions,
 			...preResolveOptions.compilerOptions
 		},
+		root: viteConfig.root,
 		isProduction: viteConfig.isProduction
 	};
 	addExtraPreprocessors(merged, viteConfig);

package/src/utils/preprocess.ts

@@ -25,7 +25,8 @@ function createViteScriptPreprocessor(): Preprocessor {
 			tsconfigRaw: {
 				compilerOptions: {
 					// svelte typescript needs this flag to work with type imports
-					importsNotUsedAsValues: 'preserve'
+					importsNotUsedAsValues: 'preserve',
+					preserveValueImports: true
 				}
 			}
 		});

package/src/utils/watch.ts

@@ -54,7 +54,7 @@ export function setupWatchers(
 			});
 		} else {
 			log.info(`svelte config changed: restarting vite server. - file: ${filename}`);
-			server.restart(!!options.experimental?.prebundleSvelteLibraries);
+			server.restart();
 		}
 	};