From e25b29224bb8ca0f26963747027041d49277cf22 Mon Sep 17 00:00:00 2001
From: Eduard Deisling <edikdeisling@gmail.com>
Date: Fri, 8 Mar 2024 15:36:38 +0200
Subject: [PATCH 1/3] fix: server middleware mode resolve

---
 packages/vite/src/node/server/index.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
index d3029175ce9376..06907e963ab48d 100644
--- a/packages/vite/src/node/server/index.ts
+++ b/packages/vite/src/node/server/index.ts
@@ -158,7 +158,7 @@ export interface ServerOptions extends CommonServerOptions {
 
 export interface ResolvedServerOptions extends ServerOptions {
   fs: Required<FileSystemServeOptions>
-  middlewareMode: boolean
+  middlewareMode: Required<ServerOptions['middlewareMode']>
   sourcemapIgnoreList: Exclude<
     ServerOptions['sourcemapIgnoreList'],
     false | undefined
@@ -786,15 +786,13 @@ export async function _createServer(
   const { proxy } = serverConfig
   if (proxy) {
     const middlewareServer =
-      (isObject(serverConfig.middlewareMode)
-        ? serverConfig.middlewareMode.server
-        : null) || httpServer
+      (isObject(middlewareMode) ? middlewareMode.server : null) || httpServer
     middlewares.use(proxyMiddleware(middlewareServer, proxy, config))
   }
 
   // base
   if (config.base !== '/') {
-    middlewares.use(baseMiddleware(config.rawBase, middlewareMode))
+    middlewares.use(baseMiddleware(config.rawBase, !!middlewareMode))
   }
 
   // open in editor support
@@ -849,7 +847,7 @@ export async function _createServer(
   }
 
   // error handler
-  middlewares.use(errorMiddleware(server, middlewareMode))
+  middlewares.use(errorMiddleware(server, !!middlewareMode))
 
   // httpServer.listen can be called multiple times
   // when port when using next port number
@@ -981,7 +979,7 @@ export function resolveServerOptions(
       raw?.sourcemapIgnoreList === false
         ? () => false
         : raw?.sourcemapIgnoreList || isInNodeModules,
-    middlewareMode: !!raw?.middlewareMode,
+    middlewareMode: raw?.middlewareMode || false,
   }
   let allowDirs = server.fs?.allow
   const deny = server.fs?.deny || ['.env', '.env.*', '*.{crt,pem}']

From c1eaa70a8401353fdf2687e3353104dc2ad350c0 Mon Sep 17 00:00:00 2001
From: Eduard Deisling <edikdeisling@gmail.com>
Date: Fri, 8 Mar 2024 15:51:36 +0200
Subject: [PATCH 2/3] fix: server middleware mode resolve

---
 packages/vite/src/node/server/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
index 06907e963ab48d..5f51c96905c350 100644
--- a/packages/vite/src/node/server/index.ts
+++ b/packages/vite/src/node/server/index.ts
@@ -158,7 +158,7 @@ export interface ServerOptions extends CommonServerOptions {
 
 export interface ResolvedServerOptions extends ServerOptions {
   fs: Required<FileSystemServeOptions>
-  middlewareMode: Required<ServerOptions['middlewareMode']>
+  middlewareMode: Exclude<ServerOptions['middlewareMode'], undefined>
   sourcemapIgnoreList: Exclude<
     ServerOptions['sourcemapIgnoreList'],
     false | undefined

From 62d7aef178ea3dcaaff7c05a7a2f46674d9b95be Mon Sep 17 00:00:00 2001
From: Eduard Deisling <edikdeisling@gmail.com>
Date: Fri, 8 Mar 2024 16:21:17 +0200
Subject: [PATCH 3/3] fix: server middleware mode resolve

---
 packages/vite/src/node/server/index.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
index 5f51c96905c350..bc4b62d070bf98 100644
--- a/packages/vite/src/node/server/index.ts
+++ b/packages/vite/src/node/server/index.ts
@@ -156,9 +156,10 @@ export interface ServerOptions extends CommonServerOptions {
     | ((sourcePath: string, sourcemapPath: string) => boolean)
 }
 
-export interface ResolvedServerOptions extends ServerOptions {
+export interface ResolvedServerOptions
+  extends Omit<ServerOptions, 'fs' | 'middlewareMode' | 'sourcemapIgnoreList'> {
   fs: Required<FileSystemServeOptions>
-  middlewareMode: Exclude<ServerOptions['middlewareMode'], undefined>
+  middlewareMode: NonNullable<ServerOptions['middlewareMode']>
   sourcemapIgnoreList: Exclude<
     ServerOptions['sourcemapIgnoreList'],
     false | undefined