Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion packages/server-renderer/__tests__/ssrTeleport.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Teleport, createApp, h } from 'vue'
import { Teleport, createApp, defineAsyncComponent, h } from 'vue'
import { renderToString } from '../src/renderToString'
import { renderToSimpleStream } from '../src/renderToStream'
import type { SSRContext } from '../src/render'
Expand Down Expand Up @@ -177,4 +177,34 @@ describe('ssrRenderTeleport', () => {
`<!--teleport start anchor--><div>content</div><!--teleport anchor-->`,
)
})

test('teleport resolves nested async content inside suspense', async () => {
const ctx: SSRContext = {}

const AsyncChild = defineAsyncComponent(() =>
Promise.resolve({
render: () => h('span', 'async'),
}),
)
const Wrapper = {
render: () => h('div', h(AsyncChild)),
}
const Comp = {
template:
'<teleport to="#target"><Suspense><Wrapper /></Suspense></teleport>',
components: { Wrapper },
}

const html = await renderToString(
h({
template: '<Comp />',
components: { Comp },
}),
ctx,
)
expect(html).toBe('<!--teleport start--><!--teleport end-->')
expect(ctx.teleports!['#target']).toBe(
`<!--teleport start anchor--><div><span>async</span></div><!--teleport anchor-->`,
)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
})
})
7 changes: 7 additions & 0 deletions packages/server-renderer/src/helpers/ssrRenderTeleport.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { type ComponentInternalInstance, ssrContextKey } from 'vue'
import { isArray, isPromise } from '@vue/shared'
import {
type PushFn,
type SSRBufferItem,
Expand Down Expand Up @@ -39,5 +40,11 @@ export function ssrRenderTeleport(
}

targetBuffer.splice(bufferIndex, 0, teleportContent)
if (
isPromise(teleportContent) ||
(isArray(teleportContent) && teleportContent.hasAsync)
) {
targetBuffer.hasAsync = true
}
parentPush('<!--teleport end-->')
}
2 changes: 1 addition & 1 deletion packages/server-renderer/src/renderToString.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export async function resolveTeleports(context: SSRContext): Promise<void> {
// note: it's OK to await sequentially here because the Promises were
// created eagerly in parallel.
context.teleports[key] = await unrollBuffer(
await Promise.all([context.__teleportBuffers[key]]),
context.__teleportBuffers[key],
)
}
}
Expand Down
Loading