From ca4acb61e368ff43f2a7a303c612591de2426ef2 Mon Sep 17 00:00:00 2001 From: Jonathan Wood Date: Tue, 15 Sep 2020 09:55:08 +0100 Subject: [PATCH 1/2] fix: remove unused ParserOptions --- packages/compiler-sfc/src/compileScript.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts index 45b754123fd..ed0911014ec 100644 --- a/packages/compiler-sfc/src/compileScript.ts +++ b/packages/compiler-sfc/src/compileScript.ts @@ -1,7 +1,7 @@ import MagicString from 'magic-string' import { BindingMetadata } from '@vue/compiler-core' import { SFCDescriptor, SFCScriptBlock } from './parse' -import { parse, ParserPlugin, ParserOptions } from '@babel/parser' +import { parse, ParserPlugin } from '@babel/parser' import { babelParserDefaultPlugins, generateCodeFrame } from '@vue/shared' import { Node, From d6eabf8380961da22016a6f4f4a7bda4f4b38d6f Mon Sep 17 00:00:00 2001 From: Jonathan Wood Date: Tue, 15 Sep 2020 10:13:38 +0100 Subject: [PATCH 2/2] replace destroyed with unmounted --- packages/vue/__tests__/index.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/vue/__tests__/index.spec.ts b/packages/vue/__tests__/index.spec.ts index 2de237e2a1b..18c1c182e5a 100644 --- a/packages/vue/__tests__/index.spec.ts +++ b/packages/vue/__tests__/index.spec.ts @@ -24,7 +24,7 @@ describe('compiler + runtime integration', () => { mounted: jest.fn(), activated: jest.fn(), deactivated: jest.fn(), - destroyed: jest.fn() + unmounted: jest.fn() } const toggle = ref(true) @@ -50,7 +50,7 @@ describe('compiler + runtime integration', () => { expect(one.mounted).toHaveBeenCalledTimes(1) expect(one.activated).toHaveBeenCalledTimes(1) expect(one.deactivated).toHaveBeenCalledTimes(0) - expect(one.destroyed).toHaveBeenCalledTimes(0) + expect(one.unmounted).toHaveBeenCalledTimes(0) toggle.value = false await nextTick() @@ -59,7 +59,7 @@ describe('compiler + runtime integration', () => { expect(one.mounted).toHaveBeenCalledTimes(1) expect(one.activated).toHaveBeenCalledTimes(1) expect(one.deactivated).toHaveBeenCalledTimes(1) - expect(one.destroyed).toHaveBeenCalledTimes(0) + expect(one.unmounted).toHaveBeenCalledTimes(0) toggle.value = true await nextTick() @@ -68,7 +68,7 @@ describe('compiler + runtime integration', () => { expect(one.mounted).toHaveBeenCalledTimes(1) expect(one.activated).toHaveBeenCalledTimes(2) expect(one.deactivated).toHaveBeenCalledTimes(1) - expect(one.destroyed).toHaveBeenCalledTimes(0) + expect(one.unmounted).toHaveBeenCalledTimes(0) }) it('should support runtime template via CSS ID selector', () => {