fix(hmr): refactor hmrRerender to remove dirtyInstance parameter and ensure proper cleanup

Author: edison1105

packages/reactivity/src/effectScope.ts

@@ -87,6 +87,13 @@ export class EffectScope implements ReactiveNode {
     if (sub !== undefined) {
       unlink(sub)
     }
+    this.cleanup()
+  }
+
+  /**
+   * @internal
+   */
+  cleanup(): void {
     cleanup(this)
   }
 }

packages/runtime-core/src/component.ts

@@ -548,7 +548,7 @@ export interface GenericComponentInstance {
   /**
    * @internal vapor only
    */
-  hmrRerender?: (dirtyInstance?: any) => void
+  hmrRerender?: () => void
   /**
    * @internal vapor only
    */

packages/runtime-core/src/hmr.ts

@@ -172,7 +172,7 @@ function reload(id: string, newComp: HMRComponent): void {
           isHmrUpdating = true
           const parent = instance.parent! as ComponentInternalInstance
           if (parent.vapor) {
-            parent.hmrRerender!(instance)
+            parent.hmrRerender!()
           } else {
             if (!(parent.effect.flags! & EffectFlags.STOP)) {
               parent.renderCache = []

packages/runtime-vapor/src/hmr.ts

@@ -15,16 +15,12 @@ import {
 } from './component'
 import { isArray } from '@vue/shared'
 
-export function hmrRerender(
-  instance: VaporComponentInstance,
-  dirtyInstance?: VaporComponentInstance,
-): void {
+export function hmrRerender(instance: VaporComponentInstance): void {
   const normalized = normalizeBlock(instance.block)
   const parent = normalized[0].parentNode!
   const anchor = normalized[normalized.length - 1].nextSibling
-  // When dirty instance is provided, instance is its parent component
-  // and dirty instance needs to be unmount to ensure unregister HMR
-  if (dirtyInstance) unmountComponent(dirtyInstance)
+  // cleanup scope, ensure child components are unregister hmr and unmount
+  instance.scope.cleanup()
   remove(instance.block, parent)
   const prev = setCurrentInstance(instance)
   if (instance.renderEffects) {
@@ -44,7 +40,7 @@ export function hmrReload(
 ): void {
   // if parent is KeepAlive, we need to rerender it
   if (instance.parent && isKeepAlive(instance.parent)) {
-    instance.parent.hmrRerender!(instance)
+    instance.parent.hmrRerender!()
     return
   }
   const normalized = normalizeBlock(instance.block)