fix(sass): remove query params when resolving virtual sass modules (#278

)
vuetifyjs · Sep 13, 2024 · c853c0f · c853c0f
1 parent 4faed02
commit c853c0f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/utils/configure-vite.ts b/src/utils/configure-vite.ts
@@ -50,15 +50,10 @@ export function configureVite(configKey: string, nuxt: Nuxt, ctx: VuetifyNuxtCon
       if (enableModernSassCompiler) {
         const sassEmbedded = isPackageExists('sass-embedded')
         if (sassEmbedded) {
-          // vite version >= 5.4.2
-          // check https://github.com/vitejs/vite/pull/17754 and https://github.com/vitejs/vite/pull/17728
-          const omit = major > 5 || (major === 5 && minor > 4) || (major === 5 && minor === 4 && patch >= 2)
-          if (!omit) {
-            viteInlineConfig.css ??= {}
-            viteInlineConfig.css.preprocessorOptions ??= {}
-            viteInlineConfig.css.preprocessorOptions.sass ??= {}
-            viteInlineConfig.css.preprocessorOptions.sass.api = 'modern-compiler'
-          }
+          viteInlineConfig.css ??= {}
+          viteInlineConfig.css.preprocessorOptions ??= {}
+          viteInlineConfig.css.preprocessorOptions.sass ??= {}
+          viteInlineConfig.css.preprocessorOptions.sass.api = 'modern-compiler'
         }
         else {
           viteInlineConfig.css ??= {}

diff --git a/src/vite/vuetify-styles-plugin.ts b/src/vite/vuetify-styles-plugin.ts
@@ -48,8 +48,13 @@ export function vuetifyStylesPlugin(
       }
     },
     async resolveId(source, importer, { custom, ssr }) {
-      if (source.startsWith(PREFIX) || source.startsWith(SSR_PREFIX))
-        return source
+      if (source.startsWith(PREFIX) || source.startsWith(SSR_PREFIX)) {
+        if (source.endsWith('.sass'))
+          return source
+
+        const idx = source.indexOf('?')
+        return idx > -1 ? source.slice(0, idx) : source
+      }
 
       if (
         source === 'vuetify/styles' || (