@sveltejs/vite-plugin-svelte 7.1.1 → 7.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/vite-plugin-svelte",
-  "version": "7.1.1",
+  "version": "7.1.3",
   "license": "MIT",
   "files": [
     "src",

package/src/plugins/inspector/index.js

@@ -115,7 +115,10 @@ export function svelteInspector(api) {
 			}
 		},
 		transform: {
-			filter: { id: /vite\/dist\/client\/client\.mjs(?:\?|$)/ },
+			// Vite+ projects install vite@npm:@voidzero-dev/vite-plus-core@latest which
+			// changes the path from `vite/dist/client/client.mjs` to `vite/dist/vite/client/client.mjs`
+			// so we need to also account for the additional `vite` subdirectory
+			filter: { id: /vite\/dist\/(?:vite\/)?client\/client\.mjs(?:\?|$)/ },
 			handler(code) {
 				if (disabled) {
 					return;

package/src/plugins/load-compiled-css.js

@@ -39,18 +39,24 @@ export function loadCompiledCss(api) {
 				if (!svelteRequest) {
 					return;
 				}
-				// we need to re-resolve the ID in case the dep has been optimised by Vite
-				// since it would now have a ?v=... query string suffix
-				const resolvedId = await this.resolve(svelteRequest.filename);
-				const moduleId = resolvedId?.id ?? svelteRequest.filename;
-				let cachedCss = this.getModuleInfo(moduleId)?.meta.svelte?.css;
+
+				let cachedCss = this.getModuleInfo(svelteRequest.filename)?.meta.svelte?.css;
+				if (!cachedCss) {
+					// some module IDs have a ?v=... query string suffix in addition to the
+					// filename. We can retrieve this by running resolve again
+					const resolvedId = await this.resolve(svelteRequest.filename);
+					if (resolvedId?.id) {
+						cachedCss = this.getModuleInfo(resolvedId.id)?.meta.svelte?.css;
+					}
+				}
+
 				// in `build --watch` or dev ssr reloads getModuleInfo only returns changed module data.
 				// To ensure virtual css is loaded unchanged, we cache it here separately
 				if (useLocalCache) {
 					if (cachedCss) {
-						buildWatchCssCache.set(moduleId, cachedCss);
+						buildWatchCssCache.set(svelteRequest.filename, cachedCss);
 					} else {
-						cachedCss = buildWatchCssCache.get(moduleId);
+						cachedCss = buildWatchCssCache.get(svelteRequest.filename);
 					}
 				}