chore: use local Vuetify dev tgz from Vuetify #21129 PR

README.md

@@ -20,6 +20,8 @@ The `dev` branch using local Vuetify tgz file from Vuetify `dev` branch: check [
 
 The `dev-pr-21104` branch using local Vuetify tgz file from this Vuetify `dev` PR [fix:fix vuetify types and simplify package exports](https://github.com/vuetifyjs/vuetify/pull/21104): check [chore: use local Vuetify dev tgz from Vuetify #21104 PR](https://github.com/userquin/vuetify-nuxt-3.16-lazy-hydration/pull/2).
 
+The `dev-pr-21129` branch using local Vuetify tgz file from this Vuetify `dev` PR [feat(package): add unimport presets and unplugin-vue-components resolvers](https://github.com/vuetifyjs/vuetify/pull/21129).
+
 **NOTE**: when switching between branches, remember to run `pnpm install` to install the dependencies.
 
 ## Screenshots

modules/auto-import/index.ts

@@ -1,8 +1,15 @@
 import { defineNuxtModule } from "@nuxt/kit";
-import type { VuetifyComposablesOptions, VuetifyDirectivesOptions} from "./unimport";
-import { VuetifyComposables, VuetifyDirectives } from "./unimport";
-import { resolveVuetifyImportMaps, toKebabCase } from "./utils";
-import type { VuetifyComponent } from "./types";
+import type {
+    VuetifyComposablesOptions,
+    VuetifyDirectivesOptions,
+} from "vuetify/unimport-presets";
+import {
+    VuetifyComposables,
+    VuetifyDirectives,
+    buildAddonsOptions,
+    prepareVuetifyComponents,
+} from "vuetify/unimport-presets";
+
 import type {Addon, AddonsOptions} from "unimport";
 
 export interface ModuleOptions {
@@ -21,35 +28,18 @@ export default defineNuxtModule<ModuleOptions>({
         })
 
         const imports = nuxt.options.imports
-        imports.addons = buildAddonOptions(imports.addons as AddonsOptions | Addon[] | undefined)
+        imports.addons = buildAddonsOptions(imports.addons as AddonsOptions | Addon[] | undefined)
 
         nuxt.hook('components:extend', async (c) => {
-            const [components, labs] = await Promise.all(
-                resolveVuetifyImportMaps()
-            )
-            // Vuetify 3.7.11+ resolves to subpath exports instead of a file in /lib
-            function patchExtension(path: string) {
-                return path.endsWith('.mjs') ? `lib/${path}` : path
-            }
-            const map = new Map<string, VuetifyComponent>()
-            Object.entries(components.components).forEach(([component, entry]) => {
-                map.set(component, {
-                    from: `vuetify/${patchExtension(entry.from)}`,
-                })
-            })
-            Object.entries(labs.components).forEach(([component, entry]) => {
-                map.set(component, {
-                    from: `vuetify/${patchExtension(entry.from)}`,
-                })
-            })
-            for (const [component, entry] of map.entries()) {
+            const components = await prepareVuetifyComponents()
+            for (const component of components) {
                 c.push({
-                    pascalName: component,
-                    kebabName: toKebabCase(component),
-                    export: component,
-                    filePath: entry.from,
-                    shortPath: entry.from,
-                    chunkName: toKebabCase(component),
+                    pascalName: component.pascalName,
+                    kebabName: component.kebabName,
+                    export: component.export,
+                    filePath: component.filePath,
+                    shortPath: component.filePath,
+                    chunkName: component.kebabName,
                     prefetch: false,
                     preload: false,
                     global: false,
@@ -73,17 +63,3 @@ export default defineNuxtModule<ModuleOptions>({
         })
     }
 })
-
-function buildAddonOptions(addons?: AddonsOptions | Addon[]): AddonsOptions {
-    if (!addons)
-        return { vueDirectives: true }
-
-    if (Array.isArray(addons))
-        return { vueDirectives: true, addons }
-
-    return {
-        ...addons,
-        vueDirectives: addons.vueDirectives ?? true,
-        addons: addons.addons,
-    }
-}

package.json

@@ -15,12 +15,10 @@
   },
   "dependencies": {
     "@nuxt/eslint": "1.2.0",
-    "@unhead/vue": "^2.0.0-rc.13",
     "eslint": "^9.0.0",
-    "nuxt": "^3.16.0",
-    "unhead": "^2.0.0-rc.13",
+    "nuxt": "^3.16.1",
     "vue": "^3.5.13",
-    "vuetify": "^3.7.16"
+    "vuetify": "file:vuetify-3.7.18.tgz"
   },
   "packageManager": "[email protected]+sha512.bb45e34d50a9a76e858a95837301bfb6bd6d35aea2c5d52094fa497a467c43f5c440103ce2511e9e0a2f89c3d6071baac3358fc68ac6fb75e2ceb3d2736065e6",
   "devDependencies": {