vuetify-nuxt-module 0.13.1 → 0.13.3

package/README.md

@@ -39,7 +39,7 @@
 - 😃 **Icon Fonts**: configure the [icon font](https://vuetifyjs.com/en/features/icon-fonts/) you want to use, the module will automatically import it for you using CDN or local dependencies
 - 🎭 **SVG Icons**: ready to use [@mdi/js](https://www.npmjs.com/package/@mdi/js) and [@fortawesome/vue-fontawesome](https://www.npmjs.com/package/@fortawesome/vue-fontawesome) SVG icons packs
 - 📦 **Multiple Icon Sets**: register [multiple icon sets](https://vuetifyjs.com/en/features/icon-fonts/#multiple-icon-sets)
-- 🌍 **I18n Ready**: install [@nuxtjs/i18n](https://v8.i18n.nuxtjs.org/) Nuxt module, and you're ready to use Vuetify [internationalization](https://vuetifyjs.com/en/features/internationalization/) features
+- 🌍 **I18n Ready**: install [@nuxtjs/i18n](https://i18n.nuxtjs.org/) Nuxt module, and you're ready to use Vuetify [internationalization](https://vuetifyjs.com/en/features/internationalization/) features
 - 📆 **Date Components**: use Vuetify components [that require date functionality](https://vuetifyjs.com/en/features/dates/) installing and configuring one of the [@date-io](https://github.com/dmtrKovalenko/date-io#projects) adapters
 - 💬 **Auto-Import Vuetify Locale Messages**: add [Vuetify Locale Messages](https://vuetifyjs.com/en/features/internationalization/#getting-started) adding just the locales you want to use, no more imports needed
 - ⚙️ **Auto-Import Vuetify Composables**: you don't need to import Vuetify composables manually, they are automatically imported for you
@@ -52,13 +52,7 @@
 > Requires Vite, will not work with Webpack
 
 ```bash
-npm i vuetify-nuxt-module -D 
-
-# yarn 
-yarn add vuetify-nuxt-module -D
-
-# pnpm 
-pnpm add vuetify-nuxt-module -D
+npx nuxi@latest 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)

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.1"
+  "version": "0.13.3"
 }

package/dist/module.mjs

@@ -14,7 +14,7 @@ import { parseQuery, parseURL } from 'ufo';
 import destr from 'destr';
 import { transformAssetUrls } from 'vite-plugin-vuetify';
 
-const version = "0.13.1";
+const version = "0.13.3";
 
 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 = [];
@@ -1226,7 +1252,6 @@ function configureNuxt(configKey, nuxt, ctx) {
   const {
     importComposables,
     prefixComposables,
-    styles,
     includeTransformAssetsUrls = true
   } = ctx.moduleOptions;
   const runtimeDir = ctx.resolver.resolve("./runtime");
@@ -1238,12 +1263,7 @@ function configureNuxt(configKey, nuxt, ctx) {
   for (const virtual of RESOLVED_VIRTUAL_MODULES)
     nuxt.options.imports.transform.include.push(new RegExp(`${virtual}$`));
   nuxt.options.css ??= [];
-  if (typeof styles === "string" && ["sass", "expose"].includes(styles))
-    nuxt.options.css.unshift("vuetify/styles/main.sass");
-  else if (styles === true)
-    nuxt.options.css.unshift("vuetify/styles");
-  else if (typeof styles === "object" && typeof styles?.configFile === "string")
-    nuxt.options.css.unshift(styles.configFile);
+  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 ??= {};

package/dist/runtime/plugins/i18n.mjs

@@ -45,16 +45,21 @@ function createProvideFunction(data) {
       if (oldVal)
         i18n.setLocale(val);
     }, { immediate: true, flush: "post" });
+    const t = wrapI18n(i18n.t);
+    const n = wrapI18n(i18n.n);
     return {
       name: "nuxt-vue-i18n",
       current: currentLocale,
       fallback: data.fallback,
       messages: data.messages,
-      // todo: fix this, we should check the options
-      // @ts-expect-error Type instantiation is excessively deep and possibly infinite.ts(2589)
-      t: (key, ...params) => i18n.t(key, params),
-      n: i18n.n,
+      t,
+      n,
       provide: createProvideFunction({ current: currentLocale, fallback: data.fallback, messages: data.messages })
     };
   };
 }
+function wrapI18n(t) {
+  return (...args) => {
+    return t(...args);
+  };
+}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.13.1",
-  "packageManager": "pnpm@8.15.5",
+  "version": "0.13.3",
+  "packageManager": "pnpm@9.0.5",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -74,7 +74,7 @@
     "ufo": "^1.5.3",
     "unconfig": "^0.3.11",
     "vite-plugin-vuetify": "^2.0.3",
-    "vuetify": "^3.5.12"
+    "vuetify": "^3.5.13"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.43.1",