chore: fix conflict

Author: aibayanyu20

.gitignore

@@ -15,6 +15,8 @@ pids
 *.pid
 *.seed
 *.pid.lock
+.idea
+.vscode
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov

package.json

@@ -35,7 +35,7 @@
   "dependencies": {
     "@nuxt/kit": "^3.5.2",
     "@ant-design/icons-vue": "^6.1.0",
-    "ant-design-vue": "^4.0.0"
+    "ant-design-vue": "^4.0.1"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.1.1",
@@ -48,4 +48,4 @@
     "nuxt": "^3.5.1",
     "vitest": "^0.31.1"
   }
-}
+}

pnpm-lock.yaml

@@ -1,4 +1,5 @@
-export const allComponents = [
+export const allComponents:(string | [string,string])[] = [
+  'App',
   'Affix',
   'Alert',
   'Anchor',
@@ -30,6 +31,7 @@ export const allComponents = [
   'CollapsePanel',
   'Comment',
   'ConfigProvider',
+  ['Compact','SpaceCompact'],
   'DatePicker',
   'Descriptions',
   'DescriptionsItem',
@@ -74,7 +76,7 @@ export const allComponents = [
   'Popconfirm',
   'Popover',
   'Progress',
-  'QRCode',
+  ['QRCode','Qrcode'],
   'QuarterPicker',
   'Radio',
   'RadioButton',
@@ -136,4 +138,4 @@ export const allComponents = [
 ]
 
 
-export const allImports = ['message','notification','Modal'];
+export const allImports = ['message','notification','Modal','App'];

src/antdv.ts

@@ -3,22 +3,38 @@ import {  iconLibraryName, libraryName, prefix } from "../config"
 import { addComponent } from "@nuxt/kit";
 
 export const resolveComponents = (config:Options) =>{
-  const { components, icons } = config;
+  const { components,icons } = config;
   const allComponents = components === false ? [] : components;
-  allComponents.forEach(component => {
-    addComponent({
-      export: component,
-      name: prefix + component,
-      filePath: libraryName + '/es'
-    })
+  allComponents.forEach(component=>{
+    if (typeof component === 'string'){
+      addComponent({
+        export: component,
+        name: prefix + component,
+        filePath: libraryName + '/es'
+      })
+    }else if (Array.isArray(component)){
+      addComponent({
+        export: component[0],
+        name: prefix + component[1],
+        filePath: libraryName + '/es'
+      })
+    }
   })
 
   const allIcons = icons === false ? [] : icons;
   allIcons.forEach(icon=>{
-    addComponent({
-      export: icon,
-      name: icon,
-      filePath: iconLibraryName
-    })
+    if (typeof  icon === 'string'){
+      addComponent({
+        export: icon,
+        name: icon,
+        filePath: iconLibraryName
+      })
+    }else if (Array.isArray(icon)){
+      addComponent({
+        export: icon[0],
+        name: icon[1],
+        filePath: iconLibraryName
+      })
+    }
   })
 }

src/core/components.ts

@@ -1,4 +1,4 @@
-export type PresetImport = string 
+export type PresetImport = string | [string,string]
 
 
 export interface Options {