From 8654a5cb7141e3c317a83877ba77428fbe46b135 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Thu, 26 May 2022 17:16:23 +0200
Subject: [PATCH] add safety if builder doesn't expose a bail method
 (builder-vite backwards compat)

---
 lib/core-server/src/build-static.ts | 4 ++--
 lib/core-server/src/dev-server.ts   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/core-server/src/build-static.ts b/lib/core-server/src/build-static.ts
index ec14b578a61..98808c66a00 100644
--- a/lib/core-server/src/build-static.ts
+++ b/lib/core-server/src/build-static.ts
@@ -184,11 +184,11 @@ export async function buildStaticStandalone(options: CLIOptions & LoadOptions &
 
   const [managerStats, previewStats] = await Promise.all([
     manager.catch(async (err) => {
-      await previewBuilder.bail();
+      await previewBuilder?.bail();
       throw err;
     }),
     preview.catch(async (err) => {
-      await managerBuilder.bail();
+      await managerBuilder?.bail();
       throw err;
     }),
     ...extractTasks,
diff --git a/lib/core-server/src/dev-server.ts b/lib/core-server/src/dev-server.ts
index 18996a968c6..9321edd2cd8 100644
--- a/lib/core-server/src/dev-server.ts
+++ b/lib/core-server/src/dev-server.ts
@@ -161,7 +161,7 @@ export async function storybookDevServer(options: Options) {
 
   const [previewResult, managerResult] = await Promise.all([
     preview.catch(async (err) => {
-      await managerBuilder.bail();
+      await managerBuilder?.bail();
       throw err;
     }),
     manager
@@ -171,7 +171,7 @@ export async function storybookDevServer(options: Options) {
       //   return result;
       // })
       .catch(async (err) => {
-        await previewBuilder.bail();
+        await previewBuilder?.bail();
         throw err;
       }),
   ]);