vuetify-nuxt-module 0.5.16 → 0.6.1

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "0.5.16"
+  "version": "0.6.1"
 }

package/dist/module.mjs

@@ -2,17 +2,20 @@ import { addVitePlugin, extendWebpackConfig, addImports, addPlugin, useLogger, d
 import defu from 'defu';
 import { debounce } from 'perfect-debounce';
 import { existsSync, statSync } from 'node:fs';
-import { resolve, dirname } from 'node:path';
+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 } from '@vuetify/loader-shared';
-import vuetify, { transformAssetUrls } from 'vite-plugin-vuetify';
+import { resolveVuetifyBase, normalizePath, writeStyles, cacheDir, generateImports } from '@vuetify/loader-shared';
 import { isAbsolute, join, relative } from 'pathe';
 import { normalizePath as normalizePath$1 } from 'vite';
+import { pathToFileURL } from 'node:url';
+import { parseQuery, parseURL } from 'ufo';
+import destr from 'destr';
+import { transformAssetUrls } from 'vite-plugin-vuetify';
 
-const version = "0.5.16";
+const version = "0.6.1";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `/@nuxt-vuetify-configuration/${VIRTUAL_VUETIFY_CONFIGURATION.slice("virtual:".length)}`;
@@ -1192,6 +1195,40 @@ function vuetifySSRClientHintsPlugin(ctx) {
   };
 }
 
