vuetify-nuxt-module 1.0.0-beta.4 → 1.0.0-beta.5

package/dist/module.d.mts

@@ -251,6 +251,18 @@ interface MOptions {
          * Path to the custom Vuetify SASS configuration file.
          */
         configFile: string;
+        /**
+         * Caching options forwarded to `@vuetify/unplugin-styles`.
+         *
+         * @default true
+         */
+        cache?: boolean | {
+            path?: string;
+            sassOptions?: Record<string, unknown>;
+        };
+        /**
+         * @deprecated Use `styles.cache` instead.
+         */
         experimental?: {
             cache?: boolean;
         };

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.15.0"
   },
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -4,20 +4,19 @@ import semver from 'semver';
 import { createFilter, version as version$1 } from 'vite';
 import defu from 'defu';
 import { transformAssetUrls } from 'vite-plugin-vuetify';
-import { createHash } from 'node:crypto';
-import fs, { existsSync, readdirSync, rmSync, statSync, readFileSync, mkdirSync, writeFileSync } from 'node:fs';
-import { isAbsolute, resolve, join, relative, dirname } from 'pathe';
+import { existsSync, statSync } from 'node:fs';
+import { isAbsolute, resolve, dirname, relative } from 'pathe';
+import { generateImports, resolveVuetifyBase, isObject } from '@vuetify/loader-shared';
+import Styles from '@vuetify/unplugin-styles/vite';
 import { pathToFileURL } from 'node:url';
-import { generateImports, isObject, resolveVuetifyBase, normalizePath } from '@vuetify/loader-shared';
 import destr from 'destr';
 import { parseQuery, parseURL } from 'ufo';
-import fsp, { readFile } from 'node:fs/promises';
-import path from 'upath';
+import { readFile } from 'node:fs/promises';
 import { debounce } from 'perfect-debounce';
 import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
 
-const version = "1.0.0-beta.4";
+const version = "1.0.0-beta.5";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `\0${VIRTUAL_VUETIFY_CONFIGURATION}`;
@@ -138,52 +137,6 @@ function resolveVuetifyConfigFile(configFile, nuxt) {
   }
   return configFile;
 }
-function createStylesCacheHash(vuetifyVersion, viteVersion, configContent, configFile) {
-  return createHash("sha256").update(vuetifyVersion).update(viteVersion).update(configContent).update(configFile).digest("hex").slice(0, 8);
-}
-function resolveStylesCachePaths(rootDir, hash) {
-  const stylesDir = resolve(rootDir, "node_modules/.cache/vuetify-nuxt-module/styles");
-  const cacheDir = join(stylesDir, hash);
-  return {
-    stylesDir,
-    cacheDir
-  };
-}
-function cleanupOldStylesCaches(stylesDir, currentHash) {
-  if (!existsSync(stylesDir)) {
-    return;
-  }
-  const dirents = readdirSync(stylesDir, { withFileTypes: true });
-  for (const dirent of dirents) {
-    if (dirent.isDirectory() && dirent.name !== currentHash) {
-      rmSync(join(stylesDir, dirent.name), { recursive: true, force: true });
-    }
-  }
-}
-function collectVuetifyCssFiles(vuetifyBase) {
-  const files = [];
-  findCssFiles(join(vuetifyBase, "lib/components"), files);
-  findCssFiles(join(vuetifyBase, "lib/styles"), files);
-  return files;
-}
-function findCssFiles(dir, fileList = []) {
-  if (!existsSync(dir)) {
-    return fileList;
-  }
-  const files = readdirSync(dir);
-  for (const file of files) {
-    const filePath = join(dir, file);
-    const stat = statSync(filePath);
-    if (stat.isDirectory()) {
-      findCssFiles(filePath, fileList);
-    } else {
-      if (file.endsWith(".css")) {
-        fileList.push(filePath);
-      }
-    }
-  }
-  return fileList;
-}
 
 function addVuetifyNuxtPlugins(nuxt, ctx) {
   addVuetifyNuxtPlugin(nuxt, ctx, "client");
@@ -948,125 +901,6 @@ function vuetifySSRClientHintsPlugin(ctx) {
   };
 }
 
