fix: dedupe imports (#229)

* fix: dedupe imports * chore: initialize date picker inclusion properly
vuetifyjs · May 21, 2024 · d4b3d47 · d4b3d47
1 parent 97619c6
commit d4b3d47
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vuetify-nuxt-module",
   "type": "module",
   "version": "0.14.0",
-  "packageManager": "[email protected].0",
+  "packageManager": "[email protected].2",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <[email protected]>",
   "license": "MIT",

diff --git a/playground/vuetify.config.ts b/playground/vuetify.config.ts
@@ -10,6 +10,9 @@ export default defineVuetifyConfiguration({
   },
   aliases: {
     MyBadge: 'VBadge',
+    MyBadge2: 'VBadge',
+    VDatePicker2: 'VDatePicker',
+    VDatePicker3: 'VDatePicker',
   },
   directives: ['ClickOutside', 'Resize', 'Ripple'],
   components: ['VDialog', 'VExpansionPanel', 'VExpansionPanelText', 'VExpansionPanelTitle'],

diff --git a/src/vite/vuetify-configuration-plugin.ts b/src/vite/vuetify-configuration-plugin.ts
@@ -171,11 +171,13 @@ async function buildConfiguration(ctx: VuetifyNuxtContext) {
   })
 
   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}'`)
   })
 
   // lab components
-  let addDatePicker = true
+  let addDatePicker = ctx.vuetify3_4 === true
+    ? !Array.from(componentsToImport.values()).some(components => components.includes('VDatePicker'))
+    : true
 
   if (labComponents) {
     const useLabComponents: LabComponentName[] = []
@@ -229,7 +231,7 @@ async function buildConfiguration(ctx: VuetifyNuxtContext) {
       }
 
       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}'`)
       })
     }
   }