vuetify-nuxt-module 0.14.0 → 0.15.0

package/dist/module.json

@@ -2,8 +2,8 @@
   "name": "vuetify-nuxt-module",
   "configKey": "vuetify",
   "compatibility": {
-    "nuxt": "^3.9.0",
+    "nuxt": ">=3.9.0",
     "bridge": false
   },
-  "version": "0.14.0"
+  "version": "0.15.0"
 }

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { addVitePlugin, addPluginTemplate, extendWebpackConfig, addImports, addPlugin, useLogger, defineNuxtModule, isNuxt3, getNuxtVersion, createResolver, hasNuxtModule } from '@nuxt/kit';
+import { addVitePlugin, addPluginTemplate, extendWebpackConfig, addImports, addPlugin, useLogger, defineNuxtModule, isNuxt2, getNuxtVersion, createResolver, hasNuxtModule } from '@nuxt/kit';
 import { isPackageExists, getPackageInfo } from 'local-pkg';
 import { resolve, dirname, relative, extname } from 'node:path';
 import defu from 'defu';
@@ -8,13 +8,13 @@ import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
 import { readFile } from 'node:fs/promises';
 import { resolveVuetifyBase, normalizePath, generateImports } from '@vuetify/loader-shared';
-import { transformAssetUrls } from 'vite-plugin-vuetify';
 import { isAbsolute, join, relative as relative$1 } from 'pathe';
+import { transformAssetUrls } from 'vite-plugin-vuetify';
 import { pathToFileURL } from 'node:url';
 import { parseQuery, parseURL } from 'ufo';
 import destr from 'destr';
 
-const version = "0.14.0";
+const version = "0.15.0";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `/@nuxt-vuetify-configuration/${VIRTUAL_VUETIFY_CONFIGURATION.slice("virtual:".length)}`;
@@ -109,14 +109,14 @@ async function mergeVuetifyModules(options, nuxt) {
     else
       resolvedOptions.sources.forEach((s) => vuetifyConfigurationFilesToWatch.add(s.replace(/\\/g, "/")));
   }
