vuetify-nuxt-module 0.6.2 → 0.6.5

package/dist/module.d.ts

@@ -398,7 +398,7 @@ declare module '@nuxt/schema' {
         'vuetify:registerModule': (registerModule: (config: InlineModuleOptions) => void) => void;
     }
 }
-declare module '#app' {
+declare module '#app/nuxt' {
     interface NuxtApp {
         $vuetify: ReturnType<typeof vuetify['createVuetify']>;
         /**

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "0.6.2"
+  "version": "0.6.5"
 }

package/dist/module.mjs

@@ -15,7 +15,7 @@ import { parseQuery, parseURL } from 'ufo';
 import destr from 'destr';
 import { transformAssetUrls } from 'vite-plugin-vuetify';
 
-const version = "0.6.2";
+const version = "0.6.5";
 
 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;
@@ -1210,10 +1212,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);

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.mjs

@@ -50,8 +50,14 @@ export default defineNuxtPlugin((nuxtApp) => {
           clientHeight
         } : true;
       }
-      if (prefersColorScheme && prefersColorSchemeOptions)
-        vuetifyOptions.theme.defaultTheme = state.value.colorSchemeFromCookie ?? prefersColorSchemeOptions.defaultTheme;
+      if (prefersColorScheme && prefersColorSchemeOptions) {
+        if (vuetifyOptions.theme === false) {
+          vuetifyOptions.theme = { defaultTheme: state.value.colorSchemeFromCookie ?? prefersColorSchemeOptions.defaultTheme };
+        } else {
+          vuetifyOptions.theme = vuetifyOptions.theme ?? {};
+          vuetifyOptions.theme.defaultTheme = state.value.colorSchemeFromCookie ?? prefersColorSchemeOptions.defaultTheme;
+        }
+      }
     });
     if (prefersColorScheme && prefersColorSchemeOptions) {
       const themeCookie = state.value.colorSchemeCookie;

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

@@ -9,6 +9,7 @@ import {
   defineNuxtPlugin,
   useCookie,
   useNuxtApp,
+  useRequestEvent,
   useRequestHeaders,
   useState
 } from "#imports";
@@ -42,11 +43,20 @@ export default defineNuxtPlugin((nuxtApp) => {
       clientWidth,
       clientHeight
     } : true;
-    if (clientHintsRequest.colorSchemeFromCookie)
-      vuetifyOptions.theme.defaultTheme = clientHintsRequest.colorSchemeFromCookie;
+    if (clientHintsRequest.colorSchemeFromCookie) {
+      if (vuetifyOptions.theme === false) {
+        vuetifyOptions.theme = { defaultTheme: clientHintsRequest.colorSchemeFromCookie };
+      } else {
+        vuetifyOptions.theme ??= {};
+        vuetifyOptions.theme.defaultTheme = clientHintsRequest.colorSchemeFromCookie;
+      }
+    }
     await nuxtApp.hooks.callHook("vuetify:ssr-client-hints", {
       vuetifyOptions,
-      ssrClientHintsConfiguration,
+      ssrClientHintsConfiguration: {
+        ...ssrClientHintsConfiguration,
+        enabled: true
+      },
       ssrClientHints: state.value
     });
   });

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

@@ -1,6 +1,5 @@
 import { configureVuetify } from "./config.mjs";
-import { defineNuxtPlugin } from "#imports";
-import { useNuxtApp } from "#app";
+import { defineNuxtPlugin, useNuxtApp } from "#imports";
 export default defineNuxtPlugin({
   name: "vuetify:configuration:plugin",
   enforce: "post",

package/dist/runtime/plugins/vuetify.mjs

@@ -1,6 +1,5 @@
 import { configureVuetify } from "./config.mjs";
-import { defineNuxtPlugin } from "#imports";
-import { useNuxtApp } from "#app";
+import { defineNuxtPlugin, useNuxtApp } from "#imports";
 export default defineNuxtPlugin({
   name: "vuetify:configuration:plugin",
   enforce: "post",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.6.2",
+  "version": "0.6.5",
   "packageManager": "pnpm@8.10.2",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
@@ -43,30 +43,33 @@
     "*.mjs"
   ],
   "scripts": {
-    "build": "pnpm dev:prepare && 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 && nuxi prepare playground",
-    "dev:prepare:multiple-json": "nuxt-module-build --stub && MULTIPLE_LANG_FILES=true nuxi prepare playground",
+    "dev:prepare": "nuxt-module-build --stub && nuxt-module-build prepare && nuxi prepare playground",
+    "dev:prepare:multiple-json": "nuxt-module-build --stub && nuxt-module-build prepare && MULTIPLE_LANG_FILES=true nuxi prepare playground",
     "dev:build": "nuxi build playground",
     "dev:generate": "nuxi generate playground",
     "dev:build:multiple-json": "MULTIPLE_LANG_FILES=true nuxi build playground",
     "dev:generate:multiple-json": "MULTIPLE_LANG_FILES=true nuxi generate playground",
     "dev:preview": "nuxi preview playground",
     "docs:dev": "pnpm -C docs run dev",
-    "docs:build": "pnpm dev:prepare && pnpm -C docs run build",
+    "docs:build": "nuxt-module-build prepare && pnpm -C docs run build",
     "docs:serve": "pnpm -C docs run serve",
     "lint": "eslint .",
     "lint:fix": "nr lint --fix",
     "test": "vitest run",
     "test:watch": "vitest watch",
-    "prepublishOnly": "pnpm build",
     "release": "bumpp && npm publish"
   },
   "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"
@@ -127,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"
   }
-}
+}