Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-25 15:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: move back into Promise.resolve

Browse Source
This commit is contained in:
Julien Huang 2024-08-23 00:16:33 +02:00
parent 1ac48fe0b7
commit 3161c1545e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/nuxt/src/app/composables/component.ts
View File

@ -47,8 +47,7 @@ export const defineNuxtComponent: typeof defineComponent =
_fetchKeyBase: key, _fetchKeyBase: key,
...options, ...options,
setup (props, ctx) { setup (props, ctx) {
const res = setup ? setup(props, ctx) : {} const res = setup ? Promise.resolve(setup(props, ctx)).then(r => r || {}) : {}
const result = Promise.resolve(res).then(() => res || {})
const promises: Promise<any>[] = [] const promises: Promise<any>[] = []
if (options.asyncData) { if (options.asyncData) {
promises.push(runLegacyAsyncData(res, options.asyncData)) promises.push(runLegacyAsyncData(res, options.asyncData))
@ -59,9 +58,9 @@ export const defineNuxtComponent: typeof defineComponent =
useHead(typeof options.head === 'function' ? () => options.head(nuxtApp) : options.head) useHead(typeof options.head === 'function' ? () => options.head(nuxtApp) : options.head)
} }
return Promise.resolve(result) return Promise.resolve(res)
.then(() => Promise.all(promises)) .then(() => Promise.all(promises))
.then(() => result) .then(() => res)
.finally(() => { .finally(() => {
promises.length = 0 promises.length = 0
}) })