Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: server middleware mode resolve #16122

Merged
merged 3 commits into from
Mar 11, 2024
Merged

fix: server middleware mode resolve #16122

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e25b292
fix: server middleware mode resolve
edikdeisling Mar 8, 2024
c1eaa70
fix: server middleware mode resolve
edikdeisling Mar 8, 2024
62d7aef
fix: server middleware mode resolve
edikdeisling Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions packages/vite/src/node/server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: boolean
middlewareMode: NonNullable<ServerOptions['middlewareMode']>
sourcemapIgnoreList: Exclude<
ServerOptions['sourcemapIgnoreList'],
false | undefined
Expand Down Expand Up @@ -786,15 +787,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
Expand Down Expand Up @@ -849,7 +848,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
Expand Down Expand Up @@ -981,7 +980,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}']
Expand Down