@sveltejs/vite-plugin-svelte 3.0.0-next.0 → 3.0.0-next.2

package/package.json

@@ -1,19 +1,21 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "3.0.0-next.0",
+  "version": "3.0.0-next.2",
   "license": "MIT",
   "author": "dominikg",
   "files": [
-    "src"
+    "src",
+    "types"
   ],
   "type": "module",
-  "types": "src/index.d.ts",
+  "types": "types/index.d.ts",
   "exports": {
     ".": {
-      "types": "./src/index.d.ts",
-      "import": "./src/index.js"
-    },
-    "./package.json": "./package.json"
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./src/index.js"
+      }
+    }
   },
   "engines": {
     "node": "^18.0.0 || >=20"
@@ -34,26 +36,28 @@
   },
   "homepage": "https://github.com/sveltejs/vite-plugin-svelte#readme",
   "dependencies": {
+    "@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",
-    "@sveltejs/vite-plugin-svelte-inspector": "^2.0.0-next.0"
+    "vitefu": "^0.2.5"
   },
   "peerDependencies": {
     "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": "^5.0.0-beta.1"
+    "@types/debug": "^4.1.10",
+    "esbuild": "^0.19.5",
+    "sass": "^1.69.5",
+    "svelte": "^4.2.2",
+    "vite": "^5.0.0-beta.12"
   },
   "scripts": {
     "check:publint": "publint --strict",
-    "check:types": "tsc --noEmit"
+    "check:types": "tsc --noEmit",
+    "generate:types": "dts-buddy -m \"@sveltejs/vite-plugin-svelte:src/public.d.ts\""
   }
 }

package/src/index.js

@@ -20,7 +20,10 @@ import { saveSvelteMetadata } from './utils/optimizer.js';
 import { VitePluginSvelteCache } from './utils/vite-plugin-svelte-cache.js';
 import { loadRaw } from './utils/load-raw.js';
 
