From: daiwei <daiwei521@126.com>
Date: Mon, 13 Oct 2025 02:14:48 +0000 (+0800)
Subject: chore: Merge branch 'minor' into edison/testVapor
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28ba1cad6c2c2d11aa51cfca89143c9143a41f7c;p=thirdparty%2Fvuejs%2Fcore.git

chore: Merge branch 'minor' into edison/testVapor
---

28ba1cad6c2c2d11aa51cfca89143c9143a41f7c
diff --cc packages/runtime-dom/src/index.ts
index 19370bc485,64ba93e0e3..7b3c3b3381
--- a/packages/runtime-dom/src/index.ts
+++ b/packages/runtime-dom/src/index.ts
@@@ -348,24 -348,7 +348,28 @@@ export 
    vModelSelectInit,
    vModelSetSelected,
  } from './directives/vModel'
 +/**
 + * @internal
 + */
 +export {
 +  resolveTransitionProps,
 +  TransitionPropsValidators,
 +  forceReflow,
 +  addTransitionClass,
 +  removeTransitionClass,
 +  type ElementWithTransition,
 +} from './components/Transition'
 +/**
 + * @internal
 + */
 +export {
 +  hasCSSTransform,
 +  callPendingCbs,
 +  moveCbKey,
 +  handleMovedChildren,
 +  baseApplyTranslation,
 +} from './components/TransitionGroup'
+ /**
+  * @internal
+  */
+ export { unsafeToTrustedHTML } from './nodeOps'
diff --cc packages/runtime-vapor/src/dom/prop.ts
index 899d7f0caa,346bea53eb..da62afa3e0
--- a/packages/runtime-vapor/src/dom/prop.ts
+++ b/packages/runtime-vapor/src/dom/prop.ts
@@@ -22,11 -14,8 +22,12 @@@ import 
    mergeProps,
    patchStyle,
    shouldSetAsProp,
 +  toClassSet,
 +  toStyleMap,
+   unsafeToTrustedHTML,
 +  vShowHidden,
    warn,
 +  warnPropMismatch,
  } from '@vue/runtime-dom'
  import {
    type VaporComponentInstance,