refactor: add parent param to EffectScope constructor

packages/reactivity/src/effectScope.ts

@@ -34,13 +34,13 @@ export class EffectScope {
  */
  private index: number | undefined
 
- constructor(public detached = false) {
- this.parent = activeEffectScope
- if (!detached && activeEffectScope) {
-  this.index =
-  (activeEffectScope.scopes || (activeEffectScope.scopes = [])).push(
-  this,
-  ) - 1
+ constructor(
+ public detached = false,
+ parent = activeEffectScope,
+ ) {
+ this.parent = parent
+ if (!detached && parent) {
+ this.index = (parent.scopes || (parent.scopes = [])).push(this) - 1
  }
  }
 

packages/runtime-vapor/src/blockEffectScope.ts

@@ -1,4 +1,4 @@
-import { EffectScope, getCurrentScope } from '@vue/reactivity'
+import { EffectScope } from '@vue/reactivity'
 import type { ComponentInternalInstance } from './component'
 import type { DirectiveBindingsMap } from './directives'
 
@@ -23,11 +23,7 @@ export class BlockEffectScope extends EffectScope {
  instance: ComponentInternalInstance,
  parentScope: EffectScope | null,
  ) {
- const isInOtherScope = parentScope && parentScope !== getCurrentScope()
- // TODO refactor: add parent param to `EffectScope` constructor
- isInOtherScope && parentScope.on()
- super(!parentScope)
- isInOtherScope && parentScope.off()
+ super(false, parentScope || undefined)
  this.im = false
  this.it = instance
  }

packages/runtime-vapor/src/component.ts

@@ -353,7 +353,7 @@ export function createComponentInstance(
  */
  // [VaporLifecycleHooks.SERVER_PREFETCH]: null,
  }
- instance.scope = new BlockEffectScope(instance, parent ? parent.scope : null)
+ instance.scope = new BlockEffectScope(instance, parent && parent.scope)
  initProps(instance, rawProps, !isFunction(component), once)
  initSlots(instance, slots, dynamicSlots)
  instance.emit = emit.bind(null, instance)