Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/vite/src/node/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,7 @@ export async function _createServer(
"ssrRewriteStacktrace doesn't need to be used for Environment Module Runners.",
)
return ssrRewriteStacktrace(stack, server.environments.ssr.moduleGraph)
.result
},
async reloadModule(module) {
warnFutureDeprecation(config, 'removeServerReloadModule')
Expand Down
22 changes: 20 additions & 2 deletions packages/vite/src/node/ssr/__tests__/ssrStacktrace.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { fileURLToPath } from 'node:url'
import { test } from 'vitest'
import { expect, test } from 'vitest'
import { createServer } from '../../server'

const root = fileURLToPath(new URL('./', import.meta.url))
Expand All @@ -22,8 +22,26 @@ test('call rewriteStacktrace twice', async () => {
for (let i = 0; i < 2; i++) {
try {
await server.ssrLoadModule('/fixtures/modules/has-error.js')
} catch (e) {
} catch (e: any) {
server.ssrFixStacktrace(e)
}
}
})

test('outputs message when stacktrace appears to be already rewritten', async () => {
const server = await createDevServer()
try {
await server.ssrLoadModule('/fixtures/modules/has-error.js')
} catch (e: any) {
// Manually craft an already-rewritten stacktrace with invalid line/column
// that will trigger the alreadyRewritten flag
e.stack = e.stack.replace(
/fixtures\/modules\/has-error\.js:\d+:\d+/,
'fixtures/modules/has-error.js:1:1',
)
server.ssrFixStacktrace(e)
expect(e.message).toContain(
'The stacktrace appears to be already rewritten by something else',
)
}
})
32 changes: 22 additions & 10 deletions packages/vite/src/node/ssr/ssrStacktrace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@ function calculateOffsetOnce() {
export function ssrRewriteStacktrace(
stack: string,
moduleGraph: EnvironmentModuleGraph,
): string {
): { result: string; alreadyRewritten: boolean } {
calculateOffsetOnce()
return stack

let alreadyRewritten = false
const rewritten = stack
.split('\n')
.map((line) => {
return line.replace(
/^ {4}at (?:(\S.*?)\s\()?(.+?):(\d+)(?::(\d+))?\)?/,
(input, varName, id, line, column) => {
(input, varName, id, originalLine, originalColumn) => {
if (!id) return input

const mod = moduleGraph.getModuleById(id)
Expand All @@ -41,13 +43,15 @@ export function ssrRewriteStacktrace(
}

const traced = new TraceMap(rawSourceMap as any)
const line = Number(originalLine) - offset
// stacktrace's column is 1-indexed, but sourcemap's one is 0-indexed
const column = Number(originalColumn) - 1
if (line <= 0 || column < 0) {
alreadyRewritten = true
Comment thread
sapphi-red marked this conversation as resolved.
return input
}

const pos = originalPositionFor(traced, {
line: Number(line) - offset,
// stacktrace's column is 1-indexed, but sourcemap's one is 0-indexed
column: Number(column) - 1,
})

const pos = originalPositionFor(traced, { line, column })
if (!pos.source) {
return input
}
Expand All @@ -65,6 +69,7 @@ export function ssrRewriteStacktrace(
)
})
.join('\n')
return { result: rewritten, alreadyRewritten }
}

export function rebindErrorStacktrace(e: Error, stacktrace: string): void {
Expand Down Expand Up @@ -94,8 +99,15 @@ export function ssrFixStacktrace(
// stacktrace shouldn't be rewritten more than once
if (rewroteStacktraces.has(e)) return

const stacktrace = ssrRewriteStacktrace(e.stack, moduleGraph)
const { result: stacktrace, alreadyRewritten } = ssrRewriteStacktrace(
e.stack,
moduleGraph,
)
rebindErrorStacktrace(e, stacktrace)
if (alreadyRewritten) {
e.message +=
' (The stacktrace appears to be already rewritten by something else, but was passed to vite.ssrFixStacktrace. This may cause incorrect stacktraces.)'
}

rewroteStacktraces.add(e)
}