vuetify-nuxt-module 1.0.0-beta.6 → 1.0.0-beta.7

package/configuration.d.ts

@@ -36,6 +36,9 @@ declare module 'virtual:vuetify-ssr-client-hints-configuration' {
       defaultTheme: string
       themeNames: string[]
       cookieName: string
+      cookieDomain?: string
+      cookieSecure?: boolean
+      cookieSameSite: 'lax' | 'strict' | 'none'
       darkThemeName: string
       lightThemeName: string
       useBrowserThemeOnly: boolean

package/dist/module.d.mts

@@ -362,9 +362,43 @@ interface MOptions {
             /**
              * The name for the cookie.
              *
+             * @deprecated Use `cookie.name` instead.
              * @default 'color-scheme'
              */
             cookieName?: string;
+            /**
+             * Cookie attributes for the color scheme cookie.
+             */
+            cookie?: {
+                /**
+                 * The name for the cookie.
+                 *
+                 * @default 'color-scheme'
+                 */
+                name?: string;
+                /**
+                 * The domain for the color scheme cookie.
+                 *
+                 * Useful to share the cookie across subdomains, e.g. `.example.com`.
+                 *
+                 * @default undefined
+                 */
+                domain?: string;
+                /**
+                 * Mark the cookie as `Secure`.
+                 *
+                 * Forced to `true` when `sameSite` is `'none'`.
+                 *
+                 * @default undefined
+                 */
+                secure?: boolean;
+                /**
+                 * The `SameSite` attribute for the cookie.
+                 *
+                 * @default 'lax'
+                 */
+                sameSite?: 'lax' | 'strict' | 'none';
+            };
             /**
              * The name for the dark theme.
              *
@@ -459,6 +493,9 @@ interface SSRClientHintsConfiguration {
         defaultTheme: string;
         themeNames: string[];
         cookieName: string;
+        cookieDomain?: string;
+        cookieSecure?: boolean;
+        cookieSameSite: 'lax' | 'strict' | 'none';
         darkThemeName: string;
         lightThemeName: string;
     };

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.15.0"
   },
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.7",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,14 +1,14 @@
-import { addPluginTemplate, resolvePath, addTemplate, extendWebpackConfig, isNuxtMajorVersion, addImports, addPlugin, addVitePlugin, useLogger, defineNuxtModule, getNuxtVersion, hasNuxtModule, createResolver } from '@nuxt/kit';
-import { isPackageExists, getPackageInfo } from 'local-pkg';
+import { existsSync, statSync, readFileSync } from 'node:fs';
+import { pathToFileURL, fileURLToPath } from 'node:url';
+import { addPluginTemplate, resolvePath, addTemplate, extendWebpackConfig, isNuxtMajorVersion, addImports, addPlugin, addVitePlugin, useLogger, defineNuxtModule, getNuxtVersion, findPath, hasNuxtModule, createResolver } from '@nuxt/kit';
+import { isAbsolute, resolve, dirname, relative } from 'pathe';
 import semver from 'semver';
 import { createFilter, version as version$1 } from 'vite';
 import defu from 'defu';
 import { transformAssetUrls } from 'vite-plugin-vuetify';
-import { existsSync, statSync } from 'node:fs';
-import { isAbsolute, resolve, dirname, relative } from 'pathe';
-import { generateImports, resolveVuetifyBase, isObject } from '@vuetify/loader-shared';
 import Styles from '@vuetify/unplugin-styles/vite';
-import { pathToFileURL } from 'node:url';
+import { isPackageExists } from 'local-pkg';
+import { generateImports } from '@vuetify/loader-shared';
 import destr from 'destr';
 import { parseQuery, parseURL } from 'ufo';
 import { readFile } from 'node:fs/promises';
@@ -16,7 +16,7 @@ import { debounce } from 'perfect-debounce';
 import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
 
-const version = "1.0.0-beta.6";
+const version = "1.0.0-beta.7";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `\0${VIRTUAL_VUETIFY_CONFIGURATION}`;
@@ -905,7 +905,7 @@ function vuetifySSRClientHintsPlugin(ctx) {
   };
 }
 
-function detectDate() {
+function detectDate(paths) {
   const result = [];
   for (const adapter of [
     "date-fns",
@@ -917,12 +917,15 @@ function detectDate() {
     "jalaali",
     "hijri"
   ]) {
-    if (isPackageExists(`@date-io/${adapter}`)) {
+    if (isPackageExists(`@date-io/${adapter}`, { paths })) {
       result.push(adapter);
     }
   }
   return result;
 }
+function multipleDateAdaptersError(adapters) {
+  return `Multiple date adapters found: ${adapters.map((adapter) => `@date-io/${adapter}`).join(", ")}, please specify the adapter to use in the "vuetifyOptions.date.adapter" option.`;
+}
 function cleanupBlueprint(vuetifyOptions) {
   const blueprint = vuetifyOptions.blueprint;
   if (blueprint) {
@@ -945,12 +948,10 @@ function checkVuetifyPlugins(config) {
     throw new Error("Remove vite-plugin-vuetify plugin from Vite Plugins entry in Nuxt config file!");
   }
 }
-function resolveVuetifyComponents(resolver) {
-  const vuetifyBase = resolveVuetifyBase();
+function resolveVuetifyComponents(resolver, vuetifyBase) {
   const componentsPromise = importMapResolver();
   const labComponentsPromise = importMapLabResolver();
   return {
-    vuetifyBase,
     componentsPromise,
     labComponentsPromise
   };
@@ -973,7 +974,7 @@ function configureVite(configKey, nuxt, ctx) {
     if (!ctx.moduleOptions.disableModernSassCompiler) {
       const enableModernSassCompiler = semver.gte(ctx.viteVersion, "5.4.0") && semver.lt(ctx.viteVersion, "7.0.0-0");
       if (enableModernSassCompiler) {
-        const sassEmbedded = isPackageExists("sass-embedded");
+        const sassEmbedded = isPackageExists("sass-embedded", { paths: ctx.resolvePaths });
         if (sassEmbedded) {
           viteInlineConfig.css ??= {};
           viteInlineConfig.css.preprocessorOptions ??= {};
@@ -1020,7 +1021,7 @@ function configureVite(configKey, nuxt, ctx) {
     const stylesOption = ctx.moduleOptions.styles;
     if (stylesOption === "none") {
       viteInlineConfig.plugins.push(Styles({ styles: "none" }));
-    } else if (isObject(stylesOption) && "configFile" in stylesOption) {
+    } else if (typeof stylesOption === "object" && stylesOption !== null && "configFile" in stylesOption) {
       if (!ctx.stylesConfigFile) {
         throw new Error("vuetify-nuxt-module: styles.configFile could not be resolved");
       }
@@ -1067,7 +1068,8 @@ const disabledResolvedIcons = Object.freeze({
   local: [],
   svg: {}
 });
-function prepareIcons(unocssPresent, logger, vuetifyOptions) {
+function prepareIcons(unocssPresent, logger, vuetifyOptions, paths) {
+  const iconPackageExists = (name) => isPackageExists(name, { paths });
   if (vuetifyOptions.icons === false) {
     return disabledResolvedIcons;
   }
@@ -1111,7 +1113,7 @@ function prepareIcons(unocssPresent, logger, vuetifyOptions) {
       }
       resolvedIcons.imports.push(`import {${name === defaultSet ? "aliases," : ""}${name}} from 'vuetify/iconsets/${name}'`);
       resolvedIcons.sets.push(name);
-      if (isPackageExists(iconsPackageNames[name].name)) {
+      if (iconPackageExists(iconsPackageNames[name].name)) {
         resolvedIcons.local.push(iconsPackageNames[name].css);
       } else {
         resolvedIcons.cdn.push([name, cdn ?? iconsCDN[name]]);
@@ -1130,18 +1132,18 @@ function prepareIcons(unocssPresent, logger, vuetifyOptions) {
     if (!faSvg) {
       faSvg = {};
     }
-    let faSvgExists = isPackageExists("@fortawesome/fontawesome-svg-core");
+    let faSvgExists = iconPackageExists("@fortawesome/fontawesome-svg-core");
     if (!faSvgExists) {
       logger.warn("Missing @fortawesome/fontawesome-svg-core dependency, install it!");
     }
-    faSvgExists = isPackageExists("@fortawesome/vue-fontawesome");
+    faSvgExists = iconPackageExists("@fortawesome/vue-fontawesome");
     if (faSvgExists) {
       if (!faSvg.libraries?.length) {
         faSvg.libraries = [[false, "fas", "@fortawesome/free-solid-svg-icons"]];
       }
       for (const p in faSvg.libraries) {
         const [_defaultExport, _name, library] = faSvg.libraries[p];
-        if (!isPackageExists(library)) {
+        if (!iconPackageExists(library)) {
           faSvgExists = false;
           logger.warn(`Missing library ${library} dependency, install it!`);
         }
@@ -1168,7 +1170,7 @@ function prepareIcons(unocssPresent, logger, vuetifyOptions) {
     if (!mdiSvg) {
       mdiSvg = {};
     }
-    const mdiSvgExists = isPackageExists("@mdi/js");
+    const mdiSvgExists = iconPackageExists("@mdi/js");
     if (mdiSvgExists) {
       resolvedIcons.svg.mdi = true;
       resolvedIcons.aliasesImportPresent ||= defaultSet === "mdi-svg";
@@ -1354,6 +1356,18 @@ const disabledClientHints = Object.freeze({
   prefersColorScheme: false,
   prefersReducedMotion: false
 });
+function resolveColorSchemeCookie(options, logger) {
+  if (options.cookieName !== void 0) {
+    logger.warn("[vuetify-nuxt-module] `prefersColorSchemeOptions.cookieName` is deprecated, use `prefersColorSchemeOptions.cookie.name` instead.");
+  }
+  const cookieSameSite = options.cookie?.sameSite ?? "lax";
+  return {
+    cookieName: options.cookie?.name ?? options.cookieName ?? "color-scheme",
+    cookieDomain: options.cookie?.domain,
+    cookieSecure: cookieSameSite === "none" ? true : options.cookie?.secure,
+    cookieSameSite
+  };
+}
 function prepareSSRClientHints(baseUrl, ctx) {
   if (!ctx.isSSR || ctx.isNuxtGenerate) {
     return disabledClientHints;
@@ -1394,14 +1408,15 @@ function prepareSSRClientHints(baseUrl, ctx) {
     if (darkThemeName === lightThemeName) {
       throw new Error("Vuetify dark theme and light theme are the same, change darkThemeName or lightThemeName!");
     }
+    const pcsOptions = ssrClientHintsConfiguration.prefersColorSchemeOptions;
     clientHints.prefersColorSchemeOptions = {
       baseUrl,
       defaultTheme,
       themeNames: Array.from(Object.keys(themes)),
-      cookieName: ssrClientHintsConfiguration.prefersColorSchemeOptions?.cookieName ?? "color-scheme",
+      ...resolveColorSchemeCookie(pcsOptions, ctx.logger),
       darkThemeName,
       lightThemeName,
-      useBrowserThemeOnly: ssrClientHintsConfiguration.prefersColorSchemeOptions?.useBrowserThemeOnly ?? false
+      useBrowserThemeOnly: pcsOptions?.useBrowserThemeOnly ?? false
     };
   }
   return clientHints;
@@ -1416,7 +1431,7 @@ async function load(options, nuxt, ctx) {
     const {
       componentsPromise,
       labComponentsPromise
-    } = resolveVuetifyComponents(ctx.resolver);
+    } = resolveVuetifyComponents(ctx.resolver, ctx.vuetifyBase);
     ctx.componentsPromise = componentsPromise;
     ctx.labComponentsPromise = labComponentsPromise;
   }
@@ -1432,9 +1447,9 @@ async function load(options, nuxt, ctx) {
   const dateOptions = vuetifyOptions.date;
   if (dateOptions) {
     const adapter = dateOptions.adapter;
-    const date = detectDate();
+    const date = detectDate(ctx.resolvePaths);
     if (!adapter && date.length > 1) {
-      throw new Error(`Multiple date adapters found: ${date.map((d) => `@date-io/${d[0]}`).join(", ")}, please specify the adapter to use in the "vuetifyOptions.date.adapter" option.`);
+      throw new Error(multipleDateAdaptersError(date));
     }
     if (adapter) {
       if (adapter === "vuetify" || adapter === "custom") {
@@ -1461,7 +1476,7 @@ async function load(options, nuxt, ctx) {
   ctx.enableRules = ctx.moduleOptions.enableRules;
   ctx.rulesConfiguration = ctx.moduleOptions.rulesConfiguration;
   ctx.vuetifyFilesToWatch = Array.from(vuetifyConfigurationFilesToWatch);
-  ctx.icons = prepareIcons(ctx.unocss, ctx.logger, vuetifyAppOptions);
+  ctx.icons = prepareIcons(ctx.unocss, ctx.logger, vuetifyAppOptions, ctx.resolvePaths);
   ctx.ssrClientHints = prepareSSRClientHints(nuxt.options.app.baseURL ?? "/", ctx);
   if (ctx.icons.enabled) {
     if (ctx.icons.local) {
@@ -1561,8 +1576,23 @@ const module$1 = defineNuxtModule({
     if (isNuxtMajorVersion(2, nuxt)) {
       logger.error(`Cannot support nuxt version: ${getNuxtVersion(nuxt)}`);
     }
-    const vuetifyPkg = await getPackageInfo("vuetify");
-    const currentVersion = vuetifyPkg?.version;
+    let vuetifyPkgPath = await findPath("vuetify/package.json");
+    if (!vuetifyPkgPath) {
+      const metaResolve = import.meta.resolve;
+      if (metaResolve) {
+        try {
+          vuetifyPkgPath = fileURLToPath(metaResolve("vuetify/package.json"));
+        } catch {
+        }
+      }
+    }
+    if (!vuetifyPkgPath) {
+      throw new Error(
+        '[vuetify-nuxt-module] Could not resolve "vuetify". Please add it as a dependency of your project (e.g. `npm add vuetify`).'
+      );
+    }
+    const vuetifyBase = dirname(vuetifyPkgPath);
+    const currentVersion = JSON.parse(readFileSync(vuetifyPkgPath, "utf8")).version;
     const vuetifyGte = (version2) => !!currentVersion && semver.gte(currentVersion, version2);
     const viteVersion = version$1;
     const ctx = {
@@ -1582,6 +1612,8 @@ const module$1 = defineNuxtModule({
       labComponentsPromise: void 0,
       vuetifyGte,
       vuetifyVersion: currentVersion || "0.0.0",
+      vuetifyBase,
+      resolvePaths: [nuxt.options.rootDir, ...nuxt.options.modulesDir],
       viteVersion
     };
     await load(options, nuxt, ctx);

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

@@ -119,12 +119,21 @@ function useSSRClientHints() {
   const {
     baseUrl,
     cookieName,
+    cookieDomain,
+    cookieSecure,
+    cookieSameSite,
     defaultTheme
   } = ssrClientHintsConfiguration.prefersColorSchemeOptions;
   const cookieNamePrefix = `${cookieName}=`;
   initial.value.colorSchemeFromCookie = document.cookie?.split(";")?.find((c) => c.trim().startsWith(cookieNamePrefix))?.split("=")[1] ?? defaultTheme;
   const date = /* @__PURE__ */ new Date();
   const expires = new Date(date.setDate(date.getDate() + 365));
-  initial.value.colorSchemeCookie = `${cookieName}=${initial.value.colorSchemeFromCookie}; Path=${baseUrl}; Expires=${expires.toUTCString()}; SameSite=Lax`;
+  initial.value.colorSchemeCookie = `${cookieName}=${initial.value.colorSchemeFromCookie}; Path=${baseUrl}; Expires=${expires.toUTCString()}; SameSite=${cookieSameSite[0].toUpperCase()}${cookieSameSite.slice(1)}`;
+  if (cookieDomain) {
+    initial.value.colorSchemeCookie += `; Domain=${cookieDomain}`;
+  }
+  if (cookieSecure) {
+    initial.value.colorSchemeCookie += "; Secure";
+  }
   return initial;
 }

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

@@ -273,15 +273,27 @@ function writeThemeCookie(clientHintsRequest, ssrClientHintsConfiguration2) {
   const cookieName = ssrClientHintsConfiguration2.prefersColorSchemeOptions.cookieName;
   const themeName = clientHintsRequest.colorSchemeFromCookie ?? ssrClientHintsConfiguration2.prefersColorSchemeOptions.defaultTheme;
   const path = ssrClientHintsConfiguration2.prefersColorSchemeOptions.baseUrl;
+  const domain = ssrClientHintsConfiguration2.prefersColorSchemeOptions.cookieDomain;
+  const secure = ssrClientHintsConfiguration2.prefersColorSchemeOptions.cookieSecure;
+  const sameSite = ssrClientHintsConfiguration2.prefersColorSchemeOptions.cookieSameSite;
   const date = /* @__PURE__ */ new Date();
   const expires = new Date(date.setDate(date.getDate() + 365));
   if (!clientHintsRequest.firstRequest || !ssrClientHintsConfiguration2.reloadOnFirstRequest) {
     useCookie(cookieName, {
       path,
+      domain,
       expires,
-      sameSite: "lax"
+      sameSite,
+      secure
     }).value = themeName;
   }
-  return `${cookieName}=${themeName}; Path=${path}; Expires=${expires.toUTCString()}; SameSite=Lax`;
+  let cookie = `${cookieName}=${themeName}; Path=${path}; Expires=${expires.toUTCString()}; SameSite=${sameSite[0].toUpperCase()}${sameSite.slice(1)}`;
+  if (domain) {
+    cookie += `; Domain=${domain}`;
+  }
+  if (secure) {
+    cookie += "; Secure";
+  }
+  return cookie;
 }
 export default plugin;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.7",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",