From: Evan You <yyx990803@gmail.com>
Date: Fri, 19 Apr 2024 14:09:34 +0000 (+0800)
Subject: chore: Merge branch 'main' into minor
X-Git-Tag: v3.5.0-alpha.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f0c6e4a05e284383172f180d5683e24740a12b2;p=thirdparty%2Fvuejs%2Fcore.git

chore: Merge branch 'main' into minor
---

5f0c6e4a05e284383172f180d5683e24740a12b2
diff --cc packages/runtime-core/src/components/BaseTransition.ts
index 0497b9cb22,5d41751285..354486c64b
--- a/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[]