From b15235da7e56cfe77e6daf2ed058835b74d38948 Mon Sep 17 00:00:00 2001
From: Fran Dios <frankdiox@gmail.com>
Date: Fri, 27 Aug 2021 17:57:51 +0200
Subject: [PATCH] fix: Special handling for ssr.noExternal in mergeConfig

---
 packages/playground/ssr-webworker/vite.config.js | 13 ++++++++++++-
 packages/vite/src/node/config.ts                 |  2 ++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/playground/ssr-webworker/vite.config.js b/packages/playground/ssr-webworker/vite.config.js
index d0e80179498685..82fdf7579e9752 100644
--- a/packages/playground/ssr-webworker/vite.config.js
+++ b/packages/playground/ssr-webworker/vite.config.js
@@ -8,5 +8,16 @@ module.exports = {
   ssr: {
     target: 'webworker',
     noExternal: true
-  }
+  },
+  plugins: [
+    {
+      config() {
+        return {
+          ssr: {
+            noExternal: ['this-should-not-replace-the-boolean']
+          }
+        }
+      }
+    }
+  ]
 }
diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index 5d04918ed48f42..100f31f84231cf 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -649,6 +649,8 @@ function mergeConfigRecursively(
       } else if (key === 'assetsInclude' && rootPath === '') {
         merged[key] = [].concat(existing, value)
         continue
+      } else if (key === 'noExternal' && existing === true) {
+        continue
       }
     }