From 7efb9dba3084816e54e2989d1812c13bba229ee9 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 12 Apr 2022 15:22:11 +0800 Subject: [PATCH] refactor: remove use of Object.assign TS already transpiles spread to Object.assign with target:es2016 --- packages/reactivity/src/effect.ts | 12 ++++-------- packages/runtime-core/src/apiCreateApp.ts | 1 - packages/runtime-core/src/apiWatch.ts | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/reactivity/src/effect.ts b/packages/reactivity/src/effect.ts index 61894ebc2..b69b23897 100644 --- a/packages/reactivity/src/effect.ts +++ b/packages/reactivity/src/effect.ts @@ -237,14 +237,10 @@ export function trackEffects( dep.add(activeEffect!) activeEffect!.deps.push(dep) if (__DEV__ && activeEffect!.onTrack) { - activeEffect!.onTrack( - Object.assign( - { - effect: activeEffect! - }, - debuggerEventExtraInfo - ) - ) + activeEffect!.onTrack({ + effect: activeEffect!, + ...debuggerEventExtraInfo! + }) } } } diff --git a/packages/runtime-core/src/apiCreateApp.ts b/packages/runtime-core/src/apiCreateApp.ts index 98eb8fc84..8b437f2bf 100644 --- a/packages/runtime-core/src/apiCreateApp.ts +++ b/packages/runtime-core/src/apiCreateApp.ts @@ -179,7 +179,6 @@ export function createAppAPI( hydrate?: RootHydrateFunction ): CreateAppFunction { return function createApp(rootComponent, rootProps = null) { - if (!isFunction(rootComponent)) { rootComponent = { ...rootComponent } } diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts index fd09c7434..881a04a66 100644 --- a/packages/runtime-core/src/apiWatch.ts +++ b/packages/runtime-core/src/apiWatch.ts @@ -92,7 +92,7 @@ export function watchPostEffect( effect, null, (__DEV__ - ? Object.assign(options || {}, { flush: 'post' }) + ? { ...options, flush: 'post' } : { flush: 'post' }) as WatchOptionsBase ) } @@ -105,7 +105,7 @@ export function watchSyncEffect( effect, null, (__DEV__ - ? Object.assign(options || {}, { flush: 'sync' }) + ? { ...options, flush: 'sync' } : { flush: 'sync' }) as WatchOptionsBase ) }