@sveltejs/vite-plugin-svelte 2.4.0 → 2.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -38,19 +38,19 @@
     "deepmerge": "^4.3.1",
     "kleur": "^4.1.5",
     "magic-string": "^0.30.0",
-    "svelte-hmr": "^0.15.1",
+    "svelte-hmr": "^0.15.2",
     "vitefu": "^0.2.4",
-    "@sveltejs/vite-plugin-svelte-inspector": "^1.0.1"
+    "@sveltejs/vite-plugin-svelte-inspector": "^1.0.3"
   },
   "peerDependencies": {
-    "svelte": "^3.54.0",
+    "svelte": "^3.54.0 || ^4.0.0",
     "vite": "^4.0.0"
   },
   "devDependencies": {
-    "@types/debug": "^4.1.7",
-    "esbuild": "^0.17.18",
-    "svelte": "^3.59.1",
-    "vite": "^4.3.5"
+    "@types/debug": "^4.1.8",
+    "esbuild": "^0.18.6",
+    "svelte": "^3.59.2",
+    "vite": "^4.3.9"
   },
   "scripts": {
     "check:publint": "publint --strict",

package/src/index.d.ts

@@ -172,7 +172,7 @@ interface ExperimentalOptions {
 	disableSvelteResolveWarnings?: boolean;
 }
 
-type ModuleFormat = NonNullable<CompileOptions['format']>;
+type ModuleFormat = NonNullable<'esm'>;
 type CssHashGetter = NonNullable<CompileOptions['cssHash']>;
 type Arrayable<T> = T | T[];
 

package/src/index.js

@@ -1,5 +1,4 @@
 import fs from 'fs';
-import { VERSION as svelteVersion } from 'svelte/compiler';
 import { version as viteVersion } from 'vite';
 
 import { svelteInspector } from '@sveltejs/vite-plugin-svelte-inspector';
@@ -25,9 +24,9 @@ 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');
-const isSvelte3 = svelteVersion.startsWith('3');
 
 /** @type {import('./index.d.ts').svelte} */
 export function svelte(inlineOptions) {

package/src/utils/compile.js

@@ -9,6 +9,8 @@ import { mapToRelative } from './sourcemaps.js';
 
 const scriptLangRE = /<script [^>]*lang=["']?([^"' >]+)["']?[^>]*>/;
 
+import { isSvelte3 } from './svelte-version.js';
+
 /**
  * @param {Function} [makeHot]
  * @returns {import('../types/compile.d.ts').CompileSvelte}
@@ -51,9 +53,12 @@ export const _createCompileSvelte = (makeHot) => {
 		const compileOptions = {
 			...options.compilerOptions,
 			filename: normalizedFilename, // use normalized here to avoid bleeding absolute fs path
-			generate: ssr ? 'ssr' : 'dom',
-			format: 'esm'
+			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}`);
@@ -120,13 +125,15 @@ export const _createCompileSvelte = (makeHot) => {
 		const endStat = stats?.start(filename);
 		const compiled = compile(finalCode, finalCompileOptions);
 
-		// 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'
-		);
+		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'
+			);
+		}
 		if (endStat) {
 			endStat();
 		}

package/src/utils/esbuild.js

@@ -2,6 +2,7 @@ import { readFileSync } from '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
@@ -64,10 +65,12 @@ async function compileSvelte(options, { filename, code }, statsCollection) {
 		...options.compilerOptions,
 		css,
 		filename,
-		format: 'esm',
 		generate: 'dom'
 	};
-
+	if (isSvelte3) {
+		// @ts-ignore
+		compileOptions.format = 'esm';
+	}
 	let preprocessed;
 
 	if (options.preprocess) {

package/src/utils/svelte-version.js

@@ -1,45 +1,6 @@
 import { VERSION } from 'svelte/compiler';
-const svelteVersion = parseVersion(VERSION);
 
 /**
- * @param {string} version
- * @returns {number[]}
+ * @type {boolean}
  */
-export function parseVersion(version) {
-	const segments = version.split('.', 3).map((s) => parseInt(s, 10));
-	while (segments.length < 3) {
-		segments.push(0);
-	}
-	return segments;
-}
-
-/**
- * compare version with current svelte, only takes major.minor.patch into account.
- * If you don't pass all three, values will be filled with 0, ie `3` is equal to `3.0.0`
- *
- * @param {string} version
- * @returns {1 | 0 | -1} 1 if passed version is larger than current, 0 if it is equal and -1 if it is lower
- */
-export function compareToSvelte(version) {
-	const parsedVersion = parseVersion(version);
-	for (let i = 0; i < svelteVersion.length; i++) {
-		const a = parsedVersion[i];
-		const b = svelteVersion[i];
-		if (a === b) {
-			continue;
-		} else if (a > b) {
-			return 1;
-		} else {
-			return -1;
-		}
-	}
-	return 0;
-}
-
-/**
- * @param {string} version
- * @returns {boolean}
- */
-export function atLeastSvelte(version) {
-	return compareToSvelte(version) <= 0;
-}
+export const isSvelte3 = VERSION.startsWith('3.');