build/bundle: use task return value passthrough

src/node/build/bundle.ts

@@ -143,19 +143,18 @@ export async function bundle(
     configFile: config.vite?.configFile
   })
 
-  let clientResult!: Rollup.RollupOutput | null
-  let serverResult!: Rollup.RollupOutput
-
-  await task('building client + server bundles', async () => {
-    clientResult = config.mpa
-      ? null
-      : ((await build(await resolveViteConfig(false))) as Rollup.RollupOutput)
-    serverResult = (await build(
-      await resolveViteConfig(true)
-    )) as Rollup.RollupOutput
-  })
+  const serverResult = await task(
+    'building server bundle',
+    () => resolveViteConfig(true).then(build) as Promise<Rollup.RollupOutput>
+  )
 
-  if (config.mpa) {
+  const clientResult = !config.mpa
+    ? await task(
+        'building client bundle',
+        () =>
+          resolveViteConfig(false).then(build) as Promise<Rollup.RollupOutput>
+      )
+    : await task('building client bundle (MPA)', async () => {
         // in MPA mode, we need to copy over the non-js asset files from the
         // server build since there is no client-side build.
         await Promise.all(
@@ -174,9 +173,11 @@ export async function bundle(
         }
         // build <script client> bundle
         if (Object.keys(clientJSMap).length) {
-      clientResult = await buildMPAClient(clientJSMap, config)
-    }
+          return buildMPAClient(clientJSMap, config)
+        } else {
+          return null
         }
+      })
 
   return { clientResult, serverResult, pageToHashMap }
 }