vuetify-nuxt-module 0.6.4 → 0.6.6

package/dist/module.d.ts

@@ -1,11 +1,10 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import * as vuetify from 'vuetify';
-import { VuetifyOptions, createVuetify, LocaleOptions, RtlOptions } from 'vuetify';
+import { HookResult } from '@nuxt/schema';
 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';
-import { UnwrapNestedRefs } from 'vue';
+import { VuetifyOptions, createVuetify, LocaleOptions, RtlOptions } from 'vuetify';
 
 type DateAdapter = 'vuetify' | 'date-fns' | 'moment' | 'luxon' | 'dayjs' | 'js-joda' | 'date-fns-jalali' | 'jalaali' | 'hijri' | 'custom';
 /**
@@ -390,40 +389,38 @@ interface SSRClientHintsConfiguration {
         lightThemeName: string;
     };
 }
-declare module '@nuxt/schema' {
-    interface NuxtConfig {
-        vuetify?: ModuleOptions;
-    }
-    interface NuxtHooks {
-        'vuetify:registerModule': (registerModule: (config: InlineModuleOptions) => void) => void;
-    }
+interface ModuleHooks {
+    'vuetify:registerModule': (registerModule: (config: InlineModuleOptions) => void) => HookResult;
 }
-declare module '#app' {
-    interface NuxtApp {
-        $vuetify: ReturnType<typeof vuetify['createVuetify']>;
-        /**
-         * Request headers received from the client in SSR.
-         */
-        $ssrClientHints: UnwrapNestedRefs<SSRClientHints>;
-    }
+declare module '#app/nuxt' {
     interface RuntimeNuxtHooks {
         'vuetify:configuration': (options: {
             isDev: boolean;
             vuetifyOptions: VuetifyOptions;
-        }) => Promise<void> | void;
+        }) => HookResult;
         'vuetify:before-create': (options: {
             isDev: boolean;
             vuetifyOptions: VuetifyOptions;
-        }) => Promise<void> | void;
-        'vuetify:ready': (vuetify: ReturnType<typeof createVuetify>) => Promise<void> | void;
+        }) => HookResult;
+        'vuetify:ready': (vuetify: ReturnType<typeof createVuetify>) => HookResult;
         'vuetify:ssr-client-hints': (options: {
             vuetifyOptions: VuetifyOptions;
             ssrClientHints: SSRClientHints;
             ssrClientHintsConfiguration: SSRClientHintsConfiguration;
-        }) => Promise<void> | void;
+        }) => HookResult;
+    }
+}
+declare module '@nuxt/schema' {
+    interface NuxtConfig {
+        ['vuetify']?: Partial<ModuleOptions>;
+    }
+    interface NuxtOptions {
+        ['vuetify']?: ModuleOptions;
+    }
+    interface NuxtHooks extends ModuleHooks {
     }
 }
 
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 
-export { ComponentName, Components, DateAdapter, DateOptions, DirectiveName, Directives, ExternalVuetifyOptions, FontAwesomeSvgIconSet, FontIconSet, IconFontName, IconSetName, IconsOptions, InlineModuleOptions, JSSVGIconSet, LabComponentName, LabComponents, MOptions, ModuleOptions, SSRClientHints, SSRClientHintsConfiguration, UnoCCSMdiIconSet, VOptions, VuetifyLocale, _default as default };
+export { ComponentName, Components, DateAdapter, DateOptions, DirectiveName, Directives, ExternalVuetifyOptions, FontAwesomeSvgIconSet, FontIconSet, IconFontName, IconSetName, IconsOptions, InlineModuleOptions, JSSVGIconSet, LabComponentName, LabComponents, MOptions, ModuleHooks, ModuleOptions, SSRClientHints, SSRClientHintsConfiguration, UnoCCSMdiIconSet, VOptions, VuetifyLocale, _default as default };

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "0.6.4"
+  "version": "0.6.6"
 }

package/dist/module.mjs

@@ -1,4 +1,5 @@
 import { addVitePlugin, extendWebpackConfig, addImports, addPlugin, useLogger, defineNuxtModule, isNuxt3, getNuxtVersion, createResolver, hasNuxtModule } from '@nuxt/kit';
+import { isPackageExists, getPackageInfo } from 'local-pkg';
 import defu from 'defu';
 import { debounce } from 'perfect-debounce';
 import { existsSync, statSync } from 'node:fs';
@@ -6,7 +7,6 @@ import { resolve, dirname, extname } from 'node:path';
 import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
 import { readFile, utimes } from 'node:fs/promises';
