From: Evan You Date: Tue, 12 Apr 2022 07:22:11 +0000 (+0800) Subject: refactor: remove use of Object.assign X-Git-Tag: v3.2.32~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7efb9dba3084816e54e2989d1812c13bba229ee9;p=thirdparty%2Fvuejs%2Fcore.git refactor: remove use of Object.assign TS already transpiles spread to Object.assign with target:es2016 --- diff --git a/packages/reactivity/src/effect.ts b/packages/reactivity/src/effect.ts index 61894ebc2e..b69b238975 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 98eb8fc844..8b437f2bfd 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 fd09c7434e..881a04a664 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 ) }