@sveltejs/vite-plugin-svelte 2.4.6 → 3.0.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "2.4.6",
+  "version": "3.0.0-next.1",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -16,7 +16,7 @@
     "./package.json": "./package.json"
   },
   "engines": {
-    "node": "^14.18.0 || >= 16"
+    "node": "^18.0.0 || >=20"
   },
   "repository": {
     "type": "git",
@@ -34,23 +34,23 @@
   },
   "homepage": "https://github.com/sveltejs/vite-plugin-svelte#readme",
   "dependencies": {
-    "@sveltejs/vite-plugin-svelte-inspector": "^1.0.4",
+    "@sveltejs/vite-plugin-svelte-inspector": "^2.0.0-next.0 || ^2.0.0",
     "debug": "^4.3.4",
     "deepmerge": "^4.3.1",
     "kleur": "^4.1.5",
-    "magic-string": "^0.30.3",
+    "magic-string": "^0.30.5",
     "svelte-hmr": "^0.15.3",
-    "vitefu": "^0.2.4"
+    "vitefu": "^0.2.5"
   },
   "peerDependencies": {
-    "svelte": "^3.54.0 || ^4.0.0",
-    "vite": "^4.0.0"
+    "svelte": "^4.0.0",
+    "vite": "^5.0.0-beta.1 || ^5.0.0"
   },
   "devDependencies": {
-    "@types/debug": "^4.1.8",
-    "esbuild": "^0.19.3",
-    "svelte": "^4.2.0",
-    "vite": "^4.4.9"
+    "@types/debug": "^4.1.9",
+    "esbuild": "^0.19.4",
+    "svelte": "^4.2.1",
+    "vite": "^5.0.0-beta.7"
   },
   "scripts": {
     "check:publint": "publint --strict",

package/src/handle-hot-update.js

@@ -14,7 +14,11 @@ import { toRollupError } from './utils/error.js';
 export async function handleHotUpdate(compileSvelte, ctx, svelteRequest, cache, options) {
 	if (!cache.has(svelteRequest)) {
 		// file hasn't been requested yet (e.g. async component)
-		log.debug(`handleHotUpdate called before initial transform for ${svelteRequest.id}`);
+		log.debug(
+			`handleHotUpdate called before initial transform for ${svelteRequest.id}`,
+			undefined,
+			'hmr'
+		);
 		return;
 	}
 	const { read, server, modules } = ctx;
@@ -39,7 +43,7 @@ export async function handleHotUpdate(compileSvelte, ctx, svelteRequest, cache,
 	if (cssIdx > -1) {
 		const cssUpdated = cssChanged(cachedCss, compileData.compiled.css);
 		if (!cssUpdated) {
-			log.debug(`skipping unchanged css for ${svelteRequest.cssId}`);
+			log.debug(`skipping unchanged css for ${svelteRequest.cssId}`, undefined, 'hmr');
 			affectedModules.splice(cssIdx, 1);
 		}
 	}
@@ -47,7 +51,7 @@ export async function handleHotUpdate(compileSvelte, ctx, svelteRequest, cache,
 	if (jsIdx > -1) {
 		const jsUpdated = jsChanged(cachedJS, compileData.compiled.js, svelteRequest.filename);
 		if (!jsUpdated) {
-			log.debug(`skipping unchanged js for ${svelteRequest.id}`);
+			log.debug(`skipping unchanged js for ${svelteRequest.id}`, undefined, 'hmr');
 			affectedModules.splice(jsIdx, 1);
 			// transform won't be called, log warnings here
 			logCompilerWarnings(svelteRequest, compileData.compiled.warnings, options);
@@ -57,14 +61,20 @@ export async function handleHotUpdate(compileSvelte, ctx, svelteRequest, cache,
 	// TODO is this enough? see also: https://github.com/vitejs/vite/issues/2274
 	const ssrModulesToInvalidate = affectedModules.filter((m) => !!m.ssrTransformResult);
 	if (ssrModulesToInvalidate.length > 0) {
-		log.debug(`invalidating modules ${ssrModulesToInvalidate.map((m) => m.id).join(', ')}`);
+		log.debug(
+			`invalidating modules ${ssrModulesToInvalidate.map((m) => m.id).join(', ')}`,
+			undefined,
+			'hmr'
+		);
 		ssrModulesToInvalidate.forEach((moduleNode) => server.moduleGraph.invalidateModule(moduleNode));
 	}
 	if (affectedModules.length > 0) {
 		log.debug(
 			`handleHotUpdate for ${svelteRequest.id} result: ${affectedModules
 				.map((m) => m.id)
-				.join(', ')}`
+				.join(', ')}`,
+			undefined,
+			'hmr'
 		);
 	}
 	return affectedModules;

package/src/index.d.ts

@@ -121,20 +121,7 @@ interface SvelteOptions {
 	 * @see https://svelte.dev/docs#svelte_compile
 	 */
 	compilerOptions?: Omit<CompileOptions, 'filename' | 'format' | 'generate'>;
-	/**
-	 * Handles warning emitted from the Svelte compiler
-	 */
-	onwarn?: (warning: Warning, defaultHandler?: (warning: Warning) => void) => void;
-	/**
-	 * Options for vite-plugin-svelte
-	 */
-	vitePlugin?: PluginOptions;
-}
 
-/**
- * These options are considered experimental and breaking changes to them can occur in any release
- */
-interface ExperimentalOptions {
 	/**
 	 * A function to update `compilerOptions` before compilation
 	 *
@@ -159,6 +146,21 @@ interface ExperimentalOptions {
 		code: string;
 		compileOptions: Partial<CompileOptions>;
 	}) => Promise<Partial<CompileOptions> | void> | Partial<CompileOptions> | void;
+
+	/**
+	 * Handles warning emitted from the Svelte compiler
+	 */
+	onwarn?: (warning: Warning, defaultHandler?: (warning: Warning) => void) => void;
+	/**
+	 * Options for vite-plugin-svelte
+	 */
+	vitePlugin?: PluginOptions;
+}
+
+/**
+ * These options are considered experimental and breaking changes to them can occur in any release
+ */
+interface ExperimentalOptions {
 	/**
 	 * send a websocket message with svelte compiler warnings during dev
 	 *

package/src/index.js

@@ -1,9 +1,7 @@
 import fs from 'node:fs';
-import { version as viteVersion } from 'vite';
 
 import { svelteInspector } from '@sveltejs/vite-plugin-svelte-inspector';
 
-import { isDepExcluded } from 'vitefu';
 import { handleHotUpdate } from './handle-hot-update.js';
 import { log, logCompilerWarnings } from './utils/log.js';
 import { createCompileSvelte } from './utils/compile.js';
@@ -17,16 +15,10 @@ import {
 } from './utils/options.js';
 
 import { ensureWatchedFile, setupWatchers } from './utils/watch.js';
-import { resolveViaPackageJsonSvelte } from './utils/resolve.js';
-
 import { toRollupError } from './utils/error.js';
 import { saveSvelteMetadata } from './utils/optimizer.js';
 import { VitePluginSvelteCache } from './utils/vite-plugin-svelte-cache.js';
 import { loadRaw } from './utils/load-raw.js';
-import { FAQ_LINK_CONFLICTS_IN_SVELTE_RESOLVE } from './utils/constants.js';
-import { isSvelte3 } from './utils/svelte-version.js';
-
-const isVite4_0 = viteVersion.startsWith('4.0');
 
 /** @type {import('./index.d.ts').svelte} */
 export function svelte(inlineOptions) {
@@ -42,15 +34,9 @@ export function svelte(inlineOptions) {
 	let options;
 	/** @type {import('vite').ResolvedConfig} */
 	let viteConfig;
-
 	/** @type {import('./types/compile.d.ts').CompileSvelte} */
 	let compileSvelte;
 	/* eslint-enable no-unused-vars */
-
-	/** @type {Promise<import('vite').Rollup.PartialResolvedId | null>} */
-	let resolvedSvelteSSR;
-	/** @type {Set<string>} */
-	let packagesWithResolveWarnings;
 	/** @type {import('./types/plugin-api.d.ts').PluginAPI} */
 	const api = {};
 	/** @type {import('vite').Plugin[]} */
@@ -71,7 +57,7 @@ export function svelte(inlineOptions) {
 				options = await preResolveOptions(inlineOptions, config, configEnv);
 				// extra vite config
 				const extraViteConfig = await buildExtraViteConfig(options, config);
-				log.debug('additional vite config', extraViteConfig);
+				log.debug('additional vite config', extraViteConfig, 'config');
 				return extraViteConfig;
 			},
 
@@ -83,11 +69,10 @@ export function svelte(inlineOptions) {
 				viteConfig = config;
 				// TODO deep clone to avoid mutability from outside?
 				api.options = options;
-				log.debug('resolved options', options);
+				log.debug('resolved options', options, 'config');
 			},
 
 			async buildStart() {
-				packagesWithResolveWarnings = new Set();
 				if (!options.prebundleSvelteLibraries) return;
 				const isSvelteMetadataChanged = await saveSvelteMetadata(viteConfig.cacheDir, options);
 				if (isSvelteMetadataChanged) {
@@ -108,18 +93,24 @@ export function svelte(inlineOptions) {
 				if (svelteRequest) {
 					const { filename, query, raw } = svelteRequest;
 					if (raw) {
-						return loadRaw(svelteRequest, compileSvelte, options);
+						const code = await loadRaw(svelteRequest, compileSvelte, options);
+						// prevent vite from injecting sourcemaps in the results.
+						return {
+							code,
+							map: {
+								mappings: ''
+							}
+						};
 					} else {
 						if (query.svelte && query.type === 'style') {
 							const css = cache.getCSS(svelteRequest);
 							if (css) {
-								log.debug(`load returns css for ${filename}`);
 								return css;
 							}
 						}
 						// prevent vite asset plugin from loading files as url that should be compiled in transform
 						if (viteConfig.assetsInclude(filename)) {
-							log.debug(`load returns raw content for ${filename}`);
+							log.debug(`load returns raw content for ${filename}`, undefined, 'load');
 							return fs.readFileSync(filename, 'utf-8');
 						}
 					}
@@ -133,78 +124,12 @@ export function svelte(inlineOptions) {
 					if (svelteRequest.query.type === 'style' && !svelteRequest.raw) {
 						// return cssId with root prefix so postcss pipeline of vite finds the directory correctly
 						// see https://github.com/sveltejs/vite-plugin-svelte/issues/14
-						log.debug(`resolveId resolved virtual css module ${svelteRequest.cssId}`);
-						return svelteRequest.cssId;
-					}
-				}
-
-				// TODO: remove this after bumping peerDep on Vite to 4.1+ or Svelte to 4.0+
-				if (isVite4_0 && isSvelte3 && ssr && importee === 'svelte') {
-					if (!resolvedSvelteSSR) {
-						resolvedSvelteSSR = this.resolve('svelte/ssr', undefined, { skipSelf: true }).then(
-							(svelteSSR) => {
-								log.debug('resolved svelte to svelte/ssr');
-								return svelteSSR;
-							},
-							(err) => {
-								log.debug(
-									'failed to resolve svelte to svelte/ssr. Update svelte to a version that exports it',
-									err
-								);
-								return null; // returning null here leads to svelte getting resolved regularly
-							}
+						log.debug(
+							`resolveId resolved virtual css module ${svelteRequest.cssId}`,
+							undefined,
+							'resolve'
 						);
-					}
-					return resolvedSvelteSSR;
-				}
-				//@ts-expect-error scan
-				const scan = !!opts?.scan; // scanner phase of optimizeDeps
-				const isPrebundled =
-					options.prebundleSvelteLibraries &&
-					viteConfig.optimizeDeps?.disabled !== true &&
-					viteConfig.optimizeDeps?.disabled !== (options.isBuild ? 'build' : 'dev') &&
-					!isDepExcluded(importee, viteConfig.optimizeDeps?.exclude ?? []);
-				// for prebundled libraries we let vite resolve the prebundling result
-				// for ssr, during scanning and non-prebundled, we do it
-				if (ssr || scan || !isPrebundled) {
-					try {
-						const isFirstResolve = !cache.hasResolvedSvelteField(importee, importer);
-						const resolved = await resolveViaPackageJsonSvelte(importee, importer, cache);
-						if (isFirstResolve && resolved) {
-							const packageInfo = await cache.getPackageInfo(resolved);
-							const packageVersion = `${packageInfo.name}@${packageInfo.version}`;
-							log.debug.once(
-								`resolveId resolved ${importee} to ${resolved} via package.json svelte field of ${packageVersion}`
-							);
-
-							try {
-								const viteResolved = (
-									await this.resolve(importee, importer, { ...opts, skipSelf: true })
-								)?.id;
-								if (resolved !== viteResolved) {
-									packagesWithResolveWarnings.add(packageVersion);
-									log.debug.enabled &&
-										log.debug.once(
-											`resolve difference for ${packageVersion} ${importee} - svelte: "${resolved}", vite: "${viteResolved}"`
-										);
-								}
-							} catch (e) {
-								packagesWithResolveWarnings.add(packageVersion);
-								log.debug.enabled &&
-									log.debug.once(
-										`resolve error for ${packageVersion} ${importee} - svelte: "${resolved}", vite: ERROR`,
-										e
-									);
-							}
-						}
-						return resolved;
-					} catch (e) {
-						log.debug.once(
-							`error trying to resolve ${importee} from ${importer} via package.json svelte field `,
-							e
-						);
-						// this error most likely happens due to non-svelte related importee/importers so swallow it here
-						// in case it really way a svelte library, users will notice anyway. (lib not working due to failed resolve)
+						return svelteRequest.cssId;
 					}
 				}
 			},
@@ -235,7 +160,6 @@ export function svelte(inlineOptions) {
 						}
 					}
 				}
-				log.debug(`transform returns compiled js for ${svelteRequest.filename}`);
 				return {
 					...compileData.compiled.js,
 					meta: {
@@ -257,16 +181,6 @@ export function svelte(inlineOptions) {
 			},
 			async buildEnd() {
 				await options.stats?.finishAll();
-				if (
-					!options.experimental?.disableSvelteResolveWarnings &&
-					packagesWithResolveWarnings?.size > 0
-				) {
-					log.warn(
-						`WARNING: The following packages use a svelte resolve configuration in package.json that has conflicting results and is going to cause problems future.\n\n${[
-							...packagesWithResolveWarnings
-						].join('\n')}\n\nPlease see ${FAQ_LINK_CONFLICTS_IN_SVELTE_RESOLVE} for details.`
-					);
-				}
 			}
 		},
 		svelteInspector()

package/src/preprocess.js

@@ -1,19 +1,18 @@
-import { preprocessCSS, resolveConfig, transformWithEsbuild } from 'vite';
+import { isCSSRequest, preprocessCSS, resolveConfig, transformWithEsbuild } from 'vite';
 import { mapToRelative, removeLangSuffix } from './utils/sourcemaps.js';
 
 /**
  * @typedef {(code: string, filename: string) => Promise<{ code: string; map?: any; deps?: Set<string> }>} CssTransform
  */
 
-const supportedStyleLangs = ['css', 'less', 'sass', 'scss', 'styl', 'stylus', 'postcss', 'sss'];
 const supportedScriptLangs = ['ts'];
 
-export const lang_sep = '.vite-preprocess.';
+export const lang_sep = '.vite-preprocess';
 
 /** @type {import('./index.d.ts').vitePreprocess} */
 export function vitePreprocess(opts) {
 	/** @type {import('svelte/types/compiler/preprocess').PreprocessorGroup} */
-	const preprocessor = {};
+	const preprocessor = { name: 'vite-preprocess' };
 	if (opts?.script !== false) {
 		preprocessor.script = viteScript().script;
 	}
@@ -63,8 +62,8 @@ function viteStyle(config = {}) {
 	let transform;
 	/** @type {import('svelte/types/compiler/preprocess').Preprocessor} */
 	const style = async ({ attributes, content, filename = '' }) => {
-		const lang = /** @type {string} */ (attributes.lang);
-		if (!supportedStyleLangs.includes(lang)) return;
+		const ext = attributes.lang ? `.${attributes.lang}` : '.css';
+		if (attributes.lang && !isCSSRequest(ext)) return;
 		if (!transform) {
 			/** @type {import('vite').ResolvedConfig} */
 			let resolvedConfig;
@@ -82,7 +81,7 @@ function viteStyle(config = {}) {
 			}
 			transform = getCssTransformFn(resolvedConfig);
 		}
-		const suffix = `${lang_sep}${lang}`;
+		const suffix = `${lang_sep}${ext}`;
 		const moduleId = `${filename}${suffix}`;
 		const { code, map, deps } = await transform(content, moduleId);
 		removeLangSuffix(map, suffix);

package/src/utils/compile.js

@@ -4,13 +4,15 @@ import { createMakeHot } from 'svelte-hmr';
 import { safeBase64Hash } from './hash.js';
 import { log } from './log.js';
 
-import { createInjectScopeEverythingRulePreprocessorGroup } from './preprocess.js';
+import {
+	checkPreprocessDependencies,
+	createInjectScopeEverythingRulePreprocessorGroup
+} from './preprocess.js';
 import { mapToRelative } from './sourcemaps.js';
+import { enhanceCompileError } from './error.js';
 
 const scriptLangRE = /<script [^>]*lang=["']?([^"' >]+)["']?[^>]*>/;
 
-import { isSvelte3 } from './svelte-version.js';
-
 /**
  * @param {Function} [makeHot]
  * @returns {import('../types/compile.d.ts').CompileSvelte}
@@ -23,7 +25,10 @@ export const _createCompileSvelte = (makeHot) => {
 	return async function compileSvelte(svelteRequest, code, options) {
 		const { filename, normalizedFilename, cssId, ssr, raw } = svelteRequest;
 		const { emitCss = true } = options;
+		/** @type {string[]} */
 		const dependencies = [];
+		/** @type {import('svelte/types/compiler/interfaces').Warning[]} */
+		const warnings = [];
 
 		if (options.stats) {
 			if (options.isBuild) {
@@ -55,13 +60,9 @@ export const _createCompileSvelte = (makeHot) => {
 			filename,
 			generate: ssr ? 'ssr' : 'dom'
 		};
-		if (isSvelte3) {
-			// @ts-ignore
-			compileOptions.format = 'esm';
-		}
+
 		if (options.hot && options.emitCss) {
 			const hash = `s-${safeBase64Hash(normalizedFilename)}`;
-			log.debug(`setting cssHash ${hash} for ${normalizedFilename}`);
 			compileOptions.cssHash = () => hash;
 		}
 		if (ssr && compileOptions.enableSourcemap !== false) {
@@ -92,7 +93,16 @@ export const _createCompileSvelte = (makeHot) => {
 				throw e;
 			}
 
-			if (preprocessed.dependencies) dependencies.push(...preprocessed.dependencies);
+			if (preprocessed.dependencies?.length) {
+				const checked = checkPreprocessDependencies(filename, preprocessed.dependencies);
+				if (checked.warnings.length) {
+					warnings.push(...checked.warnings);
+				}
+				if (checked.dependencies.length) {
+					dependencies.push(...checked.dependencies);
+				}
+			}
+
 			if (preprocessed.map) compileOptions.sourcemap = preprocessed.map;
 		}
 		if (typeof preprocessed?.map === 'object') {
@@ -105,14 +115,16 @@ export const _createCompileSvelte = (makeHot) => {
 			};
 		}
 		const finalCode = preprocessed ? preprocessed.code : code;
-		const dynamicCompileOptions = await options.experimental?.dynamicCompileOptions?.({
+		const dynamicCompileOptions = await options?.dynamicCompileOptions?.({
 			filename,
 			code: finalCode,
 			compileOptions
 		});
 		if (dynamicCompileOptions && log.debug.enabled) {
 			log.debug(
-				`dynamic compile options for  ${filename}: ${JSON.stringify(dynamicCompileOptions)}`
+				`dynamic compile options for  ${filename}: ${JSON.stringify(dynamicCompileOptions)}`,
+				undefined,
+				'compile'
 			);
 		}
 		const finalCompileOptions = dynamicCompileOptions
@@ -123,22 +135,26 @@ export const _createCompileSvelte = (makeHot) => {
 			: compileOptions;
 
 		const endStat = stats?.start(filename);
-		const compiled = compile(finalCode, finalCompileOptions);
-
-		if (isSvelte3) {
-			// prevent dangling pure comments
-			// see https://github.com/sveltejs/kit/issues/9492#issuecomment-1487704985
-			// uses regex replace with whitespace to keep sourcemap/character count unmodified
-			compiled.js.code = compiled.js.code.replace(
-				/\/\* [@#]__PURE__ \*\/(\s*)$/gm,
-				'               $1'
-			);
+		/** @type {import('svelte/types/compiler/interfaces').CompileResult} */
+		let compiled;
+		try {
+			compiled = compile(finalCode, finalCompileOptions);
+		} catch (e) {
+			enhanceCompileError(e, code, preprocessors);
+			throw e;
 		}
+
 		if (endStat) {
 			endStat();
 		}
 		mapToRelative(compiled.js?.map, filename);
 		mapToRelative(compiled.css?.map, filename);
+		if (warnings.length) {
+			if (!compiled.warnings) {
+				compiled.warnings = [];
+			}
+			compiled.warnings.push(...warnings);
+		}
 		if (!raw) {
 			// wire css import and code for hmr
 			const hasCss = compiled.css?.code?.trim().length > 0;

package/src/utils/constants.js

@@ -1,5 +1,3 @@
-import { isSvelte3 } from './svelte-version.js';
-
 export const VITE_RESOLVE_MAIN_FIELDS = ['module', 'jsnext:main', 'jsnext'];
 
 export const SVELTE_RESOLVE_MAIN_FIELDS = ['svelte'];
@@ -8,16 +6,13 @@ export const SVELTE_IMPORTS = [
 	'svelte/animate',
 	'svelte/easing',
 	'svelte/internal',
+	'svelte/internal/disclose-version',
 	'svelte/motion',
 	'svelte/ssr',
 	'svelte/store',
 	'svelte/transition',
 	'svelte'
 ];
-// TODO add to global list after dropping svelte 3
-if (!isSvelte3) {
-	SVELTE_IMPORTS.push('svelte/internal/disclose-version');
-}
 
 export const SVELTE_HMR_IMPORTS = [
 	'svelte-hmr/runtime/hot-api-esm.js',
@@ -27,5 +22,5 @@ export const SVELTE_HMR_IMPORTS = [
 
 export const SVELTE_EXPORT_CONDITIONS = ['svelte'];
 
-export const FAQ_LINK_CONFLICTS_IN_SVELTE_RESOLVE =
-	'https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/faq.md#conflicts-in-svelte-resolve';
+export const FAQ_LINK_MISSING_EXPORTS_CONDITION =
+	'https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/faq.md#missing-exports-condition';

package/src/utils/error.js

@@ -100,3 +100,79 @@ function formatFrameForVite(frame) {
 		.map((line) => (line.match(/^\s+\^/) ? '   ' + line : ' ' + line.replace(':', ' | ')))
 		.join('\n');
 }
+
+/**
+ * @param {import('svelte/types/compiler/interfaces').Warning & Error} err a svelte compiler error, which is a mix of Warning and an error
+ * @param {string} originalCode
+ * @param {import('../index.js').Arrayable<import('svelte/types/compiler/preprocess').PreprocessorGroup>} [preprocessors]
+ */
+export function enhanceCompileError(err, originalCode, preprocessors) {
+	preprocessors = arraify(preprocessors ?? []);
+
+	/** @type {string[]} */
+	const additionalMessages = [];
+
+	// Handle incorrect TypeScript usage
+	if (err.code === 'parse-error') {
+		// Reference from Svelte: https://github.com/sveltejs/svelte/blob/800f6c076be5dd87dd4d2e9d66c59b973d54d84b/packages/svelte/src/compiler/preprocess/index.js#L262
+		const scriptRe = /<script(\s[^]*?)?(?:>([^]*?)<\/script>|\/>)/gi;
+		const errIndex = err.pos ?? -1;
+
+		let m;
+		while ((m = scriptRe.exec(originalCode))) {
+			const matchStart = m.index;
+			const matchEnd = matchStart + m[0].length;
+			const isErrorInScript = matchStart <= errIndex && errIndex <= matchEnd;
+			if (isErrorInScript) {
+				// Warn missing lang="ts"
+				const hasLangTs = m[1]?.includes('lang="ts"');
+				if (!hasLangTs) {
+					additionalMessages.push('Did you forget to add lang="ts" to your script tag?');
+				}
+				// Warn missing script preprocessor
+				if (preprocessors.every((p) => p.script == null)) {
+					const preprocessorType = hasLangTs ? 'TypeScript' : 'script';
+					additionalMessages.push(
+						`Did you forget to add a ${preprocessorType} preprocessor? See https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/preprocess.md for more information.`
+					);
+				}
+			}
+		}
+	}
+
+	// Handle incorrect CSS preprocessor usage
+	if (err.code === 'css-syntax-error') {
+		const styleRe = /<style(\s[^]*?)?(?:>([^]*?)<\/style>|\/>)/gi;
+
+		let m;
+		while ((m = styleRe.exec(originalCode))) {
+			// Warn missing lang attribute
+			if (!m[1]?.includes('lang=')) {
+				additionalMessages.push('Did you forget to add a lang attribute to your style tag?');
+			}
+			// Warn missing style preprocessor
+			if (
+				preprocessors.every((p) => p.style == null || p.name === 'inject-scope-everything-rule')
+			) {
+				const preprocessorType = m[1]?.match(/lang="(.+?)"/)?.[1] ?? 'style';
+				additionalMessages.push(
+					`Did you forget to add a ${preprocessorType} preprocessor? See https://github.com/sveltejs/vite-plugin-svelte/blob/main/docs/preprocess.md for more information.`
+				);
+			}
+		}
+	}
+
+	if (additionalMessages.length) {
+		err.message += '\n\n- ' + additionalMessages.join('\n- ');
+	}
+
+	return err;
+}
+
+/**
+ * @param {T | T[]} value
+ * @template T
+ */
+function arraify(value) {
+	return Array.isArray(value) ? value : [value];
+}

package/src/utils/esbuild.js

@@ -2,7 +2,6 @@ import { readFileSync } from 'node:fs';
 import { compile, preprocess } from 'svelte/compiler';
 import { log } from './log.js';
 import { toESBuildError } from './error.js';
-import { isSvelte3 } from './svelte-version.js';
 
 /**
  * @typedef {NonNullable<import('vite').DepOptimizationOptions['esbuildOptions']>} EsbuildOptions
@@ -67,10 +66,7 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
 		filename,
 		generate: 'dom'
 	};
-	if (isSvelte3) {
-		// @ts-ignore
-		compileOptions.format = 'esm';
-	}
+
 	let preprocessed;
 
 	if (options.preprocess) {
@@ -85,14 +81,18 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
 
 	const finalCode = preprocessed ? preprocessed.code : code;
 
-	const dynamicCompileOptions = await options.experimental?.dynamicCompileOptions?.({
+	const dynamicCompileOptions = await options?.dynamicCompileOptions?.({
 		filename,
 		code: finalCode,
 		compileOptions
 	});
 
 	if (dynamicCompileOptions && log.debug.enabled) {
-		log.debug(`dynamic compile options for  ${filename}: ${JSON.stringify(dynamicCompileOptions)}`);
+		log.debug(
+			`dynamic compile options for  ${filename}: ${JSON.stringify(dynamicCompileOptions)}`,
+			undefined,
+			'compile'
+		);
 	}
 
 	const finalCompileOptions = dynamicCompileOptions

package/src/utils/load-raw.js

@@ -64,7 +64,7 @@ export async function loadRaw(svelteRequest, compileSvelte, options) {
 				}" combined with direct in ${id}. supported are: ${supportedDirectTypes.join(', ')}`
 			);
 		}
-		log.debug(`load returns direct result for ${id}`);
+		log.debug(`load returns direct result for ${id}`, undefined, 'load');
 		let directOutput = result.code;
 		if (query.sourcemap && result.map?.toUrl) {
 			const map = `sourceMappingURL=${result.map.toUrl()}`;
@@ -76,7 +76,7 @@ export async function loadRaw(svelteRequest, compileSvelte, options) {
 		}
 		return directOutput;
 	} else if (query.raw) {
-		log.debug(`load returns raw result for ${id}`);
+		log.debug(`load returns raw result for ${id}`, undefined, 'load');
 		return toRawExports(result);
 	} else {
 		throw new Error(`invalid raw mode in ${id}, supported are raw, direct`);

package/src/utils/load-svelte-config.js

@@ -59,7 +59,8 @@ export async function loadSvelteConfig(viteConfig, inlineOptions) {
 				// identify which require function to use (esm and cjs mode)
 				const _require = import.meta.url
 					? esmRequire ?? (esmRequire = createRequire(import.meta.url))
-					: require;
+					: // eslint-disable-next-line no-undef
+					  require;
 
 				// avoid loading cached version on reload
 				delete _require.cache[_require.resolve(configFile)];
@@ -104,7 +105,7 @@ function findConfigToLoad(viteConfig, inlineOptions) {
 			.map((candidate) => path.resolve(root, candidate))
 			.filter((file) => fs.existsSync(file));
 		if (existingKnownConfigFiles.length === 0) {
-			log.debug(`no svelte config found at ${root}`);
+			log.debug(`no svelte config found at ${root}`, undefined, 'config');
 			return;
 		} else if (existingKnownConfigFiles.length > 1) {
 			log.warn(

package/src/utils/log.js

@@ -8,7 +8,7 @@ const prefix = 'vite-plugin-svelte';
 /** @type {Record<import('../types/log.d.ts').LogLevel, any>} */
 const loggers = {
 	debug: {
-		log: debug(`vite:${prefix}`),
+		log: debug(`${prefix}`),
 		enabled: false,
 		isDebug: true
 	},
@@ -65,7 +65,13 @@ function _log(logger, message, payload, namespace) {
 		return;
 	}
 	if (logger.isDebug) {
-		const log = namespace ? logger.log.extend(namespace) : logger.log;
+		let log = logger.log;
+		if (namespace) {
+			if (!isDebugNamespaceEnabled(namespace)) {
+				return;
+			}
+			log = logger.log.extend(namespace);
+		}
 		payload !== undefined ? log(message, payload) : log(message);
 	} else {
 		logger.log(
@@ -251,5 +257,5 @@ export function buildExtendedLogMessage(w) {
  * @returns {boolean}
  */
 export function isDebugNamespaceEnabled(namespace) {
-	return debug.enabled(`vite:${prefix}:${namespace}`);
+	return debug.enabled(`${prefix}:${namespace}`);
 }

package/src/utils/options.js

@@ -3,6 +3,7 @@ import { normalizePath } from 'vite';
 import { isDebugNamespaceEnabled, log } from './log.js';
 import { loadSvelteConfig } from './load-svelte-config.js';
 import {
+	FAQ_LINK_MISSING_EXPORTS_CONDITION,
 	SVELTE_EXPORT_CONDITIONS,
 	SVELTE_HMR_IMPORTS,
 	SVELTE_IMPORTS,
@@ -35,6 +36,7 @@ const allowedPluginOptions = new Set([
 	'disableDependencyReinclusion',
 	'prebundleSvelteLibraries',
 	'inspector',
+	'dynamicCompileOptions',
 	'experimental'
 ]);
 
@@ -315,13 +317,13 @@ function removeIgnoredOptions(options) {
 function handleDeprecatedOptions(options) {
 	const experimental = /** @type {Record<string, any>} */ (options.experimental);
 	if (experimental) {
-		for (const promoted of ['prebundleSvelteLibraries', 'inspector']) {
+		for (const promoted of ['prebundleSvelteLibraries', 'inspector', 'dynamicCompileOptions']) {
 			if (experimental[promoted]) {
 				//@ts-expect-error untyped assign
 				options[promoted] = experimental[promoted];
 				delete experimental[promoted];
 				log.warn(
-					`Option "vitePlugin.experimental.${promoted}" is no longer experimental and has moved to "vitePlugin.${promoted}". Please update your svelte config.`
+					`Option "experimental.${promoted}" is no longer experimental and has moved to "${promoted}". Please update your Svelte or Vite config.`
 				);
 			}
 		}
@@ -428,7 +430,7 @@ export async function buildExtraViteConfig(options, config) {
 			(options.hot && options.hot.partialAccept !== false)) && // deviate from svelte-hmr, default to true
 		config.experimental?.hmrPartialAccept !== false
 	) {
-		log.debug('enabling "experimental.hmrPartialAccept" in vite config');
+		log.debug('enabling "experimental.hmrPartialAccept" in vite config', undefined, 'config');
 		extraViteConfig.experimental = { hmrPartialAccept: true };
 	}
 	validateViteConfig(extraViteConfig, config, options);
@@ -481,6 +483,7 @@ function validateViteConfig(extraViteConfig, config, options) {
  */
 async function buildExtraConfigForDependencies(options, config) {
 	// extra handling for svelte dependencies in the project
+	const packagesWithoutSvelteExportsCondition = new Set();
 	const depsConfig = await crawlFrameworkPkgs({
 		root: options.root,
 		isBuild: options.isBuild,
@@ -496,7 +499,11 @@ async function buildExtraConfigForDependencies(options, config) {
 					return value;
 				});
 			}
-			return hasSvelteCondition || !!pkgJson.svelte;
+			const hasSvelteField = !!pkgJson.svelte;
+			if (hasSvelteField && !hasSvelteCondition) {
+				packagesWithoutSvelteExportsCondition.add(`${pkgJson.name}@${pkgJson.version}`);
+			}
+			return hasSvelteCondition || hasSvelteField;
 		},
 		isSemiFrameworkPkgByJson(pkgJson) {
 			return !!pkgJson.dependencies?.svelte || !!pkgJson.peerDependencies?.svelte;
@@ -510,8 +517,17 @@ async function buildExtraConfigForDependencies(options, config) {
 			}
 		}
 	});
-
-	log.debug('extra config for dependencies generated by vitefu', depsConfig);
+	if (
+		!options.experimental?.disableSvelteResolveWarnings &&
+		packagesWithoutSvelteExportsCondition?.size > 0
+	) {
+		log.warn(
+			`WARNING: The following packages have a svelte field in their package.json but no exports condition for svelte.\n\n${[
+				...packagesWithoutSvelteExportsCondition
+			].join('\n')}\n\nPlease see ${FAQ_LINK_MISSING_EXPORTS_CONDITION} for details.`
+		);
+	}
+	log.debug('extra config for dependencies generated by vitefu', depsConfig, 'config');
 
 	if (options.prebundleSvelteLibraries) {
 		// prebundling enabled, so we don't need extra dependency excludes
@@ -545,7 +561,7 @@ async function buildExtraConfigForDependencies(options, config) {
 		});
 	}
 
-	log.debug('post-processed extra config for dependencies', depsConfig);
+	log.debug('post-processed extra config for dependencies', depsConfig, 'config');
 
 	return depsConfig;
 }
@@ -562,11 +578,17 @@ function buildExtraConfigForSvelte(config) {
 	if (!isDepExcluded('svelte', config.optimizeDeps?.exclude ?? [])) {
 		const svelteImportsToInclude = SVELTE_IMPORTS.filter((x) => x !== 'svelte/ssr'); // not used on clientside
 		log.debug(
-			`adding bare svelte packages to optimizeDeps.include: ${svelteImportsToInclude.join(', ')} `
+			`adding bare svelte packages to optimizeDeps.include: ${svelteImportsToInclude.join(', ')} `,
+			undefined,
+			'config'
 		);
 		include.push(...svelteImportsToInclude);
 	} else {
-		log.debug('"svelte" is excluded in optimizeDeps.exclude, skipped adding it to include.');
+		log.debug(
+			'"svelte" is excluded in optimizeDeps.exclude, skipped adding it to include.',
+			undefined,
+			'config'
+		);
 	}
 	/** @type {(string | RegExp)[]} */
 	const noExternal = [];

package/src/utils/preprocess.js

@@ -1,6 +1,7 @@
 import MagicString from 'magic-string';
 import { log } from './log.js';
 import path from 'node:path';
+import { normalizePath } from 'vite';
 
 /**
  * this appends a *{} rule to component styles to force the svelte compiler to add style classes to all nodes
@@ -12,6 +13,7 @@ import path from 'node:path';
  */
 export function createInjectScopeEverythingRulePreprocessorGroup() {
 	return {
+		name: 'inject-scope-everything-rule',
 		style({ content, filename }) {
 			const s = new MagicString(content);
 			s.append(' *{}');
@@ -84,14 +86,18 @@ function buildExtraPreprocessors(options, config) {
 		log.debug(
 			`Ignoring svelte preprocessors defined by these vite plugins: ${ignored
 				.map((p) => p.name)
-				.join(', ')}`
+				.join(', ')}`,
+			undefined,
+			'preprocess'
 		);
 	}
 	if (included.length > 0) {
 		log.debug(
 			`Adding svelte preprocessors defined by these vite plugins: ${included
 				.map((p) => p.name)
-				.join(', ')}`
+				.join(', ')}`,
+			undefined,
+			'preprocess'
 		);
 		appendPreprocessors.push(...pluginsWithPreprocessors.map((p) => p.api.sveltePreprocess));
 	}
@@ -116,3 +122,52 @@ export function addExtraPreprocessors(options, config) {
 		}
 	}
 }
+
+/**
+ *
+ * @param filename {string}
+ * @param dependencies  {string[]}
+ * @returns {({dependencies: string[], warnings:import('svelte/types/compiler/interfaces').Warning[] })}
+ */
+export function checkPreprocessDependencies(filename, dependencies) {
+	/** @type {import('svelte/types/compiler/interfaces').Warning[]} */
+	const warnings = [];
+
+	// to find self, we have to compare normalized filenames, but must keep the original values in `dependencies`
+	// because otherwise file watching on windows doesn't work
+	// so we track idx and filter by that in the end
+	/** @type {number[]} */
+	const selfIdx = [];
+	const normalizedFullFilename = normalizePath(filename);
+	const normalizedDeps = dependencies.map(normalizePath);
+	for (let i = 0; i < normalizedDeps.length; i++) {
+		if (normalizedDeps[i] === normalizedFullFilename) {
+			selfIdx.push(i);
+		}
+	}
+	const hasSelfDependency = selfIdx.length > 0;
+	if (hasSelfDependency) {
+		warnings.push({
+			code: 'vite-plugin-svelte-preprocess-depends-on-self',
+			message:
+				'svelte.preprocess returned this file as a dependency of itself. This can be caused by an invalid configuration or importing generated code that depends on .svelte files (eg. tailwind base css)',
+			filename
+		});
+	}
+
+	if (dependencies.length > 10) {
+		warnings.push({
+			code: 'vite-plugin-svelte-preprocess-many-dependencies',
+			message: `svelte.preprocess depends on more than 10 external files which can cause slow builds and poor DX, try to reduce them. Found: ${dependencies.join(
+				', '
+			)}`,
+			filename
+		});
+	}
+	return {
+		dependencies: hasSelfDependency
+			? dependencies.filter((_, i) => !selfIdx.includes(i)) // remove self dependency
+			: dependencies,
+		warnings
+	};
+}

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

@@ -24,8 +24,6 @@ export class VitePluginSvelteCache {
 	#dependencies = new Map();
 	/** @type {Map<string, Set<string>>} */
 	#dependants = new Map();
-	/** @type {Map<string, string>} */
-	#resolvedSvelteFields = new Map();
 	/** @type {Map<string, any>} */
 	#errors = new Map();
 	/** @type {PackageInfo[]} */
@@ -168,45 +166,6 @@ export class VitePluginSvelteCache {
 		return dependants ? [...dependants] : [];
 	}
 
-	/**
-	 * @param {string} name
-	 * @param {string} [importer]
-	 * @returns {string|void}
-	 */
-	getResolvedSvelteField(name, importer) {
-		return this.#resolvedSvelteFields.get(this.#getResolvedSvelteFieldKey(name, importer));
-	}
-
-	/**
-	 * @param {string} name
-	 * @param {string} [importer]
-	 * @returns {boolean}
-	 */
-	hasResolvedSvelteField(name, importer) {
-		return this.#resolvedSvelteFields.has(this.#getResolvedSvelteFieldKey(name, importer));
-	}
-	/**
-	 *
-	 * @param {string} importee
-	 * @param {string | undefined} importer
-	 * @param {string} resolvedSvelte
-	 */
-	setResolvedSvelteField(importee, importer, resolvedSvelte) {
-		this.#resolvedSvelteFields.set(
-			this.#getResolvedSvelteFieldKey(importee, importer),
-			resolvedSvelte
-		);
-	}
-
-	/**
-	 * @param {string} importee
-	 * @param {string | undefined} importer
-	 * @returns {string}
-	 */
-	#getResolvedSvelteFieldKey(importee, importer) {
-		return importer ? `${importer} > ${importee}` : importee;
-	}
-
 	/**
 	 * @param {string} file
 	 * @returns {Promise<PackageInfo>}

package/src/utils/watch.js

@@ -22,7 +22,9 @@ export function setupWatchers(options, cache, requestParser) {
 		dependants.forEach((dependant) => {
 			if (fs.existsSync(dependant)) {
 				log.debug(
-					`emitting virtual change event for "${dependant}" because depdendency "${filename}" changed`
+					`emitting virtual change event for "${dependant}" because depdendency "${filename}" changed`,
+					undefined,
+					'hmr'
 				);
 				watcher.emit('change', dependant);
 			}
@@ -34,7 +36,7 @@ export function setupWatchers(options, cache, requestParser) {
 		if (svelteRequest) {
 			const removedFromCache = cache.remove(svelteRequest);
 			if (removedFromCache) {
-				log.debug(`cleared VitePluginSvelteCache for deleted file ${filename}`);
+				log.debug(`cleared VitePluginSvelteCache for deleted file ${filename}`, undefined, 'hmr');
 			}
 		}
 	};

package/src/utils/resolve.js

@@ -1,66 +0,0 @@
-import path from 'node:path';
-import { builtinModules } from 'node:module';
-import { resolveDependencyData, isCommonDepWithoutSvelteField } from './dependencies.js';
-import { normalizePath } from 'vite';
-
-/**
- * @param {string} importee
- * @param {string | undefined} importer
- * @param {import('./vite-plugin-svelte-cache').VitePluginSvelteCache} cache
- * @returns {Promise<string | void>}
- */
-export async function resolveViaPackageJsonSvelte(importee, importer, cache) {
-	if (
-		importer &&
-		isBareImport(importee) &&
-		!isNodeInternal(importee) &&
-		!isCommonDepWithoutSvelteField(importee)
-	) {
-		const cached = cache.getResolvedSvelteField(importee, importer);
-		if (cached) {
-			return cached;
-		}
-		const pkgData = await resolveDependencyData(importee, importer);
-		if (pkgData) {
-			const { pkg, dir } = pkgData;
-			if (pkg.svelte) {
-				const result = normalizePath(path.resolve(dir, pkg.svelte));
-				cache.setResolvedSvelteField(importee, importer, result);
-				return result;
-			}
-		}
-	}
-}
-
-/**
- * @param {string} importee
- * @returns {boolean}
- */
-function isNodeInternal(importee) {
-	return importee.startsWith('node:') || builtinModules.includes(importee);
-}
-
-/**
- * @param {string} importee
- * @returns {boolean}
- */
-function isBareImport(importee) {
-	if (
-		!importee ||
-		importee[0] === '.' ||
-		importee[0] === '\0' ||
-		importee.includes(':') ||
-		path.isAbsolute(importee)
-	) {
-		return false;
-	}
-	const parts = importee.split('/');
-	switch (parts.length) {
-		case 1:
-			return true;
-		case 2:
-			return parts[0].startsWith('@');
-		default:
-			return false;
-	}
-}