diff --git a/packages/runtime-core/src/components/KeepAlive.ts b/packages/runtime-core/src/components/KeepAlive.ts index 4b2c7288581..3fec48140fc 100644 --- a/packages/runtime-core/src/components/KeepAlive.ts +++ b/packages/runtime-core/src/components/KeepAlive.ts @@ -96,8 +96,11 @@ const KeepAliveImpl: ComponentOptions = { // if the internal renderer is not registered, it indicates that this is server-side rendering, // for KeepAlive, we just need to render its children - if (!sharedContext.renderer) { - return slots.default + if (__SSR__ && !sharedContext.renderer) { + return () => { + const children = slots.default && slots.default() + return children && children.length === 1 ? children[0] : children + } } const cache: Cache = new Map() diff --git a/packages/server-renderer/__tests__/render.spec.ts b/packages/server-renderer/__tests__/render.spec.ts index 96e16750917..4fd781fcae2 100644 --- a/packages/server-renderer/__tests__/render.spec.ts +++ b/packages/server-renderer/__tests__/render.spec.ts @@ -676,7 +676,7 @@ function testRender(type: string, render: typeof renderToString) { render: () => h('p', 'hello') } expect(await render(h(KeepAlive, () => h(MyComp)))).toBe( - `

hello

` + `

hello

` ) })