Merge branch 'main' into docs/social-links

vitest-dev · Nov 30, 2023 · 3c0d097 · 3c0d097
2 parents 85c4b21 + c01c2ff
commit 3c0d097
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 26 deletions.
diff --git a/netlify.toml b/netlify.toml
@@ -1,5 +1,5 @@
 [build.environment]
-  NODE_VERSION = "18"
+  NODE_VERSION = "20"
   # don't need playwright for docs build
   PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"
 

diff --git 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(

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml