@@ -156,9 +156,10 @@ export interface ServerOptions extends CommonServerOptions {
156
156
| ( ( sourcePath : string , sourcemapPath : string ) => boolean )
157
157
}
158
158
159
- export interface ResolvedServerOptions extends ServerOptions {
159
+ export interface ResolvedServerOptions
160
+ extends Omit < ServerOptions , 'fs' | 'middlewareMode' | 'sourcemapIgnoreList' > {
160
161
fs : Required < FileSystemServeOptions >
161
- middlewareMode : boolean
162
+ middlewareMode : NonNullable < ServerOptions [ 'middlewareMode' ] >
162
163
sourcemapIgnoreList : Exclude <
163
164
ServerOptions [ 'sourcemapIgnoreList' ] ,
164
165
false | undefined
@@ -786,15 +787,13 @@ export async function _createServer(
786
787
const { proxy } = serverConfig
787
788
if ( proxy ) {
788
789
const middlewareServer =
789
- ( isObject ( serverConfig . middlewareMode )
790
- ? serverConfig . middlewareMode . server
791
- : null ) || httpServer
790
+ ( isObject ( middlewareMode ) ? middlewareMode . server : null ) || httpServer
792
791
middlewares . use ( proxyMiddleware ( middlewareServer , proxy , config ) )
793
792
}
794
793
795
794
// base
796
795
if ( config . base !== '/' ) {
797
- middlewares . use ( baseMiddleware ( config . rawBase , middlewareMode ) )
796
+ middlewares . use ( baseMiddleware ( config . rawBase , ! ! middlewareMode ) )
798
797
}
799
798
800
799
// open in editor support
@@ -849,7 +848,7 @@ export async function _createServer(
849
848
}
850
849
851
850
// error handler
852
- middlewares . use ( errorMiddleware ( server , middlewareMode ) )
851
+ middlewares . use ( errorMiddleware ( server , ! ! middlewareMode ) )
853
852
854
853
// httpServer.listen can be called multiple times
855
854
// when port when using next port number
@@ -981,7 +980,7 @@ export function resolveServerOptions(
981
980
raw ?. sourcemapIgnoreList === false
982
981
? ( ) => false
983
982
: raw ?. sourcemapIgnoreList || isInNodeModules ,
984
- middlewareMode : ! ! raw ?. middlewareMode ,
983
+ middlewareMode : raw ?. middlewareMode || false ,
985
984
}
986
985
let allowDirs = server . fs ?. allow
987
986
const deny = server . fs ?. deny || [ '.env' , '.env.*' , '*.{crt,pem}' ]
0 commit comments