+function parseId2(id) {
+  id = id.replace(/^(virtual:nuxt:|virtual:)/, "");
+  return parseURL(decodeURIComponent(isAbsolute(id) ? pathToFileURL(id).href : id));
+}
+function parseId(id) {
+  const { search, pathname } = parseId2(id);
+  const query = parseQuery(search);
+  const urlProps = query.props ? destr(query.props) : void 0;
+  return {
+    query: urlProps,
+    path: pathname ?? id
+  };
+}
+function vuetifyImportPlugin() {
+  return {
+    name: "vuetify:import",
+    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");
+    },
+    async transform(code, id) {
+      const { query, path } = parseId(id);
+      if ((!query || !("vue" in query)) && extname(path) === ".vue" && !/^import { render as _sfc_render } from ".*"$/m.test(code) || query && "vue" in query && (query.type === "template" || query.type === "script" && query.setup === "true")) {
+        const { code: imports, source } = generateImports(code);
+        return {
+          code: source + imports,
+          map: null
+        };
+      }
+      return null;
+    }
+  };
+}
+
 function configureVite(configKey, nuxt, ctx) {
   nuxt.hook("vite:extend", ({ config }) => checkVuetifyPlugins(config));
   nuxt.hook("vite:extendConfig", (viteInlineConfig) => {
@@ -1205,7 +1242,7 @@ function configureVite(configKey, nuxt, ctx) {
         configKey
       ];
     }
-    viteInlineConfig.plugins.push(vuetify({ styles: true, autoImport: true }));
+    viteInlineConfig.plugins.push(vuetifyImportPlugin());
     viteInlineConfig.plugins.push(vuetifyStylesPlugin({ styles: ctx.moduleOptions.styles }, ctx.logger));
     viteInlineConfig.plugins.push(vuetifyConfigurationPlugin(ctx));
     viteInlineConfig.plugins.push(vuetifyIconsPlugin(ctx));

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

@@ -5,7 +5,7 @@ export interface ClientHintRequestFeatures {
     viewportHeightAvailable: boolean;
     viewportWidthAvailable: boolean;
 }
-export interface ClientHintsRequest extends ClientHintRequestFeatures {
+export interface SSRClientHints extends ClientHintRequestFeatures {
     prefersColorScheme?: 'dark' | 'light' | 'no-preference';
     prefersReducedMotion?: 'no-preference' | 'reduce';
     viewportHeight?: number;
@@ -13,7 +13,4 @@ export interface ClientHintsRequest extends ClientHintRequestFeatures {
     colorSchemeFromCookie?: string;
     colorSchemeCookie?: string;
 }
-export interface SSRClientHints {
-    ssrClientHints: ClientHintsRequest;
-}
 export declare const VuetifyHTTPClientHints = "vuetify:nuxt:ssr-client-hints";

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

@@ -10,7 +10,7 @@ export default defineNuxtPlugin((nuxtApp) => {
     prefersReducedMotionAvailable,
     viewportHeightAvailable,
     viewportWidthAvailable
-  } = state.value.ssrClientHints;
+  } = state.value;
   const {
     reloadOnFirstRequest,
     viewportSize,
@@ -20,12 +20,12 @@ export default defineNuxtPlugin((nuxtApp) => {
   } = ssrClientHintsConfiguration;
   if (firstRequest && reloadOnFirstRequest) {
     if (prefersColorScheme) {
-      const themeCookie = state.value.ssrClientHints.colorSchemeCookie;
+      const themeCookie = state.value.colorSchemeCookie;
       if (prefersColorSchemeOptions && themeCookie) {
         const prefersDark = window.matchMedia("(prefers-color-scheme: dark)").matches;
         const cookieName = prefersColorSchemeOptions.cookieName;
         const parseCookieName = `${cookieName}=`;
-        const cookieEntry = `${parseCookieName}${state.value.ssrClientHints.colorSchemeFromCookie ?? prefersColorSchemeOptions.defaultTheme};`;
+        const cookieEntry = `${parseCookieName}${state.value.colorSchemeFromCookie ?? prefersColorSchemeOptions.defaultTheme};`;
         const newThemeName = prefersDark ? prefersColorSchemeOptions.darkThemeName : prefersColorSchemeOptions.lightThemeName;
         document.cookie = themeCookie.replace(cookieEntry, `${cookieName}=${newThemeName};`);
         window.location.reload();
@@ -43,24 +43,24 @@ export default defineNuxtPlugin((nuxtApp) => {
   if (viewportSize || prefersColorScheme && prefersColorSchemeOptions) {
     nuxtApp.hook("vuetify:before-create", ({ vuetifyOptions }) => {
       if (viewportSize) {
-        const clientWidth = state.value.ssrClientHints.viewportWidth;
-        const clientHeight = state.value.ssrClientHints.viewportHeight;
+        const clientWidth = state.value.viewportWidth;
+        const clientHeight = state.value.viewportHeight;
         vuetifyOptions.ssr = typeof clientWidth === "number" ? {
           clientWidth,
           clientHeight
         } : true;
       }
       if (prefersColorScheme && prefersColorSchemeOptions)
-        vuetifyOptions.theme.defaultTheme = state.value.ssrClientHints.colorSchemeFromCookie ?? prefersColorSchemeOptions.defaultTheme;
+        vuetifyOptions.theme.defaultTheme = state.value.colorSchemeFromCookie ?? prefersColorSchemeOptions.defaultTheme;
     });
     if (prefersColorScheme && prefersColorSchemeOptions) {
-      const themeCookie = state.value.ssrClientHints.colorSchemeCookie;
+      const themeCookie = state.value.colorSchemeCookie;
       if (themeCookie) {
         nuxtApp.hook("app:beforeMount", () => {
           const vuetify = useNuxtApp().$vuetify;
           const cookieName = prefersColorSchemeOptions.cookieName;
           const parseCookieName = `${cookieName}=`;
-          const cookieEntry = `${parseCookieName}${state.value.ssrClientHints.colorSchemeFromCookie ?? prefersColorSchemeOptions.defaultTheme};`;
+          const cookieEntry = `${parseCookieName}${state.value.colorSchemeFromCookie ?? prefersColorSchemeOptions.defaultTheme};`;
           watch(vuetify.theme.global.name, (newThemeName) => {
             document.cookie = themeCookie.replace(cookieEntry, `${cookieName}=${newThemeName};`);
           });

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

@@ -21,10 +21,8 @@ export default defineNuxtPlugin((nuxtApp) => {
   const userAgent = userAgentHeader ? parseUserAgent(userAgentHeader) : null;
   const clientHintsRequest = collectClientHints(userAgent, ssrClientHintsConfiguration, requestHeaders);
   writeClientHintsResponseHeaders(clientHintsRequest, ssrClientHintsConfiguration, response);
-  state.value = {
-    ssrClientHints: clientHintsRequest
-  };
-  state.value.ssrClientHints.colorSchemeCookie = writeThemeCookie(
+  state.value = clientHintsRequest;
+  state.value.colorSchemeCookie = writeThemeCookie(
     clientHintsRequest,
     ssrClientHintsConfiguration
   );

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.5.16",
-  "packageManager": "pnpm@8.9.2",
+  "version": "0.6.1",
+  "packageManager": "pnpm@8.10.2",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -69,7 +69,7 @@
     "perfect-debounce": "^1.0.0",
     "unconfig": "^0.3.9",
     "vite-plugin-vuetify": "^1.0.2",
-    "vuetify": "^3.3.17"
+    "vuetify": "^3.3.23"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.41.0",
@@ -104,6 +104,7 @@
       "node:child_process",
       "node:fs",
       "consola",
+      "destr",
       "esbuild",
       "local-pkg",
       "pathe",