@sveltejs/vite-plugin-svelte 1.0.0-next.31 → 1.0.0-next.35

package/src/index.ts

@@ -9,15 +9,17 @@ import {
 	validateInlineOptions,
 	Options,
 	ResolvedOptions,
-	resolveOptions
+	resolveOptions,
+	patchResolvedViteConfig,
+	preResolveOptions
 } from './utils/options';
 import { VitePluginSvelteCache } from './utils/vite-plugin-svelte-cache';
 
 import { ensureWatchedFile, setupWatchers } from './utils/watch';
 import { resolveViaPackageJsonSvelte } from './utils/resolve';
-import { addExtraPreprocessors } from './utils/preprocess';
 import { PartialResolvedId } from 'rollup';
 import { toRollupError } from './utils/error';
+import { handleOptimizeDeps } from './utils/optimizer';
 
 export function svelte(inlineOptions?: Partial<Options>): Plugin {
 	if (process.env.DEBUG != null) {
@@ -25,7 +27,7 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 	}
 	validateInlineOptions(inlineOptions);
 	const cache = new VitePluginSvelteCache();
-	const pkg_export_errors = new Set();
+	const pkg_resolve_errors = new Set();
 	// updated in configResolved hook
 	let requestParser: IdParser;
 	let options: ResolvedOptions;
@@ -51,21 +53,27 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 			} else if (config.logLevel) {
 				log.setLevel(config.logLevel);
 			}
-			options = await resolveOptions(inlineOptions, config, configEnv);
+			// @ts-expect-error temporarily lend the options variable until fixed in configResolved
+			options = await preResolveOptions(inlineOptions, config, configEnv);
 			// extra vite config
 			const extraViteConfig = buildExtraViteConfig(options, config, configEnv);
 			log.debug('additional vite config', extraViteConfig);
-			return extraViteConfig as Partial<UserConfig>;
+			return extraViteConfig;
 		},
 
 		async configResolved(config) {
-			addExtraPreprocessors(options, config);
+			options = resolveOptions(options, config);
+			patchResolvedViteConfig(config, options);
 			requestParser = buildIdParser(options);
 			compileSvelte = createCompileSvelte(options);
 			viteConfig = config;
 			log.debug('resolved options', options);
 		},
 
+		async buildStart() {
+			await handleOptimizeDeps(options, viteConfig);
+		},
+
 		configureServer(server) {
 			// eslint-disable-next-line no-unused-vars
 			options.server = server;
@@ -95,11 +103,9 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 			}
 		},
 
