vuetify-nuxt-module 0.4.7 → 0.4.8

package/dist/module.d.ts

@@ -1,6 +1,7 @@
 import * as _nuxt_schema from '@nuxt/schema';
 import * as vuetify from 'vuetify';
 import { VuetifyOptions, LocaleOptions, RtlOptions } from 'vuetify';
+import * as vuetify_locale from 'vuetify/locale';
 import * as vuetify_labs_components from 'vuetify/labs/components';
 import * as vuetify_directives from 'vuetify/directives';
 import * as vuetify_components from 'vuetify/components';
@@ -90,6 +91,7 @@ type DirectiveName = keyof typeof vuetify_directives;
 type Directives = boolean | DirectiveName | DirectiveName[];
 type LabComponentName = keyof typeof vuetify_labs_components;
 type LabComponents = boolean | LabComponentName | LabComponentName[];
+type VuetifyLocale = keyof typeof vuetify_locale;
 interface VOptions extends Partial<Omit<VuetifyOptions, 'ssr' | 'aliases' | 'components' | 'directives' | 'locale' | 'date' | 'icons'>> {
     aliases?: Record<string, ComponentName>;
     /**
@@ -105,10 +107,19 @@ interface VOptions extends Partial<Omit<VuetifyOptions, 'ssr' | 'aliases' | 'com
      * - `locale`
      * - `fallback`
      * - `rtl`
+     * - `messages`
      *
      * The adapter will be `vuetify`, if you want to use another adapter, check `date` option.
      */
     locale?: Omit<LocaleOptions, 'adapter'> & RtlOptions;
+    /**
+     * Include locale messages?
+     *
+     * When `@nuxtjs/i18n` Nuxt module is present, this option will be ignored.
+     *
+     * You can include the locales you want to use in your application, this module will load and configure the messages for you.
+     */
+    localeMessages?: VuetifyLocale | VuetifyLocale[];
     /**
      * Include the lab components?
      *
@@ -209,4 +220,4 @@ declare module '#app' {
 
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 
-export { ComponentName, Components, DateAdapter, DateOptions, DirectiveName, Directives, FontAwesomeSvgIconSet, FontIconSet, IconFontName, IconSetName, IconsOptions, JSSVGIconSet, LabComponentName, LabComponents, MOptions, ModuleOptions, VOptions, _default as default };
+export { ComponentName, Components, DateAdapter, DateOptions, DirectiveName, Directives, FontAwesomeSvgIconSet, FontIconSet, IconFontName, IconSetName, IconsOptions, JSSVGIconSet, LabComponentName, LabComponents, MOptions, ModuleOptions, VOptions, VuetifyLocale, _default as default };

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "0.4.7"
+  "version": "0.4.8"
 }

package/dist/module.mjs

@@ -1,12 +1,12 @@
-import { utimes, readFile } from 'node:fs/promises';
 import { useLogger, defineNuxtModule, isNuxt3, getNuxtVersion, createResolver, hasNuxtModule, extendWebpackConfig, addImports, addPlugin } from '@nuxt/kit';
 import defu from 'defu';
+import { utimes, readFile } from 'node:fs/promises';
 import { resolveVuetifyBase, normalizePath, writeStyles, cacheDir } from '@vuetify/loader-shared';
 import { isAbsolute, join, relative } from 'pathe';
 import { normalizePath as normalizePath$1 } from 'vite';
 import { isPackageExists } from 'local-pkg';
 
-const version = "0.4.7";
+const version = "0.4.8";
 
 function isSubdir(root, test) {
   const relative$1 = relative(root, test);
@@ -189,6 +189,7 @@ function vuetifyConfigurationPlugin(isDev, i18n, directives, labComponents, vuet
     directives: _directives,
     date: _date,
     icons: _icons,
+    localeMessages,
     components,
     aliases,
     ...newVuetifyOptions
@@ -208,6 +209,7 @@ function vuetifyConfigurationPlugin(isDev, i18n, directives, labComponents, vuet
           delete newVuetifyOptions.locale.fallback;
         }
         const result = await buildConfiguration();
+        const deepCopy = result.messages.length > 0;
         return `${result.imports}
 
 export const isDev = ${isDev}
@@ -216,8 +218,21 @@ export function vuetifyConfiguration() {
   ${result.directives}
   ${result.aliases}
   ${result.components}
+  ${result.messages}
   return options
 }
+${deepCopy ? `function deepCopy(src,des) {
+    for (const key in src) {
+      if (typeof src[key] === 'object') {
+        if (!typeof des[key] === 'object') des[key] = {}
+        deepCopy(src[key], des[key])
+      } else {
+        des[key] = src[key]
+      }
+    }
+    return des
+  }
+  ` : ""}
 `;
       }
     }
@@ -230,7 +245,8 @@ export function vuetifyConfiguration() {
       aliasEntries: [],
       aliases: aliases || {},
       components: new Set(components ? Array.isArray(components) ? components : [components] : []),
-      labComponents: /* @__PURE__ */ new Set()
+      labComponents: /* @__PURE__ */ new Set(),
+      messages: ""
     };
     if (directives) {
       if (typeof directives === "boolean") {
@@ -348,11 +364,31 @@ export function vuetifyConfiguration() {
       else
         componentsEntry = `options.components = {${Array.from(config.labComponents).join(",")}}`;
     }
+    if (
+      /*! i18n && */
+      localeMessages
+    ) {
+      const useLocales = Array.isArray(localeMessages) ? [.../* @__PURE__ */ new Set([...localeMessages])] : [localeMessages];
+      config.imports.push(`import {${useLocales.join(",")}} from 'vuetify/locale'`);
+      config.messages = `
+  options.locale = options.locale || {}
+  options.locale.messages = options.locale.messages || {}
+${useLocales.map((locale) => {
+        return `
+  if ('${locale}' in options.locale.messages)
+    options.locale.messages['${locale}'] = deepCopy(options.locale.messages['${locale}'],${locale})
+  else
+    options.locale.messages['${locale}'] = ${locale}
+`;
+      }).join("")}
+`;
+    }
     return {
       imports: config.imports.length ? config.imports.join("\n") : "",
       components: componentsEntry,
       aliases: config.aliasEntries.length ? `options.aliases = {${config.aliasEntries.join(",")}}` : "",
-      directives: config.directives
+      directives: config.directives,
+      messages: config.messages
     };
   }
 }
