@sveltejs/vite-plugin-svelte 3.0.0 → 3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -36,13 +36,13 @@
   },
   "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.5",
     "svelte-hmr": "^0.15.3",
-    "vitefu": "^0.2.5"
+    "vitefu": "^0.2.5",
+    "@sveltejs/vite-plugin-svelte-inspector": "^2.0.0"
   },
   "peerDependencies": {
     "svelte": "^4.0.0 || ^5.0.0-next.0",
@@ -50,10 +50,10 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "esbuild": "^0.19.5",
-    "sass": "^1.69.5",
-    "svelte": "^4.2.3",
-    "vite": "^5.0.0"
+    "esbuild": "^0.19.12",
+    "sass": "^1.70.0",
+    "svelte": "^4.2.9",
+    "vite": "^5.0.11"
   },
   "scripts": {
     "check:publint": "publint --strict",

package/src/handle-hot-update.js

@@ -104,8 +104,10 @@ function jsChanged(prev, next, filename) {
 	}
 	const isLooseEqual = isCodeEqual(normalizeJsCode(prevJs), normalizeJsCode(nextJs));
 	if (!isStrictEqual && isLooseEqual) {
-		log.warn(
-			`ignoring compiler output js change for ${filename} as it is equal to previous output after normalization`
+		log.debug(
+			`ignoring compiler output js change for ${filename} as it is equal to previous output after normalization`,
+			undefined,
+			'hmr'
 		);
 	}
 	return !isLooseEqual;

package/src/preprocess.js

@@ -10,7 +10,7 @@ const supportedScriptLangs = ['ts'];
 export const lang_sep = '.vite-preprocess';
 
 /**
- * @param {import('./public.d.ts').VitePreprocessOptions} opts
+ * @param {import('./public.d.ts').VitePreprocessOptions} [opts]
  * @returns {import('svelte/compiler').PreprocessorGroup}
  */
 export function vitePreprocess(opts) {

package/src/utils/compile.js

@@ -12,7 +12,11 @@ import { mapToRelative } from './sourcemaps.js';
 import { enhanceCompileError } from './error.js';
 import { isSvelte5 } from './svelte-version.js';
 
-const scriptLangRE = /<script [^>]*lang=["']?([^"' >]+)["']?[^>]*>/;
+// TODO this is a patched version of https://github.com/sveltejs/vite-plugin-svelte/pull/796/files#diff-3bce0b33034aad4b35ca094893671f7e7ddf4d27254ae7b9b0f912027a001b15R10
+// which is closer to the other regexes in at least not falling into commented script
+// but ideally would be shared exactly with svelte and other tools that use it
+const scriptLangRE =
+	/<!--[^]*?-->|<script (?:[^>]*|(?:[^=>'"/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)\s+)*)lang=["']?([^"' >]+)["']?[^>]*>/g;
 
 /**
  * @param {Function} [makeHot]
@@ -133,7 +137,7 @@ export const _createCompileSvelte = (makeHot) => {
 			? {
 					...compileOptions,
 					...dynamicCompileOptions
-			  }
+				}
 			: compileOptions;
 
 		const endStat = stats?.start(filename);
@@ -180,10 +184,18 @@ export const _createCompileSvelte = (makeHot) => {
 			}
 		}
 
+		let lang = 'js';
+		for (const match of code.matchAll(scriptLangRE)) {
+			if (match[1]) {
+				lang = match[1];
+				break;
+			}
+		}
+
 		return {
 			filename,
 			normalizedFilename,
-			lang: code.match(scriptLangRE)?.[1] || 'js',
+			lang,
 			// @ts-ignore
 			compiled,
 			ssr,

package/src/utils/constants.js

@@ -1,6 +1,6 @@
 import { isSvelte5 } from './svelte-version.js';
 
-export const VITE_RESOLVE_MAIN_FIELDS = ['module', 'jsnext:main', 'jsnext'];
+export const VITE_RESOLVE_MAIN_FIELDS = ['browser', 'module', 'jsnext:main', 'jsnext'];
 
 export const SVELTE_RESOLVE_MAIN_FIELDS = ['svelte'];
 

package/src/utils/error.js

@@ -114,8 +114,9 @@ export function enhanceCompileError(err, originalCode, preprocessors) {
 
 	// 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;
+		// Reference from Svelte: https://github.com/sveltejs/svelte/blob/9926347ad9dbdd0f3324d5538e25dcb7f5e442f8/packages/svelte/src/compiler/preprocess/index.js#L259
+		const scriptRe =
+			/<!--[^]*?-->|<script((?:\s+[^=>'"/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"/]+)*\s*)(?:\/>|>([\S\s]*?)<\/script>)/g;
 		const errIndex = err.pos ?? -1;
 
 		let m;
@@ -142,7 +143,9 @@ export function enhanceCompileError(err, originalCode, preprocessors) {
 
 	// Handle incorrect CSS preprocessor usage
 	if (err.code === 'css-syntax-error') {
-		const styleRe = /<style(\s[^]*?)?(?:>([^]*?)<\/style>|\/>)/gi;
+		// Reference from Svelte: https://github.com/sveltejs/svelte/blob/9926347ad9dbdd0f3324d5538e25dcb7f5e442f8/packages/svelte/src/compiler/preprocess/index.js#L257
+		const styleRe =
+			/<!--[^]*?-->|<style((?:\s+[^=>'"/]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"/]+)*\s*)(?:\/>|>([\S\s]*?)<\/style>)/g;
 
 		let m;
 		while ((m = styleRe.exec(originalCode))) {

package/src/utils/esbuild.js

@@ -120,7 +120,7 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
 		? {
 				...compileOptions,
 				...dynamicCompileOptions
-		  }
+			}
 		: compileOptions;
 	const endStat = statsCollection?.start(filename);
 	const compiled = svelte.compile(finalCode, finalCompileOptions);

package/src/utils/load-raw.js

@@ -31,7 +31,7 @@ export async function loadRaw(svelteRequest, compileSvelte, options) {
 					? {
 							js: type === 'script' || type === 'all',
 							css: type === 'style' || type === 'all'
-					  }
+						}
 					: false,
 				...svelteRequest.query.compilerOptions
 			},

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

@@ -25,8 +25,8 @@ async function dynamicImportDefault(filePath, timestamp) {
 }
 
 /**
- * @param {import('vite').UserConfig} viteConfig
- * @param {Partial<import('../public.d.ts').Options>} inlineOptions
+ * @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) {
@@ -63,7 +63,7 @@ export async function loadSvelteConfig(viteConfig, inlineOptions) {
 				const _require = import.meta.url
 					? esmRequire ?? (esmRequire = createRequire(import.meta.url))
 					: // eslint-disable-next-line no-undef
-					  require;
+						require;
 
 				// avoid loading cached version on reload
 				delete _require.cache[_require.resolve(configFile)];

package/src/utils/options.js

@@ -199,7 +199,7 @@ export function resolveOptions(preResolveOptions, viteConfig, cache) {
 			: {
 					injectCss: css === 'injected',
 					partialAccept: !!viteConfig.experimental?.hmrPartialAccept
-			  },
+				},
 		compilerOptions: {
 			css,
 			dev: !viteConfig.isProduction
@@ -551,7 +551,7 @@ async function buildExtraConfigForDependencies(options, config) {
 							.slice(0, -1)
 							.some((d) => isDepExcluded(d.trim(), userExclude))
 					);
-			  });
+				});
 	}
 	if (options.disableDependencyReinclusion === true) {
 		depsConfig.optimizeDeps.include = depsConfig.optimizeDeps.include.filter(

package/types/index.d.ts

@@ -190,8 +190,8 @@ declare module '@sveltejs/vite-plugin-svelte' {
 		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>;
+	export function vitePreprocess(opts?: VitePreprocessOptions | undefined): import('svelte/compiler').PreprocessorGroup;
+	export function loadSvelteConfig(viteConfig?: import("vite").UserConfig | undefined, inlineOptions?: Partial<Options> | undefined): Promise<Partial<SvelteConfig> | undefined>;
 }
 
 //# sourceMappingURL=index.d.ts.map