From e159b16ef3dc65de9a1c5f319d59e06d89547bc9 Mon Sep 17 00:00:00 2001 From: Matt Garrett Date: Mon, 19 Aug 2024 19:01:08 -0700 Subject: [PATCH] fix(server-renderer): simplify logic, remove two promises --- packages/server-renderer/src/render.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/server-renderer/src/render.ts b/packages/server-renderer/src/render.ts index 5f105b745e0..ff95dbe60a3 100644 --- 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 = ( - hasAsyncSetup - ? // instance.sp may be null until an async setup resolves, so evaluate it here - (res as Promise).then(() => (prefetches = instance.sp)) - : Promise.resolve() - ) + const p: Promise = Promise.resolve(res as Promise) .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)),