From 642d65ba6190a87a2f4d534f545672a1a0f10f1c Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Wed, 4 May 2022 02:46:10 +0800
Subject: [PATCH] fix: only handle merge ssr.noExternal (#8003)

---
 .../vite/src/node/__tests__/config.spec.ts    | 24 +++++++++++++++++++
 packages/vite/src/node/config.ts              |  6 ++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/node/__tests__/config.spec.ts b/packages/vite/src/node/__tests__/config.spec.ts
index dd427c19433475..ca7a2e76122cd0 100644
--- a/packages/vite/src/node/__tests__/config.spec.ts
+++ b/packages/vite/src/node/__tests__/config.spec.ts
@@ -157,6 +157,30 @@ describe('mergeConfig', () => {
 
     expect(mergeConfig(baseConfig, newConfig)).toEqual(mergedConfig)
   })
+
+  test('handles ssr.noExternal', () => {
+    const baseConfig = {
+      ssr: {
+        noExternal: true
+      }
+    }
+
+    const newConfig = {
+      ssr: {
+        noExternal: ['foo']
+      }
+    }
+
+    const mergedConfig = {
+      ssr: {
+        noExternal: true
+      }
+    }
+
+    // merging either ways, `ssr.noExternal: true` should take highest priority
+    expect(mergeConfig(baseConfig, newConfig)).toEqual(mergedConfig)
+    expect(mergeConfig(newConfig, baseConfig)).toEqual(mergedConfig)
+  })
 })
 
 describe('resolveConfig', () => {
diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index 27a107f3e2098c..531fe169f72de0 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -745,7 +745,11 @@ function mergeConfigRecursively(
     } else if (key === 'assetsInclude' && rootPath === '') {
       merged[key] = [].concat(existing, value)
       continue
-    } else if (key === 'noExternal' && (existing === true || value === true)) {
+    } else if (
+      key === 'noExternal' &&
+      rootPath === 'ssr' &&
+      (existing === true || value === true)
+    ) {
       merged[key] = true
       continue
     }