From 97e9ff2a4fab11528546a69da9634993ad8cea55 Mon Sep 17 00:00:00 2001
From: bluwy <bjornlu.dev@gmail.com>
Date: Fri, 10 Mar 2023 17:50:11 +0800
Subject: [PATCH] fix(optimizer): suppress esbuild cancel error

---
 packages/vite/src/node/optimizer/index.ts | 8 ++++++++
 packages/vite/src/node/optimizer/scan.ts  | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
index 45768d81a1b794..c952d7b792d457 100644
--- a/packages/vite/src/node/optimizer/index.ts
+++ b/packages/vite/src/node/optimizer/index.ts
@@ -626,6 +626,14 @@ export function runOptimizeDeps(
 
         return createProcessingResult()
       })
+      .catch((e) => {
+        if (e.errors && e.message.includes('The build was canceled')) {
+          // esbuild logs an error when cancelling, but this is expected so
+          // return an empty result instead
+          return createProcessingResult()
+        }
+        throw e
+      })
       .finally(() => {
         return disposeContext()
       })
diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
index 1eab390405c5bb..7929b337b8a6e4 100644
--- a/packages/vite/src/node/optimizer/scan.ts
+++ b/packages/vite/src/node/optimizer/scan.ts
@@ -111,6 +111,12 @@ export function scanImports(config: ResolvedConfig): {
         })
     })
     .catch(async (e) => {
+      if (e.errors && e.message.includes('The build was canceled')) {
+        // esbuild logs an error when cancelling, but this is expected so
+        // return an empty result instead
+        return { deps: {}, missing: {} }
+      }
+
       const prependMessage = colors.red(`\
   Failed to scan for dependencies from entries:
   ${entries.join('\n')}