@@ -156,9 +156,10 @@ export interface ServerOptions extends CommonServerOptions {
156156 | ( ( sourcePath : string , sourcemapPath : string ) => boolean )
157157}
158158
159- export interface ResolvedServerOptions extends ServerOptions {
159+ export interface ResolvedServerOptions
160+ extends Omit < ServerOptions , 'fs' | 'middlewareMode' | 'sourcemapIgnoreList' > {
160161 fs : Required < FileSystemServeOptions >
161- middlewareMode : boolean
162+ middlewareMode : NonNullable < ServerOptions [ 'middlewareMode' ] >
162163 sourcemapIgnoreList : Exclude <
163164 ServerOptions [ 'sourcemapIgnoreList' ] ,
164165 false | undefined
@@ -786,15 +787,13 @@ export async function _createServer(
786787 const { proxy } = serverConfig
787788 if ( proxy ) {
788789 const middlewareServer =
789- ( isObject ( serverConfig . middlewareMode )
790- ? serverConfig . middlewareMode . server
791- : null ) || httpServer
790+ ( isObject ( middlewareMode ) ? middlewareMode . server : null ) || httpServer
792791 middlewares . use ( proxyMiddleware ( middlewareServer , proxy , config ) )
793792 }
794793
795794 // base
796795 if ( config . base !== '/' ) {
797- middlewares . use ( baseMiddleware ( config . rawBase , middlewareMode ) )
796+ middlewares . use ( baseMiddleware ( config . rawBase , ! ! middlewareMode ) )
798797 }
799798
800799 // open in editor support
@@ -849,7 +848,7 @@ export async function _createServer(
849848 }
850849
851850 // error handler
852- middlewares . use ( errorMiddleware ( server , middlewareMode ) )
851+ middlewares . use ( errorMiddleware ( server , ! ! middlewareMode ) )
853852
854853 // httpServer.listen can be called multiple times
855854 // when port when using next port number
@@ -981,7 +980,7 @@ export function resolveServerOptions(
981980 raw ?. sourcemapIgnoreList === false
982981 ? ( ) => false
983982 : raw ?. sourcemapIgnoreList || isInNodeModules ,
984- middlewareMode : ! ! raw ?. middlewareMode ,
983+ middlewareMode : raw ?. middlewareMode || false ,
985984 }
986985 let allowDirs = server . fs ?. allow
987986 const deny = server . fs ?. deny || [ '.env' , '.env.*' , '*.{crt,pem}' ]
0 commit comments