From c607dfd39965943ea913527c92d08a3dfb1e6524 Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sleuths.slews0s@icloud.com>
Date: Thu, 30 Nov 2023 17:30:42 +0100
Subject: [PATCH] fix(browser): respect "server" option in vite config

---
 packages/vitest/src/integrations/browser/server.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/vitest/src/integrations/browser/server.ts b/packages/vitest/src/integrations/browser/server.ts
index 84a12a8ce157..2485b2fe7479 100644
--- a/packages/vitest/src/integrations/browser/server.ts
+++ b/packages/vitest/src/integrations/browser/server.ts
@@ -39,7 +39,10 @@ export async function createBrowserServer(project: WorkspaceProject, configFile:
           // browser never runs in middleware mode
           server.middlewareMode = false
 
-          config.server = server
+          config.server = {
+            ...config.server,
+            ...server,
+          }
           config.server.fs ??= {}
           config.server.fs.allow = config.server.fs.allow || []
           config.server.fs.allow.push(