fix(server-renderer): simplify logic, remove two promises

vuejs · Aug 20, 2024 · e159b16 · e159b16
1 parent 7af4f77
commit e159b16
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/packages/server-renderer/src/render.ts b/packages/server-renderer/src/render.ts
@@ -96,13 +96,10 @@ export function renderComponentVNode(
   const hasAsyncSetup = isPromise(res)
   let prefetches = instance.sp /* LifecycleHooks.SERVER_PREFETCH */
   if (hasAsyncSetup || prefetches) {
-    let p: Promise<unknown> = (
-      hasAsyncSetup
-        ? // instance.sp may be null until an async setup resolves, so evaluate it here
-          (res as Promise<void>).then(() => (prefetches = instance.sp))
-        : Promise.resolve()
-    )
+    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
+        prefetches = instance.sp
         if (prefetches) {
           return Promise.all(
             prefetches.map(prefetch => prefetch.call(instance.proxy)),