Skip to content

Commit

Permalink
fix(server-renderer): Fix call to serverPrefetch in server renderer w…
Browse files Browse the repository at this point in the history
…ith an async setup (#10893)
  • Loading branch information
deleteme authored Sep 3, 2024
1 parent 7b5b6e0 commit 6039e25
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 13 deletions.
20 changes: 20 additions & 0 deletions packages/server-renderer/__tests__/render.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,26 @@ function testRender(type: string, render: typeof renderToString) {
expect(html).toBe(`<div>hello</div>`)
})

test('serverPrefetch w/ async setup', async () => {
const msg = Promise.resolve('hello')
const app = createApp({
data() {
return {
msg: '',
}
},
async serverPrefetch() {
this.msg = await msg
},
render() {
return h('div', this.msg)
},
async setup() {},
})
const html = await render(app)
expect(html).toBe(`<div>hello</div>`)
})

// #2763
test('error handling w/ async setup', async () => {
const fn = vi.fn()
Expand Down
25 changes: 12 additions & 13 deletions packages/server-renderer/src/render.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,20 @@ export function renderComponentVNode(
const instance = createComponentInstance(vnode, parentComponent, null)
const res = setupComponent(instance, true /* isSSR */)
const hasAsyncSetup = isPromise(res)
const prefetches = instance.sp /* LifecycleHooks.SERVER_PREFETCH */
let prefetches = instance.sp /* LifecycleHooks.SERVER_PREFETCH */
if (hasAsyncSetup || prefetches) {
let p: Promise<unknown> = hasAsyncSetup
? (res as Promise<void>)
: Promise.resolve()
if (prefetches) {
p = p
.then(() =>
Promise.all(
const p: Promise<unknown> = Promise.resolve(res as Promise<void>)
.then(() => {
// instance.sp may be null until an async setup resolves, so evaluate it here
if (hasAsyncSetup) prefetches = instance.sp
if (prefetches) {
return Promise.all(
prefetches.map(prefetch => prefetch.call(instance.proxy)),
),
)
// Note: error display is already done by the wrapped lifecycle hook function.
.catch(NOOP)
}
)
}
})
// Note: error display is already done by the wrapped lifecycle hook function.
.catch(NOOP)
return p.then(() => renderComponentSubTree(instance, slotScopeId))
} else {
return renderComponentSubTree(instance, slotScopeId)
Expand Down

0 comments on commit 6039e25

Please sign in to comment.