From b547d300d9d8d7e8bd7da6c004ea86cb50c672fb Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Thu, 10 Jan 2019 22:10:50 +0100
Subject: [PATCH] Show clear error when client build fails in serverless target
 (#6027)

---
 packages/next/build/index.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
index 4933b822..c60b9485 100644
--- a/packages/next/build/index.ts
+++ b/packages/next/build/index.ts
@@ -38,8 +38,13 @@ export default async function build (dir: string, conf = null): Promise<void> {
   let result: CompilerResult = {warnings: [], errors: []}
   if (config.target === 'serverless') {
     const clientResult = await runCompiler([configs[0]])
-    const serverResult = await runCompiler([configs[1]])
-    result = {warnings: [...clientResult.warnings, ...serverResult.warnings], errors: [...clientResult.errors, ...serverResult.errors]}
+    // Fail build if clientResult contains errors
+    if(clientResult.errors.length > 0) {
+      result = {warnings: [...clientResult.warnings], errors: [...clientResult.errors]}
+    } else {
+      const serverResult = await runCompiler([configs[1]])
+      result = {warnings: [...clientResult.warnings, ...serverResult.warnings], errors: [...clientResult.errors, ...serverResult.errors]}
+    }
   } else {
     result = await runCompiler(configs)
   }