Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 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 eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default antfu(
'test/network-imports/public/[email protected]',
'test/coverage-test/src/transpiled.js',
'test/coverage-test/src/original.ts',
'test/cli/deps/error/index.js',
'examples/**/mockServiceWorker.js',
'examples/sveltekit/.svelte-kit',
'packages/browser/**/esm-client-injector.js',
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-node/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ export class ViteNodeServer {
}

const sourcemap = this.options.sourcemap ?? 'inline'
if (sourcemap === 'inline' && result && !id.includes('node_modules')) {
if (sourcemap === 'inline' && result) {
result = await this.processTransformResult(filepath, result)
}

Expand Down
8 changes: 8 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions test/cli/deps/error/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import 'node:path'

export function testStack() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently ssr transform doesn't preserve lines with export, so this repro fails on main.

innerTestStack()
}

import 'node:util'

function innerTestStack() {
throw new Error('__TEST_STACK__')
}
6 changes: 6 additions & 0 deletions test/cli/deps/error/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@vitest/test-dep-error",
"type": "module",
"private": true,
"exports": "./index.js"
}
6 changes: 6 additions & 0 deletions test/cli/fixtures/stacktraces/error-in-package.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { test } from 'vitest'
import { testStack } from "@vitest/test-dep-error"

test('error in package', () => {
testStack()
})
1 change: 1 addition & 0 deletions test/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"@types/ws": "^8.5.9",
"@vitejs/plugin-basic-ssl": "^1.0.2",
"@vitest/runner": "workspace:^",
"@vitest/test-dep-error": "file:./deps/error",
"@vitest/utils": "workspace:*",
"debug": "^4.3.4",
"unplugin-swc": "^1.4.4",
Expand Down
53 changes: 53 additions & 0 deletions test/cli/test/__snapshots__/stacktraces.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,48 @@ Error: Something truly horrible has happened!
"
`;

exports[`stacktrace in dependency package > external 1`] = `
"
⎯⎯ Failed Tests 1 ⎯⎯

FAIL error-in-package.test.js > error in package
Error: __TEST_STACK__
❯ innerTestStack (NODE_MODULES)/@vitest/test-dep-error/index.js:10:9
❯ testStack (NODE_MODULES)/@vitest/test-dep-error/index.js:4:3
❯ error-in-package.test.js:5:12
3|
4| test('error in package', () => {
5| testStack()
| ^
6| })
7|

⎯⎯[1/1]⎯

"
`;

exports[`stacktrace in dependency package > inline 1`] = `
"
⎯⎯ Failed Tests 1 ⎯⎯

FAIL error-in-package.test.js > error in package
Error: __TEST_STACK__
❯ innerTestStack (NODE_MODULES)/@vitest/test-dep-error/index.js:10:9
8|
9| function innerTestStack() {
10| throw new Error('__TEST_STACK__')
| ^
11| }
12|
❯ testStack (NODE_MODULES)/@vitest/test-dep-error/index.js:4:3
❯ error-in-package.test.js:5:12

⎯⎯[1/1]⎯

"
`;

exports[`stacktrace in vmThreads 1`] = `
"
⎯⎯ Failed Tests 1 ⎯⎯
Expand Down Expand Up @@ -117,6 +159,17 @@ exports[`stacktraces should respect sourcemaps > error-in-deps.test.js 1`] = `
"
`;

exports[`stacktraces should respect sourcemaps > error-in-package.test.js 1`] = `
" ❯ error-in-package.test.js:5:12
3|
4| test('error in package', () => {
5| testStack()
| ^
6| })
7|
"
`;

exports[`stacktraces should respect sourcemaps > error-with-stack.test.js 1`] = `
" ❯ d error-with-stack.test.js:20:9
18|
Expand Down
28 changes: 28 additions & 0 deletions test/cli/test/stacktraces.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,30 @@ describe('stacktrace filtering', async () => {
})
})

describe('stacktrace in dependency package', () => {
const root = resolve(__dirname, '../fixtures/stacktraces')
const testFile = resolve(root, './error-in-package.test.js')

it('external', async () => {
const { stderr } = await runVitest({
root,
}, [testFile])
expect(removeNodeModules(removeLines(stderr))).toMatchSnapshot()
})

it('inline', async () => {
const { stderr } = await runVitest({
root,
server: {
deps: {
inline: ['@vitest/test-dep-error'],
},
},
}, [testFile])
expect(removeNodeModules(removeLines(stderr))).toMatchSnapshot()
})
})

it.runIf(major < 22)('stacktrace in vmThreads', async () => {
const root = resolve(__dirname, '../fixtures/stacktraces')
const testFile = resolve(root, './error-with-stack.test.js')
Expand All @@ -82,3 +106,7 @@ it.runIf(major < 22)('stacktrace in vmThreads', async () => {
function removeLines(log: string) {
return log.replace(/⎯{2,}/g, '⎯⎯')
}

function removeNodeModules(log: string) {
return log.replace(/[^ ]*\/node_modules\//g, '(NODE_MODULES)/')
}
Loading