-import { isPackageExists } from 'local-pkg';
 import { resolveVuetifyBase, normalizePath, writeStyles, cacheDir, generateImports } from '@vuetify/loader-shared';
 import { isAbsolute, join, relative } from 'pathe';
 import { normalizePath as normalizePath$1 } from 'vite';
@@ -15,7 +15,7 @@ import { parseQuery, parseURL } from 'ufo';
 import destr from 'destr';
 import { transformAssetUrls } from 'vite-plugin-vuetify';
 
-const version = "0.6.4";
+const version = "0.6.6";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `/@nuxt-vuetify-configuration/${VIRTUAL_VUETIFY_CONFIGURATION.slice("virtual:".length)}`;
@@ -290,7 +290,7 @@ function prepareIcons(unocssPresent, logger, vuetifyOptions) {
       resolvedIcons.imports.push(`import {${defaultSet === "fa-svg" ? "aliases," : ""}fa} from 'vuetify/iconsets/fa-svg'`);
       resolvedIcons.imports.push("import { library } from '@fortawesome/fontawesome-svg-core'");
       resolvedIcons.imports.push("import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'");
-      resolvedIcons.imports.push("import { useNuxtApp } from '#app'");
+      resolvedIcons.imports.push("import { useNuxtApp } from '#imports'");
       resolvedIcons.svg.fa = ["useNuxtApp().vueApp.component('font-awesome-icon', FontAwesomeIcon)"];
       faSvg.libraries.forEach(([defaultExport, name, library]) => {
         resolvedIcons.imports.push(`import ${defaultExport ? name : `{${name}}`} from '${library}'`);
@@ -598,6 +598,8 @@ function vuetifyStylesPlugin(options, logger) {
       }
     },
     configResolved(config) {
+      if (config.plugins.findIndex((plugin) => plugin.name === "vuetify:styles") > -1)
+        throw new Error("Remove vite-plugin-vuetify from your Nuxt config file, this module registers a modified version.");
       if (typeof options.styles === "object") {
         if (isAbsolute(options.styles.configFile))
           configFile = options.styles.configFile;
@@ -864,7 +866,8 @@ async function buildConfiguration(ctx) {
     if (typeof labComponents === "boolean") {
       config.imports.push("import * as labsComponents from 'vuetify/labs/components'");
       config.labComponents.add("*");
-      addDatePicker = false;
+      if (ctx.vuetify3_4 === false)
+        addDatePicker = false;
     } else if (typeof labComponents === "string") {
       useLabComponents.push(labComponents);
     } else if (Array.isArray(labComponents)) {
@@ -891,22 +894,32 @@ async function buildConfiguration(ctx) {
           componentsArray.push(component);
         config.labComponents.add(component);
       });
-      if (dateOptions && !config.labComponents.has("VDatePicker")) {
+      if (ctx.vuetify3_4 === false && dateOptions && !addDatePicker) {
         const entry = componentsToImport.get("VDatePicker");
         if (entry) {
           entry.push("VDatePicker");
           config.labComponents.add("VDatePicker");
+          addDatePicker = false;
         }
       }
       componentsToImport.forEach((componentsArray, from) => {
         config.imports.push(`import {${componentsArray.join(",")}} from 'vuetify/labs/${from}'`);
       });
-      addDatePicker = !config.labComponents.has("VDatePicker");
     }
   }
   if (dateOptions && addDatePicker) {
-    config.imports.push("import {VDatePicker} from 'vuetify/labs/VDatePicker'");
-    config.labComponents.add("VDatePicker");
+    let warn = true;
+    if (typeof ctx.vuetify3_4 === "boolean") {
+      warn = false;
+      if (ctx.vuetify3_4) {
+        config.components.add("VDatePicker");
+        config.imports.push("import {VDatePicker} from 'vuetify/components/VDatePicker'");
+      } else {
+        config.labComponents.add("VDatePicker");
+        config.imports.push("import {VDatePicker} from 'vuetify/labs/VDatePicker'");
+      }
+    }
+    warn && logger.warn("Unable to load Vuetify version from package.json, add VDatePicker to components or labComponents");
   }
   let componentsEntry = "";
   if (config.components.size) {
@@ -1146,7 +1159,7 @@ export function dateConfiguration() {
 `;
         }
         const { adapter: _adapter, ...newDateOptions } = ctx.vuetifyOptions.date ?? {};
-        const imports = ctx.dateAdapter === "vuetify" ? "import { VuetifyDateAdapter } from 'vuetify/labs/date/adapters/vuetify'" : ctx.dateAdapter === "custom" ? "" : `import Adapter from '@date-io/${ctx.dateAdapter}'`;
+        const imports = ctx.dateAdapter === "vuetify" ? ctx.vuetify3_4 === true ? "" : "import { VuetifyDateAdapter } from 'vuetify/labs/date/adapters/vuetify'" : ctx.dateAdapter === "custom" ? "" : `import Adapter from '@date-io/${ctx.dateAdapter}'`;
         return `${imports}
 export const enabled = true
 export const isDev = ${ctx.isDev}
@@ -1162,7 +1175,7 @@ export function dateConfiguration() {
     }
   };
   function buildAdapter() {
-    if (ctx.dateAdapter === "custom")
+    if (ctx.dateAdapter === "custom" || ctx.dateAdapter === "vuetify" && ctx.vuetify3_4 === true)
       return "";
     if (ctx.dateAdapter === "vuetify")
       return "options.adapter = VuetifyDateAdapter";
@@ -1210,10 +1223,10 @@ function parseId(id) {
 }
 function vuetifyImportPlugin() {
   return {
-    name: "vuetify:import",
+    name: "vuetify:import:nuxt",
     configResolved(config) {
-      if (config.plugins.findIndex((plugin) => plugin.name === "vuetify:import") < config.plugins.findIndex((plugin) => plugin.name === "vite:vue"))
-        throw new Error("Vuetify plugin must be loaded after the vue plugin");
+      if (config.plugins.findIndex((plugin) => plugin.name === "vuetify:import") > -1)
+        throw new Error("Remove vite-plugin-vuetify from your Nuxt config file, this module registers a modified version.");
     },
     async transform(code, id) {
       const { query, path } = parseId(id);
@@ -1305,6 +1318,10 @@ function configureNuxt(configKey, nuxt, ctx) {
       src: ctx.resolver.resolve(runtimeDir, "plugins/vuetify-client-hints.server"),
       mode: "server"
     });
+  } else {
+    addPlugin({
+      src: ctx.resolver.resolve(runtimeDir, "plugins/vuetify-no-client-hints")
+    });
   }
   addPlugin({
     src: ctx.resolver.resolve(runtimeDir, `plugins/vuetify${ctx.i18n ? "-sync" : ""}`)
@@ -1347,6 +1364,9 @@ const module = defineNuxtModule({
   async setup(options, nuxt) {
     if (!isNuxt3(nuxt))
       logger.error(`Cannot support nuxt version: ${getNuxtVersion(nuxt)}`);
+    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[1] >= 4;
     const ctx = {
       logger,
       resolver: createResolver(import.meta.url),
@@ -1361,7 +1381,8 @@ const module = defineNuxtModule({
       icons: void 0,
       ssrClientHints: void 0,
       componentsPromise: void 0,
-      labComponentsPromise: void 0
+      labComponentsPromise: void 0,
+      vuetify3_4
     };
     await load(options, nuxt, ctx);
     configureNuxt(CONFIG_KEY, nuxt, ctx);

package/dist/runtime/plugins/config.mjs

@@ -1,6 +1,6 @@
 import { createVuetify } from "vuetify";
 import { isDev, vuetifyConfiguration } from "virtual:vuetify-configuration";
-import { useNuxtApp } from "#app";
+import { useNuxtApp } from "#imports";
 export async function configureVuetify() {
   const nuxtApp = useNuxtApp();
   const vuetifyOptions = vuetifyConfiguration();

package/dist/runtime/plugins/date.mjs

@@ -1,5 +1,5 @@
 import { adapter, dateConfiguration, enabled, i18n } from "virtual:vuetify-date-configuration";
-import { useNuxtApp } from "#app";
+import { useNuxtApp } from "#imports";
 export function configureDate(vuetifyOptions) {
   if (adapter === "custom" || !enabled)
     return;

package/dist/runtime/plugins/i18n.mjs

@@ -1,6 +1,6 @@
 import { ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
-import { useNuxtApp } from "#app";
+import { useNuxtApp } from "#imports";
 export function createAdapter(vuetifyOptions) {
   vuetifyOptions.locale = {};
   const nuxtApp = useNuxtApp();

package/dist/runtime/plugins/vuetify-client-hints.client.d.ts

@@ -1,2 +1,7 @@
-declare const _default: any;
-export default _default;
+import type { UnwrapNestedRefs } from 'vue';
+import type { SSRClientHints } from './client-hints';
+import type { Plugin } from '#app/nuxt';
+declare const plugin: Plugin<{
+    ssrClientHints: UnwrapNestedRefs<SSRClientHints>;
+}>;
+export default plugin;

package/dist/runtime/plugins/vuetify-client-hints.client.mjs

@@ -2,7 +2,7 @@ import { ssrClientHintsConfiguration } from "virtual:vuetify-ssr-client-hints-co
 import { reactive, watch } from "vue";
 import { VuetifyHTTPClientHints } from "./client-hints.mjs";
 import { defineNuxtPlugin, useNuxtApp, useState } from "#imports";
-export default defineNuxtPlugin((nuxtApp) => {
+const plugin = defineNuxtPlugin((nuxtApp) => {
   const state = useState(VuetifyHTTPClientHints);
   const {
     firstRequest,
@@ -87,3 +87,4 @@ export default defineNuxtPlugin((nuxtApp) => {
     })
   };
 });
+export default plugin;

package/dist/runtime/plugins/vuetify-client-hints.server.d.ts

@@ -1,2 +1,7 @@
-declare const _default: any;
-export default _default;
+import type { UnwrapNestedRefs } from 'vue';
+import type { SSRClientHints } from './client-hints';
+import type { Plugin } from '#app/nuxt';
+declare const plugin: Plugin<{
+    ssrClientHints: UnwrapNestedRefs<SSRClientHints>;
+}>;
+export default plugin;

package/dist/runtime/plugins/vuetify-client-hints.server.mjs

@@ -24,7 +24,7 @@ const AcceptClientHintsRequestHeaders = Object.entries(AcceptClientHintsHeaders)
   return acc;
 }, {});
 const HttpRequestHeaders = Array.from(Object.values(AcceptClientHintsRequestHeaders)).concat("user-agent", "cookie");
-export default defineNuxtPlugin((nuxtApp) => {
+const plugin = defineNuxtPlugin((nuxtApp) => {
   const state = useState(VuetifyHTTPClientHints);
   const requestHeaders = useRequestHeaders(HttpRequestHeaders);
   const userAgentHeader = requestHeaders["user-agent"];
@@ -237,3 +237,4 @@ function writeThemeCookie(clientHintsRequest, ssrClientHintsConfiguration2) {
   }
   return `${cookieName}=${themeName}; Path=${path}; Expires=${expires.toUTCString()}; SameSite=Lax`;
 }
+export default plugin;

package/dist/runtime/plugins/vuetify-no-client-hints.d.ts

@@ -0,0 +1,7 @@
+import type { UnwrapNestedRefs } from 'vue';
+import type { SSRClientHints } from './client-hints';
+import type { Plugin } from '#app/nuxt';
+declare const plugin: Plugin<{
+    ssrClientHints: UnwrapNestedRefs<SSRClientHints>;
+}>;
+export default plugin;

package/dist/runtime/plugins/vuetify-no-client-hints.mjs

@@ -0,0 +1,16 @@
+import { reactive } from "vue";
+import { defineNuxtPlugin } from "#imports";
+const plugin = defineNuxtPlugin(() => {
+  return {
+    provide: reactive({
+      ssrClientHints: {
+        firstRequest: false,
+        prefersColorSchemeAvailable: false,
+        prefersReducedMotionAvailable: false,
+        viewportHeightAvailable: false,
+        viewportWidthAvailable: false
+      }
+    })
+  };
+});
+export default plugin;

package/dist/runtime/plugins/vuetify-sync.d.ts

@@ -1,2 +1,6 @@
-declare const _default: any;
-export default _default;
+import type { createVuetify } from 'vuetify';
+import type { Plugin } from '#app/nuxt';
+declare const plugin: Plugin<{
+    vuetify: ReturnType<typeof createVuetify>;
+}>;
+export default plugin;

package/dist/runtime/plugins/vuetify-sync.mjs

@@ -1,7 +1,6 @@
 import { configureVuetify } from "./config.mjs";
-import { defineNuxtPlugin } from "#imports";
-import { useNuxtApp } from "#app";
-export default defineNuxtPlugin({
+import { defineNuxtPlugin, useNuxtApp } from "#imports";
+const plugin = defineNuxtPlugin({
   name: "vuetify:configuration:plugin",
   enforce: "post",
   // i18n runtime plugin is async
@@ -10,3 +9,4 @@ export default defineNuxtPlugin({
     useNuxtApp().hook("app:created", configureVuetify);
   }
 });
+export default plugin;

package/dist/runtime/plugins/vuetify.d.ts

@@ -1,2 +1,6 @@
-declare const _default: any;
-export default _default;
+import type { createVuetify } from 'vuetify';
+import type { Plugin } from '#app/nuxt';
+declare const plugin: Plugin<{
+    vuetify: ReturnType<typeof createVuetify>;
+}>;
+export default plugin;

package/dist/runtime/plugins/vuetify.mjs

@@ -1,10 +1,10 @@
 import { configureVuetify } from "./config.mjs";
-import { defineNuxtPlugin } from "#imports";
-import { useNuxtApp } from "#app";
-export default defineNuxtPlugin({
+import { defineNuxtPlugin, useNuxtApp } from "#imports";
+const plugin = defineNuxtPlugin({
   name: "vuetify:configuration:plugin",
   enforce: "post",
   setup() {
     useNuxtApp().hook("app:created", configureVuetify);
   }
 });
+export default plugin;

package/dist/types.d.ts

@@ -1,15 +1,17 @@
 
-import { ModuleOptions } from './module'
+import { ModuleOptions, ModuleHooks } from './module'
 
 declare module '@nuxt/schema' {
   interface NuxtConfig { ['vuetify']?: Partial<ModuleOptions> }
   interface NuxtOptions { ['vuetify']?: ModuleOptions }
+  interface NuxtHooks extends ModuleHooks {}
 }
 
 declare module 'nuxt/schema' {
   interface NuxtConfig { ['vuetify']?: Partial<ModuleOptions> }
   interface NuxtOptions { ['vuetify']?: ModuleOptions }
+  interface NuxtHooks extends ModuleHooks {}
 }
 
 
-export { ComponentName, Components, DateAdapter, DateOptions, DirectiveName, Directives, ExternalVuetifyOptions, FontAwesomeSvgIconSet, FontIconSet, IconFontName, IconSetName, IconsOptions, InlineModuleOptions, JSSVGIconSet, LabComponentName, LabComponents, MOptions, ModuleOptions, SSRClientHints, SSRClientHintsConfiguration, UnoCCSMdiIconSet, VOptions, VuetifyLocale, default } from './module'
+export { ComponentName, Components, DateAdapter, DateOptions, DirectiveName, Directives, ExternalVuetifyOptions, FontAwesomeSvgIconSet, FontIconSet, IconFontName, IconSetName, IconsOptions, InlineModuleOptions, JSSVGIconSet, LabComponentName, LabComponents, MOptions, ModuleHooks, ModuleOptions, SSRClientHints, SSRClientHintsConfiguration, UnoCCSMdiIconSet, VOptions, VuetifyLocale, default } from './module'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "packageManager": "pnpm@8.10.2",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
@@ -43,7 +43,7 @@
     "*.mjs"
   ],
   "scripts": {
-    "prepack": "nuxt-module-build",
+    "prepack": "nuxt-module-build prepare && nuxt-module-build",
     "dev": "nuxi dev playground",
     "dev:multiple-json": "MULTIPLE_LANG_FILES=true nuxi dev playground",
     "dev:prepare": "nuxt-module-build --stub && nuxt-module-build prepare && nuxi prepare playground",
@@ -65,7 +65,11 @@
   "dependencies": {
     "@nuxt/kit": "^3.6.2",
     "defu": "^6.1.2",
+    "destr": "^2.0.2",
+    "local-pkg": "^0.5.0",
+    "pathe": "^1.1.1",
     "perfect-debounce": "^1.0.0",
+    "ufo": "^1.3.1",
     "unconfig": "^0.3.9",
     "vite-plugin-vuetify": "^1.0.2",
     "vuetify": "^3.3.23"
@@ -84,7 +88,7 @@
     "@nuxt/module-builder": "^0.4.0",
     "@nuxt/schema": "^3.6.5",
     "@nuxt/test-utils": "^3.6.5",
-    "@nuxtjs/i18n": "npm:@nuxtjs/i18n-edge",
+    "@nuxtjs/i18n": "8.0.0-rc.5",
     "@parcel/watcher": "^2.2.0",
     "@types/node": "^18",
     "@unocss/nuxt": "^0.53.6",
@@ -126,6 +130,6 @@
   },
   "stackblitz": {
     "installDependencies": false,
-    "startCommand": "node .stackblitz.js && pnpm install && pnpm run dev"
+    "startCommand": "node .stackblitz.js && pnpm install && pnpm dev:prepare && pnpm run dev"
   }
-}
+}