vuetify-nuxt-module 0.13.2 → 0.13.4

package/dist/module.d.mts

@@ -59,7 +59,7 @@ interface FontIconSet {
     /**
      * Use CDN?
      *
-     * - mdi: https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons
+     * - mdi: https://cdn.jsdelivr.net/npm/@mdi/font@5.x/css/materialdesignicons.min.css
      * - md:  https://fonts.googleapis.com/css?family=Material+Icons
      * - fa:  https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@latest/css/all.min.css
      * - fa4: https://cdn.jsdelivr.net/npm/font-awesome@4.x/css/font-awesome.min.css
@@ -209,7 +209,7 @@ interface VOptions extends Partial<Omit<VuetifyOptions, 'ssr' | 'aliases' | 'com
     /**
      * Include the icons?
      *
-     * By default, `mdi` icons will be used via cdn: https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css.
+     * By default, `mdi` icons will be used via cdn: https://cdn.jsdelivr.net/npm/@mdi/font@5.x/css/materialdesignicons.min.css.
      *
      * @see https://vuetifyjs.com/en/features/icon-fonts/
      */

package/dist/module.d.ts

@@ -59,7 +59,7 @@ interface FontIconSet {
     /**
      * Use CDN?
      *
-     * - mdi: https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons
+     * - mdi: https://cdn.jsdelivr.net/npm/@mdi/font@5.x/css/materialdesignicons.min.css
      * - md:  https://fonts.googleapis.com/css?family=Material+Icons
      * - fa:  https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@latest/css/all.min.css
      * - fa4: https://cdn.jsdelivr.net/npm/font-awesome@4.x/css/font-awesome.min.css
@@ -209,7 +209,7 @@ interface VOptions extends Partial<Omit<VuetifyOptions, 'ssr' | 'aliases' | 'com
     /**
      * Include the icons?
      *
-     * By default, `mdi` icons will be used via cdn: https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css.
+     * By default, `mdi` icons will be used via cdn: https://cdn.jsdelivr.net/npm/@mdi/font@5.x/css/materialdesignicons.min.css.
      *
      * @see https://vuetifyjs.com/en/features/icon-fonts/
      */

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.9.0",
     "bridge": false
   },
-  "version": "0.13.2"
+  "version": "0.13.4"
 }

package/dist/module.mjs

@@ -8,13 +8,13 @@ import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
 import { readFile } from 'node:fs/promises';
 import { resolveVuetifyBase, normalizePath, generateImports } from '@vuetify/loader-shared';
+import { transformAssetUrls } from 'vite-plugin-vuetify';
 import { isAbsolute, join, relative as relative$1 } from 'pathe';
 import { pathToFileURL } from 'node:url';
 import { parseQuery, parseURL } from 'ufo';
 import destr from 'destr';
-import { transformAssetUrls } from 'vite-plugin-vuetify';
 
-const version = "0.13.2";
+const version = "0.13.4";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `/@nuxt-vuetify-configuration/${VIRTUAL_VUETIFY_CONFIGURATION.slice("virtual:".length)}`;
@@ -114,9 +114,11 @@ async function mergeVuetifyModules(options, nuxt) {
     vuetifyOptions: resolvedOptions.config
   });
   if (moduleOptions.length > 1) {
-    const [base, ...rest] = moduleOptions;
+    const [base, ...rest] = moduleOptions.reverse();
+    const configuration = defu(base, ...rest);
+    dedupeIcons(configuration, moduleOptions);
     return {
-      configuration: defu(base, ...rest),
+      configuration,
       vuetifyConfigurationFilesToWatch
     };
   } else {
@@ -129,6 +131,30 @@ async function mergeVuetifyModules(options, nuxt) {
     };
   }
 }
