]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
chore: Merge branch 'edison/feat/vaporHydration' into edison/testVapor
authordaiwei <daiwei521@126.com>
Wed, 25 Jun 2025 06:52:10 +0000 (14:52 +0800)
committerdaiwei <daiwei521@126.com>
Wed, 25 Jun 2025 06:52:10 +0000 (14:52 +0800)
1  2 
packages/runtime-vapor/src/apiCreateDynamicComponent.ts
packages/runtime-vapor/src/apiCreateFor.ts
packages/runtime-vapor/src/apiCreateIf.ts
packages/runtime-vapor/src/componentSlots.ts

index e0341a54e90604c3d923e434b2d0fe978573aa07,bd873266b10869a2334daf1f4cc0c9cda4a0aa29..11a4d18d491f1951ecf313d75f718e1f32947fdf
@@@ -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,
index 059f2176ad3a5607e9b4d6637300b746c8de9b12,488fb5b9e85e2db7c769c249bc26704571600685..b6c1429675223456c3249885f140ae2c5bb4f071
@@@ -38,6 -41,6 +37,7 @@@ import 
    insertionParent,
    resetInsertionState,
  } from './insertionState'
++import { applyTransitionHooks } from './components/Transition'
  
  class ForBlock extends VaporFragment {
    scope: EffectScope | undefined
index f7c70f758216536319aac5caf1e93600d9cd887f,3e370592b32d118e36736ea7ecee0ec77beaf263..56b9d9b4a217bb72c0e8cc56dbb72d4395f01bc4
@@@ -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,
index d3ef5b01470d3283ccfffa0067c3ded1cdfd1a01,3ab49867e8d3afdc0b59185231fca9219ce5afbc..2831dd5fc686a4f9ffdcd09a4d628f41df4f9785
@@@ -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)