From: daiwei <daiwei521@126.com>
Date: Fri, 20 Jun 2025 06:22:23 +0000 (+0800)
Subject: chore: Merge branch 'vapor' into edison/feat/fowardedSlots
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13408%2Fhead;p=thirdparty%2Fvuejs%2Fcore.git

chore: Merge branch 'vapor' into edison/feat/fowardedSlots
---

748686a3f94df3fda596b636ec5104d7c09598f3
diff --cc packages/runtime-core/src/index.ts
index f921eb0a2c,1ed6f21df7..b172d6b6b7
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@@ -557,7 -557,7 +557,11 @@@ export { startMeasure, endMeasure } fro
   * @internal
   */
  export { initFeatureFlags } from './featureFlags'
 +/**
 + * @internal
 + */
 +export { ensureVaporSlotFallback } from './helpers/renderSlot'
+ /**
+  * @internal
+  */
+ export { createInternalObject } from './internalObject'
diff --cc packages/runtime-vapor/src/componentSlots.ts
index b8af4c9162,100c99cdb8..5ccbe6be89
--- a/packages/runtime-vapor/src/componentSlots.ts
+++ b/packages/runtime-vapor/src/componentSlots.ts
@@@ -114,9 -100,11 +118,11 @@@ export function createSlot
    const _insertionAnchor = insertionAnchor
    if (isHydrating) {
      locateHydrationNode()
+   } else {
+     resetInsertionState()
    }
  
 -  const instance = currentInstance as VaporComponentInstance
 +  const instance = i || (currentInstance as VaporComponentInstance)
    const rawSlots = instance.rawSlots
    const slotProps = rawProps
      ? new Proxy(rawProps, rawPropsProxyHandlers)
diff --cc packages/runtime-vapor/src/vdomInterop.ts
index 9b73e15b84,b916a2c8eb..46ca86904e
--- a/packages/runtime-vapor/src/vdomInterop.ts
+++ b/packages/runtime-vapor/src/vdomInterop.ts
@@@ -14,8 -13,7 +15,9 @@@ import 
    createVNode,
    currentInstance,
    ensureRenderer,
 +  ensureVaporSlotFallback,
+   isEmitListener,
 +  isVNode,
    onScopeDispose,
    renderSlot,
    shallowRef,