-		async resolveId(importee, importer, opts, _ssr) {
-			// @ts-expect-error anticipate vite deprecating forth parameter and rely on `opts.ssr` instead`
-			// see https://github.com/vitejs/vite/discussions/5109
-			const ssr: boolean = _ssr === true || opts.ssr;
-			const svelteRequest = requestParser(importee, !!ssr);
+		async resolveId(importee, importer, opts) {
+			const ssr = !!opts?.ssr;
+			const svelteRequest = requestParser(importee, ssr);
 			if (svelteRequest?.query.svelte) {
 				if (svelteRequest.query.type === 'style') {
 					// return cssId with root prefix so postcss pipeline of vite finds the directory correctly
@@ -131,29 +137,19 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 			}
 
 			try {
-				const resolved = resolveViaPackageJsonSvelte(importee, importer);
+				const resolved = resolveViaPackageJsonSvelte(importee, importer, cache);
 				if (resolved) {
 					log.debug(`resolveId resolved ${resolved} via package.json svelte field of ${importee}`);
 					return resolved;
 				}
 			} catch (err) {
-				switch (err.code) {
-					case 'ERR_PACKAGE_PATH_NOT_EXPORTED':
-						pkg_export_errors.add(importee);
-						return null;
-					case 'MODULE_NOT_FOUND':
-						return null;
-					default:
-						throw err;
-				}
+				pkg_resolve_errors.add(importee);
 			}
 		},
 
 		async transform(code, id, opts) {
-			// @ts-expect-error anticipate vite changing third parameter as options object
-			// see https://github.com/vitejs/vite/discussions/5109
-			const ssr: boolean = opts === true || opts?.ssr;
-			const svelteRequest = requestParser(id, !!ssr);
+			const ssr = !!opts?.ssr;
+			const svelteRequest = requestParser(id, ssr);
 			if (!svelteRequest) {
 				return;
 			}
@@ -202,10 +198,11 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 		 */
 		// TODO generateBundle isn't called by vite, is buildEnd enough or should it be logged once per violation in resolve
 		buildEnd() {
-			if (pkg_export_errors.size > 0) {
+			if (pkg_resolve_errors.size > 0) {
 				log.warn(
-					`The following packages did not export their \`package.json\` file so we could not check the "svelte" field. If you had difficulties importing svelte components from a package, then please contact the author and ask them to export the package.json file.`,
-					Array.from(pkg_export_errors, (s) => `- ${s}`).join('\n')
+					`vite-plugin-svelte was unable to find package.json of the following packages and wasn't able to resolve via their "svelte" field.
+					If you had difficulties importing svelte components from a package, then please contact the author and ask them to export the package.json file.
+					${Array.from(pkg_resolve_errors, (s) => `- ${s}`).join('\n')}`.replace(/\t/g, '')
 				);
 			}
 		}

package/src/utils/dependencies.ts

@@ -66,7 +66,10 @@ function getSvelteDependencies(
 	return result;
 }
 
-function resolveDependencyData(dep: string, localRequire: NodeRequire): DependencyData | void {
+export function resolveDependencyData(
+	dep: string,
+	localRequire: NodeRequire
+): DependencyData | void {
 	try {
 		const pkgJson = `${dep}/package.json`;
 		const pkg = localRequire(pkgJson);
@@ -166,7 +169,7 @@ const COMMON_PREFIXES_WITHOUT_SVELTE_FIELD = [
  * @param dependency {string}
  * @returns {boolean} true if it is a dependency without a svelte field
  */
-function is_common_without_svelte_field(dependency: string): boolean {
+export function is_common_without_svelte_field(dependency: string): boolean {
 	return (
 		COMMON_DEPENDENCIES_WITHOUT_SVELTE_FIELD.includes(dependency) ||
 		COMMON_PREFIXES_WITHOUT_SVELTE_FIELD.some(
@@ -184,7 +187,12 @@ export function needsOptimization(dep: string, localRequire: NodeRequire): boole
 	const pkg = depData.pkg;
 	// only optimize if is cjs, using the below as heuristic
 	// see https://github.com/sveltejs/vite-plugin-svelte/issues/162
-	return pkg.main && !pkg.module && !pkg.exports;
+	const isCjs = pkg.main && !pkg.module && !pkg.exports;
+	if (!isCjs) return false;
+	// ensure entry is js so vite can prebundle it
+	// see https://github.com/sveltejs/vite-plugin-svelte/issues/233
+	const entryExt = path.extname(pkg.main);
+	return !entryExt || entryExt === '.js' || entryExt === '.cjs';
 }
 
 interface DependencyData {

package/src/utils/esbuild.ts

@@ -10,6 +10,8 @@ type EsbuildOptions = NonNullable<DepOptimizationOptions['esbuildOptions']>;
 type EsbuildPlugin = NonNullable<EsbuildOptions['plugins']>[number];
 type EsbuildPluginBuild = Parameters<EsbuildPlugin['setup']>[0];
 
+export const facadeEsbuildSveltePluginName = 'vite-plugin-svelte:facade';
+
 export function esbuildSveltePlugin(options: ResolvedOptions): EsbuildPlugin {
 	return {
 		name: 'vite-plugin-svelte:optimize-svelte',
@@ -64,6 +66,7 @@ async function compileSvelte(
 		...options.compilerOptions,
 		css: true,
 		filename,
+		format: 'esm',
 		generate: 'dom'
 	};
 

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

@@ -1,5 +1,12 @@
 /* eslint-disable no-unused-vars */
-import { ConfigEnv, DepOptimizationOptions, UserConfig, ViteDevServer, normalizePath } from 'vite';
+import {
+	ConfigEnv,
+	DepOptimizationOptions,
+	ResolvedConfig,
+	UserConfig,
+	ViteDevServer,
+	normalizePath
+} from 'vite';
 import { log } from './log';
 import { loadSvelteConfig } from './load-svelte-config';
 import { SVELTE_HMR_IMPORTS, SVELTE_IMPORTS, SVELTE_RESOLVE_MAIN_FIELDS } from './constants';
@@ -15,7 +22,8 @@ import {
 import path from 'path';
 import { findRootSvelteDependencies, needsOptimization, SvelteDependency } from './dependencies';
 import { createRequire } from 'module';
-import { esbuildSveltePlugin } from './esbuild';
+import { esbuildSveltePlugin, facadeEsbuildSveltePluginName } from './esbuild';
+import { addExtraPreprocessors } from './preprocess';
 
 const knownOptions = new Set([
 	'configFile',
@@ -32,33 +40,85 @@ const knownOptions = new Set([
 	'experimental'
 ]);
 
-function buildDefaultOptions(isProduction: boolean, emitCss = true): Partial<Options> {
-	// no hmr in prod, only inject css in dev if emitCss is false
-	const hot = isProduction
-		? false
-		: {
-				// emit for prod, emit in dev unless css hmr is disabled
-				injectCss: !emitCss
-		  };
+export function validateInlineOptions(inlineOptions?: Partial<Options>) {
+	const invalidKeys = Object.keys(inlineOptions || {}).filter((key) => !knownOptions.has(key));
+	if (invalidKeys.length) {
+		log.warn(`invalid plugin options "${invalidKeys.join(', ')}" in config`, inlineOptions);
+	}
+}
+
+// used in config phase, merges the default options, svelte config, and inline options
+export async function preResolveOptions(
+	inlineOptions: Partial<Options> = {},
+	viteUserConfig: UserConfig,
+	viteEnv: ConfigEnv
+): Promise<PreResolvedOptions> {
+	const viteConfigWithResolvedRoot: UserConfig = {
+		...viteUserConfig,
+		root: resolveViteRoot(viteUserConfig)
+	};
 	const defaultOptions: Partial<Options> = {
 		extensions: ['.svelte'],
-		hot,
-		emitCss,
+		emitCss: true,
 		compilerOptions: {
-			format: 'esm',
-			css: !emitCss,
-			dev: !isProduction
+			format: 'esm'
 		}
 	};
-	log.debug(`default options for ${isProduction ? 'production' : 'development'}`, defaultOptions);
-	return defaultOptions;
+	const svelteConfig = await loadSvelteConfig(viteConfigWithResolvedRoot, inlineOptions);
+	const merged = {
+		...defaultOptions,
+		...svelteConfig,
+		...inlineOptions,
+		compilerOptions: {
+			...defaultOptions?.compilerOptions,
+			...svelteConfig?.compilerOptions,
+			...inlineOptions?.compilerOptions
+		},
+		experimental: {
+			...defaultOptions?.experimental,
+			...svelteConfig?.experimental,
+			...inlineOptions?.experimental
+		},
+		// extras
+		root: viteConfigWithResolvedRoot.root!,
+		isBuild: viteEnv.command === 'build',
+		isServe: viteEnv.command === 'serve'
+	};
+	// configFile of svelteConfig contains the absolute path it was loaded from,
+	// prefer it over the possibly relative inline path
+	if (svelteConfig?.configFile) {
+		merged.configFile = svelteConfig.configFile;
+	}
+	return merged;
 }
 
-export function validateInlineOptions(inlineOptions?: Partial<Options>) {
-	const invalidKeys = Object.keys(inlineOptions || {}).filter((key) => !knownOptions.has(key));
-	if (invalidKeys.length) {
-		log.warn(`invalid plugin options "${invalidKeys.join(', ')}" in config`, inlineOptions);
-	}
+// used in configResolved phase, merges a contextual default config, pre-resolved options, and some preprocessors.
+// also validates the final config.
+export function resolveOptions(
+	preResolveOptions: PreResolvedOptions,
+	viteConfig: ResolvedConfig
+): ResolvedOptions {
+	const defaultOptions: Partial<Options> = {
+		hot: viteConfig.isProduction ? false : { injectCss: !preResolveOptions.emitCss },
+		compilerOptions: {
+			css: !preResolveOptions.emitCss,
+			dev: !viteConfig.isProduction
+		}
+	};
+	const merged: ResolvedOptions = {
+		...defaultOptions,
+		...preResolveOptions,
+		compilerOptions: {
+			...defaultOptions.compilerOptions,
+			...preResolveOptions.compilerOptions
+		},
+		root: viteConfig.root,
+		isProduction: viteConfig.isProduction
+	};
+	addExtraPreprocessors(merged, viteConfig);
+	enforceOptionsForHmr(merged);
+	enforceOptionsForProduction(merged);
+	return merged;
 }
 
 function enforceOptionsForHmr(options: ResolvedOptions) {
@@ -114,66 +174,6 @@ function enforceOptionsForProduction(options: ResolvedOptions) {
 	}
 }
 
-function mergeOptions(
-	defaultOptions: Partial<Options>,
-	svelteConfig: Partial<Options>,
-	inlineOptions: Partial<Options>,
-	viteConfig: UserConfig,
-	viteEnv: ConfigEnv
-): ResolvedOptions {
-	const merged = {
-		...defaultOptions,
-		...svelteConfig,
-		...inlineOptions,
-		compilerOptions: {
-			...defaultOptions.compilerOptions,
-			...(svelteConfig?.compilerOptions || {}),
-			...(inlineOptions?.compilerOptions || {})
-		},
-		experimental: {
-			...(svelteConfig?.experimental || {}),
-			...(inlineOptions?.experimental || {})
-		},
-		root: viteConfig.root!,
-		isProduction: viteEnv.mode === 'production',
-		isBuild: viteEnv.command === 'build',
-		isServe: viteEnv.command === 'serve'
-	};
-	// configFile of svelteConfig contains the absolute path it was loaded from,
-	// prefer it over the possibly relative inline path
-	if (svelteConfig?.configFile) {
-		merged.configFile = svelteConfig.configFile;
-	}
-	return merged;
-}
-
-export async function resolveOptions(
-	inlineOptions: Partial<Options> = {},
-	viteConfig: UserConfig,
-	viteEnv: ConfigEnv
-): Promise<ResolvedOptions> {
-	const viteConfigWithResolvedRoot = {
-		...viteConfig,
-		root: resolveViteRoot(viteConfig)
-	};
-	const svelteConfig = (await loadSvelteConfig(viteConfigWithResolvedRoot, inlineOptions)) || {};
-	const defaultOptions = buildDefaultOptions(
-		viteEnv.mode === 'production',
-		inlineOptions.emitCss ?? svelteConfig.emitCss
-	);
-	const resolvedOptions = mergeOptions(
-		defaultOptions,
-		svelteConfig,
-		inlineOptions,
-		viteConfigWithResolvedRoot,
-		viteEnv
-	);
-
-	enforceOptionsForProduction(resolvedOptions);
-	enforceOptionsForHmr(resolvedOptions);
-	return resolvedOptions;
-}
-
 // vite passes unresolved `root`option to config hook but we need the resolved value, so do it here
 // https://github.com/sveltejs/vite-plugin-svelte/issues/113
 // https://github.com/vitejs/vite/blob/43c957de8a99bb326afd732c962f42127b0a4d1e/packages/vite/src/node/config.ts#L293
@@ -182,7 +182,7 @@ function resolveViteRoot(viteConfig: UserConfig): string | undefined {
 }
 
 export function buildExtraViteConfig(
-	options: ResolvedOptions,
+	options: PreResolvedOptions,
 	config: UserConfig,
 	configEnv: ConfigEnv
 ): Partial<UserConfig> {
@@ -215,7 +215,7 @@ export function buildExtraViteConfig(
 
 function buildOptimizeDepsForSvelte(
 	svelteDeps: SvelteDependency[],
-	options: ResolvedOptions,
+	options: PreResolvedOptions,
 	optimizeDeps?: DepOptimizationOptions
 ): DepOptimizationOptions {
 	// include svelte imports for optimization unless explicitly excluded
@@ -246,7 +246,7 @@ function buildOptimizeDepsForSvelte(
 			include,
 			exclude,
 			esbuildOptions: {
-				plugins: [esbuildSveltePlugin(options)]
+				plugins: [{ name: facadeEsbuildSveltePluginName, setup: () => {} }]
 			}
 		};
 	}
@@ -317,6 +317,14 @@ function buildSSROptionsForSvelte(
 	};
 }
 
+export function patchResolvedViteConfig(viteConfig: ResolvedConfig, options: ResolvedOptions) {
+	const facadeEsbuildSveltePlugin = viteConfig.optimizeDeps.esbuildOptions?.plugins?.find(
+		(plugin) => plugin.name === facadeEsbuildSveltePluginName
+	);
+	if (facadeEsbuildSveltePlugin) {
+		Object.assign(facadeEsbuildSveltePlugin, esbuildSveltePlugin(options));
+	}
+}
 export interface Options {
 	/**
 	 * Path to a svelte config file, either absolute or relative to Vite root
@@ -475,15 +483,18 @@ export interface ExperimentalOptions {
 	}) => Promise<Partial<CompileOptions> | void> | Partial<CompileOptions> | void;
 }
 
-export interface ResolvedOptions extends Options {
+export interface PreResolvedOptions extends Options {
 	// these options are non-nullable after resolve
 	compilerOptions: CompileOptions;
 	experimental: ExperimentalOptions;
 	// extra options
 	root: string;
-	isProduction: boolean;
 	isBuild: boolean;
 	isServe: boolean;
+}
+
+export interface ResolvedOptions extends PreResolvedOptions {
+	isProduction: boolean;
 	server?: ViteDevServer;
 }
 

package/src/utils/preprocess.ts

@@ -17,7 +17,6 @@ const supportedStyleLangs = ['css', 'less', 'sass', 'scss', 'styl', 'stylus', 'p
 const supportedScriptLangs = ['ts'];
 
 function createViteScriptPreprocessor(): Preprocessor {
-	// @ts-expect-error - allow return void
 	return async ({ attributes, content, filename = '' }) => {
 		const lang = attributes.lang as string;
 		if (!supportedScriptLangs.includes(lang)) return;
@@ -26,7 +25,8 @@ function createViteScriptPreprocessor(): Preprocessor {
 			tsconfigRaw: {
 				compilerOptions: {
 					// svelte typescript needs this flag to work with type imports
-					importsNotUsedAsValues: 'preserve'
+					importsNotUsedAsValues: 'preserve',
+					preserveValueImports: true
 				}
 			}
 		});
@@ -47,7 +47,6 @@ function createViteStylePreprocessor(config: ResolvedConfig): Preprocessor {
 		throw new Error(`plugin ${pluginName} has no transform`);
 	}
 	const pluginTransform = plugin.transform!.bind(null as unknown as TransformPluginContext);
-	// @ts-expect-error - allow return void
 	return async ({ attributes, content, filename = '' }) => {
 		const lang = attributes.lang as string;
 		if (!supportedStyleLangs.includes(lang)) return;
@@ -56,20 +55,18 @@ function createViteStylePreprocessor(config: ResolvedConfig): Preprocessor {
 			content,
 			moduleId
 		)) as TransformResult;
-		// vite returns empty mappings that would kill svelte compiler before 3.43.0
-		const hasMap = transformResult.map && transformResult.map.mappings !== '';
 		// patch sourcemap source to point back to original filename
-		if (hasMap && transformResult.map?.sources?.[0] === moduleId) {
+		if (transformResult.map?.sources?.[0] === moduleId) {
 			transformResult.map.sources[0] = filename;
 		}
 		return {
 			code: transformResult.code,
-			map: hasMap ? transformResult.map : undefined
+			map: transformResult.map ?? undefined
 		};
 	};
 }
 
-export function createVitePreprocessorGroup(config: ResolvedConfig): PreprocessorGroup {
+function createVitePreprocessorGroup(config: ResolvedConfig): PreprocessorGroup {
 	return {
 		markup({ content, filename }) {
 			return preprocess(

package/src/utils/resolve.ts

@@ -1,20 +1,41 @@
 import path from 'path';
-import fs from 'fs';
-// @ts-ignore
-import relative from 'require-relative';
+import { createRequire } from 'module';
+import { is_common_without_svelte_field, resolveDependencyData } from './dependencies';
+import { VitePluginSvelteCache } from './vite-plugin-svelte-cache';
 
-export function resolveViaPackageJsonSvelte(importee: string, importer?: string): string | void {
-	if (importer && isBareImport(importee)) {
-		const importeePkgFile = relative.resolve(`${importee}/package.json`, path.dirname(importer));
-		const importeePkg = JSON.parse(fs.readFileSync(importeePkgFile, { encoding: 'utf-8' }));
-		if (importeePkg.svelte) {
-			return path.resolve(path.dirname(importeePkgFile), importeePkg.svelte);
+export function resolveViaPackageJsonSvelte(
+	importee: string,
+	importer: string | undefined,
+	cache: VitePluginSvelteCache
+): string | void {
+	if (importer && isBareImport(importee) && !is_common_without_svelte_field(importee)) {
+		const cached = cache.getResolvedSvelteField(importee, importer);
+		if (cached) {
+			return cached;
+		}
+		const localRequire = createRequire(importer);
+		const pkgData = resolveDependencyData(importee, localRequire);
+		if (pkgData) {
+			const { pkg, dir } = pkgData;
+			if (pkg.svelte) {
+				const result = path.resolve(dir, pkg.svelte);
+				cache.setResolvedSvelteField(importee, importer, result);
+				return result;
+			}
+		} else {
+			throw new Error(`failed to resolve package.json of ${importee} imported by ${importer}`);
 		}
 	}
 }
 
 function isBareImport(importee: string): boolean {
-	if (!importee || importee[0] === '.' || importee[0] === '\0' || path.isAbsolute(importee)) {
+	if (
+		!importee ||
+		importee[0] === '.' ||
+		importee[0] === '\0' ||
+		importee.includes(':') ||
+		path.isAbsolute(importee)
+	) {
 		return false;
 	}
 	const parts = importee.split('/');

package/src/utils/vite-plugin-svelte-cache.ts

@@ -6,6 +6,7 @@ export class VitePluginSvelteCache {
 	private _js = new Map<string, Code>();
 	private _dependencies = new Map<string, string[]>();
 	private _dependants = new Map<string, Set<string>>();
+	private _resolvedSvelteFields = new Map<string, string>();
 
 	public update(compileData: CompileData) {
 		this.updateCSS(compileData);
@@ -80,4 +81,23 @@ export class VitePluginSvelteCache {
 		const dependants = this._dependants.get(path);
 		return dependants ? [...dependants] : [];
 	}
+
+	public getResolvedSvelteField(name: string, importer?: string): string | void {
+		return this._resolvedSvelteFields.get(this._getResolvedSvelteFieldKey(name, importer));
+	}
+
+	public setResolvedSvelteField(
+		importee: string,
+		importer: string | undefined = undefined,
+		resolvedSvelte: string
+	) {
+		this._resolvedSvelteFields.set(
+			this._getResolvedSvelteFieldKey(importee, importer),
+			resolvedSvelte
+		);
+	}
+
+	private _getResolvedSvelteFieldKey(importee: string, importer?: string): string {
+		return importer ? `${importer} > ${importee}` : importee;
+	}
 }

package/src/utils/watch.ts

@@ -17,7 +17,7 @@ export function setupWatchers(
 		return;
 	}
 	const { watcher, ws } = server;
-	const { configFile: viteConfigFile, root, server: serverConfig } = server.config;
+	const { root, server: serverConfig } = server.config;
 
 	const emitChangeEventOnDependants = (filename: string) => {
 		const dependants = cache.getDependants(filename);
@@ -42,12 +42,9 @@ export function setupWatchers(
 	};
 
 	const triggerViteRestart = (filename: string) => {
-		// vite restart is triggered by simulating a change to vite config. This requires that vite config exists
-		// also we do not restart in middleware-mode as it could be risky
-		if (!!viteConfigFile && !serverConfig.middlewareMode) {
-			log.info(`svelte config changed: restarting vite server. - file: ${filename}`);
-			watcher.emit('change', viteConfigFile);
-		} else {
+		if (serverConfig.middlewareMode) {
+			// in middlewareMode we can't restart the server automatically
+			// show the user an overlay instead
 			const message =
 				'Svelte config change detected, restart your dev process to apply the changes.';
 			log.info(message, filename);
@@ -55,6 +52,9 @@ export function setupWatchers(
 				type: 'error',
 				err: { message, stack: '', plugin: 'vite-plugin-svelte', id: filename }
 			});
+		} else {
+			log.info(`svelte config changed: restarting vite server. - file: ${filename}`);
+			server.restart();
 		}
 	};