mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-25 07:05:11 +00:00
fix: result
This commit is contained in:
parent
47ac6bb843
commit
1ac48fe0b7
@ -48,7 +48,7 @@ export const defineNuxtComponent: typeof defineComponent =
|
||||
...options,
|
||||
setup (props, ctx) {
|
||||
const res = setup ? setup(props, ctx) : {}
|
||||
|
||||
const result = Promise.resolve(res).then(() => res || {})
|
||||
const promises: Promise<any>[] = []
|
||||
if (options.asyncData) {
|
||||
promises.push(runLegacyAsyncData(res, options.asyncData))
|
||||
@ -59,9 +59,9 @@ export const defineNuxtComponent: typeof defineComponent =
|
||||
useHead(typeof options.head === 'function' ? () => options.head(nuxtApp) : options.head)
|
||||
}
|
||||
|
||||
return Promise.resolve(res)
|
||||
return Promise.resolve(result)
|
||||
.then(() => Promise.all(promises))
|
||||
.then(() => res)
|
||||
.then(() => result)
|
||||
.finally(() => {
|
||||
promises.length = 0
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user