@@ -675,6 +711,19 @@ toKebabCase.cache = /* @__PURE__ */ new Map();
 
 function detectDate() {
   const result = [];
+  [
+    "date-fns",
+    "moment",
+    "luxon",
+    "dayjs",
+    "js-joda",
+    "date-fns-jalali",
+    "jalaali",
+    "hijri"
+  ].forEach((adapter) => {
+    if (isPackageExists(`@date-io/${adapter}`))
+      result.push(adapter);
+  });
   return result;
 }
 function cleanupBlueprint(vuetifyOptions) {
@@ -689,6 +738,30 @@ function cleanupBlueprint(vuetifyOptions) {
     vuetifyOptions.blueprint = blueprint;
   }
 }
+function checkVuetifyPlugins(config) {
+  let plugin = config.plugins?.find((p) => p && typeof p === "object" && "name" in p && p.name === "vuetify:import");
+  if (plugin)
+    throw new Error("Remove vite-plugin-vuetify plugin from Vite Plugins entry in Nuxt config file!");
+  plugin = config.plugins?.find((p) => p && typeof p === "object" && "name" in p && p.name === "vuetify:styles");
+  if (plugin)
+    throw new Error("Remove vite-plugin-vuetify plugin from Vite Plugins entry in Nuxt config file!");
+}
+function resolveVuetifyComponents(resolver) {
+  const vuetifyBase = resolveVuetifyBase();
+  const componentsPromise = importMapResolver();
+  const labComponentsPromise = importMapLabResolver();
+  return {
+    vuetifyBase,
+    componentsPromise,
+    labComponentsPromise
+  };
+  async function importMapResolver() {
+    return JSON.parse(await readFile(resolver.resolve(vuetifyBase, "dist/json/importMap.json"), "utf-8")).components;
+  }
+  async function importMapLabResolver() {
+    return JSON.parse(await readFile(resolver.resolve(vuetifyBase, "dist/json/importMap-labs.json"), "utf-8")).components;
+  }
+}
 
 async function mergeVuetifyModules(options, nuxt) {
   const moduleOptions = [];
@@ -781,7 +854,7 @@ const module = defineNuxtModule({
       nuxt.options.css.unshift("vuetify/styles/main.sass");
     else if (styles === true)
       nuxt.options.css.unshift("vuetify/styles");
-    else if (typeof styles === "object" && styles?.configFile && typeof styles.configFile === "string")
+    else if (typeof styles === "object" && typeof styles?.configFile === "string")
       nuxt.options.css.unshift(styles.configFile);
     if (icons.enabled) {
       icons.local?.forEach((css) => nuxt.options.css.push(css));
@@ -802,15 +875,11 @@ const module = defineNuxtModule({
     nuxt.hook("prepare:types", ({ references }) => {
       references.push({ types: "vuetify-nuxt-module/configuration" });
     });
-    const vuetifyBase = resolveVuetifyBase();
-    async function importMapResolver() {
-      return JSON.parse(await readFile(resolver.resolve(vuetifyBase, "dist/json/importMap.json"), "utf-8")).components;
-    }
-    async function importMapLabResolver() {
-      return JSON.parse(await readFile(resolver.resolve(vuetifyBase, "dist/json/importMap-labs.json"), "utf-8")).components;
-    }
-    const componentsPromise = importMapResolver();
-    const labComponentsPromise = importMapLabResolver();
+    const {
+      vuetifyBase,
+      componentsPromise,
+      labComponentsPromise
+    } = resolveVuetifyComponents(resolver);
     nuxt.hook("components:extend", async (c) => {
       const components = await componentsPromise;
       Object.keys(components).forEach((component) => {
@@ -820,7 +889,7 @@ const module = defineNuxtModule({
           kebabName: toKebabCase(component),
           export: component,
           filePath: `${resolver.resolve(vuetifyBase, `lib/${from}`)}`,
-          shortPath: `components/${from}`,
+          shortPath: `vuetify/components/${from}`,
           chunkName: toKebabCase(component),
           prefetch: false,
           preload: false,
@@ -890,13 +959,5 @@ const module = defineNuxtModule({
     }
   }
 });
-function checkVuetifyPlugins(config) {
-  let plugin = config.plugins?.find((p) => p && typeof p === "object" && "name" in p && p.name === "vuetify:import");
-  if (plugin)
-    throw new Error("Remove vite-plugin-vuetify plugin from Vite Plugins entry in Nuxt config file!");
-  plugin = config.plugins?.find((p) => p && typeof p === "object" && "name" in p && p.name === "vuetify:styles");
-  if (plugin)
-    throw new Error("Remove vite-plugin-vuetify plugin from Vite Plugins entry in Nuxt config file!");
-}
 
 export { module as default };

package/dist/types.d.ts

@@ -12,4 +12,4 @@ declare module 'nuxt/schema' {
 }
 
 
-export { ComponentName, Components, DateAdapter, DateOptions, DirectiveName, Directives, FontAwesomeSvgIconSet, FontIconSet, IconFontName, IconSetName, IconsOptions, JSSVGIconSet, LabComponentName, LabComponents, MOptions, ModuleOptions, VOptions, default } from './module'
+export { ComponentName, Components, DateAdapter, DateOptions, DirectiveName, Directives, FontAwesomeSvgIconSet, FontIconSet, IconFontName, IconSetName, IconsOptions, JSSVGIconSet, LabComponentName, LabComponents, MOptions, ModuleOptions, VOptions, VuetifyLocale, default } from './module'

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.4.7",
-  "packageManager": "pnpm@8.6.8",
+  "version": "0.4.8",
+  "packageManager": "pnpm@8.6.9",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -59,13 +59,13 @@
   "peerDependencies": {
     "@nuxt/kit": "^3.6.2",
     "vite-plugin-vuetify": "^1.0.2",
-    "vuetify": "^3.3.6"
+    "vuetify": "^3.3.9"
   },
   "dependencies": {
     "@nuxt/kit": "^3.6.2",
     "defu": "^6.1.2",
     "vite-plugin-vuetify": "^1.0.2",
-    "vuetify": "^3.3.6"
+    "vuetify": "^3.3.9"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.39.6",
@@ -125,4 +125,4 @@
     "installDependencies": false,
     "startCommand": "node .stackblitz.js && pnpm install && pnpm run dev"
   }
-}
+}