From d121a9bc7e7af59adb2d2803954cfeee95b35270 Mon Sep 17 00:00:00 2001 From: Yuchao Date: Tue, 12 Apr 2022 17:14:23 +1000 Subject: [PATCH] fix(runtime-core): Avoid mutating original options object in createApp (#4840) fix #4398 --- .../__tests__/helpers/resolveAssets.spec.ts | 4 +-- packages/runtime-core/src/apiCreateApp.ts | 5 ++++ .../runtime-dom/__tests__/createApp.spec.ts | 29 +++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/packages/runtime-core/__tests__/helpers/resolveAssets.spec.ts b/packages/runtime-core/__tests__/helpers/resolveAssets.spec.ts index 44434a256d5..fdcde4639fc 100644 --- a/packages/runtime-core/__tests__/helpers/resolveAssets.spec.ts +++ b/packages/runtime-core/__tests__/helpers/resolveAssets.spec.ts @@ -91,9 +91,9 @@ describe('resolveAssets', () => { const root = nodeOps.createElement('div') app.mount(root) - expect(component1!).toBe(Root) // explicit self name reference + expect(component1!).toMatchObject(Root) // explicit self name reference expect(component2!).toBe(Foo) // successful resolve take higher priority - expect(component3!).toBe(Root) // fallback when resolve fails + expect(component3!).toMatchObject(Root) // fallback when resolve fails }) describe('warning', () => { diff --git a/packages/runtime-core/src/apiCreateApp.ts b/packages/runtime-core/src/apiCreateApp.ts index ae2f58418dc..98eb8fc844f 100644 --- a/packages/runtime-core/src/apiCreateApp.ts +++ b/packages/runtime-core/src/apiCreateApp.ts @@ -179,6 +179,11 @@ export function createAppAPI( hydrate?: RootHydrateFunction ): CreateAppFunction { return function createApp(rootComponent, rootProps = null) { + + if (!isFunction(rootComponent)) { + rootComponent = { ...rootComponent } + } + if (rootProps != null && !isObject(rootProps)) { __DEV__ && warn(`root props passed to app.mount() must be an object.`) rootProps = null diff --git a/packages/runtime-dom/__tests__/createApp.spec.ts b/packages/runtime-dom/__tests__/createApp.spec.ts index 00c9282e1b3..86b25f5c211 100644 --- a/packages/runtime-dom/__tests__/createApp.spec.ts +++ b/packages/runtime-dom/__tests__/createApp.spec.ts @@ -12,4 +12,33 @@ describe('createApp for dom', () => { expect(root.children.length).toBe(1) expect(root.children[0] instanceof SVGElement).toBe(true) }) + + // #4398 + test('should not mutate original root component options object', () => { + + const originalObj = { + data() { + return { + counter: 0 + } + } + } + + const handler = jest.fn(msg => { + expect(msg).toMatch(`Component is missing template or render function`) + }) + + const Root = { ...originalObj} + + const app = createApp(Root) + app.config.warnHandler = handler + app.mount(document.createElement('div')) + + // ensure mount is based on a copy of Root object rather than Root object itself + expect(app._component).not.toBe(Root) + + // ensure no mutation happened to Root object + expect(originalObj).toMatchObject(Root) + + }) })