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
10 changes: 8 additions & 2 deletions packages/utils/src/serialize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export function serializeValue(val: any, seen: WeakMap<WeakKey, any> = new WeakM
obj = Object.getPrototypeOf(obj)
}
if (val instanceof Error) {
safe(() => val.message = normalizeErrorMessage(val.message))
safe(() => clone.message = normalizeErrorMessage(val.message))
}
return clone
}
Expand All @@ -136,5 +136,11 @@ function safe(fn: () => void) {
}

function normalizeErrorMessage(message: string) {
return message.replace(/__(vite_ssr_import|vi_import)_\d+__\./g, '')
return message
// vite 7+
.replace(/\(0\s?,\s?__vite_ssr_import_\d+__.(\w+)\)/g, '$1')
// vite <7
.replace(/__(vite_ssr_import|vi_import)_\d+__\./g, '')
// vitest-browser-* errors will have __vitest_<componentId>__ in their messages
.replace(/getByTestId('__vitest_\d+__')/g, 'page')
}
5 changes: 4 additions & 1 deletion packages/utils/src/source-map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,10 @@ export function parseSingleV8Stack(raw: string): ParsedStack | null {

if (method) {
method = method
.replace(/__vite_ssr_import_\d+__\./g, '')
// vite 7+
.replace(/\(0\s?,\s?__vite_ssr_import_\d+__.(\w+)\)/g, '$1')
// vite <7
.replace(/__(vite_ssr_import|vi_import)_\d+__\./g, '')
.replace(/(Object\.)?__vite_ssr_export_default__\s?/g, '')
}

Expand Down
6 changes: 4 additions & 2 deletions packages/vitest/src/node/ast-collect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,10 @@ function astParseFile(filepath: string, code: string) {
}

message = message
// Vite SSR injects these
.replace(/__vite_ssr_import_\d+__\./g, '')
// vite 7+
.replace(/\(0\s?,\s?__vite_ssr_import_\d+__.(\w+)\)/g, '$1')
// vite <7
.replace(/__(vite_ssr_import|vi_import)_\d+__\./g, '')
// Vitest module mocker injects these
.replace(/__vi_import_\d+__\./g, '')

Expand Down
6 changes: 6 additions & 0 deletions test/cli/fixtures/fails/exports-error.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { test, vi } from 'vitest'

test('__vite_ssr_import__ is removed in error', () => {
// vi is not a function
vi()
})
2 changes: 2 additions & 0 deletions test/cli/test/__snapshots__/fails.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ exports[`should fail expect-soft.test.ts 1`] = `"Error: expect.soft() can only b

exports[`should fail expect-unreachable.test.ts 1`] = `"AssertionError: expected "hi" not to be reached"`;

exports[`should fail exports-error.test.js 1`] = `"TypeError: vi is not a function"`;

exports[`should fail hook-timeout.test.ts 1`] = `"Error: Hook timed out in 10ms."`;

exports[`should fail hooks-called.test.ts 1`] = `
Expand Down
2 changes: 1 addition & 1 deletion test/cli/test/fails.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { expect, it } from 'vitest'
import { runInlineTests, runVitest, ts } from '../../test-utils'

const root = resolve(import.meta.dirname, '../fixtures/fails')
const files = await glob(['**/*.test.ts'], { cwd: root, dot: true, expandDirectories: false })
const files = await glob(['**/*.test.{ts,js}'], { cwd: root, dot: true, expandDirectories: false })

it.each(files)('should fail %s', async (file) => {
const { stderr } = await runVitest({ root }, [file])
Expand Down
Loading