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

fix: use latest module graph in transform middleware #14892

Merged
merged 1 commit into from
Nov 7, 2023
Merged

fix: use latest module graph in transform middleware #14892

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 9 additions & 13 deletions packages/vite/src/node/server/middlewares/transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ const knownIgnoreList = new Set(['/', '/favicon.ico'])
export function transformMiddleware(
server: ViteDevServer,
): Connect.NextHandleFunction {
const {
config: { root, logger },
moduleGraph,
} = server

// Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
return async function viteTransformMiddleware(req, res, next) {
if (req.method !== 'GET' || knownIgnoreList.has(req.url!)) {
Expand Down Expand Up @@ -80,7 +75,7 @@ export function transformMiddleware(
// means that the dependency has already been pre-bundled and loaded
const sourcemapPath = url.startsWith(FS_PREFIX)
? fsPathFromId(url)
: normalizePath(path.resolve(root, url.slice(1)))
: normalizePath(path.resolve(server.config.root, url.slice(1)))
try {
const map = JSON.parse(
await fsp.readFile(sourcemapPath, 'utf-8'),
Expand All @@ -90,7 +85,7 @@ export function transformMiddleware(
map,
sourcemapPath,
server.config.server.sourcemapIgnoreList,
logger,
server.config.logger,
)

return send(req, res, JSON.stringify(map), 'json', {
Expand All @@ -115,8 +110,9 @@ export function transformMiddleware(
}
} else {
const originalUrl = url.replace(/\.map($|\?)/, '$1')
const map = (await moduleGraph.getModuleByUrl(originalUrl, false))
?.transformResult?.map
const map = (
await server.moduleGraph.getModuleByUrl(originalUrl, false)
)?.transformResult?.map
if (map) {
return send(req, res, JSON.stringify(map), 'json', {
headers: server.config.server.headers,
Expand Down Expand Up @@ -162,7 +158,7 @@ export function transformMiddleware(
)}.`
}

logger.warn(colors.yellow(warning))
server.config.logger.warn(colors.yellow(warning))
}
}

Expand Down Expand Up @@ -192,10 +188,10 @@ export function transformMiddleware(
const ifNoneMatch = req.headers['if-none-match']
if (
ifNoneMatch &&
(await moduleGraph.getModuleByUrl(url, false))?.transformResult
(await server.moduleGraph.getModuleByUrl(url, false))?.transformResult
?.etag === ifNoneMatch
) {
debugCache?.(`[304] ${prettifyUrl(url, root)}`)
debugCache?.(`[304] ${prettifyUrl(url, server.config.root)}`)
res.statusCode = 304
return res.end()
}
Expand Down Expand Up @@ -227,7 +223,7 @@ export function transformMiddleware(
res.end()
}
// This timeout is unexpected
logger.error(e.message)
server.config.logger.error(e.message)
return
}
if (e?.code === ERR_OUTDATED_OPTIMIZED_DEP) {
Expand Down