vuetify-nuxt-module 0.13.0 → 0.13.2

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

@@ -229,6 +229,7 @@ interface MOptions {
      * - `useLayout` -> `useVLayout`
      * - `useRtl` -> `useVRtl`
      * - `useTheme` -> `useVTheme`
+     * - `useGoTo` -> `useVGoTo`
      *
      * @default false
      */

package/dist/module.d.ts

@@ -229,6 +229,7 @@ interface MOptions {
      * - `useLayout` -> `useVLayout`
      * - `useRtl` -> `useVRtl`
      * - `useTheme` -> `useVTheme`
+     * - `useGoTo` -> `useVGoTo`
      *
      * @default false
      */

package/dist/module.json

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

package/dist/module.mjs

@@ -1,20 +1,20 @@
 import { addVitePlugin, addPluginTemplate, extendWebpackConfig, addImports, addPlugin, useLogger, defineNuxtModule, isNuxt3, getNuxtVersion, createResolver, hasNuxtModule } from '@nuxt/kit';
 import { isPackageExists, getPackageInfo } from 'local-pkg';
+import { resolve, dirname, relative, extname } from 'node:path';
 import defu from 'defu';
 import { debounce } from 'perfect-debounce';
 import { existsSync, statSync } from 'node:fs';
-import { resolve, dirname, extname } from 'node:path';
 import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
 import { readFile } from 'node:fs/promises';
 import { resolveVuetifyBase, normalizePath, generateImports } from '@vuetify/loader-shared';
-import { isAbsolute, join, relative } from 'pathe';
+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.0";
+const version = "0.13.2";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `/@nuxt-vuetify-configuration/${VIRTUAL_VUETIFY_CONFIGURATION.slice("virtual:".length)}`;
@@ -469,6 +469,7 @@ function registerWatcher(options, nuxt, ctx) {
   if (nuxt.options.dev) {
     let pageReload;
     nuxt.hooks.hook("builder:watch", (_event, path) => {
+      path = relative(nuxt.options.srcDir, resolve(nuxt.options.srcDir, path));
       if (!pageReload && ctx.vuetifyFilesToWatch.includes(path))
         return nuxt.callHook("restart");
     });
@@ -499,8 +500,8 @@ function registerWatcher(options, nuxt, ctx) {
 }
 
 function isSubdir(root, test) {
-  const relative$1 = relative(root, test);
-  return relative$1 && !relative$1.startsWith("..") && !isAbsolute(relative$1);
+  const relative = relative$1(root, test);
+  return relative && !relative.startsWith("..") && !isAbsolute(relative);
 }
 function vuetifyStylesPlugin(options, _logger) {
   const vuetifyBase = resolveVuetifyBase();
@@ -531,7 +532,7 @@ function vuetifyStylesPlugin(options, _logger) {
           if (!resolution)
             return null;
           const target = resolution.id.replace(/\.css$/, ".sass");
-          const file = relative(join(vuetifyBase, "lib"), target);
+          const file = relative$1(join(vuetifyBase, "lib"), target);
           const contents = `@use "${normalizePath(configFile)}"
 @use "${normalizePath(target)}"`;
           tempFiles.set(file, contents);
@@ -1225,7 +1226,6 @@ function configureNuxt(configKey, nuxt, ctx) {
   const {
     importComposables,
     prefixComposables,
-    styles,
     includeTransformAssetsUrls = true
   } = ctx.moduleOptions;
   const runtimeDir = ctx.resolver.resolve("./runtime");
@@ -1237,12 +1237,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 ??= {};
@@ -1261,6 +1256,8 @@ function configureNuxt(configKey, nuxt, ctx) {
   });
   if (importComposables) {
     const composables = ["useDate", "useLocale", "useDefaults", "useDisplay", "useLayout", "useRtl", "useTheme"];
+    if (ctx.vuetify3_5)
+      composables.push("useGoTo");
     addImports(composables.map((name) => ({
       name,
       from: ctx.vuetify3_4 || name !== "useDate" ? "vuetify" : "vuetify/labs/date",
@@ -1333,6 +1330,7 @@ const module = defineNuxtModule({
     const vuetifyPkg = await getPackageInfo("vuetify");
     const versions = vuetifyPkg?.version?.split(".").map((v) => Number.parseInt(v));
     const vuetify3_4 = versions && versions.length > 1 && (versions[0] > 3 || versions[0] === 3 && versions[1] >= 4);
+    const vuetify3_5 = versions && versions.length > 1 && (versions[0] > 3 || versions[0] === 3 && versions[1] >= 5);
     const ctx = {
       logger,
       resolver: createResolver(import.meta.url),
@@ -1348,7 +1346,8 @@ const module = defineNuxtModule({
       ssrClientHints: void 0,
       componentsPromise: void 0,
       labComponentsPromise: void 0,
-      vuetify3_4
+      vuetify3_4,
+      vuetify3_5
     };
     await load(options, nuxt, ctx);
     configureNuxt(CONFIG_KEY, nuxt, ctx);

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.0",
-  "packageManager": "pnpm@8.15.4",
+  "version": "0.13.2",
+  "packageManager": "pnpm@8.15.6",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -66,15 +66,15 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.9.0",
-    "defu": "^6.1.3",
-    "destr": "^2.0.2",
+    "defu": "^6.1.4",
+    "destr": "^2.0.3",
     "local-pkg": "^0.5.0",
-    "pathe": "^1.1.1",
+    "pathe": "^1.1.2",
     "perfect-debounce": "^1.0.0",
-    "ufo": "^1.3.2",
+    "ufo": "^1.5.3",
     "unconfig": "^0.3.11",
-    "vite-plugin-vuetify": "^2.0.1",
-    "vuetify": "^3.5.1"
+    "vite-plugin-vuetify": "^2.0.3",
+    "vuetify": "^3.5.13"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.43.1",
@@ -103,8 +103,8 @@
     "sass": "^1.63.6",
     "typescript": "^5.3.3",
     "vite": "^5.0.12",
-    "vitest": "^1.1.3",
-    "vue-tsc": "^1.8.27"
+    "vitest": "^1.4.0",
+    "vue-tsc": "^2.0.7"
   },
   "pnpm": {
     "peerDependencyRules": {
@@ -114,7 +114,7 @@
     }
   },
   "resolutions": {
-    "@nuxt/kit": "^3.10.2"
+    "@nuxt/kit": "3.11.1"
   },
   "build": {
     "externals": [