-  moduleOptions.push({
+  moduleOptions.unshift({
     moduleOptions: options.moduleOptions,
     vuetifyOptions: resolvedOptions.config
   });
   if (moduleOptions.length > 1) {
-    const [base, ...rest] = moduleOptions.reverse();
-    const configuration = defu(base, ...rest);
-    dedupeIcons(configuration, moduleOptions);
+    const [app, ...rest] = moduleOptions;
+    const configuration = defu(app, ...rest);
+    dedupeIcons(configuration, moduleOptions.reverse());
     return {
       configuration,
       vuetifyConfigurationFilesToWatch
@@ -608,6 +608,29 @@ function pascalize(str) {
   return pascal;
 }
 pascalize.cache = /* @__PURE__ */ new Map();
+function createTransformAssetUrls(ctx, viteInlineConfig) {
+  const { includeTransformAssetsUrls } = ctx.moduleOptions;
+  if (!includeTransformAssetsUrls)
+    return void 0;
+  let existingTransformAssetUrls = viteInlineConfig.vue?.template?.transformAssetUrls ?? {};
+  let useURLOptions;
+  if (typeof existingTransformAssetUrls === "boolean") {
+    existingTransformAssetUrls = {};
+  } else if ("base" in existingTransformAssetUrls || "includeAbsolute" in existingTransformAssetUrls || "tags" in existingTransformAssetUrls) {
+    useURLOptions = {
+      base: existingTransformAssetUrls.base,
+      includeAbsolute: existingTransformAssetUrls.includeAbsolute
+    };
+    existingTransformAssetUrls = existingTransformAssetUrls.tags ?? {};
+  }
+  const transformAssetUrls$1 = normalizeTransformAssetUrls(
+    typeof includeTransformAssetsUrls === "object" ? defu(existingTransformAssetUrls, transformAssetUrls, includeTransformAssetsUrls) : defu(existingTransformAssetUrls, transformAssetUrls)
+  );
+  if (!useURLOptions)
+    return transformAssetUrls$1;
+  useURLOptions.tags = transformAssetUrls$1;
+  return useURLOptions;
+}
 function normalizeTransformAssetUrls(transformAssetUrls) {
   const names = new Set(Object.keys(transformAssetUrls));
   let kebab;
@@ -774,9 +797,9 @@ async function buildConfiguration(ctx) {
     config.aliasEntries.push(`'${key}': ${component}`);
   });
   componentsToImport.forEach((componentsArray, from) => {
-    config.imports.push(`import {${componentsArray.join(",")}} from 'vuetify/components/${from}'`);
+    config.imports.push(`import {${Array.from(new Set(componentsArray)).join(",")}} from 'vuetify/components/${from}'`);
   });
-  let addDatePicker = true;
+  let addDatePicker = ctx.vuetify3_4 === true ? !Array.from(componentsToImport.values()).some((components2) => components2.includes("VDatePicker")) : true;
   if (labComponents) {
     const useLabComponents = [];
     if (typeof labComponents === "boolean") {
@@ -819,7 +842,7 @@ async function buildConfiguration(ctx) {
         }
       }
       componentsToImport.forEach((componentsArray, from) => {
-        config.imports.push(`import {${componentsArray.join(",")}} from 'vuetify/labs/${from}'`);
+        config.imports.push(`import {${Array.from(new Set(componentsArray)).join(",")}} from 'vuetify/labs/${from}'`);
       });
     }
   }
@@ -1183,33 +1206,17 @@ function configureVite(configKey, nuxt, ctx) {
         configKey
       ];
     }
-    const { includeTransformAssetsUrls, styles } = ctx.moduleOptions;
-    if (includeTransformAssetsUrls) {
+    const transformAssetUrls = createTransformAssetUrls(
+      ctx,
+      viteInlineConfig
+    );
+    if (transformAssetUrls) {
       viteInlineConfig.vue ??= {};
       viteInlineConfig.vue.template ??= {};
-      let existingTransformAssetUrls = viteInlineConfig.vue.template.transformAssetUrls ?? {};
-      let useURLOptions;
-      if (typeof existingTransformAssetUrls === "boolean") {
-        existingTransformAssetUrls = {};
-      } else if ("base" in existingTransformAssetUrls || "includeAbsolute" in existingTransformAssetUrls || "tags" in existingTransformAssetUrls) {
-        useURLOptions = {
-          base: existingTransformAssetUrls.base,
-          includeAbsolute: existingTransformAssetUrls.includeAbsolute
-        };
-        existingTransformAssetUrls = existingTransformAssetUrls.tags ?? {};
-      }
-      const transformAssetUrls$1 = normalizeTransformAssetUrls(
-        typeof includeTransformAssetsUrls === "object" ? defu(existingTransformAssetUrls, transformAssetUrls, includeTransformAssetsUrls) : defu(existingTransformAssetUrls, transformAssetUrls)
-      );
-      if (useURLOptions) {
-        useURLOptions.tags = transformAssetUrls$1;
-        viteInlineConfig.vue.template.transformAssetUrls = useURLOptions;
-      } else {
-        viteInlineConfig.vue.template.transformAssetUrls = transformAssetUrls$1;
-      }
+      viteInlineConfig.vue.template.transformAssetUrls = transformAssetUrls;
     }
     viteInlineConfig.plugins.push(vuetifyImportPlugin({}));
-    viteInlineConfig.plugins.push(vuetifyStylesPlugin({ styles }, ctx.logger));
+    viteInlineConfig.plugins.push(vuetifyStylesPlugin({ styles: ctx.moduleOptions.styles }, ctx.logger));
     viteInlineConfig.plugins.push(vuetifyConfigurationPlugin(ctx));
     viteInlineConfig.plugins.push(vuetifyIconsPlugin(ctx));
     viteInlineConfig.plugins.push(vuetifyDateConfigurationPlugin(ctx));
@@ -1351,7 +1358,7 @@ const module = defineNuxtModule({
     name: "vuetify-nuxt-module",
     configKey: "vuetify",
     compatibility: {
-      nuxt: "^3.9.0",
+      nuxt: ">=3.9.0",
       bridge: false
     },
     version
@@ -1368,7 +1375,7 @@ const module = defineNuxtModule({
     }
   }),
   async setup(options, nuxt) {
-    if (!isNuxt3(nuxt))
+    if (isNuxt2(nuxt))
       logger.error(`Cannot support nuxt version: ${getNuxtVersion(nuxt)}`);
     const vuetifyPkg = await getPackageInfo("vuetify");
     const versions = vuetifyPkg?.version?.split(".").map((v) => Number.parseInt(v));

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.14.0",
-  "packageManager": "pnpm@9.1.0",
+  "version": "0.15.0",
+  "packageManager": "pnpm@9.5.0",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -65,7 +65,7 @@
     "release": "bumpp && npm publish"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.9.0",
+    "@nuxt/kit": "^3.12.3",
     "defu": "^6.1.4",
     "destr": "^2.0.3",
     "local-pkg": "^0.5.0",
@@ -74,7 +74,7 @@
     "ufo": "^1.5.3",
     "unconfig": "^0.3.11",
     "vite-plugin-vuetify": "^2.0.3",
-    "vuetify": "^3.6.5"
+    "vuetify": "^3.6.12"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.43.1",
@@ -86,10 +86,10 @@
     "@iconify-json/carbon": "^1.1.21",
     "@iconify-json/mdi": "^1.1.55",
     "@mdi/js": "^7.3.67",
-    "@nuxt/devtools": "^1.0.8",
+    "@nuxt/devtools": "latest",
     "@nuxt/module-builder": "^0.5.5",
-    "@nuxt/schema": "^3.10.2",
-    "@nuxt/test-utils": "^3.11.0",
+    "@nuxt/schema": "^3.12.3",
+    "@nuxt/test-utils": "^3.13.1",
     "@nuxtjs/i18n": "^8.0.0",
     "@parcel/watcher": "^2.3.0",
     "@types/node": "^18",
@@ -104,7 +104,7 @@
     "typescript": "^5.3.3",
     "vite": "^5.0.12",
     "vitest": "^1.4.0",
-    "vue-tsc": "^2.0.7"
+    "vue-tsc": "^2.0.26"
   },
   "pnpm": {
     "peerDependencyRules": {
@@ -114,7 +114,9 @@
     }
   },
   "resolutions": {
-    "@nuxt/kit": "3.11.1"
+    "@nuxt/kit": "3.12.3",
+    "vite": "5.3.2",
+    "vue": "3.4.31"
   },
   "build": {
     "externals": [