vuetify-nuxt-module 0.19.0 → 0.19.2

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.15.0"
   },
-  "version": "0.19.0",
+  "version": "0.19.2",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,5 +1,6 @@
 import { addVitePlugin, addPluginTemplate, extendWebpackConfig, isNuxtMajorVersion, addImports, addPlugin, useLogger, defineNuxtModule, getNuxtVersion, hasNuxtModule, createResolver } from '@nuxt/kit';
 import { isPackageExists, getPackageInfo } from 'local-pkg';
+import semver from 'semver';
 import { createFilter, version as version$1 } from 'vite';
 import { resolve, dirname, relative } from 'node:path';
 import defu from 'defu';
@@ -16,7 +17,7 @@ import { transformAssetUrls } from 'vite-plugin-vuetify';
 import { parseQuery, parseURL } from 'ufo';
 import destr from 'destr';
 
-const version = "0.19.0";
+const version = "0.19.2";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `\0${VIRTUAL_VUETIFY_CONFIGURATION}`;
@@ -529,7 +530,7 @@ function registerWatcher(options, nuxt, ctx) {
   }
 }
 
-function vuetifyStylesPlugin(options, [major, minor, patch], _logger) {
+function vuetifyStylesPlugin(options, viteVersion, _logger) {
   let configFile;
   const vuetifyBase = resolveVuetifyBase();
   const noneFiles = /* @__PURE__ */ new Set();
@@ -547,7 +548,7 @@ function vuetifyStylesPlugin(options, [major, minor, patch], _logger) {
         throw new Error("Remove vite-plugin-vuetify from your Nuxt config file, this module registers a modified version.");
       if (isObject(options.styles)) {
         sassVariables = true;
-        fileImport = major > 5 || major === 5 && minor > 4 || major === 5 && minor === 4 && patch > 2;
+        fileImport = semver.gt(viteVersion, "5.4.2");
         if (path.isAbsolute(options.styles.configFile))
           configFile = path.resolve(options.styles.configFile);
         else
@@ -835,13 +836,13 @@ async function buildConfiguration(ctx) {
   componentsToImport.forEach((componentsArray, from) => {
     config.imports.push(`import {${Array.from(new Set(componentsArray)).join(",")}} from 'vuetify/components/${from}'`);
   });
-  let addDatePicker = ctx.isVuetifyAtLeast(3, 4) ? !Array.from(componentsToImport.values()).some((components2) => components2.includes("VDatePicker")) : true;
+  let addDatePicker = ctx.vuetifyGte("3.4.0") ? !Array.from(componentsToImport.values()).some((components2) => components2.includes("VDatePicker")) : true;
   if (labComponents) {
     const useLabComponents = [];
     if (typeof labComponents === "boolean") {
       config.imports.push("import * as labsComponents from 'vuetify/labs/components'");
       config.labComponents.add("*");
-      if (!ctx.isVuetifyAtLeast(3, 4))
+      if (!ctx.vuetifyGte("3.4.0"))
         addDatePicker = false;
     } else if (typeof labComponents === "string") {
       useLabComponents.push(labComponents);
@@ -869,7 +870,7 @@ async function buildConfiguration(ctx) {
           componentsArray.push(component);
         config.labComponents.add(component);
       });
-      if (!ctx.isVuetifyAtLeast(3, 4) && dateOptions && !addDatePicker) {
+      if (!ctx.vuetifyGte("3.4.0") && dateOptions && !addDatePicker) {
         const entry = componentsToImport.get("VDatePicker");
         if (entry) {
           entry.push("VDatePicker");
@@ -884,9 +885,9 @@ async function buildConfiguration(ctx) {
   }
   if (dateOptions && addDatePicker) {
     let warn = true;
-    if (ctx.isVuetifyAtLeast(0, 0)) {
+    if (ctx.vuetifyGte("3.0.0")) {
       warn = false;
-      if (ctx.isVuetifyAtLeast(3, 4)) {
+      if (ctx.vuetifyGte("3.4.0")) {
         config.components.add("VDatePicker");
         config.imports.push("import {VDatePicker} from 'vuetify/components/VDatePicker'");
       } else {
@@ -1149,7 +1150,7 @@ export function dateConfiguration() {
     }
   };
   function buildAdapter() {
-    if (ctx.dateAdapter === "custom" || ctx.dateAdapter === "vuetify" && ctx.isVuetifyAtLeast(3, 4))
+    if (ctx.dateAdapter === "custom" || ctx.dateAdapter === "vuetify" && ctx.vuetifyGte("3.4.0"))
       return "";
     if (ctx.dateAdapter === "vuetify")
       return "options.adapter = VuetifyDateAdapter";
@@ -1159,7 +1160,7 @@ export function dateConfiguration() {
     return "options.adapter = Adapter";
   }
   function buildImports() {
-    if (ctx.dateAdapter === "custom" || ctx.dateAdapter === "vuetify" && ctx.isVuetifyAtLeast(3, 4))
+    if (ctx.dateAdapter === "custom" || ctx.dateAdapter === "vuetify" && ctx.vuetifyGte("3.4.0"))
       return "";
     if (ctx.dateAdapter === "vuetify")
       return "import { VuetifyDateAdapter } from 'vuetify/labs/date/adapters/vuetify'";
@@ -1259,8 +1260,7 @@ function configureVite(configKey, nuxt, ctx) {
       viteInlineConfig.vue.template.transformAssetUrls = transformAssetUrls;
     }
     if (!ctx.moduleOptions.disableModernSassCompiler) {
-      const [major, minor, patch] = ctx.viteVersion;
-      const enableModernSassCompiler = major > 5 || major === 5 && minor >= 4;
+      const enableModernSassCompiler = semver.gte(ctx.viteVersion, "5.4.0");
       if (enableModernSassCompiler) {
         const sassEmbedded = isPackageExists("sass-embedded");
         if (sassEmbedded) {
@@ -1354,7 +1354,6 @@ export default defineNuxtPlugin({
     await nuxtApp.hooks.callHook('vuetify:configuration', { isDev, vuetifyOptions })
     await nuxtApp.hooks.callHook('vuetify:before-create', { isDev, vuetifyOptions })
     const vuetify = createVuetify(vuetifyOptions)
-    console.log('vuetify', vuetify)
     nuxtApp.vueApp.use(vuetify)${rulesPlugin}
     nuxtApp.provide('vuetify', vuetify)
     await nuxtApp.hooks.callHook('vuetify:ready', vuetify)
@@ -1376,7 +1375,7 @@ function configureNuxt(configKey, nuxt, ctx) {
   } = ctx.moduleOptions;
   const runtimeDir = ctx.resolver.resolve("./runtime");
   if (typeof ctx.enableRules !== "undefined")
-    ctx.enableRules = ctx.isVuetifyAtLeast(3, 8);
+    ctx.enableRules = ctx.vuetifyGte("3.8.0");
   if (ctx.isSSR && !!styles && typeof styles === "object")
     nuxt.options.features.inlineStyles = false;
   if (!disableVuetifyStyles) {
@@ -1411,18 +1410,18 @@ function configureNuxt(configKey, nuxt, ctx) {
   });
   if (importComposables) {
     const composables = ["useDate", "useLocale", "useDefaults", "useDisplay", "useLayout", "useRtl", "useTheme"];
-    if (ctx.isVuetifyAtLeast(3, 5))
+    if (ctx.vuetifyGte("3.5.0"))
       composables.push("useGoTo");
-    if (ctx.isVuetifyAtLeast(3, 8)) {
+    if (ctx.vuetifyGte("3.8.0")) {
       composables.push("useHotkey");
       if (ctx.enableRules)
         composables.push("useRules");
     }
-    if (ctx.isVuetifyAtLeast(3, 10))
+    if (ctx.vuetifyGte("3.10.0"))
       composables.push("useMask");
     addImports(composables.map((name) => ({
       name,
-      from: ctx.isVuetifyAtLeast(3, 4) || name !== "useDate" ? "vuetify" : "vuetify/labs/date",
+      from: ctx.vuetifyGte("3.4.0") || name !== "useDate" ? "vuetify" : "vuetify/labs/date",
       as: prefixComposables ? name.replace(/^use/, "useV") : void 0,
       meta: { docsUrl: name === "useRules" ? "https://vuetifyjs.com/en/features/rules/" : `https://vuetifyjs.com/en/api/${toKebabCase(name)}/` }
     })));
@@ -1495,9 +1494,9 @@ const module$1 = defineNuxtModule({
     if (isNuxtMajorVersion(2, 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 isVuetifyAtLeast = (major, minor) => !!versions && versions.length > 1 && (versions[0] > major || versions[0] === major && versions[1] >= minor);
-    const viteVersion = version$1.split(".").map((v) => v.includes("-") ? v.split("-")[0] : v).map((v) => Number.parseInt(v));
+    const currentVersion = vuetifyPkg?.version;
+    const vuetifyGte = (version2) => !!currentVersion && semver.gte(currentVersion, version2);
+    const viteVersion = version$1;
     const ctx = {
       logger,
       resolver: createResolver(import.meta.url),
@@ -1513,7 +1512,7 @@ const module$1 = defineNuxtModule({
       ssrClientHints: void 0,
       componentsPromise: void 0,
       labComponentsPromise: void 0,
-      isVuetifyAtLeast,
+      vuetifyGte,
       viteVersion
     };
     await load(options, nuxt, ctx);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.19.0",
+  "version": "0.19.2",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -57,6 +57,7 @@
     "local-pkg": "^0.5.0",
     "pathe": "^1.1.2",
     "perfect-debounce": "^1.0.0",
+    "semver": "^7.7.3",
     "ufo": "^1.5.4",
     "unconfig": "^0.5.5",
     "upath": "^2.0.1",
@@ -80,6 +81,7 @@
     "@nuxtjs/i18n": "^8.0.0",
     "@parcel/watcher": "^2.3.0",
     "@types/node": "^18",
+    "@types/semver": "^7.7.1",
     "@unocss/nuxt": "^66.5.10",
     "bumpp": "^9.2.0",
     "eslint": "^8.54.0",