Merge branch 'main' into bwsy/fix/slot

Author: baiwusanyu-c

packages/compiler-core/src/transforms/vSlot.ts

@@ -389,24 +389,32 @@ function buildDynamicSlot(
   return createObjectExpression(props)
 }
 
-function hasForwardedSlots(children: TemplateChildNode[]): boolean {
+function hasForwardedSlots(
+  children: TemplateChildNode[],
+  hasBranches = false
+): boolean {
   for (let i = 0; i < children.length; i++) {
     const child = children[i]
     switch (child.type) {
       case NodeTypes.ELEMENT:
         if (
           child.tagType === ElementTypes.SLOT ||
-          hasForwardedSlots(child.children)
+          (child.tagType === ElementTypes.ELEMENT && hasBranches) ||
+          hasForwardedSlots(child.children, hasBranches)
         ) {
           return true
         }
         break
       case NodeTypes.IF:
-        if (hasForwardedSlots(child.branches)) return true
+        hasBranches = true
+        if (hasForwardedSlots(child.branches, hasBranches)) return true
         break
       case NodeTypes.IF_BRANCH:
+        hasBranches = true
+        if (hasForwardedSlots(child.children, hasBranches)) return true
+        break
       case NodeTypes.FOR:
-        if (hasForwardedSlots(child.children)) return true
+        if (hasForwardedSlots(child.children, hasBranches)) return true
         break
       default:
         break

packages/compiler-dom/__tests__/transforms/__snapshots__/Transition.spec.ts.snap

@@ -41,7 +41,7 @@ return function render(_ctx, _cache) {
                     ], 2112 /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */))
               ]))
       ]),
-      _: 1 /* STABLE */
+      _: 3 /* FORWARDED */
     }))
   }
 }"

packages/compiler-ssr/__tests__/ssrComponent.spec.ts

@@ -280,7 +280,7 @@ describe('ssr: components', () => {
                 ]
               }
             }),
-            _: 1 /* STABLE */
+            _: 3 /* FORWARDED */
           }, _parent))
         }"
       `)
@@ -341,12 +341,12 @@ describe('ssr: components', () => {
                           ? (_openBlock(), _createBlock("div", { key: 0 }))
                           : _createCommentVNode("v-if", true)
                       ]),
-                      _: 1 /* STABLE */
+                      _: 3 /* FORWARDED */
                     })
                   ]
                 }
               }),
-              _: 1 /* STABLE */
+              _: 3 /* FORWARDED */
             }, _parent))
           }"
         `)

packages/runtime-core/src/renderer.ts

@@ -828,7 +828,7 @@ function baseCreateRenderer(
     }
 
     const areChildrenSVG = isSVG && n2.type !== 'foreignObject'
-    if (dynamicChildren) {
+    if (dynamicChildren && dynamicChildren.length > 0) {
       patchBlockChildren(
         n1.dynamicChildren!,
         dynamicChildren,