vuetify-nuxt-module 1.0.0-alpha.6 → 1.0.0-beta.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023-PRESENT Joaquín Sánchez <https://github.com/userquin>
+Copyright (c) 2023-PRESENT Vuetify, LLC <https://github.com/vuetifyjs>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -52,7 +52,7 @@
 > Requires Vite, will not work with Webpack
 
 ```bash
-npx nuxi@latest module add vuetify-nuxt-module
+npx nuxt module add vuetify-nuxt-module
 ```
 
 [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/userquin/vuetify-nuxt-module)
@@ -92,4 +92,4 @@ The virtual modules can be found in [configuration.d.ts](https://github.com/vuet
 
 ## 📄 License
 
-[MIT](https://github.com/vuetifyjs/nuxt-module/blob/main/LICENSE) License © 2023-PRESENT [Joaquín Sánchez](https://github.com/userquin)
+[MIT](https://github.com/vuetifyjs/nuxt-module/blob/main/LICENSE) License © 2023-PRESENT [Vuetify, LLC](https://github.com/vuetifyjs)

package/dist/module.json

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

package/dist/module.mjs

@@ -1,24 +1,23 @@
-import { addPluginTemplate, addTemplate, resolvePath, extendWebpackConfig, isNuxtMajorVersion, addImports, addPlugin, addVitePlugin, useLogger, defineNuxtModule, getNuxtVersion, hasNuxtModule, createResolver } from '@nuxt/kit';
+import { addPluginTemplate, resolvePath, addTemplate, extendWebpackConfig, isNuxtMajorVersion, addImports, addPlugin, addVitePlugin, useLogger, defineNuxtModule, getNuxtVersion, hasNuxtModule, createResolver } from '@nuxt/kit';
 import { isPackageExists, getPackageInfo } from 'local-pkg';
 import semver from 'semver';
 import { createFilter, version as version$1 } from 'vite';
-import fs, { existsSync, statSync, readFileSync, readdirSync, rmSync, mkdirSync, writeFileSync } from 'node:fs';
-import { isAbsolute, resolve, relative } from 'pathe';
 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 { pathToFileURL } from 'node:url';
-import { generateImports, resolveVuetifyBase, isObject, normalizePath } from '@vuetify/loader-shared';
+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 { resolve as resolve$1, dirname, join, relative as relative$1 } from 'node:path';
 import { debounce } from 'perfect-debounce';
 import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
-import { createHash } from 'node:crypto';
 
-const version = "1.0.0-alpha.6";
+const version = "1.0.0-beta.2";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `\0${VIRTUAL_VUETIFY_CONFIGURATION}`;
@@ -128,6 +127,64 @@ function normalizeTransformAssetUrlsAttrs(attrs) {
   return [...result];
 }
 
+function resolveVuetifyConfigFile(configFile, nuxt) {
+  if (typeof configFile === "string" && !isAbsolute(configFile)) {
+    for (const layer of nuxt.options._layers) {
+      const resolved = resolve(layer.config.srcDir, configFile);
+      if (existsSync(resolved)) {
+        return resolved;
+      }
+    }
+  }
+  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");
   addVuetifyNuxtPlugin(nuxt, ctx, "server");
@@ -198,17 +255,6 @@ export default defineNuxtPlugin({
 function getTemplate(source, settings) {
   return [settings ? `@use '${settings}';` : "", `@use '${source}';`].filter(Boolean).join("\n");
 }
-function resolveVuetifyConfigFile(configFile, nuxt) {
-  if (typeof configFile === "string" && !isAbsolute(configFile)) {
-    for (const layer of nuxt.options._layers) {
-      const resolved = resolve(layer.config.rootDir, configFile);
-      if (existsSync(resolved)) {
-        return resolved;
-      }
-    }
-  }
-  return configFile;
-}
 async function configureNuxt(configKey, nuxt, ctx) {
   const {
     styles,
@@ -223,9 +269,10 @@ async function configureNuxt(configKey, nuxt, ctx) {
     nuxt.options.css ??= [];
     if (typeof styles === "object" && "configFile" in styles) {
       const configFile = resolveVuetifyConfigFile(styles.configFile, nuxt);
+      ctx.stylesConfigFile = await resolvePath(configFile);
       const a = addTemplate({
         filename: "vuetify.settings.scss",
-        getContents: async () => getTemplate("vuetify/styles", await resolvePath(configFile))
+        getContents: async () => getTemplate("vuetify/styles", ctx.stylesConfigFile)
       });
       nuxt.options.css.push(a.dst);
     } else if (ctx.vuetifyGte("4.0.0")) {
@@ -903,8 +950,8 @@ function vuetifySSRClientHintsPlugin(ctx) {
 
 function vuetifyStylesPlugin(ctx) {
   let configFile;
+  let vuetifyBase;
   const options = { styles: ctx.moduleOptions.styles };
-  const vuetifyBase = resolveVuetifyBase();
   const noneFiles = /* @__PURE__ */ new Set();
   let isNone = false;
   let sassVariables = false;
@@ -923,10 +970,11 @@ function vuetifyStylesPlugin(ctx) {
       if (isObject(options.styles) && "configFile" in options.styles) {
         sassVariables = true;
         fileImport = semver.gt(ctx.viteVersion, "5.4.2");
-        configFile = await resolvePath(options.styles.configFile);
+        configFile = ctx.stylesConfigFile ?? await resolvePath(options.styles.configFile);
       } else {
         isNone = options.styles === "none";
       }
+      vuetifyBase = await resolveVuetifyBase();
     },
     async resolveId(source, importer, { custom, ssr }) {
       if (!sassVariables) {
@@ -939,7 +987,7 @@ function vuetifyStylesPlugin(ctx) {
         const idx = source.indexOf("?");
         return idx === -1 ? source : source.slice(0, idx);
       }
-      if (importer && source.endsWith(".css") && isSubdir(vuetifyBase, path.isAbsolute(source) ? source : importer)) {
+      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);
@@ -972,6 +1020,9 @@ function vuetifyStylesPlugin(ctx) {
     },
     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";
@@ -1314,7 +1365,7 @@ async function loadVuetifyConfiguration(cwd = process.cwd(), configOrPath = cwd,
     inlineConfig = configOrPath;
     configOrPath = process.cwd();
   }
-  const resolved = resolve$1(cwd, configOrPath);
+  const resolved = resolve(cwd, configOrPath);
   let isFile = false;
   if (existsSync(resolved) && statSync(resolved).isFile()) {
     isFile = true;
@@ -1513,11 +1564,12 @@ async function prepareVuetifyStyles(nuxt, ctx) {
   if (stylesConfig.experimental?.cache === false) {
     return;
   }
-  const vuetifyBase = resolveVuetifyBase();
+  const vuetifyBase = await resolveVuetifyBase();
   let configFile;
   let configContent = "";
   if (stylesConfig.configFile) {
-    configFile = await resolvePath(stylesConfig.configFile);
+    configFile = await resolvePath(resolveVuetifyConfigFile(stylesConfig.configFile, nuxt));
+    ctx.stylesConfigFile = configFile;
     if (existsSync(configFile)) {
       configContent = readFileSync(configFile, "utf8");
       if (!ctx.vuetifyFilesToWatch.includes(configFile)) {
@@ -1528,18 +1580,15 @@ async function prepareVuetifyStyles(nuxt, ctx) {
   if (!configFile) {
     return;
   }
-  const hash = createHash("sha256").update(ctx.vuetifyVersion).update(ctx.viteVersion).update(configContent).update(configFile).digest("hex").slice(0, 8);
-  const stylesDir = resolve$1(nuxt.options.rootDir, "node_modules/.cache/vuetify-nuxt-module/styles");
-  const cacheDir = join(stylesDir, hash);
+  const hash = createStylesCacheHash(
+    ctx.vuetifyVersion,
+    ctx.viteVersion,
+    configContent,
+    configFile
+  );
+  const { stylesDir, cacheDir } = resolveStylesCachePaths(nuxt.options.rootDir, hash);
   ctx.stylesCachePath = cacheDir;
-  if (existsSync(stylesDir)) {
-    const dirents = readdirSync(stylesDir, { withFileTypes: true });
-    for (const dirent of dirents) {
-      if (dirent.isDirectory() && dirent.name !== hash) {
-        rmSync(join(stylesDir, dirent.name), { recursive: true, force: true });
-      }
-    }
-  }
+  cleanupOldStylesCaches(stylesDir, hash);
   if (existsSync(cacheDir)) {
     return;
   }
@@ -1555,11 +1604,9 @@ async function prepareVuetifyStyles(nuxt, ctx) {
       return;
     }
   }
-  const files = [];
-  findCssFiles(join(vuetifyBase, "lib/components"), files);
-  findCssFiles(join(vuetifyBase, "lib/styles"), files);
+  const files = collectVuetifyCssFiles(vuetifyBase);
   for (const file of files) {
-    const relativePath = relative$1(vuetifyBase, file);
+    const relativePath = relative(vuetifyBase, file);
     const cacheFile = join(cacheDir, relativePath);
     const sassFile = file.replace(/\.css$/, ".sass");
     const scssFile = file.replace(/\.css$/, ".scss");
@@ -1582,8 +1629,8 @@ async function prepareVuetifyStyles(nuxt, ctx) {
           loadPaths: [
             dirname(configFile),
             dirname(targetFile),
-            resolve$1(vuetifyBase, ".."),
-            resolve$1(vuetifyBase, "../.."),
+            resolve(vuetifyBase, ".."),
+            resolve(vuetifyBase, "../.."),
             // In case of monorepo/hoisting issues, but standard is enough
             vuetifyBase
           ],
@@ -1604,24 +1651,6 @@ async function prepareVuetifyStyles(nuxt, ctx) {
   };
   writeFileSync(join(cacheDir, "metadata.json"), JSON.stringify(metadata, null, 2), "utf8");
 }
-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;
-}
 
 async function load(options, nuxt, ctx) {
   const {
@@ -1704,7 +1733,7 @@ function registerWatcher(options, nuxt, ctx) {
   if (nuxt.options.dev) {
     let pageReload;
     nuxt.hooks.hook("builder:watch", (_event, path) => {
-      path = relative$1(nuxt.options.srcDir, resolve$1(nuxt.options.srcDir, path));
+      path = relative(nuxt.options.srcDir, resolve(nuxt.options.srcDir, path));
       if (!pageReload && ctx.vuetifyFilesToWatch.includes(path)) {
         return nuxt.callHook("restart");
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-beta.2",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -134,7 +134,7 @@
     "dev:prepare:date-io": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare ../../apps/date-io-playground",
     "dev:date-io": "pnpm -C ../../apps/date-io-playground dev",
     "docs:dev": "pnpm -C ../../docs run dev",
-    "docs:build": "nuxt-module-build prepare && pnpm -C ../../docs run build",
+    "docs:build": "pnpm -C ../../docs run build",
     "docs:serve": "pnpm -C ../../docs run serve",
     "lint": "eslint .",
     "lint:fix": "nr lint --fix",