-/** @type {import('./index.d.ts').svelte} */
+/**
+ * @param {Partial<import('./public.d.ts').Options>} [inlineOptions]
+ * @returns {import('vite').Plugin[]}
+ */
 export function svelte(inlineOptions) {
 	if (process.env.DEBUG != null) {
 		log.setLevel('debug');

package/src/preprocess.js

@@ -1,19 +1,21 @@
-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} */
+/**
+ * @param {import('./public.d.ts').VitePreprocessOptions} opts
+ * @returns {import('svelte/compiler').PreprocessorGroup}
+ */
 export function vitePreprocess(opts) {
-	/** @type {import('svelte/types/compiler/preprocess').PreprocessorGroup} */
-	const preprocessor = {};
+	/** @type {import('svelte/compiler').PreprocessorGroup} */
+	const preprocessor = { name: 'vite-preprocess' };
 	if (opts?.script !== false) {
 		preprocessor.script = viteScript().script;
 	}
@@ -25,7 +27,7 @@ export function vitePreprocess(opts) {
 }
 
 /**
- * @returns {{ script: import('svelte/types/compiler/preprocess').Preprocessor }}
+ * @returns {{ script: import('svelte/compiler').Preprocessor }}
  */
 function viteScript() {
 	return {
@@ -56,15 +58,15 @@ function viteScript() {
 
 /**
  * @param {import('vite').ResolvedConfig | import('vite').InlineConfig} config
- * @returns {{ style: import('svelte/types/compiler/preprocess').Preprocessor }}
+ * @returns {{ style: import('svelte/compiler').Preprocessor }}
  */
 function viteStyle(config = {}) {
 	/** @type {CssTransform} */
 	let transform;
-	/** @type {import('svelte/types/compiler/preprocess').Preprocessor} */
+	/** @type {import('svelte/compiler').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 +84,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/{index.d.ts → public.d.ts}

@@ -1,9 +1,10 @@
-import type { InlineConfig, ResolvedConfig, UserConfig, Plugin } from 'vite';
-import type { CompileOptions, Warning } from 'svelte/types/compiler/interfaces';
-import type { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
+import type { InlineConfig, ResolvedConfig } from 'vite';
+import type { CompileOptions } from 'svelte/compiler';
+import type { Warning } from 'svelte/types/compiler/interfaces';
+import type { PreprocessorGroup } from 'svelte/compiler';
 import type { Options as InspectorOptions } from '@sveltejs/vite-plugin-svelte-inspector';
 
-type Options = Omit<SvelteOptions, 'vitePlugin'> & PluginOptionsInline;
+export type Options = Omit<SvelteConfig, 'vitePlugin'> & PluginOptionsInline;
 
 interface PluginOptionsInline extends PluginOptions {
 	/**
@@ -94,13 +95,39 @@ interface PluginOptions {
 	 * @default unset for dev, always false for build
 	 */
 	inspector?: InspectorOptions | boolean;
+
+	/**
+	 * A function to update `compilerOptions` before compilation
+	 *
+	 * `data.filename` - The file to be compiled
+	 * `data.code` - The preprocessed Svelte code
+	 * `data.compileOptions` - The current compiler options
+	 *
+	 * To change part of the compiler options, return an object with the changes you need.
+	 *
+	 * @example
+	 * ```
+	 * ({ filename, compileOptions }) => {
+	 *   // Dynamically set hydration per Svelte file
+	 *   if (compileWithHydratable(filename) && !compileOptions.hydratable) {
+	 *     return { hydratable: true };
+	 *   }
+	 * }
+	 * ```
+	 */
+	dynamicCompileOptions?: (data: {
+		filename: string;
+		code: string;
+		compileOptions: Partial<CompileOptions>;
+	}) => Promise<Partial<CompileOptions> | void> | Partial<CompileOptions> | void;
+
 	/**
 	 * These options are considered experimental and breaking changes to them can occur in any release
 	 */
 	experimental?: ExperimentalOptions;
 }
 
-interface SvelteOptions {
+export interface SvelteConfig {
 	/**
 	 * A list of file extensions to be compiled by Svelte
 	 *
@@ -121,6 +148,7 @@ interface SvelteOptions {
 	 * @see https://svelte.dev/docs#svelte_compile
 	 */
 	compilerOptions?: Omit<CompileOptions, 'filename' | 'format' | 'generate'>;
+
 	/**
 	 * Handles warning emitted from the Svelte compiler
 	 */
@@ -135,30 +163,6 @@ interface SvelteOptions {
  * These options are considered experimental and breaking changes to them can occur in any release
  */
 interface ExperimentalOptions {
-	/**
-	 * A function to update `compilerOptions` before compilation
-	 *
-	 * `data.filename` - The file to be compiled
-	 * `data.code` - The preprocessed Svelte code
-	 * `data.compileOptions` - The current compiler options
-	 *
-	 * To change part of the compiler options, return an object with the changes you need.
-	 *
-	 * @example
-	 * ```
-	 * ({ filename, compileOptions }) => {
-	 *   // Dynamically set hydration per Svelte file
-	 *   if (compileWithHydratable(filename) && !compileOptions.hydratable) {
-	 *     return { hydratable: true };
-	 *   }
-	 * }
-	 * ```
-	 */
-	dynamicCompileOptions?: (data: {
-		filename: string;
-		code: string;
-		compileOptions: Partial<CompileOptions>;
-	}) => Promise<Partial<CompileOptions> | void> | Partial<CompileOptions> | void;
 	/**
 	 * send a websocket message with svelte compiler warnings during dev
 	 *
@@ -172,44 +176,11 @@ interface ExperimentalOptions {
 	disableSvelteResolveWarnings?: boolean;
 }
 
-type ModuleFormat = NonNullable<'esm'>;
-type CssHashGetter = NonNullable<CompileOptions['cssHash']>;
 type Arrayable<T> = T | T[];
 
-interface VitePreprocessOptions {
+export interface VitePreprocessOptions {
 	script?: boolean;
 	style?: boolean | InlineConfig | ResolvedConfig;
 }
 
-declare function vitePreprocess(opts?: VitePreprocessOptions): PreprocessorGroup;
-
-declare function loadSvelteConfig(
-	viteConfig?: UserConfig,
-	inlineOptions?: Partial<Options>
-): Promise<Partial<SvelteOptions> | undefined>;
-
-declare function svelte(inlineOptions?: Partial<Options>): Plugin[];
-
-export {
-	Arrayable,
-	CssHashGetter,
-	ModuleFormat,
-	Options,
-	PluginOptions,
-	SvelteOptions,
-	loadSvelteConfig,
-	svelte,
-	VitePreprocessOptions,
-	vitePreprocess
-};
-
-// reexported types
-
-export { CompileOptions, Warning } from 'svelte/types/compiler/interfaces';
-
-export {
-	MarkupPreprocessor,
-	Preprocessor,
-	PreprocessorGroup,
-	Processed
-} from 'svelte/types/compiler/preprocess';
+export * from './index.js';

package/src/types/compile.d.ts

@@ -1,4 +1,4 @@
-import type { Processed } from 'svelte/types/compiler/preprocess';
+import type { Processed, CompileResult } from 'svelte/compiler';
 import type { SvelteRequest } from './id.d.ts';
 import type { ResolvedOptions } from './options.d.ts';
 
@@ -14,34 +14,11 @@ export interface Code {
 	dependencies?: any[];
 }
 
-export interface Compiled {
-	js: Code;
-	css: Code;
-	ast: any; // TODO type
-	warnings: any[]; // TODO type
-	vars: Array<{
-		name: string;
-		export_name: string;
-		injected: boolean;
-		module: boolean;
-		mutated: boolean;
-		reassigned: boolean;
-		referenced: boolean;
-		writable: boolean;
-		referenced_from_script: boolean;
-	}>;
-	stats: {
-		timings: {
-			total: number;
-		};
-	};
-}
-
 export interface CompileData {
 	filename: string;
 	normalizedFilename: string;
 	lang: string;
-	compiled: Compiled;
+	compiled: CompileResult;
 	ssr: boolean | undefined;
 	dependencies: string[];
 	preprocessed: Processed;

package/src/types/log.d.ts

@@ -1,4 +1,4 @@
-import type { Warning } from '../index.d.ts';
+import type { Warning } from 'svelte/types/compiler/interfaces';
 
 export interface LogFn extends SimpleLogFn {
 	(message: string, payload?: any, namespace?: string): void;

package/src/types/options.d.ts

@@ -1,7 +1,7 @@
 import type { CompileOptions } from 'svelte/types/compiler/interfaces';
 import type { ViteDevServer } from 'vite';
 import { VitePluginSvelteStats } from '../utils/vite-plugin-svelte-stats.js';
-import type { Options } from '../index.d.ts';
+import type { Options } from '../public.d.ts';
 
 export interface PreResolvedOptions extends Options {
 	// these options are non-nullable after resolve

package/src/utils/compile.js

@@ -4,8 +4,12 @@ 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=["']?([^"' >]+)["']?[^>]*>/;
 
@@ -21,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) {
@@ -47,7 +54,7 @@ export const _createCompileSvelte = (makeHot) => {
 				// also they for hmr updates too
 			}
 		}
-		/** @type {import('../index.d.ts').CompileOptions} */
+		/** @type {import('svelte/compiler').CompileOptions} */
 		const compileOptions = {
 			...options.compilerOptions,
 			filename,
@@ -86,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') {
@@ -99,7 +115,7 @@ 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
@@ -119,13 +135,26 @@ export const _createCompileSvelte = (makeHot) => {
 			: compileOptions;
 
 		const endStat = stats?.start(filename);
-		const compiled = compile(finalCode, finalCompileOptions);
+		/** @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/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('../public.d.ts').Options['preprocess']} [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

@@ -59,7 +59,7 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
 		// TODO ideally we'd be able to externalize prebundled styles too, but for now always put them in the js
 		css = 'injected';
 	}
-	/** @type {import('../index.d.ts').CompileOptions} */
+	/** @type {import('svelte/compiler').CompileOptions} */
 	const compileOptions = {
 		...options.compilerOptions,
 		css,
@@ -81,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/id.js

@@ -159,8 +159,8 @@ function stripRoot(normalizedFilename, normalizedRoot) {
 }
 
 /**
- * @param {import('../index.d.ts').Arrayable<string> | undefined} include
- * @param {import('../index.d.ts').Arrayable<string> | undefined} exclude
+ * @param {import('../public.d.ts').Options['include'] | undefined} include
+ * @param {import('../public.d.ts').Options['exclude'] | undefined} exclude
  * @param {string[]} extensions
  * @returns {(filename: string) => boolean}
  */

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

@@ -16,16 +16,19 @@ export const knownSvelteConfigNames = [
 	'svelte.config.mjs'
 ];
 
-// hide dynamic import from ts transform to prevent it turning into a require
-// see https://github.com/microsoft/TypeScript/issues/43329#issuecomment-811606238
-// also use timestamp query to avoid caching on reload
-const dynamicImportDefault = new Function(
-	'path',
-	'timestamp',
-	'return import(path + "?t=" + timestamp).then(m => m.default)'
-);
+/**
+ * @param {string} filePath
+ * @param {number} timestamp
+ */
+async function dynamicImportDefault(filePath, timestamp) {
+	return await import(filePath + '?t=' + timestamp).then((m) => m.default);
+}
 
-/** @type {import('../index.d.ts').loadSvelteConfig} */
+/**
+ * @param {import('vite').UserConfig} viteConfig
+ * @param {Partial<import('../public.d.ts').Options>} inlineOptions
+ * @returns {Promise<Partial<import('../public.d.ts').SvelteConfig> | undefined>}
+ */
 export async function loadSvelteConfig(viteConfig, inlineOptions) {
 	if (inlineOptions?.configFile === false) {
 		return;
@@ -59,7 +62,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)];
@@ -86,7 +90,7 @@ export async function loadSvelteConfig(viteConfig, inlineOptions) {
 
 /**
  * @param {import('vite').UserConfig | undefined} viteConfig
- * @param {Partial<import('../index.d.ts').Options> | undefined} inlineOptions
+ * @param {Partial<import('../public.d.ts').Options> | undefined} inlineOptions
  * @returns {string | undefined}
  */
 function findConfigToLoad(viteConfig, inlineOptions) {

package/src/utils/options.js

@@ -36,6 +36,7 @@ const allowedPluginOptions = new Set([
 	'disableDependencyReinclusion',
 	'prebundleSvelteLibraries',
 	'inspector',
+	'dynamicCompileOptions',
 	'experimental'
 ]);
 
@@ -44,7 +45,7 @@ const knownRootOptions = new Set(['extensions', 'compilerOptions', 'preprocess',
 const allowedInlineOptions = new Set(['configFile', ...allowedPluginOptions, ...knownRootOptions]);
 
 /**
- * @param {Partial<import('../index.d.ts').Options>} [inlineOptions]
+ * @param {Partial<import('../public.d.ts').Options>} [inlineOptions]
  */
 export function validateInlineOptions(inlineOptions) {
 	const invalidKeys = Object.keys(inlineOptions || {}).filter(
@@ -56,8 +57,8 @@ export function validateInlineOptions(inlineOptions) {
 }
 
 /**
- * @param {Partial<import('../index.d.ts').SvelteOptions>} [config]
- * @returns {Partial<import('../index.d.ts').Options> | undefined}
+ * @param {Partial<import('../public.d.ts').SvelteConfig>} [config]
+ * @returns {Partial<import('../public.d.ts').Options> | undefined}
  */
 function convertPluginOptions(config) {
 	if (!config) {
@@ -107,7 +108,7 @@ function convertPluginOptions(config) {
 			delete pluginOptions[unkownOption];
 		});
 	}
-	/** @type {import('../index.d.ts').Options} */
+	/** @type {import('../public.d.ts').Options} */
 	const result = {
 		...config,
 		...pluginOptions
@@ -120,7 +121,7 @@ function convertPluginOptions(config) {
 
 /**
  * used in config phase, merges the default options, svelte config, and inline options
- * @param {Partial<import('../index.d.ts').Options> | undefined} inlineOptions
+ * @param {Partial<import('../public.d.ts').Options> | undefined} inlineOptions
  * @param {import('vite').UserConfig} viteUserConfig
  * @param {import('vite').ConfigEnv} viteEnv
  * @returns {Promise<import('../types/options.d.ts').PreResolvedOptions>}
@@ -190,7 +191,7 @@ function mergeConfigs(...configs) {
  */
 export function resolveOptions(preResolveOptions, viteConfig, cache) {
 	const css = preResolveOptions.emitCss ? 'external' : 'injected';
-	/** @type {Partial<import('../index.d.ts').Options>} */
+	/** @type {Partial<import('../public.d.ts').Options>} */
 	const defaultOptions = {
 		hot: viteConfig.isProduction
 			? false
@@ -316,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.`
 				);
 			}
 		}

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
@@ -8,10 +9,11 @@ import path from 'node:path';
  *
  * only used during dev with enabled css hmr
  *
- * @returns {import('svelte/types/compiler/preprocess').PreprocessorGroup}
+ * @returns {import('svelte/compiler').PreprocessorGroup}
  */
 export function createInjectScopeEverythingRulePreprocessorGroup() {
 	return {
+		name: 'inject-scope-everything-rule',
 		style({ content, filename }) {
 			const s = new MagicString(content);
 			s.append(' *{}');
@@ -30,14 +32,14 @@ export function createInjectScopeEverythingRulePreprocessorGroup() {
  * @param {import('../types/options.d.ts').ResolvedOptions} options
  * @param {import('vite').ResolvedConfig} config
  * @returns {{
- * 	prependPreprocessors: import('svelte/types/compiler/preprocess').PreprocessorGroup[],
- * 	appendPreprocessors: import('svelte/types/compiler/preprocess').PreprocessorGroup[]
+ * 	prependPreprocessors: import('svelte/compiler').PreprocessorGroup[],
+ * 	appendPreprocessors: import('svelte/compiler').PreprocessorGroup[]
  * }}
  */
 function buildExtraPreprocessors(options, config) {
-	/** @type {import('svelte/types/compiler/preprocess').PreprocessorGroup[]} */
+	/** @type {import('svelte/compiler').PreprocessorGroup[]} */
 	const prependPreprocessors = [];
-	/** @type {import('svelte/types/compiler/preprocess').PreprocessorGroup[]} */
+	/** @type {import('svelte/compiler').PreprocessorGroup[]} */
 	const appendPreprocessors = [];
 
 	// @ts-ignore
@@ -120,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/types/index.d.ts

@@ -0,0 +1,189 @@
+declare module '@sveltejs/vite-plugin-svelte' {
+	import type { InlineConfig, ResolvedConfig } from 'vite';
+	import type { CompileOptions, PreprocessorGroup } from 'svelte/compiler';
+	import type { Warning } from 'svelte/types/compiler/interfaces';
+	import type { Options as InspectorOptions } from '@sveltejs/vite-plugin-svelte-inspector';
+	export type Options = Omit<SvelteConfig, 'vitePlugin'> & PluginOptionsInline;
+
+	interface PluginOptionsInline extends PluginOptions {
+		/**
+		 * Path to a svelte config file, either absolute or relative to Vite root
+		 *
+		 * set to `false` to ignore the svelte config file
+		 *
+		 * @see https://vitejs.dev/config/#root
+		 */
+		configFile?: string | false;
+	}
+
+	interface PluginOptions {
+		/**
+		 * A `picomatch` pattern, or array of patterns, which specifies the files the plugin should
+		 * operate on. By default, all svelte files are included.
+		 *
+		 * @see https://github.com/micromatch/picomatch
+		 */
+		include?: Arrayable<string>;
+		/**
+		 * A `picomatch` pattern, or array of patterns, which specifies the files to be ignored by the
+		 * plugin. By default, no files are ignored.
+		 *
+		 * @see https://github.com/micromatch/picomatch
+		 */
+		exclude?: Arrayable<string>;
+		/**
+		 * Emit Svelte styles as virtual CSS files for Vite and other plugins to process
+		 *
+		 * @default true
+		 */
+		emitCss?: boolean;
+		/**
+		 * Enable or disable Hot Module Replacement.
+		 *
+		 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+		 *
+		 * DO NOT CUSTOMIZE SVELTE-HMR OPTIONS UNLESS YOU KNOW EXACTLY WHAT YOU ARE DOING
+		 *
+		 *                             YOU HAVE BEEN WARNED
+		 *
+		 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+		 *
+		 * Set an object to pass custom options to svelte-hmr
+		 *
+		 * @see https://github.com/rixo/svelte-hmr#options
+		 * @default true for development, always false for production
+		 */
+		hot?:
+			| boolean
+			| {
+					injectCss?: boolean;
+					partialAccept?: boolean;
+					[key: string]: any;
+			  };
+		/**
+		 * Some Vite plugins can contribute additional preprocessors by defining `api.sveltePreprocess`.
+		 * If you don't want to use them, set this to true to ignore them all or use an array of strings
+		 * with plugin names to specify which.
+		 *
+		 * @default false
+		 */
+		ignorePluginPreprocessors?: boolean | string[];
+		/**
+		 * vite-plugin-svelte automatically handles excluding svelte libraries and reinclusion of their dependencies
+		 * in vite.optimizeDeps.
+		 *
+		 * `disableDependencyReinclusion: true` disables all reinclusions
+		 * `disableDependencyReinclusion: ['foo','bar']` disables reinclusions for dependencies of foo and bar
+		 *
+		 * This should be used for hybrid packages that contain both node and browser dependencies, eg Routify
+		 *
+		 * @default false
+		 */
+		disableDependencyReinclusion?: boolean | string[];
+		/**
+		 * Enable support for Vite's dependency optimization to prebundle Svelte libraries.
+		 *
+		 * To disable prebundling for a specific library, add it to `optimizeDeps.exclude`.
+		 *
+		 * @default true for dev, false for build
+		 */
+		prebundleSvelteLibraries?: boolean;
+		/**
+		 * toggle/configure Svelte Inspector
+		 *
+		 * @default unset for dev, always false for build
+		 */
+		inspector?: InspectorOptions | boolean;
+
+		/**
+		 * A function to update `compilerOptions` before compilation
+		 *
+		 * `data.filename` - The file to be compiled
+		 * `data.code` - The preprocessed Svelte code
+		 * `data.compileOptions` - The current compiler options
+		 *
+		 * To change part of the compiler options, return an object with the changes you need.
+		 *
+		 * @example
+		 * ```
+		 * ({ filename, compileOptions }) => {
+		 *   // Dynamically set hydration per Svelte file
+		 *   if (compileWithHydratable(filename) && !compileOptions.hydratable) {
+		 *     return { hydratable: true };
+		 *   }
+		 * }
+		 * ```
+		 */
+		dynamicCompileOptions?: (data: {
+			filename: string;
+			code: string;
+			compileOptions: Partial<CompileOptions>;
+		}) => Promise<Partial<CompileOptions> | void> | Partial<CompileOptions> | void;
+
+		/**
+		 * These options are considered experimental and breaking changes to them can occur in any release
+		 */
+		experimental?: ExperimentalOptions;
+	}
+
+	export interface SvelteConfig {
+		/**
+		 * A list of file extensions to be compiled by Svelte
+		 *
+		 * @default ['.svelte']
+		 */
+		extensions?: string[];
+		/**
+		 * An array of preprocessors to transform the Svelte source code before compilation
+		 *
+		 * @see https://svelte.dev/docs#svelte_preprocess
+		 */
+		preprocess?: Arrayable<PreprocessorGroup>;
+		/**
+		 * The options to be passed to the Svelte compiler. A few options are set by default,
+		 * including `dev` and `css`. However, some options are non-configurable, like
+		 * `filename`, `format`, `generate`, and `cssHash` (in dev).
+		 *
+		 * @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 {
+		/**
+		 * send a websocket message with svelte compiler warnings during dev
+		 *
+		 */
+		sendWarningsToBrowser?: boolean;
+		/**
+		 * disable svelte field resolve warnings
+		 *
+		 * @default false
+		 */
+		disableSvelteResolveWarnings?: boolean;
+	}
+
+	type Arrayable<T> = T | T[];
+
+	export interface VitePreprocessOptions {
+		script?: boolean;
+		style?: boolean | InlineConfig | ResolvedConfig;
+	}
+	export function svelte(inlineOptions?: Partial<Options> | undefined): import('vite').Plugin[];
+	export function vitePreprocess(opts: VitePreprocessOptions): import('svelte/compiler').PreprocessorGroup;
+	export function loadSvelteConfig(viteConfig: import('vite').UserConfig, inlineOptions: Partial<Options>): Promise<Partial<SvelteConfig> | undefined>;
+}
+
+//# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -0,0 +1,25 @@
+{
+	"version": 3,
+	"file": "index.d.ts",
+	"names": [
+		"Options",
+		"SvelteConfig",
+		"VitePreprocessOptions",
+		"svelte",
+		"vitePreprocess",
+		"loadSvelteConfig"
+	],
+	"sources": [
+		"../src/public.d.ts",
+		"../src/index.js",
+		"../src/preprocess.js",
+		"../src/utils/load-svelte-config.js"
+	],
+	"sourcesContent": [
+		null,
+		null,
+		null,
+		null
+	],
+	"mappings": ";;;;;aAMYA,OAAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBA2HFC,YAAYA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAmDZC,qBAAqBA;;;;iBC1JtBC,MAAMA;iBCXNC,cAAcA;iBCgBRC,gBAAgBA"
+}