Merge branch 'minor' into edison/feat/vaporAsyncComponent

diff --cc packages/runtime-core/src/apiAsyncComponent.ts
index 8eee833ac4bf0976f1d5b4a07227877a54c093c8,5c5c06c4891c67fc588a189d28b0cc19014fd8a3..f3698157c82aa2180d67812c585415d8c55608f5
--- 1/packages/runtime-core/src/apiAsyncComponent.ts
--- 2/packages/runtime-core/src/apiAsyncComponent.ts
+++ b/packages/runtime-core/src/apiAsyncComponent.ts
@@@ -75,9 -143,10 +88,10 @@@ export function defineAsyncComponent
              if (teardown) {
                ;(instance.bum || (instance.bum = [])).push(teardown)
              }
+             ;(instance.u || (instance.u = [])).push(() => (patched = true))
            }
          : hydrate
 -      if (resolvedComp) {
 +      if (getResolvedComp()) {
          doHydrate()
        } else {
          load().then(() => !instance.isUnmounted && doHydrate())

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

diff --cc packages/runtime-vapor/src/apiTemplateRef.ts
Simple merge

diff --cc packages/runtime-vapor/src/block.ts
Simple merge

diff --cc packages/runtime-vapor/src/component.ts
Simple merge

diff --cc packages/runtime-vapor/src/index.ts
Simple merge