From 32d65d40c55b7df1a814820d5117c360f9d449a4 Mon Sep 17 00:00:00 2001
From: Divyansh Singh <40380293+brc-dd@users.noreply.github.com>
Date: Tue, 4 Jul 2023 11:48:35 +0530
Subject: [PATCH] perf: fix race conditions with cache (#2579)

---
 src/node/build/build.ts  |  4 ++--
 src/node/build/bundle.ts | 12 ++++++------
 src/node/build/render.ts |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/node/build/build.ts b/src/node/build/build.ts
index 3713ead3..ed71ffc3 100644
--- a/src/node/build/build.ts
+++ b/src/node/build/build.ts
@@ -56,12 +56,12 @@ export async function build(
         ) as OutputChunk)
 
       const cssChunk = (
-        siteConfig.mpa ? serverResult : clientResult
+        siteConfig.mpa ? serverResult : clientResult!
       ).output.find(
         (chunk) => chunk.type === 'asset' && chunk.fileName.endsWith('.css')
       ) as OutputAsset
 
-      const assets = (siteConfig.mpa ? serverResult : clientResult).output
+      const assets = (siteConfig.mpa ? serverResult : clientResult!).output
         .filter(
           (chunk) => chunk.type === 'asset' && !chunk.fileName.endsWith('.css')
         )
diff --git a/src/node/build/bundle.ts b/src/node/build/bundle.ts
index 179b908c..fda61462 100644
--- a/src/node/build/bundle.ts
+++ b/src/node/build/bundle.ts
@@ -31,7 +31,7 @@ export async function bundle(
   config: SiteConfig,
   options: BuildOptions
 ): Promise<{
-  clientResult: RollupOutput
+  clientResult: RollupOutput | null
   serverResult: RollupOutput
   pageToHashMap: Record<string, string>
 }> {
@@ -142,16 +142,16 @@ export async function bundle(
     }
   })
 
-  let clientResult: RollupOutput
+  let clientResult: RollupOutput | null
   let serverResult: RollupOutput
 
   const spinner = ora()
   spinner.start('building client + server bundles...')
   try {
-    ;[clientResult, serverResult] = await (Promise.all([
-      config.mpa ? null : build(await resolveViteConfig(false)),
-      build(await resolveViteConfig(true))
-    ]) as Promise<[RollupOutput, RollupOutput]>)
+    clientResult = config.mpa
+      ? null
+      : ((await build(await resolveViteConfig(false))) as RollupOutput)
+    serverResult = (await build(await resolveViteConfig(true))) as RollupOutput
   } catch (e) {
     spinner.stopAndPersist({
       symbol: failMark
diff --git a/src/node/build/render.ts b/src/node/build/render.ts
index b3be8cc9..6bd51f13 100644
--- a/src/node/build/render.ts
+++ b/src/node/build/render.ts
@@ -24,8 +24,8 @@ export async function renderPage(
   config: SiteConfig,
   page: string, // foo.md
   result: RollupOutput | null,
-  appChunk: OutputChunk | undefined,
-  cssChunk: OutputAsset | undefined,
+  appChunk: OutputChunk | null,
+  cssChunk: OutputAsset | null,
   assets: string[],
   pageToHashMap: Record<string, string>,
   hashMapString: string,