]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
chore: Merge branch 'vapor' into edison/feat/fowardedSlots edison/feat/fowardedSlots 13408/head
authordaiwei <daiwei521@126.com>
Fri, 20 Jun 2025 06:22:23 +0000 (14:22 +0800)
committerdaiwei <daiwei521@126.com>
Fri, 20 Jun 2025 06:22:23 +0000 (14:22 +0800)
1  2 
packages/compiler-vapor/__tests__/transforms/__snapshots__/vSlot.spec.ts.snap
packages/compiler-vapor/__tests__/transforms/vSlot.spec.ts
packages/compiler-vapor/src/ir/index.ts
packages/compiler-vapor/src/transform.ts
packages/compiler-vapor/src/transforms/transformSlotOutlet.ts
packages/compiler-vapor/src/transforms/vSlot.ts
packages/runtime-core/src/index.ts
packages/runtime-core/src/renderer.ts
packages/runtime-vapor/src/componentSlots.ts
packages/runtime-vapor/src/vdomInterop.ts

index f921eb0a2cf8101695612f578f9d26e8cac54f3b,1ed6f21df7769a695a0643a6c27c38eaeaf30eef..b172d6b6b79510d84bbe014fd762bcb7bc9a094b
@@@ -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'
Simple merge
index b8af4c91629be9e139137c688487e1ba563515ed,100c99cdb8af19f17437e323fbe19806c9769c97..5ccbe6be89c8249683c98e40c863f5cbf4825304
@@@ -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)
index 9b73e15b84cbd9e19a1b0b2895803e12e01b30e5,b916a2c8ebb0106b1d7542db2a83c17005c2649e..46ca86904e71a05a72d3fc4f37f99b9087977ee7
@@@ -14,8 -13,7 +15,9 @@@ import 
    createVNode,
    currentInstance,
    ensureRenderer,
 +  ensureVaporSlotFallback,
+   isEmitListener,
 +  isVNode,
    onScopeDispose,
    renderSlot,
    shallowRef,