]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
Merge branch 'minor' into edison/feat/fowardedSlots
authoredison <daiwei521@126.com>
Wed, 16 Jul 2025 12:51:22 +0000 (20:51 +0800)
committerGitHub <noreply@github.com>
Wed, 16 Jul 2025 12:51:22 +0000 (20:51 +0800)
1  2 
packages/runtime-core/src/helpers/renderSlot.ts
packages/runtime-core/src/index.ts
packages/runtime-core/src/renderer.ts
packages/runtime-vapor/src/block.ts
packages/runtime-vapor/src/index.ts
packages/runtime-vapor/src/vdomInterop.ts

Simple merge
Simple merge
Simple merge
index 10d0aa63384cd085de2546760e7c0fc7db8fc521,7a8aea5a0d71778852b4eb97a8b470016c30340e..4900c8d7dd16086e921ef289278335f7ee9d9b3a
@@@ -7,9 -7,13 +7,13 @@@ export type { VaporDirective } from './
  // compiler-use only
  export { insert, prepend, remove, isFragment, VaporFragment } from './block'
  export { setInsertionState } from './insertionState'
- export { createComponent, createComponentWithFallback } from './component'
+ export {
+   createComponent,
+   createComponentWithFallback,
+   isVaporComponent,
+ } from './component'
  export { renderEffect } from './renderEffect'
 -export { createSlot } from './componentSlots'
 +export { createSlot, forwardedSlotCreator } from './componentSlots'
  export { template } from './dom/template'
  export { createTextNode, child, nthChild, next } from './dom/node'
  export {
index 46ca86904e71a05a72d3fc4f37f99b9087977ee7,1573a306922aacd6813fc8cdfe8f7c7a84ec4f4a..8dafdeaaf6a1d5abc0bec59786cb8a777fa65b6f
@@@ -15,11 -13,10 +15,12 @@@ import 
    createVNode,
    currentInstance,
    ensureRenderer,
 +  ensureVaporSlotFallback,
    isEmitListener,
 +  isVNode,
    onScopeDispose,
    renderSlot,
+   shallowReactive,
    shallowRef,
    simpleSetCurrentInstance,
  } from '@vue/runtime-dom'