feat(mini-runner): 为vue增加custom-wrapper，fix #8989

NervJS · May 6, 2021 · ad97018 · ad97018
1 parent 329c57a
commit ad97018
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/packages/taro-mini-runner/src/webpack/vue.ts b/packages/taro-mini-runner/src/webpack/vue.ts
@@ -2,6 +2,8 @@ import { REG_VUE, chalk } from '@tarojs/helper'
 import { toCamelCase, internalComponents, capitalize } from '@tarojs/shared'
 import { componentConfig } from '../template/component'
 
+const CUSTOM_WRAPPER = 'custom-wrapper'
+
 export function customVueChain (chain) {
   let vueLoaderPath: string
   try {
@@ -43,6 +45,10 @@ export function customVueChain (chain) {
               componentConfig.includes.add(nodeName)
             }
 
+            if (nodeName === CUSTOM_WRAPPER) {
+              componentConfig.thirdPartyComponents.set(CUSTOM_WRAPPER, new Set())
+            }
+
             const usingComponent = componentConfig.thirdPartyComponents.get(nodeName)
             if (usingComponent != null) {
               el.attrsList

diff --git a/packages/taro-mini-runner/src/webpack/vue3.ts b/packages/taro-mini-runner/src/webpack/vue3.ts
@@ -4,6 +4,8 @@ import { toCamelCase, internalComponents, capitalize } from '@tarojs/shared'
 import { componentConfig } from '../template/component'
 import type { RootNode, TemplateChildNode, ElementNode, AttributeNode, DirectiveNode, SimpleExpressionNode } from '@vue/compiler-core'
 
+const CUSTOM_WRAPPER = 'custom-wrapper'
+
 export function customVue3Chain (chain) {
   let vueLoaderPath: string
   try {
@@ -62,6 +64,11 @@ export function customVue3Chain (chain) {
               componentConfig.includes.add(nodeName)
             }
 
+            if (nodeName === CUSTOM_WRAPPER) {
+              node.tagType = 0 /* ELEMENT */
+              componentConfig.thirdPartyComponents.set(CUSTOM_WRAPPER, new Set())
+            }
+
             const usingComponent = componentConfig.thirdPartyComponents.get(nodeName)
             if (usingComponent != null) {
               node.props.forEach(prop => {

diff --git a/packages/taro-runtime/src/dom/root.ts b/packages/taro-runtime/src/dom/root.ts
@@ -142,7 +142,7 @@ export class TaroRootElement extends TaroElement {
               eventCenter.trigger(eventId)
             })
           })
-          ctx.setData(normalUpdate, () => {
+          Object.keys(normalUpdate).length && ctx.setData(normalUpdate, () => {
             eventCenter.trigger(eventId)
           })
         } else {