From 4d315deb2f5f9e8ca562330945310f72d1f64753 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Mon, 16 Aug 2021 23:23:31 +0800 Subject: [PATCH] chore: rename `onDispose` to `onScopeDispose` in warnings and tests --- packages/reactivity/__tests__/effectScope.spec.ts | 6 +++--- packages/reactivity/src/effectScope.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/reactivity/__tests__/effectScope.spec.ts b/packages/reactivity/__tests__/effectScope.spec.ts index 6028882772f..9eac6da1ac6 100644 --- a/packages/reactivity/__tests__/effectScope.spec.ts +++ b/packages/reactivity/__tests__/effectScope.spec.ts @@ -173,7 +173,7 @@ describe('reactivity/effect/scope', () => { expect(doubled).toBe(undefined) }) - it('should fire onDispose hook', () => { + it('should fire onScopeDispose hook', () => { let dummy = 0 const scope = new EffectScope() @@ -192,7 +192,7 @@ describe('reactivity/effect/scope', () => { expect(dummy).toBe(7) }) - it('should warn onDispose() is called when there is no active effect scope', () => { + it('should warn onScopeDispose() is called when there is no active effect scope', () => { const spy = jest.fn() const scope = new EffectScope() scope.run(() => { @@ -204,7 +204,7 @@ describe('reactivity/effect/scope', () => { onScopeDispose(spy) expect( - '[Vue warn] onDispose() is called when there is no active effect scope to be associated with.' + '[Vue warn] onScopeDispose() is called when there is no active effect scope to be associated with.' ).toHaveBeenWarned() scope.stop() diff --git a/packages/reactivity/src/effectScope.ts b/packages/reactivity/src/effectScope.ts index 05a700be43e..864443f85b8 100644 --- a/packages/reactivity/src/effectScope.ts +++ b/packages/reactivity/src/effectScope.ts @@ -98,7 +98,7 @@ export function onScopeDispose(fn: () => void) { activeEffectScope.cleanups.push(fn) } else if (__DEV__) { warn( - `onDispose() is called when there is no active effect scope` + + `onScopeDispose() is called when there is no active effect scope` + ` to be associated with.` ) }