vuetify-nuxt-module 0.18.4 → 0.18.6

package/dist/module.json

@@ -5,7 +5,7 @@
     "nuxt": ">=3.9.0",
     "bridge": false
   },
-  "version": "0.18.4",
+  "version": "0.18.6",
   "builder": {
     "@nuxt/module-builder": "0.8.3",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -4,10 +4,10 @@ import { createFilter, version as version$1 } from 'vite';
 import { resolve, dirname, relative } from 'node:path';
 import defu from 'defu';
 import { debounce } from 'perfect-debounce';
-import { existsSync, statSync } from 'node:fs';
+import fs, { existsSync, statSync } from 'node:fs';
 import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
-import { readFile } from 'node:fs/promises';
+import fsp, { readFile } from 'node:fs/promises';
 import { resolveVuetifyBase, isObject, normalizePath, generateImports } from '@vuetify/loader-shared';
 import { pathToFileURL } from 'node:url';
 import { relative as relative$1, isAbsolute } from 'pathe';
@@ -16,7 +16,7 @@ import { transformAssetUrls } from 'vite-plugin-vuetify';
 import { parseQuery, parseURL } from 'ufo';
 import destr from 'destr';
 
-const version = "0.18.4";
+const version = "0.18.6";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `\0${VIRTUAL_VUETIFY_CONFIGURATION}`;
@@ -536,6 +536,7 @@ function vuetifyStylesPlugin(options, [major, minor, patch], _logger) {
   let fileImport = false;
   const PREFIX = "vuetify-styles/";
   const SSR_PREFIX = `/@${PREFIX}`;
+  const resolveCss = resolveCssFactory();
   return {
     name: "vuetify:styles:nuxt",
     enforce: "pre",
@@ -556,20 +557,18 @@ function vuetifyStylesPlugin(options, [major, minor, patch], _logger) {
     },
     async resolveId(source, importer, { custom, ssr }) {
       if (source.startsWith(PREFIX) || source.startsWith(SSR_PREFIX)) {
-        if (source.endsWith(".sass"))
+        if (source.match(/\.s[ca]ss$/))
           return source;
         const idx = source.indexOf("?");
         return idx > -1 ? source.slice(0, idx) : source;
       }
       if (source === "vuetify/styles" || importer && source.endsWith(".css") && isSubdir(vuetifyBase, path.isAbsolute(source) ? source : importer)) {
-        if (options.styles === "sass") {
-          const target2 = source.replace(/\.css$/, ".sass");
-          return this.resolve(target2, importer, { skipSelf: true, custom });
-        }
+        if (options.styles === "sass")
+          return this.resolve(await resolveCss(source), importer, { skipSelf: true, custom });
         const resolution = await this.resolve(source, importer, { skipSelf: true, custom });
         if (!resolution)
           return void 0;
-        const target = resolution.id.replace(/\.css$/, ".sass");
+        const target = await resolveCss(resolution.id);
         if (isNone) {
           noneFiles.add(target);
           return target;
@@ -582,9 +581,9 @@ function vuetifyStylesPlugin(options, [major, minor, patch], _logger) {
       if (sassVariables) {
         const target = id.startsWith(PREFIX) ? path.resolve(vuetifyBase, id.slice(PREFIX.length)) : id.startsWith(SSR_PREFIX) ? path.resolve(vuetifyBase, id.slice(SSR_PREFIX.length)) : void 0;
         if (target) {
+          const suffix = target.match(/\.scss/) ? ";\n" : "\n";
           return {
-            code: `@use "${configFile}"
-@use "${fileImport ? pathToFileURL(target).href : normalizePath(target)}"`,
+            code: `@use "${configFile}"${suffix}@use "${fileImport ? pathToFileURL(target).href : normalizePath(target)}"${suffix}`,
             map: {
               mappings: ""
             }
@@ -595,6 +594,24 @@ function vuetifyStylesPlugin(options, [major, minor, patch], _logger) {
     }
   };
 }
+function resolveCssFactory() {
+  const mappings = /* @__PURE__ */ new Map();
+  return async (source) => {
+    let mapping = mappings.get(source);
+    if (!mapping) {
+      try {
+        mapping = source.replace(/\.css$/, ".sass");
+        await fsp.access(mapping, fs.constants.R_OK);
+      } catch (err) {
+        if (!(err instanceof Error && "code" in err && err.code === "ENOENT"))
+          throw err;
+        mapping = source.replace(/\.css$/, ".scss");
+      }
+      mappings.set(source, mapping);
+    }
+    return mapping;
+  };
+}
 function isSubdir(root, test) {
   const relative = relative$1(root, test);
   return relative && !relative.startsWith("..") && !isAbsolute(relative);
@@ -1249,23 +1266,26 @@ function configureVite(configKey, nuxt, ctx) {
           viteInlineConfig.css.preprocessorOptions ??= {};
           viteInlineConfig.css.preprocessorOptions.sass ??= {};
           viteInlineConfig.css.preprocessorOptions.sass.api = "modern-compiler";
+          viteInlineConfig.css.preprocessorOptions.scss ??= {};
+          viteInlineConfig.css.preprocessorOptions.scss.api = "modern-compiler";
         } else {
           viteInlineConfig.css ??= {};
           viteInlineConfig.css.preprocessorOptions ??= {};
           viteInlineConfig.css.preprocessorOptions.sass ??= {};
           viteInlineConfig.css.preprocessorOptions.sass.api = "modern";
+          viteInlineConfig.css.preprocessorOptions.scss ??= {};
+          viteInlineConfig.css.preprocessorOptions.scss.api = "modern";
           if (!("preprocessorMaxWorkers" in viteInlineConfig.css))
             viteInlineConfig.css.preprocessorMaxWorkers = true;
         }
       }
     }
-    const vuetifyImportOptions = {};
+    const autoImport = { labs: true };
     const ignoreDirectives = ctx.moduleOptions.ignoreDirectives;
     if (ignoreDirectives) {
-      const ignore = Array.isArray(ignoreDirectives) ? ignoreDirectives : [ignoreDirectives];
-      vuetifyImportOptions.autoImport = { ignore };
+      autoImport.ignore = Array.isArray(ignoreDirectives) ? ignoreDirectives : [ignoreDirectives];
     }
-    viteInlineConfig.plugins.push(vuetifyImportPlugin(vuetifyImportOptions));
+    viteInlineConfig.plugins.push(vuetifyImportPlugin({ autoImport }));
     if (typeof ctx.moduleOptions.styles !== "boolean")
       viteInlineConfig.plugins.push(vuetifyStylesPlugin({ styles: ctx.moduleOptions.styles }, ctx.viteVersion, ctx.logger));
     viteInlineConfig.plugins.push(vuetifyConfigurationPlugin(ctx));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.18.4",
+  "version": "0.18.6",
   "packageManager": "pnpm@9.9.0",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
@@ -143,4 +143,4 @@
     "installDependencies": false,
     "startCommand": "node .stackblitz.js && pnpm install && nr prepack && nr dev:prepare && nr dev"
   }
-}
+}