refactor: only create anchor for forwarded slots in ssr vnode-based slot

diff --git a/packages/runtime-vapor/src/block.ts b/packages/runtime-vapor/src/block.ts
index 4dd76021a0884775b4234295628f11dfb1c3dd42..04b0a4881cbff58337b95aed838bf5d80ad7c350 100644 (file)
--- a/packages/runtime-vapor/src/block.ts
+++ b/packages/runtime-vapor/src/block.ts
@@ -14,7 +14,11 @@ import {
 } from '@vue/runtime-dom'
 import { isHydrating } from './dom/hydration'
 import { getInheritedScopeIds } from '@vue/runtime-dom'
-import { DynamicFragment, type VaporFragment, isFragment } from './fragment'
+import {
+  type DynamicFragment,
+  type VaporFragment,
+  isFragment,
+} from './fragment'
 
 export interface TransitionOptions {
   $key?: any
@@ -165,19 +169,6 @@ export function normalizeAnchor(node: Block): Node | undefined {
   }
 }
 
-export function findLastChild(node: Block): Node | undefined | null {
-  if (node && node instanceof Node) {
-    return node
-  } else if (isArray(node)) {
-    return findLastChild(node[node.length - 1])
-  } else if (isVaporComponent(node)) {
-    return findLastChild(node.block!)
-  } else {
-    if (node instanceof DynamicFragment) return node.anchor
-    return findLastChild(node.nodes!)
-  }
-}
-
 /**
  * dev / test only
  */

diff --git a/packages/runtime-vapor/src/fragment.ts b/packages/runtime-vapor/src/fragment.ts
index 6e1cf5ecea7d46c2bc23f87799d94558fd706061..49c4a25fd7ad6aa6bdc958160504fc789dd42006 100644 (file)
--- a/packages/runtime-vapor/src/fragment.ts
+++ b/packages/runtime-vapor/src/fragment.ts
@@ -5,7 +5,6 @@ import {
   type BlockFn,
   type TransitionOptions,
   type VaporTransitionHooks,
-  findLastChild,
   insert,
   isValidBlock,
   remove,
@@ -153,17 +152,16 @@ export class DynamicFragment extends VaporFragment {
       this.anchor = locateVaporFragmentAnchor(currentHydrationNode!, '')!
     } else {
       this.anchor = locateVaporFragmentAnchor(currentHydrationNode!, label)!
-      if (!this.anchor && label === 'slot') {
-        // fallback to fragment end anchor for
-        this.anchor = locateVaporFragmentAnchor(currentHydrationNode!, ']')!
-      }
 
-      // anchors are not present in ssr slot vnode fallback
-      if (!this.anchor) {
-        const { parentNode, nextSibling } = findLastChild(this.nodes)!
+      // forwarded slots anchors are not present in ssr vnode-based slot
+      if (
+        !this.anchor &&
+        this.nodes instanceof DynamicFragment &&
+        this.nodes.forwarded
+      ) {
+        const { parentNode, nextSibling } = this.nodes.anchor
         parentNode!.insertBefore(
-          // TODO use empty text node in PROD?
-          (this.anchor = createComment(label)),
+          (this.anchor = __DEV__ ? createComment(label) : createTextNode()),
           nextSibling,
         )
       }