chore: Merge branch 'main' into minor

diff --cc packages/runtime-core/src/componentPublicInstance.ts
Simple merge

diff --cc packages/runtime-core/src/components/BaseTransition.ts
index 0497b9cb228aab6e25a4fd2d4dbd3987d88ecff8,5d41751285bf5c6ee7fbd0a0b2e02d51e31f25a2..354486c64bb405bec3f42ecf11ce45de9ebd20d8
--- 1/packages/runtime-core/src/components/BaseTransition.ts
--- 2/packages/runtime-core/src/components/BaseTransition.ts
+++ b/packages/runtime-core/src/components/BaseTransition.ts
@@@ -16,10 -16,9 +16,10 @@@ import { warn } from '../warning
  import { isKeepAlive } from './KeepAlive'
  import { toRaw } from '@vue/reactivity'
  import { ErrorCodes, callWithAsyncErrorHandling } from '../errorHandling'
- import { PatchFlags, ShapeFlags, isArray } from '@vue/shared'
+ import { PatchFlags, ShapeFlags, isArray, isFunction } from '@vue/shared'
  import { onBeforeUnmount, onMounted } from '../apiLifecycle'
  import type { RendererElement } from '../renderer'
 +import { SchedulerJobFlags } from '../scheduler'
  
  type Hook<T = () => void> = T | T[]