+function dedupeIcons(configuration, moduleOptions) {
+  const vuetifyOptions = configuration.vuetifyOptions;
+  if (vuetifyOptions.icons) {
+    if (vuetifyOptions.icons.sets) {
+      const sets = /* @__PURE__ */ new Map();
+      for (const { vuetifyOptions: vuetifyOptions2 } of moduleOptions) {
+        if (vuetifyOptions2.icons && vuetifyOptions2.icons.sets) {
+          const mSets = vuetifyOptions2.icons.sets;
+          if (typeof mSets === "string") {
+            sets.set(mSets, { name: mSets });
+          } else {
+            for (const set of mSets) {
+              if (typeof set === "string")
+                sets.set(set, { name: set });
+              else
+                sets.set(set.name, set);
+            }
+          }
+        }
+      }
+      vuetifyOptions.icons.sets = Array.from(sets.values());
+    }
+  }
+}
 
 function detectDate() {
   const result = [];
@@ -1157,8 +1183,33 @@ function configureVite(configKey, nuxt, ctx) {
         configKey
       ];
     }
+    const { includeTransformAssetsUrls, styles } = ctx.moduleOptions;
+    if (includeTransformAssetsUrls) {
+      viteInlineConfig.vue ??= {};
+      viteInlineConfig.vue.template ??= {};
+      let existingTransformAssetUrls = viteInlineConfig.vue.template.transformAssetUrls ?? {};
+      let useURLOptions;
+      if (typeof existingTransformAssetUrls === "boolean") {
+        existingTransformAssetUrls = {};
+      } else if ("base" in existingTransformAssetUrls || "includeAbsolute" in existingTransformAssetUrls || "tags" in existingTransformAssetUrls) {
+        useURLOptions = {
+          base: existingTransformAssetUrls.base,
+          includeAbsolute: existingTransformAssetUrls.includeAbsolute
+        };
+        existingTransformAssetUrls = existingTransformAssetUrls.tags ?? {};
+      }
+      const transformAssetUrls$1 = normalizeTransformAssetUrls(
+        typeof includeTransformAssetsUrls === "object" ? defu(existingTransformAssetUrls, transformAssetUrls, includeTransformAssetsUrls) : defu(existingTransformAssetUrls, transformAssetUrls)
+      );
+      if (useURLOptions) {
+        useURLOptions.tags = transformAssetUrls$1;
+        viteInlineConfig.vue.template.transformAssetUrls = useURLOptions;
+      } else {
+        viteInlineConfig.vue.template.transformAssetUrls = transformAssetUrls$1;
+      }
+    }
     viteInlineConfig.plugins.push(vuetifyImportPlugin({}));
-    viteInlineConfig.plugins.push(vuetifyStylesPlugin({ styles: ctx.moduleOptions.styles }, ctx.logger));
+    viteInlineConfig.plugins.push(vuetifyStylesPlugin({ styles }, ctx.logger));
     viteInlineConfig.plugins.push(vuetifyConfigurationPlugin(ctx));
     viteInlineConfig.plugins.push(vuetifyIconsPlugin(ctx));
     viteInlineConfig.plugins.push(vuetifyDateConfigurationPlugin(ctx));
@@ -1225,8 +1276,7 @@ export default defineNuxtPlugin({
 function configureNuxt(configKey, nuxt, ctx) {
   const {
     importComposables,
-    prefixComposables,
-    includeTransformAssetsUrls = true
+    prefixComposables
   } = ctx.moduleOptions;
   const runtimeDir = ctx.resolver.resolve("./runtime");
   nuxt.options.build.transpile.push(configKey);
@@ -1238,13 +1288,6 @@ function configureNuxt(configKey, nuxt, ctx) {
     nuxt.options.imports.transform.include.push(new RegExp(`${virtual}$`));
   nuxt.options.css ??= [];
   nuxt.options.css.unshift("vuetify/styles");
-  if (includeTransformAssetsUrls && typeof nuxt.options.vite.vue?.template?.transformAssetUrls === "undefined") {
-    nuxt.options.vite.vue ??= {};
-    nuxt.options.vite.vue.template ??= {};
-    nuxt.options.vite.vue.template.transformAssetUrls = normalizeTransformAssetUrls(
-      typeof includeTransformAssetsUrls === "object" ? defu(includeTransformAssetsUrls, transformAssetUrls) : transformAssetUrls
-    );
-  }
   extendWebpackConfig(() => {
     throw new Error("Webpack is not supported: vuetify-nuxt-module module can only be used with Vite!");
   });

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.13.2",
-  "packageManager": "pnpm@8.15.6",
+  "version": "0.13.4",
+  "packageManager": "pnpm@9.0.5",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",