vuetify-nuxt-module 1.0.0-alpha.3 → 1.0.0-alpha.4

package/dist/module.json

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

package/dist/module.mjs

@@ -2,22 +2,22 @@ import { addPluginTemplate, addTemplate, resolvePath, extendWebpackConfig, isNux
 import { isPackageExists, getPackageInfo } from 'local-pkg';
 import semver from 'semver';
 import { createFilter, version as version$1 } from 'vite';
+import fs, { existsSync, statSync } from 'node:fs';
+import { isAbsolute, resolve, relative } from 'pathe';
 import defu from 'defu';
 import { transformAssetUrls } from 'vite-plugin-vuetify';
 import { pathToFileURL } from 'node:url';
 import { generateImports, resolveVuetifyBase, isObject, normalizePath } from '@vuetify/loader-shared';
 import destr from 'destr';
-import { isAbsolute, relative } from 'pathe';
 import { parseQuery, parseURL } from 'ufo';
-import fs, { existsSync, statSync } from 'node:fs';
 import fsp, { readFile } from 'node:fs/promises';
 import path from 'upath';
-import { resolve, dirname, relative as relative$1 } from 'node:path';
+import { resolve as resolve$1, dirname, relative as relative$1 } from 'node:path';
 import { debounce } from 'perfect-debounce';
 import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
 
-const version = "1.0.0-alpha.3";
+const version = "1.0.0-alpha.4";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `\0${VIRTUAL_VUETIFY_CONFIGURATION}`;
@@ -197,6 +197,17 @@ 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,
@@ -210,9 +221,10 @@ async function configureNuxt(configKey, nuxt, ctx) {
   if (styles !== "none" && styles !== false) {
     nuxt.options.css ??= [];
     if (typeof styles === "object" && "configFile" in styles) {
+      const configFile = resolveVuetifyConfigFile(styles.configFile, nuxt);
       const a = addTemplate({
         filename: "vuetify.settings.scss",
-        getContents: async () => getTemplate("vuetify/styles", await resolvePath(styles.configFile))
+        getContents: async () => getTemplate("vuetify/styles", await resolvePath(configFile))
       });
       nuxt.options.css.push(a.dst);
     } else if (ctx.vuetifyGte("4.0.0")) {
@@ -424,7 +436,8 @@ async function buildConfiguration(ctx) {
   const importMapComponents = await componentsPromise;
   const componentsToImport = /* @__PURE__ */ new Map();
   for (const component of config.components) {
-    const { from } = importMapComponents[component];
+    const componentEntry = importMapComponents[component];
+    const from = componentEntry?.from;
     if (!from) {
       logger.warn(`Component ${component} not found in Vuetify.`);
       continue;
@@ -434,16 +447,21 @@ async function buildConfiguration(ctx) {
       logger.warn(`Component ${component} not found in Vuetify, please report a new issue.`);
       continue;
     }
-    if (!componentsToImport.has(parts[1])) {
-      componentsToImport.set(parts[1], []);
+    const bucket = parts[1];
+    if (!bucket) {
+      continue;
+    }
+    if (!componentsToImport.has(bucket)) {
+      componentsToImport.set(bucket, []);
     }
-    const componentsArray = componentsToImport.get(parts[1]);
+    const componentsArray = componentsToImport.get(bucket);
     if (!componentsArray.includes(component)) {
       componentsArray.push(component);
     }
   }
   for (const [key, component] of Object.entries(config.aliases)) {
-    const { from } = importMapComponents[component];
+    const componentEntry = importMapComponents[component];
+    const from = componentEntry?.from;
     if (!from) {
       logger.warn(`Component ${component} not found in Vuetify.`);
       continue;
@@ -453,10 +471,14 @@ async function buildConfiguration(ctx) {
       logger.warn(`Component ${component} not found in Vuetify, please report a new issue.`);
       continue;
     }
-    if (!componentsToImport.has(parts[1])) {
-      componentsToImport.set(parts[1], []);
+    const bucket = parts[1];
+    if (!bucket) {
+      continue;
+    }
+    if (!componentsToImport.has(bucket)) {
+      componentsToImport.set(bucket, []);
     }
-    const componentsArray = componentsToImport.get(parts[1]);
+    const componentsArray = componentsToImport.get(bucket);
     if (!componentsArray.includes(component)) {
       componentsArray.push(component);
     }
@@ -483,7 +505,8 @@ async function buildConfiguration(ctx) {
       componentsToImport.clear();
       const importMapLabComponents = await labComponentsPromise;
       for (const component of useLabComponents) {
-        const { from } = importMapLabComponents[component];
+        const componentEntry = importMapLabComponents[component];
+        const from = componentEntry?.from;
         if (!from) {
           logger.warn(`Lab Component ${component} not found in Vuetify.`);
           continue;
@@ -493,10 +516,14 @@ async function buildConfiguration(ctx) {
           logger.warn(`Lab Component ${component} not found in Vuetify, please report a new issue.`);
           continue;
         }
-        if (!componentsToImport.has(parts[1])) {
-          componentsToImport.set(parts[1], []);
+        const bucket = parts[1];
+        if (!bucket) {
+          continue;
+        }
+        if (!componentsToImport.has(bucket)) {
+          componentsToImport.set(bucket, []);
         }
-        const componentsArray = componentsToImport.get(parts[1]);
+        const componentsArray = componentsToImport.get(bucket);
         if (!componentsArray.includes(component)) {
           componentsArray.push(component);
         }
@@ -885,6 +912,7 @@ function vuetifyStylesPlugin(options, viteVersion, _logger) {
   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",
@@ -918,6 +946,9 @@ function vuetifyStylesPlugin(options, viteVersion, _logger) {
           return;
         }
         const target = await resolveCss(resolution.id);
+        if (target.startsWith(PREFIX) || target.startsWith(SSR_PREFIX)) {
+          return target;
+        }
         if (isNone) {
           noneFiles.add(target);
           return target;
@@ -938,7 +969,7 @@ function vuetifyStylesPlugin(options, viteVersion, _logger) {
           }
           const suffix = /\.scss/.test(target) ? ";\n" : "\n";
           const result = {
-            code: `@use "${configFile}"${suffix}@use "${fileImport ? pathToFileURL(target).href : normalizePath(target)}"${suffix}`,
+            code: `@use "${toPath(configFile)}"${suffix}@use "${toPath(target)}"${suffix}`,
             map: {
               mappings: ""
             }
@@ -1284,7 +1315,7 @@ async function loadVuetifyConfiguration(cwd = process.cwd(), configOrPath = cwd,
     inlineConfig = configOrPath;
     configOrPath = process.cwd();
   }
-  const resolved = resolve(cwd, configOrPath);
+  const resolved = resolve$1(cwd, configOrPath);
   let isFile = false;
   if (existsSync(resolved) && statSync(resolved).isFile()) {
     isFile = true;
@@ -1320,6 +1351,14 @@ async function loadVuetifyConfiguration(cwd = process.cwd(), configOrPath = cwd,
   });
   const result = await loader.load();
   result.config = result.config?.config === false ? Object.assign(defaults, inlineConfig) : Object.assign(defaults, result.config || inlineConfig);
+  if (result.config && typeof result.config === "object" && "vuetifyOptions" in result.config) {
+    const nestedOptions = result.config.vuetifyOptions;
+    if (typeof nestedOptions === "object" && nestedOptions !== null) {
+      console.warn('[@vuetify/nuxt-module] Detected nested "vuetifyOptions" in your configuration file. This usually happens when using a named export or wrapping options incorrectly. Please export the options directly using "export default".');
+      Object.assign(result.config, nestedOptions);
+      delete result.config.vuetifyOptions;
+    }
+  }
   delete result.config.config;
   return result;
 }
@@ -1547,7 +1586,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(nuxt.options.srcDir, path));
+      path = relative$1(nuxt.options.srcDir, resolve$1(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.3",
+  "version": "1.0.0-alpha.4",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",