Merge branch 'minor' into setup-render

Author: zhiyuanzmj

packages/reactivity/src/effectScope.ts

@@ -73,6 +73,17 @@ export class EffectScope implements ReactiveNode {
       return
     }
     this.flags = EffectFlags.STOP
+    this.reset()
+    const sub = this.subs
+    if (sub !== undefined) {
+      unlink(sub)
+    }
+  }
+
+  /**
+   * @internal
+   */
+  reset(): void {
     let dep = this.deps
     while (dep !== undefined) {
       const node = dep.dep
@@ -83,10 +94,6 @@ export class EffectScope implements ReactiveNode {
         dep = unlink(dep, this)
       }
     }
-    const sub = this.subs
-    if (sub !== undefined) {
-      unlink(sub)
-    }
     cleanup(this)
   }
 }

packages/runtime-core/src/hmr.ts

@@ -117,13 +117,14 @@ function reload(id: string, newComp: HMRComponent): void {
   if (!record) return
 
   newComp = normalizeClassComponent(newComp)
+  const isVapor = record.initialDef.__vapor
   // update initial def (for not-yet-rendered components)
   updateComponentDef(record.initialDef, newComp)
 
   // create a snapshot which avoids the set being mutated during updates
   const instances = [...record.instances]
 
-  if (newComp.__vapor && !instances.some(i => i.ceReload)) {
+  if (isVapor && newComp.__vapor && !instances.some(i => i.ceReload)) {
     // For multiple instances with the same __hmrId, remove styles first before reload
     // to avoid the second instance's style removal deleting the first instance's
     // newly added styles (since hmrReload is synchronous)

packages/runtime-vapor/src/component.ts

@@ -592,8 +592,7 @@ export class VaporComponentInstance<
   asyncDep: Promise<any> | null
   asyncResolved: boolean
 
-  // for HMR and vapor custom element
-  // all render effects associated with this instance
+  // for vapor custom element
   renderEffects?: RenderEffect[]
 
   hasFallthrough: boolean

packages/runtime-vapor/src/hmr.ts

@@ -19,12 +19,10 @@ export function hmrRerender(instance: VaporComponentInstance): void {
   const normalized = normalizeBlock(instance.block)
   const parent = normalized[0].parentNode!
   const anchor = normalized[normalized.length - 1].nextSibling
+  // reset scope to avoid stale effects
+  instance.scope.reset()
   remove(instance.block, parent)
   const prev = setCurrentInstance(instance)
-  if (instance.renderEffects) {
-    instance.renderEffects.forEach(e => e.stop())
-    instance.renderEffects = []
-  }
   pushWarningContext(instance)
   devRender(instance)
   popWarningContext()

packages/runtime-vapor/src/renderEffect.ts

@@ -44,8 +44,8 @@ export class RenderEffect extends ReactiveEffect {
           : void 0
       }
 
-      if (__DEV__ || instance.type.ce) {
-        // register effect for stopping them during HMR rerender
+      // register effect for vapor custom element update
+      if (instance.type.ce) {
         ;(instance.renderEffects || (instance.renderEffects = [])).push(this)
       }
       job.i = instance