feat: isCustomElement option array to merge

YunYouJun · Feb 15, 2024 · fe94ed5 · fe94ed5 · github-actions · Feb 15, 2024
1 parent c41b385
commit fe94ed5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/packages/valaxy-addon-meting/valaxy.config.ts b/packages/valaxy-addon-meting/valaxy.config.ts
@@ -2,12 +2,10 @@ import { defineValaxyConfig } from 'valaxy'
 
 export default defineValaxyConfig({
   vue: {
-    template: {
-      compilerOptions: {
-        isCustomElement: (tag) => {
-          return tag === 'meting-js'
-        },
+    isCustomElement: [
+      (tag) => {
+        return tag === 'meting-js'
       },
-    },
+    ],
   },
 })
diff --git a/packages/valaxy/node/plugins/preset.ts b/packages/valaxy/node/plugins/preset.ts
@@ -37,11 +37,13 @@ export async function ViteValaxyPlugins(
       include: [/\.vue$/, /\.md$/],
       exclude: [],
       template: {
-        ...valaxyConfig.vue?.template,
         compilerOptions: {
-          ...valaxyConfig.vue?.template?.compilerOptions,
           isCustomElement: (tag) => {
-            return customElements.has(tag) || valaxyConfig.vue?.template?.compilerOptions?.isCustomElement?.(tag)
+            let is = customElements.has(tag)
+            valaxyConfig.vue?.isCustomElement?.forEach((fn) => {
+              is = is || fn(tag)
+            })
+            return is
           },
         },
       },

diff --git a/packages/valaxy/node/types.ts b/packages/valaxy/node/types.ts
@@ -83,7 +83,9 @@ export interface ValaxyExtendConfig {
    * @vitejs/plugin-vue options
    * @see https://github.com/vitejs/vite-plugin-vue/blob/main/packages/plugin-vue/README.md
    */
-  vue?: Parameters<typeof Vue>[0]
+  vue?: Parameters<typeof Vue>[0] & {
+    isCustomElement?: ((tag: string) => boolean)[]
+  }
   // unplugin
   components?: Parameters<typeof Components>[0]
   layouts?: Parameters<typeof Layouts>[0]