-function vuetifyStylesPlugin(ctx) {
-  let configFile;
-  let vuetifyBase;
-  const options = { styles: ctx.moduleOptions.styles };
-  const noneFiles = /* @__PURE__ */ new Set();
-  let isNone = false;
-  let sassVariables = false;
-  let fileImport = false;
-  const PREFIX = "vuetify-styles/";
-  const SSR_PREFIX = `/@${PREFIX}`;
-  const resolveCss = resolveCssFactory();
-  const toPath = (file) => fileImport ? pathToFileURL(file).href : normalizePath(file);
-  return {
-    name: "vuetify:styles:nuxt",
-    enforce: "pre",
-    async configResolved(config) {
-      if (config.plugins.some((plugin) => plugin.name === "vuetify:styles")) {
-        throw new Error("Remove vite-plugin-vuetify from your Nuxt config file, this module registers a modified version.");
-      }
-      if (isObject(options.styles) && "configFile" in options.styles) {
-        sassVariables = true;
-        fileImport = semver.gt(ctx.viteVersion, "5.4.2");
-        configFile = ctx.stylesConfigFile ?? await resolvePath(options.styles.configFile);
-      } else {
-        isNone = options.styles === "none";
-      }
-      vuetifyBase = await resolveVuetifyBase();
-    },
-    async resolveId(source, importer, { custom, ssr }) {
-      if (!sassVariables) {
-        return;
-      }
-      if (source.startsWith(PREFIX) || source.startsWith(SSR_PREFIX)) {
-        if (/\.s[ca]ss$/.test(source)) {
-          return source;
-        }
-        const idx = source.indexOf("?");
-        return idx === -1 ? source : source.slice(0, idx);
-      }
-      if (vuetifyBase && importer && source.endsWith(".css") && isSubdir(vuetifyBase, path.isAbsolute(source) ? source : importer)) {
-        let resolutionId;
-        if (source.startsWith(".")) {
-          resolutionId = path.resolve(path.dirname(importer), source);
-        } else if (path.isAbsolute(source)) {
-          resolutionId = source;
-        } else {
-          const resolution = await this.resolve(source, importer, { skipSelf: true, custom });
-          if (resolution) {
-            resolutionId = resolution.id;
-          }
-        }
-        if (!resolutionId) {
-          return;
-        }
-        const target = await resolveCss(resolutionId);
-        if (isNone) {
-          noneFiles.add(target);
-          return target;
-        }
-        if (ctx.stylesCachePath) {
-          const relative = path.relative(vuetifyBase, target);
-          const cacheFile = path.resolve(ctx.stylesCachePath, relative.replace(/\.s[ac]ss$/, ".css"));
-          if (fs.existsSync(cacheFile)) {
-            return cacheFile;
-          }
-        }
-        return `${ssr ? SSR_PREFIX : PREFIX}${path.relative(vuetifyBase, target)}`;
-      }
-      return void 0;
-    },
-    load(id) {
-      if (sassVariables) {
-        if (!vuetifyBase) {
-          return;
-        }
-        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 = /\.scss/.test(target) ? ";\n" : "\n";
-          return {
-            code: `@use "${toPath(configFile)}"${suffix}@use "${toPath(target)}"${suffix}`,
-            map: {
-              mappings: ""
-            }
-          };
-        }
-      }
-      return isNone && noneFiles.has(id) ? "" : void 0;
-    }
-  };
-}
-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 (error) {
-        if (!(error instanceof Error && "code" in error && error.code === "ENOENT")) {
-          throw error;
-        }
-        try {
-          mapping = source.replace(/\.css$/, ".scss");
-          await fsp.access(mapping, fs.constants.R_OK);
-        } catch {
-          mapping = source;
-        }
-      }
-      mappings.set(source, mapping);
-    }
-    return mapping;
-  };
-}
-function isSubdir(root, test) {
-  const relative$1 = relative(root, test);
-  return relative$1 && !relative$1.startsWith("..") && !isAbsolute(relative$1);
-}
-
 function detectDate() {
   const result = [];
   for (const adapter of [
@@ -1124,6 +958,9 @@ function resolveVuetifyComponents(resolver) {
   }
 }
 
+function resolveStylesCache(stylesOption) {
+  return stylesOption.cache ?? stylesOption.experimental?.cache;
+}
 function configureVite(configKey, nuxt, ctx) {
   nuxt.hook("vite:extend", ({ config }) => checkVuetifyPlugins(config));
   nuxt.hook("vite:extendConfig", (viteInlineConfig) => {
@@ -1176,8 +1013,18 @@ function configureVite(configKey, nuxt, ctx) {
       autoImport.ignore = Array.isArray(ignoreDirectives) ? ignoreDirectives : [ignoreDirectives];
     }
     viteInlineConfig.plugins.push(vuetifyImportPlugin({ autoImport }));
-    if (ctx.moduleOptions.styles !== false && ctx.moduleOptions.styles !== "none") {
-      viteInlineConfig.plugins.push(vuetifyStylesPlugin(ctx));
+    const stylesOption = ctx.moduleOptions.styles;
+    if (stylesOption === "none") {
+      viteInlineConfig.plugins.push(Styles({ styles: "none" }));
+    } else if (isObject(stylesOption) && "configFile" in stylesOption) {
+      if (!ctx.stylesConfigFile) {
+        throw new Error("vuetify-nuxt-module: styles.configFile could not be resolved");
+      }
+      const cache = resolveStylesCache(stylesOption);
+      viteInlineConfig.plugins.push(Styles({
+        settings: ctx.stylesConfigFile,
+        ...cache === void 0 ? {} : { cache }
+      }));
     }
     viteInlineConfig.plugins.push(vuetifyConfigurationPlugin(ctx), vuetifyIconsPlugin(ctx), vuetifyDateConfigurationPlugin(ctx));
     if (ctx.ssrClientHints.enabled) {
@@ -1556,102 +1403,6 @@ function prepareSSRClientHints(baseUrl, ctx) {
   return clientHints;
 }
 
-async function prepareVuetifyStyles(nuxt, ctx) {
-  const stylesConfig = ctx.moduleOptions.styles;
-  if (!isObject(stylesConfig) || !("configFile" in stylesConfig)) {
-    return;
-  }
-  if (stylesConfig.experimental?.cache === false) {
-    return;
-  }
-  const vuetifyBase = await resolveVuetifyBase();
-  let configFile;
-  let configContent = "";
-  if (stylesConfig.configFile) {
-    configFile = await resolvePath(resolveVuetifyConfigFile(stylesConfig.configFile, nuxt));
-    ctx.stylesConfigFile = configFile;
-    if (existsSync(configFile)) {
-      configContent = readFileSync(configFile, "utf8");
-      if (!ctx.vuetifyFilesToWatch.includes(configFile)) {
-        ctx.vuetifyFilesToWatch.push(configFile);
-      }
-    }
-  }
-  if (!configFile) {
-    return;
-  }
-  const hash = createStylesCacheHash(
-    ctx.vuetifyVersion,
-    ctx.viteVersion,
-    configContent,
-    configFile
-  );
-  const { stylesDir, cacheDir } = resolveStylesCachePaths(nuxt.options.rootDir, hash);
-  ctx.stylesCachePath = cacheDir;
-  cleanupOldStylesCaches(stylesDir, hash);
-  if (existsSync(cacheDir)) {
-    return;
-  }
-  ctx.logger.info("Compiling Vuetify styles...");
-  let sass;
-  try {
-    sass = await import('sass');
-  } catch {
-    try {
-      sass = await import('sass-embedded');
-    } catch {
-      ctx.logger.warn('Could not load "sass" or "sass-embedded". Skipping styles pre-compilation.');
-      return;
-    }
-  }
-  const files = collectVuetifyCssFiles(vuetifyBase);
-  for (const file of files) {
-    const relativePath = relative(vuetifyBase, file);
-    const cacheFile = join(cacheDir, relativePath);
-    const sassFile = file.replace(/\.css$/, ".sass");
-    const scssFile = file.replace(/\.css$/, ".scss");
-    let targetFile;
-    if (existsSync(sassFile)) {
-      targetFile = sassFile;
-    } else if (existsSync(scssFile)) {
-      targetFile = scssFile;
-    }
-    if (targetFile) {
-      const dir = dirname(cacheFile);
-      if (!existsSync(dir)) {
-        mkdirSync(dir, { recursive: true });
-      }
-      const content = `@use "${normalizePath(configFile)}";
-@use "${normalizePath(targetFile)}";
-`;
-      try {
-        const result = sass.compileString(content, {
-          loadPaths: [
-            dirname(configFile),
-            dirname(targetFile),
-            resolve(vuetifyBase, ".."),
-            resolve(vuetifyBase, "../.."),
-            // In case of monorepo/hoisting issues, but standard is enough
-            vuetifyBase
-          ],
-          url: new URL(pathToFileURL(cacheFile).href)
-        });
-        writeFileSync(cacheFile, result.css, "utf8");
-      } catch (error) {
-        ctx.logger.error(`Failed to compile ${targetFile}:`, error);
-      }
-    }
-  }
-  const metadata = {
-    hash,
-    vuetifyVersion: ctx.vuetifyVersion,
-    viteVersion: ctx.viteVersion,
-    configFile,
-    createdAt: (/* @__PURE__ */ new Date()).toISOString()
-  };
-  writeFileSync(join(cacheDir, "metadata.json"), JSON.stringify(metadata, null, 2), "utf8");
-}
-
 async function load(options, nuxt, ctx) {
   const {
     configuration,
@@ -1727,7 +1478,6 @@ async function load(options, nuxt, ctx) {
       }
     }
   }
-  await prepareVuetifyStyles(nuxt, ctx);
 }
 function registerWatcher(options, nuxt, ctx) {
   if (nuxt.options.dev) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -52,6 +52,7 @@
   ],
   "dependencies": {
     "@nuxt/kit": "^4.3.1",
+    "@vuetify/unplugin-styles": "^1.0.0-beta.10",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
     "local-pkg": "^1.1.2",
@@ -60,7 +61,6 @@
     "semver": "^7.7.4",
     "ufo": "^1.6.3",
     "unconfig": "^7.5.0",
-    "upath": "^2.0.1",
     "vite-plugin-vuetify": "^2.1.3",
     "vuetify": "^4.0.1"
   },
@@ -87,6 +87,7 @@
     "eslint": "^10.0.2",
     "luxon": "^3.7.2",
     "nuxt": "^4.3.1",
+    "playwright-core": "^1.58.0",
     "publint": "^0.3.18",
     "rimraf": "^6.1.3",
     "sass": "^1.97.3",
@@ -98,6 +99,7 @@
   "build": {
     "externals": [
       "@vuetify/loader-shared",
+      "@vuetify/unplugin-styles",
       "node:child_process",
       "node:fs",
       "consola",
@@ -109,7 +111,6 @@
       "rollup",
       "sass",
       "sass-embedded",
-      "upath",
       "ufo",
       "unconfig",
       "vite",
@@ -139,8 +140,9 @@
     "lint": "eslint .",
     "lint:fix": "nr lint --fix",
     "publint": "publint",
-    "test": "vitest run",
-    "test:watch": "vitest watch",
+    "test": "vitest run --exclude 'test/e2e/**'",
+    "test:watch": "vitest watch --exclude 'test/e2e/**'",
+    "test:e2e": "vitest run test/e2e",
     "release": "bumpp"
   }
 }