diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts index 938318d4a9f..1f4df1248c0 100644 --- a/packages/runtime-core/src/componentProps.ts +++ b/packages/runtime-core/src/componentProps.ts @@ -363,7 +363,7 @@ export function normalizePropsOptions( } if (!raw && !hasExtends) { - return (comp.__props = EMPTY_ARR) + return (comp.__props = EMPTY_ARR as any) } if (isArray(raw)) { diff --git a/packages/runtime-core/src/componentRenderUtils.ts b/packages/runtime-core/src/componentRenderUtils.ts index 39f53603c56..a3da6e0ff4f 100644 --- a/packages/runtime-core/src/componentRenderUtils.ts +++ b/packages/runtime-core/src/componentRenderUtils.ts @@ -226,7 +226,7 @@ const getChildRoot = ( return [vnode, undefined] } const rawChildren = vnode.children as VNodeArrayChildren - const dynamicChildren = vnode.dynamicChildren as VNodeArrayChildren + const dynamicChildren = vnode.dynamicChildren const childRoot = filterSingleRoot(rawChildren) if (!childRoot) { return [vnode, undefined] @@ -235,10 +235,12 @@ const getChildRoot = ( const dynamicIndex = dynamicChildren ? dynamicChildren.indexOf(childRoot) : -1 const setRoot = (updatedRoot: VNode) => { rawChildren[index] = updatedRoot - if (dynamicIndex > -1) { - dynamicChildren[dynamicIndex] = updatedRoot - } else if (dynamicChildren && updatedRoot.patchFlag > 0) { - dynamicChildren.push(updatedRoot) + if (dynamicChildren) { + if (dynamicIndex > -1) { + dynamicChildren[dynamicIndex] = updatedRoot + } else if (updatedRoot.patchFlag > 0) { + vnode.dynamicChildren = [...dynamicChildren, updatedRoot] + } } } return [normalizeVNode(childRoot), setRoot] diff --git a/packages/runtime-core/src/vnode.ts b/packages/runtime-core/src/vnode.ts index 56ff85f5eea..87ef17e6148 100644 --- a/packages/runtime-core/src/vnode.ts +++ b/packages/runtime-core/src/vnode.ts @@ -243,7 +243,7 @@ export function createBlock( true /* isBlock: prevent a block from tracking itself */ ) // save current block children on the block vnode - vnode.dynamicChildren = currentBlock || EMPTY_ARR + vnode.dynamicChildren = currentBlock || (EMPTY_ARR as any) // close block closeBlock() // a block is always going to be patched, so track it as a child of its diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index f32988096ba..bf58efbded4 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -28,7 +28,7 @@ export const babelParserDefaultPlugins = [ export const EMPTY_OBJ: { readonly [key: string]: any } = __DEV__ ? Object.freeze({}) : {} -export const EMPTY_ARR: [] = [] +export const EMPTY_ARR = __DEV__ ? Object.freeze([]) : [] export const NOOP = () => {} diff --git a/packages/vue/__tests__/index.spec.ts b/packages/vue/__tests__/index.spec.ts index 18c1c182e5a..ae1f35bc259 100644 --- a/packages/vue/__tests__/index.spec.ts +++ b/packages/vue/__tests__/index.spec.ts @@ -1,3 +1,4 @@ +import { EMPTY_ARR } from '@vue/shared' import { createApp, ref, nextTick, reactive } from '../src' describe('compiler + runtime integration', () => { @@ -281,4 +282,14 @@ describe('compiler + runtime integration', () => { await nextTick() expect(container.innerHTML).toBe(`
2
1
`) }) + + // #2413 + it('EMPTY_ARR should not change', () => { + const App = { + template: `
{{ v }}
` + } + const container = document.createElement('div') + createApp(App).mount(container) + expect(EMPTY_ARR.length).toBe(0) + }) })