]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
chore: Merge branch 'minor' into edison/testVapor
authordaiwei <daiwei521@126.com>
Mon, 13 Oct 2025 02:14:48 +0000 (10:14 +0800)
committerdaiwei <daiwei521@126.com>
Mon, 13 Oct 2025 02:14:48 +0000 (10:14 +0800)
1  2 
packages/runtime-dom/src/index.ts
packages/runtime-vapor/src/dom/prop.ts

index 19370bc485ee157f39e0b8d95507009289f19e2e,64ba93e0e3e98e8d86b2d6d080d4a0e3a0c3afcb..7b3c3b33816b273d9c4ade961d951ab914ebc021
@@@ -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'
index 899d7f0caa5dfcec244bf993d67ddee068b1b0d0,346bea53eb16659eaea357db91a26bbef4e6cae8..da62afa3e0fcf5658906711a28008a2ce55cd7a2
@@@ -22,11 -14,8 +22,12 @@@ import 
    mergeProps,
    patchStyle,
    shouldSetAsProp,
 +  toClassSet,
 +  toStyleMap,
+   unsafeToTrustedHTML,
 +  vShowHidden,
    warn,
 +  warnPropMismatch,
  } from '@vue/runtime-dom'
  import {
    type VaporComponentInstance,