@sveltejs/vite-plugin-svelte 3.1.0 → 3.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "MIT",
   "author": "dominikg",
   "files": [
@@ -36,11 +36,11 @@
   },
   "homepage": "https://github.com/sveltejs/vite-plugin-svelte#readme",
   "dependencies": {
-    "@sveltejs/vite-plugin-svelte-inspector": "^2.0.0",
+    "@sveltejs/vite-plugin-svelte-inspector": "^2.1.0",
     "debug": "^4.3.4",
     "deepmerge": "^4.3.1",
     "kleur": "^4.1.5",
-    "magic-string": "^0.30.9",
+    "magic-string": "^0.30.10",
     "svelte-hmr": "^0.16.0",
     "vitefu": "^0.2.5"
   },
@@ -51,9 +51,9 @@
   "devDependencies": {
     "@types/debug": "^4.1.12",
     "esbuild": "^0.20.2",
-    "sass": "^1.74.1",
-    "svelte": "^4.2.12",
-    "vite": "^5.2.8"
+    "sass": "^1.75.0",
+    "svelte": "^4.2.15",
+    "vite": "^5.2.9"
   },
   "scripts": {
     "check:publint": "publint --strict",

package/src/preprocess.js

@@ -61,29 +61,16 @@ function viteScript() {
  * @returns {{ style: import('svelte/compiler').Preprocessor }}
  */
 function viteStyle(config = {}) {
-	/** @type {CssTransform} */
-	let transform;
+	/** @type {Promise<CssTransform> | CssTransform} */
+	let cssTransform;
 	/** @type {import('svelte/compiler').Preprocessor} */
 	const style = async ({ attributes, content, filename = '' }) => {
 		const ext = attributes.lang ? `.${attributes.lang}` : '.css';
 		if (attributes.lang && !isCSSRequest(ext)) return;
-		if (!transform) {
-			/** @type {import('vite').ResolvedConfig} */
-			let resolvedConfig;
-			// @ts-expect-error special prop added if running in v-p-s
-			if (style.__resolvedConfig) {
-				// @ts-expect-error
-				resolvedConfig = style.__resolvedConfig;
-			} else if (isResolvedConfig(config)) {
-				resolvedConfig = config;
-			} else {
-				resolvedConfig = await resolveConfig(
-					config,
-					process.env.NODE_ENV === 'production' ? 'build' : 'serve'
-				);
-			}
-			transform = getCssTransformFn(resolvedConfig);
+		if (!cssTransform) {
+			cssTransform = createCssTransform(style, config).then((t) => (cssTransform = t));
 		}
+		const transform = await cssTransform;
 		const suffix = `${lang_sep}${ext}`;
 		const moduleId = `${filename}${suffix}`;
 		const { code, map, deps } = await transform(content, moduleId);
@@ -102,12 +89,27 @@ function viteStyle(config = {}) {
 }
 
 /**
- * @param {import('vite').ResolvedConfig} config
- * @returns {CssTransform}
+ * @param {import('svelte/compiler').Preprocessor} style
+ * @param {import('vite').ResolvedConfig | import('vite').InlineConfig} config
+ * @returns {Promise<CssTransform>}
  */
-function getCssTransformFn(config) {
+async function createCssTransform(style, config) {
+	/** @type {import('vite').ResolvedConfig} */
+	let resolvedConfig;
+	// @ts-expect-error special prop added if running in v-p-s
+	if (style.__resolvedConfig) {
+		// @ts-expect-error
+		resolvedConfig = style.__resolvedConfig;
+	} else if (isResolvedConfig(config)) {
+		resolvedConfig = config;
+	} else {
+		resolvedConfig = await resolveConfig(
+			config,
+			process.env.NODE_ENV === 'production' ? 'build' : 'serve'
+		);
+	}
 	return async (code, filename) => {
-		return preprocessCSS(code, filename, config);
+		return preprocessCSS(code, filename, resolvedConfig);
 	};
 }
 

package/src/utils/options.js

@@ -199,13 +199,15 @@ export function resolveOptions(preResolveOptions, viteConfig, cache) {
 			dev: !viteConfig.isProduction
 		}
 	};
+	const hot =
+		!viteConfig.isProduction && !preResolveOptions.isBuild && viteConfig.server.hmr !== false;
 	if (isSvelte5) {
 		if (isSvelte5WithHMRSupport) {
 			// @ts-expect-error svelte4 does not have hmr option
-			defaultOptions.compilerOptions.hmr = !viteConfig.isProduction;
+			defaultOptions.compilerOptions.hmr = hot;
 		}
 	} else {
-		defaultOptions.hot = viteConfig.isProduction
+		defaultOptions.hot = !hot
 			? false
 			: {
 					injectCss: css === 'injected',
@@ -224,7 +226,7 @@ export function resolveOptions(preResolveOptions, viteConfig, cache) {
 	removeIgnoredOptions(merged);
 	handleDeprecatedOptions(merged);
 	addExtraPreprocessors(merged, viteConfig);
-	enforceOptionsForHmr(merged);
+	enforceOptionsForHmr(merged, viteConfig);
 	enforceOptionsForProduction(merged);
 	// mergeConfigs would mangle functions on the stats class, so do this afterwards
 	if (log.debug.enabled && isDebugNamespaceEnabled('stats')) {
@@ -235,8 +237,15 @@ export function resolveOptions(preResolveOptions, viteConfig, cache) {
 
 /**
  * @param {import('../types/options.d.ts').ResolvedOptions} options
+ * @param {import('vite').ResolvedConfig} viteConfig
  */
-function enforceOptionsForHmr(options) {
+function enforceOptionsForHmr(options, viteConfig) {
+	if (options.hot && viteConfig.server.hmr === false) {
+		log.warn(
+			'vite config server.hmr is false but hot is true. Forcing hot to false as it would not work.'
+		);
+		options.hot = false;
+	}
 	if (isSvelte5) {
 		if (options.hot && isSvelte5WithHMRSupport) {
 			log.warn(