From: daiwei <daiwei521@126.com>
Date: Wed, 25 Jun 2025 06:52:10 +0000 (+0800)
Subject: chore: Merge branch 'edison/feat/vaporHydration' into edison/testVapor
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bba71becba239ca301eef9b7656b97187bd9ba0b;p=thirdparty%2Fvuejs%2Fcore.git

chore: Merge branch 'edison/feat/vaporHydration' into edison/testVapor
---

bba71becba239ca301eef9b7656b97187bd9ba0b
diff --cc packages/runtime-vapor/src/apiCreateDynamicComponent.ts
index e0341a54e9,bd873266b1..11a4d18d49
--- a/packages/runtime-vapor/src/apiCreateDynamicComponent.ts
+++ b/packages/runtime-vapor/src/apiCreateDynamicComponent.ts
@@@ -10,8 -10,7 +10,8 @@@ import 
    resetInsertionState,
  } from './insertionState'
  import { DYNAMIC_COMPONENT_ANCHOR_LABEL } from '@vue/shared'
- import { isHydrating, locateHydrationNode } from './dom/hydration'
+ import { isHydrating } from './dom/hydration'
 +import { DynamicFragment, type VaporFragment } from './fragment'
  
  export function createDynamicComponent(
    getter: () => any,
diff --cc packages/runtime-vapor/src/apiCreateFor.ts
index 059f2176ad,488fb5b9e8..b6c1429675
--- a/packages/runtime-vapor/src/apiCreateFor.ts
+++ b/packages/runtime-vapor/src/apiCreateFor.ts
@@@ -38,6 -41,6 +37,7 @@@ import 
    insertionParent,
    resetInsertionState,
  } from './insertionState'
++import { applyTransitionHooks } from './components/Transition'
  
  class ForBlock extends VaporFragment {
    scope: EffectScope | undefined
diff --cc packages/runtime-vapor/src/apiCreateIf.ts
index f7c70f7582,3e370592b3..56b9d9b4a2
--- a/packages/runtime-vapor/src/apiCreateIf.ts
+++ b/packages/runtime-vapor/src/apiCreateIf.ts
@@@ -1,6 -1,6 +1,6 @@@
  import { IF_ANCHOR_LABEL } from '@vue/shared'
 -import { type Block, type BlockFn, DynamicFragment, insert } from './block'
 +import { type Block, type BlockFn, insert } from './block'
- import { isHydrating, locateHydrationNode } from './dom/hydration'
+ import { isHydrating } from './dom/hydration'
  import {
    insertionAnchor,
    insertionParent,
diff --cc packages/runtime-vapor/src/componentSlots.ts
index d3ef5b0147,3ab49867e8..2831dd5fc6
--- a/packages/runtime-vapor/src/componentSlots.ts
+++ b/packages/runtime-vapor/src/componentSlots.ts
@@@ -16,8 -16,7 +16,8 @@@ import 
    insertionParent,
    resetInsertionState,
  } from './insertionState'
- import { isHydrating, locateHydrationNode } from './dom/hydration'
+ import { isHydrating } from './dom/hydration'
 +import { DynamicFragment, type VaporFragment, isFragment } from './fragment'
  
  export type RawSlots = Record<string, VaporSlot> & {
    $?: DynamicSlotSource[]
@@@ -117,13 -105,9 +117,9 @@@ export function createSlot
  ): Block {
    const _insertionParent = insertionParent
    const _insertionAnchor = insertionAnchor
-   if (isHydrating) {
-     locateHydrationNode(true)
-   } else {
-     resetInsertionState()
-   }
+   if (!isHydrating) resetInsertionState()
  
 -  const instance = currentInstance as VaporComponentInstance
 +  const instance = i || (currentInstance as VaporComponentInstance)
    const rawSlots = instance.rawSlots
    const slotProps = rawProps
      ? new Proxy(rawProps, rawPropsProxyHandlers)