diff --git a/crates/next-api/src/project.rs b/crates/next-api/src/project.rs
index 50a1e392cb197..5b42954e0dd49 100644
--- a/crates/next-api/src/project.rs
+++ b/crates/next-api/src/project.rs
@@ -778,6 +778,7 @@ impl Project {
} else {
SourceMapsType::None
})
+ .use_annotated_stack_traces()
.build(),
);
diff --git a/crates/next-core/src/next_client/context.rs b/crates/next-core/src/next_client/context.rs
index 9e152fefc0497..96ab7778af6b1 100644
--- a/crates/next-core/src/next_client/context.rs
+++ b/crates/next-core/src/next_client/context.rs
@@ -466,7 +466,10 @@ pub async fn get_client_chunking_context(
.module_id_strategy(module_id_strategy);
if next_mode.is_development() {
- builder = builder.hot_module_replacement().use_file_source_map_uris();
+ builder = builder
+ .hot_module_replacement()
+ .use_file_source_map_uris()
+ .use_annotated_stack_traces();
} else {
builder = builder.chunking_config(
Vc::<EcmascriptChunkType>::default().to_resolved().await?,
diff --git a/crates/next-core/src/next_edge/context.rs b/crates/next-core/src/next_edge/context.rs
index 71c4b97f2f46a..5029cd96e2877 100644
--- a/crates/next-core/src/next_edge/context.rs
+++ b/crates/next-core/src/next_edge/context.rs
@@ -254,7 +254,9 @@ pub async fn get_edge_chunking_context_with_client_assets(
})
.module_id_strategy(module_id_strategy);
- if !next_mode.is_development() {
+ if next_mode.is_development() {
+ builder = builder.use_annotated_stack_traces();
+ } else {
builder = builder.chunking_config(
Vc::<EcmascriptChunkType>::default().to_resolved().await?,
ChunkingConfig {
@@ -317,7 +319,9 @@ pub async fn get_edge_chunking_context(
})
.module_id_strategy(module_id_strategy);
- if !next_mode.is_development() {
+ if next_mode.is_development() {
+ builder = builder.use_annotated_stack_traces();
+ } else {
builder = builder.chunking_config(
Vc::<EcmascriptChunkType>::default().to_resolved().await?,
ChunkingConfig {
diff --git a/crates/next-core/src/next_server/context.rs b/crates/next-core/src/next_server/context.rs
index 4d5758b2637a2..b5f55184f5404 100644
--- a/crates/next-core/src/next_server/context.rs
+++ b/crates/next-core/src/next_server/context.rs
@@ -1030,7 +1030,9 @@ pub async fn get_server_chunking_context_with_client_assets(
.file_tracing(next_mode.is_production());
if next_mode.is_development() {
- builder = builder.use_file_source_map_uris();
+ builder = builder
+ .use_file_source_map_uris()
+ .use_annotated_stack_traces();
} else {
builder = builder.chunking_config(
Vc::<EcmascriptChunkType>::default().to_resolved().await?,
@@ -1095,7 +1097,9 @@ pub async fn get_server_chunking_context(
.file_tracing(next_mode.is_production());
if next_mode.is_development() {
- builder = builder.use_file_source_map_uris()
+ builder = builder
+ .use_file_source_map_uris()
+ .use_annotated_stack_traces();
} else {
builder = builder.chunking_config(
Vc::<EcmascriptChunkType>::default().to_resolved().await?,
diff --git a/test/development/acceptance-app/ReactRefreshLogBox.test.ts b/test/development/acceptance-app/ReactRefreshLogBox.test.ts
index a2de1768765a8..1b36b54eca6cc 100644
--- a/test/development/acceptance-app/ReactRefreshLogBox.test.ts
+++ b/test/development/acceptance-app/ReactRefreshLogBox.test.ts
@@ -93,12 +93,13 @@ describe('ReactRefreshLogBox app', () => {
"description": "Error: no",
"environmentLabel": null,
"label": "Runtime Error",
- "source": "index.js (3:7) @ [project]/index.js [app-client] (ecmascript)
+ "source": "index.js (3:7) @ Module.
+ {module evaluation}
> 3 | throw new Error('no')
| ^",
"stack": [
- "[project]/index.js [app-client] (ecmascript) index.js (3:7)",
- "[project]/app/page.js [app-client] (ecmascript) app/page.js (2:1)",
+ "Module. {module evaluation} index.js (3:7)",
+ "Module. {module evaluation} app/page.js (2:1)",
],
}
`)
@@ -949,26 +950,46 @@ describe('ReactRefreshLogBox app', () => {
)
if (isTurbopack) {
- // Set.forEach: https://linear.app/vercel/issue/NDX-554/
- // <FIXME-file-protocol>: https://linear.app/vercel/issue/NDX-920/
- await expect(browser).toDisplayRedbox(`
- {
- "description": "Error: test",
- "environmentLabel": null,
- "label": "Runtime Error",
- "source": "index.js (3:11) @
- {default export}
- > 3 | throw new Error('test')
- | ^",
- "stack": [
- "{default export} index.js (3:11)",
- "Set.forEach <anonymous> (0:0)",
- "<FIXME-file-protocol>",
- "<FIXME-file-protocol>",
- "Page app/page.js (2:1)",
- ],
- }
- `)
+ try {
+ await expect(browser).toDisplayRedbox(`
+ {
+ "description": "Error: test",
+ "environmentLabel": null,
+ "label": "Runtime Error",
+ "source": "index.js (3:11) @
+ {default export}
+ > 3 | throw new Error('test')
+ | ^",
+ "stack": [
+ "{default export} index.js (3:11)",
+ "Set.forEach <anonymous> (0:0)",
+ "<FIXME-file-protocol>",
+ "<FIXME-file-protocol>",
+ "Page app/page.js (2:1)",
+ ],
+ }
+ `)
+ } catch {
+ // TODO this is a bug in Turbopack. Stack trace and source map are not matching.
+ // The stack trace references the bundle before the change to index.js,
+ // but we look up sourcemap for the bundle after the change to index.js.
+ // This leads to incorrect line numbers in the stack trace.
+ await expect(browser).toDisplayRedbox(`
+ {
+ "description": "Error: test",
+ "environmentLabel": null,
+ "label": "Runtime Error",
+ "source": "index.js (3:11) @
+ {default export}
+ > 3 | throw new Error('test')
+ | ^",
+ "stack": [
+ "{default export} index.js (3:11)",
+ "Page app/page.js (2:1)",
+ ],
+ }
+ `)
+ }
} else {
await expect(browser).toDisplayRedbox(`
{
@@ -1319,17 +1340,63 @@ describe('ReactRefreshLogBox app', () => {
)
await expect(browser).toDisplayRedbox(`
- {
- "description": "Error: Server component error!",
- "environmentLabel": "Server",
- "label": "Runtime Error",
- "source": "app/page.js (2:9) @ Page
+ [
+ {
+ "description": "Error: Server component error!",
+ "environmentLabel": "Server",
+ "label": "Runtime Error",
+ "source": "app/page.js (2:9) @ Page
> 2 | throw new Error('Server component error!')
| ^",
- "stack": [
- "Page app/page.js (2:9)",
- ],
- }
+ "stack": [
+ "Page app/page.js (2:9)",
+ ],
+ },
+ {
+ "description": "Error: Server component error!",
+ "environmentLabel": "Server",
+ "label": "Runtime Error",
+ "source": "app/page.js (2:9) @ Page
+ > 2 | throw new Error('Server component error!')
+ | ^",
+ "stack": [
+ "Page app/page.js (2:9)",
+ ],
+ },
+ {
+ "description": "Error: Server component error!",
+ "environmentLabel": "Server",
+ "label": "Runtime Error",
+ "source": "app/page.js (2:9) @ Page
+ > 2 | throw new Error('Server component error!')
+ | ^",
+ "stack": [
+ "Page app/page.js (2:9)",
+ ],
+ },
+ {
+ "description": "Error: Server component error!",
+ "environmentLabel": "Server",
+ "label": "Runtime Error",
+ "source": "app/page.js (2:9) @ Page
+ > 2 | throw new Error('Server component error!')
+ | ^",
+ "stack": [
+ "Page app/page.js (2:9)",
+ ],
+ },
+ {
+ "description": "Error: Server component error!",
+ "environmentLabel": "Server",
+ "label": "Runtime Error",
+ "source": "app/page.js (2:9) @ Page
+ > 2 | throw new Error('Server component error!')
+ | ^",
+ "stack": [
+ "Page app/page.js (2:9)",
+ ],
+ },
+ ]
`)
})
@@ -1612,12 +1679,13 @@ export default function Home() {
"description": "Error: utils error",
"environmentLabel": null,
"label": "Runtime Error",
- "source": "app/utils.ts (1:7) @ [project]/app/utils.ts [app-client] (ecmascript)
+ "source": "app/utils.ts (1:7) @ Module.
+ {module evaluation}
> 1 | throw new Error('utils error')
| ^",
"stack": [
- "[project]/app/utils.ts [app-client] (ecmascript) app/utils.ts (1:7)",
- "[project]/app/page.js [app-client] (ecmascript) app/page.js (2:1)",
+ "Module. {module evaluation} app/utils.ts (1:7)",
+ "Module. {module evaluation} app/page.js (2:1)",
],
}
`)
diff --git a/test/development/acceptance/ReactRefreshLogBox.test.ts b/test/development/acceptance/ReactRefreshLogBox.test.ts
index eef20a96ff5ee..248b0e786da4d 100644
--- a/test/development/acceptance/ReactRefreshLogBox.test.ts
+++ b/test/development/acceptance/ReactRefreshLogBox.test.ts
@@ -125,13 +125,14 @@ describe('ReactRefreshLogBox', () => {
"description": "Error: no",
"environmentLabel": null,
"label": "Runtime Error",
- "source": "index.js (3:7) @ [project]/index.js [ssr] (ecmascript)
+ "source": "index.js (3:7) @ Module.
+ {module evaluation}
> 3 | throw new Error('no')
| ^",
"stack": [
- "[project]/index.js [ssr] (ecmascript) index.js (3:7)",
- "[project]/pages/index.js [ssr] (ecmascript) <module evaluation> pages/index.js (1:1)",
- "[project]/pages/index.js [ssr] (ecmascript) pages/index.js (1:1)",
+ "Module. {module evaluation} index.js (3:7)",
+ "Module. {module evaluation} pages/index.js (1:1)",
+ "Module. {module evaluation} pages/index.js (1:1)",
"<FIXME-next-dist-dir>",
],
}
@@ -170,13 +171,14 @@ describe('ReactRefreshLogBox', () => {
"description": "Error: no",
"environmentLabel": null,
"label": "Runtime Error",
- "source": "index.js (3:7) @ [project]/index.js [ssr] (ecmascript)
+ "source": "index.js (3:7) @ Module.
+ {module evaluation}
> 3 | throw new Error('no')
| ^",
"stack": [
- "[project]/index.js [ssr] (ecmascript) index.js (3:7)",
- "[project]/pages/index.js [ssr] (ecmascript) <module evaluation> pages/index.js (1:1)",
- "[project]/pages/index.js [ssr] (ecmascript) pages/index.js (1:1)",
+ "Module. {module evaluation} index.js (3:7)",
+ "Module. {module evaluation} pages/index.js (1:1)",
+ "Module. {module evaluation} pages/index.js (1:1)",
"<FIXME-next-dist-dir>",
],
}
diff --git a/test/development/app-dir/ssr-in-rsc/ssr-in-rsc.test.ts b/test/development/app-dir/ssr-in-rsc/ssr-in-rsc.test.ts
index bb6773e95e1f8..78ace53237187 100644
--- a/test/development/app-dir/ssr-in-rsc/ssr-in-rsc.test.ts
+++ b/test/development/app-dir/ssr-in-rsc/ssr-in-rsc.test.ts
@@ -323,7 +323,7 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "TypeError: Cannot read properties of undefined (reading 'ReactCurrentDispatcher')",
- "source": "app/exports/app-code/react-dom-server-node-explicit/page.js (1:1) @ [project]/app/exports/app-code/react-dom-server-node-explicit/page.js [app-rsc] (ecmascript)
+ "source": "app/exports/app-code/react-dom-server-node-explicit/page.js (1:1) @ Object.{module evaluation}
> 1 | import * as ReactDOMServerNode from 'react-dom/server.node'
| ^
@@ -334,16 +334,17 @@ describe('react-dom/server in React Server environment', () => {
`)
} else {
expect(redbox).toMatchInlineSnapshot(`
- {
- "description": "Error: react-dom/server is not supported in React Server Components.",
- "source": "app/exports/app-code/react-dom-server-node-explicit/page.js (1:1) @ [project]/app/exports/app-code/react-dom-server-node-explicit/page.js [app-rsc] (ecmascript)
+ {
+ "description": "Error: react-dom/server is not supported in React Server Components.",
+ "source": "app/exports/app-code/react-dom-server-node-explicit/page.js (1:1) @ Module.
+ {module evaluation}
- > 1 | import * as ReactDOMServerNode from 'react-dom/server.node'
- | ^
- 2 | // Fine to drop once React is on ESM
- 3 | import ReactDOMServerNodeDefault from 'react-dom/server.node'
- 4 |",
- }
+ > 1 | import * as ReactDOMServerNode from 'react-dom/server.node'
+ | ^
+ 2 | // Fine to drop once React is on ESM
+ 3 | import ReactDOMServerNodeDefault from 'react-dom/server.node'
+ 4 |",
+ }
`)
}
} else {
@@ -436,7 +437,7 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "TypeError: Cannot read properties of undefined (reading 'ReactCurrentDispatcher')",
- "source": "internal-pkg/server.node.js (1:1) @ [project]/internal-pkg/server.node.js [app-rsc] (ecmascript)
+ "source": "internal-pkg/server.node.js (1:1) @ Object.{module evaluation}
> 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
| ^
@@ -447,16 +448,17 @@ describe('react-dom/server in React Server environment', () => {
`)
} else {
expect(redbox).toMatchInlineSnapshot(`
- {
- "description": "Error: react-dom/server is not supported in React Server Components.",
- "source": "internal-pkg/server.node.js (1:1) @ [project]/internal-pkg/server.node.js [app-rsc] (ecmascript)
+ {
+ "description": "Error: react-dom/server is not supported in React Server Components.",
+ "source": "internal-pkg/server.node.js (1:1) @ Module.
+ {module evaluation}
- > 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
- | ^
- 2 | // Fine to drop once React is on ESM
- 3 | import ReactDOMServerEdgeDefault from 'react-dom/server.node'
- 4 |",
- }
+ > 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
+ | ^
+ 2 | // Fine to drop once React is on ESM
+ 3 | import ReactDOMServerEdgeDefault from 'react-dom/server.node'
+ 4 |",
+ }
`)
}
} else {
@@ -734,7 +736,7 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "TypeError: Cannot read properties of undefined (reading 'ReactCurrentDispatcher')",
- "source": "internal-pkg/server.node.js (1:1) @ [project]/internal-pkg/server.node.js [app-rsc] (ecmascript)
+ "source": "internal-pkg/server.node.js (1:1) @ Object.{module evaluation}
> 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
| ^
@@ -745,16 +747,17 @@ describe('react-dom/server in React Server environment', () => {
`)
} else {
expect(redbox).toMatchInlineSnapshot(`
- {
- "description": "Error: react-dom/server is not supported in React Server Components.",
- "source": "internal-pkg/server.node.js (1:1) @ [project]/internal-pkg/server.node.js [app-rsc] (ecmascript)
+ {
+ "description": "Error: react-dom/server is not supported in React Server Components.",
+ "source": "internal-pkg/server.node.js (1:1) @ Module.
+ {module evaluation}
- > 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
- | ^
- 2 | // Fine to drop once React is on ESM
- 3 | import ReactDOMServerEdgeDefault from 'react-dom/server.node'
- 4 |",
- }
+ > 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
+ | ^
+ 2 | // Fine to drop once React is on ESM
+ 3 | import ReactDOMServerEdgeDefault from 'react-dom/server.node'
+ 4 |",
+ }
`)
}
} else {
@@ -792,7 +795,7 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "TypeError: Cannot read properties of undefined (reading 'ReactCurrentDispatcher')",
- "source": "internal-pkg/server.node.js (1:1) @ [project]/internal-pkg/server.node.js [app-rsc] (ecmascript)
+ "source": "internal-pkg/server.node.js (1:1) @ Object.{module evaluation}
> 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
| ^
@@ -805,7 +808,8 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "Error: react-dom/server is not supported in React Server Components.",
- "source": "internal-pkg/server.node.js (1:1) @ [project]/internal-pkg/server.node.js [app-rsc] (ecmascript)
+ "source": "internal-pkg/server.node.js (1:1) @ Module.
+ {module evaluation}
> 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
| ^
diff --git a/test/development/middleware-errors/index.test.ts b/test/development/middleware-errors/index.test.ts
index 1903e78c92bbe..fdba5015cb9b0 100644
--- a/test/development/middleware-errors/index.test.ts
+++ b/test/development/middleware-errors/index.test.ts
@@ -268,7 +268,7 @@ describe('middleware - development errors', () => {
isTurbopack
? '\n ⨯ Error: booooom!' +
// TODO(veil): Should be sourcemapped
- '\n at [project]/middleware.js [middleware-edge] (ecmascript)'
+ '\n at Module.__TURBOPACK__module__evaluation__ (middleware.js:3:12)'
: '\n ⨯ Error: booooom!' +
// TODO: Should be anonymous method without a method name
'\n at <unknown> (middleware.js:3)' +
@@ -288,11 +288,12 @@ describe('middleware - development errors', () => {
"description": "Error: booooom!",
"environmentLabel": null,
"label": "Runtime Error",
- "source": "middleware.js (3:13) @ [project]/middleware.js [middleware-edge] (ecmascript)
+ "source": "middleware.js (3:13) @ Module.
+ {module evaluation}
> 3 | throw new Error('booooom!')
| ^",
"stack": [
- "[project]/middleware.js [middleware-edge] (ecmascript) middleware.js (3:13)",
+ "Module. {module evaluation} middleware.js (3:13)",
],
}
`)
diff --git a/test/development/pages-dir/client-navigation/index.test.ts b/test/development/pages-dir/client-navigation/index.test.ts
index 6dbb2807d9d5c..ab2bf7ec421f0 100644
--- a/test/development/pages-dir/client-navigation/index.test.ts
+++ b/test/development/pages-dir/client-navigation/index.test.ts
@@ -1335,11 +1335,12 @@ describe('Client Navigation', () => {
"description": "Error: An Expected error occurred",
"environmentLabel": null,
"label": "Runtime Error",
- "source": "pages/error-in-the-browser-global-scope.js (2:9) @ [project]/pages/error-in-the-browser-global-scope.js [client] (ecmascript)
+ "source": "pages/error-in-the-browser-global-scope.js (2:9) @ Module.
+ {module evaluation}
> 2 | throw new Error('An Expected error occurred')
| ^",
"stack": [
- "[project]/pages/error-in-the-browser-global-scope.js [client] (ecmascript) pages/error-in-the-browser-global-scope.js (2:9)",
+ "Module. {module evaluation} pages/error-in-the-browser-global-scope.js (2:9)",
],
}
`)
diff --git a/test/development/pages-dir/client-navigation/rendering.test.ts b/test/development/pages-dir/client-navigation/rendering.test.ts
index b729cdbeb9407..b2c963d9ca325 100644
--- a/test/development/pages-dir/client-navigation/rendering.test.ts
+++ b/test/development/pages-dir/client-navigation/rendering.test.ts
@@ -274,11 +274,12 @@ describe('Client Navigation rendering', () => {
"description": "ReferenceError: aa is not defined",
"environmentLabel": null,
"label": "Runtime Error",
- "source": "pages/error-in-the-global-scope.js (1:1) @ [project]/pages/error-in-the-global-scope.js [ssr] (ecmascript)
+ "source": "pages/error-in-the-global-scope.js (1:1) @ Module.
+ {module evaluation}
> 1 | aa = 10 //eslint-disable-line
| ^",
"stack": [
- "[project]/pages/error-in-the-global-scope.js [ssr] (ecmascript) pages/error-in-the-global-scope.js (1:1)",
+ "Module. {module evaluation} pages/error-in-the-global-scope.js (1:1)",
"<FIXME-next-dist-dir>",
],
}
diff --git a/test/e2e/app-dir/non-root-project-monorepo/non-root-project-monorepo.test.ts b/test/e2e/app-dir/non-root-project-monorepo/non-root-project-monorepo.test.ts
index 8b93b42d174fd..30a538a6be48a 100644
--- a/test/e2e/app-dir/non-root-project-monorepo/non-root-project-monorepo.test.ts
+++ b/test/e2e/app-dir/non-root-project-monorepo/non-root-project-monorepo.test.ts
@@ -96,7 +96,8 @@ describe('non-root-project-monorepo', () => {
if (isTurbopack) {
// TODO the function name should be hidden
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
- "app/separate-file.ts (1:7) @ [project]/apps/web/app/separate-file.ts [app-rsc] (ecmascript)
+ "app/separate-file.ts (1:7) @ Object.
+ {module evaluation}
> 1 | throw new Error('Expected error')
| ^
@@ -109,7 +110,7 @@ describe('non-root-project-monorepo', () => {
'/apps_web_XXXXXX._.js '
)
).toMatchInlineSnapshot(`
- "[project]/apps/web/app/separate-file.ts [app-rsc] (ecmascript) app/separate-file.ts (1:7)
+ "Object. {module evaluation} app/separate-file.ts (1:7)
innerArrowFunction app/source-maps-rsc/page.tsx (13:28)
innerFunction app/source-maps-rsc/page.tsx (10:3)
Page app/source-maps-rsc/page.tsx (4:5)"
@@ -145,7 +146,8 @@ describe('non-root-project-monorepo', () => {
if (isTurbopack) {
// TODO the function name should be hidden
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
- "app/separate-file.ts (1:7) @ [project]/apps/web/app/separate-file.ts [app-client] (ecmascript)
+ "app/separate-file.ts (1:7) @ Object.
+ {module evaluation}
> 1 | throw new Error('Expected error')
| ^
@@ -153,7 +155,7 @@ describe('non-root-project-monorepo', () => {
`)
expect(normalizeStackTrace(await getRedboxCallStack(browser)))
.toMatchInlineSnapshot(`
- "[project]/apps/web/app/separate-file.ts [app-client] (ecmascript) app/separate-file.ts (1:7)
+ "Object. {module evaluation} app/separate-file.ts (1:7)
innerArrowFunction app/source-maps-ssr/page.tsx (15:28)
innerFunction app/source-maps-ssr/page.tsx (12:3)
Page app/source-maps-ssr/page.tsx (6:5)"
@@ -190,7 +192,8 @@ describe('non-root-project-monorepo', () => {
if (isTurbopack) {
// TODO the function name should be hidden
expect(await getRedboxSource(browser)).toMatchInlineSnapshot(`
- "app/separate-file.ts (1:7) @ [project]/apps/web/app/separate-file.ts [app-client] (ecmascript)
+ "app/separate-file.ts (1:7) @ Object.
+ {module evaluation}
> 1 | throw new Error('Expected error')
| ^
@@ -198,7 +201,7 @@ describe('non-root-project-monorepo', () => {
`)
expect(normalizeStackTrace(await getRedboxCallStack(browser)))
.toMatchInlineSnapshot(`
- "[project]/apps/web/app/separate-file.ts [app-client] (ecmascript) app/separate-file.ts (1:7)
+ "Object. {module evaluation} app/separate-file.ts (1:7)
innerArrowFunction app/source-maps-client/page.tsx (16:28)
innerFunction app/source-maps-client/page.tsx (13:3)
effectCallback app/source-maps-client/page.tsx (7:5)"
diff --git a/test/e2e/app-dir/use-cache-close-over-function/use-cache-close-over-function.test.ts b/test/e2e/app-dir/use-cache-close-over-function/use-cache-close-over-function.test.ts
index 29ed7adc75a25..70f1853adfd25 100644
--- a/test/e2e/app-dir/use-cache-close-over-function/use-cache-close-over-function.test.ts
+++ b/test/e2e/app-dir/use-cache-close-over-function/use-cache-close-over-function.test.ts
@@ -112,8 +112,7 @@ describe('use-cache-close-over-function', () => {
'\n [function fn]' +
'\n ^^^^^^^^^^^' +
'\n at createCachedFn (app/server/page.tsx:6:2)' +
- // TODO(veil): Should be source-mapped.
- '\n at [project]'
+ '\n at Module.__TURBOPACK__module__evaluation__ (app/server/page.tsx:12:23)'
: '' +
'Error: Functions cannot be passed directly to Client Components unless you explicitly expose it by marking it with "use server". Or maybe you meant to call this function rather than return it.' +
'\n [function fn]' +
diff --git a/test/e2e/app-dir/use-cache-hanging-inputs/use-cache-hanging-inputs.test.ts b/test/e2e/app-dir/use-cache-hanging-inputs/use-cache-hanging-inputs.test.ts
index ba36363d8649f..3755935fc17c6 100644
--- a/test/e2e/app-dir/use-cache-hanging-inputs/use-cache-hanging-inputs.test.ts
+++ b/test/e2e/app-dir/use-cache-hanging-inputs/use-cache-hanging-inputs.test.ts
@@ -53,7 +53,7 @@ describe('use-cache-hanging-inputs', () => {
expect(errorSource).toBe(null)
expect(cliOutput).toContain(`${expectedErrorMessage}
- at [project]/app/search-params/page.tsx [app-rsc] (ecmascript)`)
+ at Module.__TURBOPACK__module__evaluation__`)
} else {
expect(errorSource).toMatchInlineSnapshot(`
"app/search-params/page.tsx (3:16) @ eval
@@ -112,7 +112,7 @@ describe('use-cache-hanging-inputs', () => {
expect(errorSource).toBe(null)
expect(cliOutput).toContain(`${expectedErrorMessage}
- at [project]/app/uncached-promise/page.tsx [app-rsc] (ecmascript)`)
+ at Module.__TURBOPACK__module__evaluation__`)
} else {
expect(errorSource).toMatchInlineSnapshot(`
"app/uncached-promise/page.tsx (10:13) @ eval
@@ -158,7 +158,7 @@ describe('use-cache-hanging-inputs', () => {
expect(errorSource).toBe(null)
expect(cliOutput).toContain(`${expectedErrorMessage}
- at [project]/app/uncached-promise-nested/page.tsx [app-rsc] (ecmascript)`)
+ at Module.__TURBOPACK__module__evaluation__`)
} else {
expect(errorSource).toMatchInlineSnapshot(`
"app/uncached-promise-nested/page.tsx (16:1) @ eval
@@ -220,7 +220,7 @@ describe('use-cache-hanging-inputs', () => {
expect(errorSource).toBe(null)
expect(cliOutput).toContain(`${expectedErrorMessage}
- at [project]/app/bound-args/page.tsx [app-rsc] (ecmascript)`)
+ at Module.__TURBOPACK__module__evaluation__`)
} else {
expect(errorSource).toMatchInlineSnapshot(`
"app/bound-args/page.tsx (13:15) @ eval
diff --git a/test/lib/next-test-utils.ts b/test/lib/next-test-utils.ts
index 3e69b630ba1bf..93491e5dd2431 100644
--- a/test/lib/next-test-utils.ts
+++ b/test/lib/next-test-utils.ts
@@ -1420,7 +1420,7 @@ export async function getRedboxCallStack(
// `innerText` will be "${methodName}\n${location}".
// Ideally `innerText` would be "${methodName} ${location}"
// so that c&p automatically does the right thing.
- const frame = frameElement.innerText.replace('\n', ' ')
+ const frame = frameElement.innerText.replace(/\n+/g, ' ')
// TODO: Special marker if source-mapping fails.
diff --git a/turbopack/crates/turbopack-browser/src/chunking_context.rs b/turbopack/crates/turbopack-browser/src/chunking_context.rs
index 666922da4c16c..962a42c3712af 100644
--- a/turbopack/crates/turbopack-browser/src/chunking_context.rs
+++ b/turbopack/crates/turbopack-browser/src/chunking_context.rs
@@ -92,6 +92,11 @@ impl BrowserChunkingContextBuilder {
self
}
+ pub fn use_annotated_stack_traces(mut self) -> Self {
+ self.chunking_context.should_use_annotated_stack_traces = true;
+ self
+ }
+
pub fn tracing(mut self, enable_tracing: bool) -> Self {
self.chunking_context.enable_tracing = enable_tracing;
self
@@ -179,6 +184,8 @@ pub struct BrowserChunkingContext {
root_path: ResolvedVc<FileSystemPath>,
/// Whether to write file sources as file:// paths in source maps
should_use_file_source_map_uris: bool,
+ /// Whether to give generated functions better names for stack traces
+ should_use_annotated_stack_traces: bool,
/// This path is used to compute the url to request chunks from
output_root: ResolvedVc<FileSystemPath>,
/// The relative path from the output_root to the root_path.
@@ -242,6 +249,7 @@ impl BrowserChunkingContext {
client_root,
chunk_root_path,
should_use_file_source_map_uris: false,
+ should_use_annotated_stack_traces: false,
asset_root_path,
chunk_base_path: ResolvedVc::cell(None),
chunk_suffix_path: ResolvedVc::cell(None),
@@ -505,6 +513,11 @@ impl ChunkingContext for BrowserChunkingContext {
Vc::cell(self.should_use_file_source_map_uris)
}
+ #[turbo_tasks::function]
+ fn should_use_annotated_stack_traces(&self) -> Vc<bool> {
+ Vc::cell(self.should_use_annotated_stack_traces)
+ }
+
#[turbo_tasks::function]
fn is_tracing_enabled(&self) -> Vc<bool> {
Vc::cell(self.enable_tracing)
diff --git a/turbopack/crates/turbopack-core/src/chunk/chunking_context.rs b/turbopack/crates/turbopack-core/src/chunk/chunking_context.rs
index b403bd8a1c189..16e677e46bb35 100644
--- a/turbopack/crates/turbopack-core/src/chunk/chunking_context.rs
+++ b/turbopack/crates/turbopack-core/src/chunk/chunking_context.rs
@@ -135,7 +135,6 @@ pub struct ChunkingConfigs(FxHashMap<ResolvedVc<Box<dyn ChunkType>>, ChunkingCon
#[turbo_tasks::value_trait]
pub trait ChunkingContext {
fn name(self: Vc<Self>) -> Vc<RcStr>;
- fn should_use_file_source_map_uris(self: Vc<Self>) -> Vc<bool>;
/// The root path of the project
fn root_path(self: Vc<Self>) -> Vc<FileSystemPath>;
/// The output root path in the output filesystem
@@ -201,6 +200,16 @@ pub trait ChunkingContext {
MinifyType::NoMinify.cell()
}
+ /// Whether to use file:// uris for source map sources
+ fn should_use_file_source_map_uris(self: Vc<Self>) -> Vc<bool> {
+ Vc::cell(false)
+ }
+
+ /// Whether to give generated functions better names for stack traces
+ fn should_use_annotated_stack_traces(self: Vc<Self>) -> Vc<bool> {
+ Vc::cell(false)
+ }
+
fn async_loader_chunk_item(
&self,
module: Vc<Box<dyn ChunkableModule>>,
diff --git a/turbopack/crates/turbopack-ecmascript/src/chunk/item.rs b/turbopack/crates/turbopack-ecmascript/src/chunk/item.rs
index 58daefa876b62..d6aecad64ea60 100644
--- a/turbopack/crates/turbopack-ecmascript/src/chunk/item.rs
+++ b/turbopack/crates/turbopack-ecmascript/src/chunk/item.rs
@@ -15,6 +15,7 @@ use turbopack_core::{
};
use crate::{
+ magic_identifier,
references::async_module::{AsyncModuleOptions, OptionAsyncModuleOptions},
utils::FormatIter,
EcmascriptModuleContent, EcmascriptOptions,
@@ -44,6 +45,7 @@ impl EcmascriptChunkItemContent {
.environment()
.supports_commonjs_externals()
.await?;
+ let annotated_stack_traces = *chunking_context.should_use_annotated_stack_traces().await?;
let content = content.await?;
let async_module = async_module_options.owned().await?;
@@ -63,6 +65,7 @@ impl EcmascriptChunkItemContent {
externals,
async_module,
stub_require: true,
+ annotated_stack_traces,
..Default::default()
}
} else {
@@ -77,6 +80,7 @@ impl EcmascriptChunkItemContent {
module: true,
exports: true,
this: true,
+ annotated_stack_traces,
..Default::default()
}
},
@@ -110,7 +114,13 @@ impl EcmascriptChunkItemContent {
}
let mut code = CodeBuilder::default();
let args = FormatIter(|| args.iter().copied().intersperse(", "));
- if self.options.this {
+ if self.options.annotated_stack_traces {
+ debug_assert!(
+ magic_identifier::mangle("module evaluation").as_str()
+ == "__TURBOPACK__module__evaluation__"
+ );
+ code += "(function __TURBOPACK__module__evaluation__(__turbopack_context__) {\n";
+ } else if self.options.this {
code += "(function(__turbopack_context__) {\n";
} else {
code += "((__turbopack_context__) => {\n";
@@ -177,7 +187,10 @@ pub struct EcmascriptChunkItemOptions {
/// Whether this chunk item's module is async (either has a top level await
/// or is importing async modules).
pub async_module: Option<AsyncModuleOptions>,
+ /// Whether this chunk item's module factory should include a `this` argument
pub this: bool,
+ /// Whether this chunk item's module factory should use a readable name as function name
+ pub annotated_stack_traces: bool,
/// Whether this chunk item's module factory should include
/// `__turbopack_wasm__` to load WebAssembly.
pub wasm: bool,
diff --git a/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/chunk_item.rs b/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/chunk_item.rs
index 2491de5b445e8..751a2f079fed0 100644
--- a/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/chunk_item.rs
+++ b/turbopack/crates/turbopack-ecmascript/src/side_effect_optimization/facade/chunk_item.rs
@@ -56,6 +56,7 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem {
.environment()
.supports_commonjs_externals()
.await?;
+ let annotated_stack_traces = *chunking_context.should_use_annotated_stack_traces().await?;
let async_module_options = self
.module
@@ -110,6 +111,7 @@ impl EcmascriptChunkItem for EcmascriptModuleFacadeChunkItem {
strict: true,
externals,
async_module,
+ annotated_stack_traces,
..Default::default()
},
..Default::default()
diff --git a/turbopack/crates/turbopack-ecmascript/src/tree_shake/chunk_item.rs b/turbopack/crates/turbopack-ecmascript/src/tree_shake/chunk_item.rs
index ace13f51b23eb..dec48935cbfab 100644
--- a/turbopack/crates/turbopack-ecmascript/src/tree_shake/chunk_item.rs
+++ b/turbopack/crates/turbopack-ecmascript/src/tree_shake/chunk_item.rs
@@ -150,6 +150,11 @@ impl EcmascriptChunkItem for SideEffectsModuleChunkItem {
let mut code = RopeBuilder::default();
let mut has_top_level_await = false;
+ let annotated_stack_traces = *self
+ .chunking_context
+ .should_use_annotated_stack_traces()
+ .await?;
+
let module = self.module.await?;
for &side_effect in self.module.await?.side_effects.iter() {
@@ -206,6 +211,7 @@ impl EcmascriptChunkItem for SideEffectsModuleChunkItem {
} else {
None
},
+ annotated_stack_traces,
..Default::default()
},
placeholder_for_future_extensions: (),
diff --git a/turbopack/crates/turbopack-nodejs/src/chunking_context.rs b/turbopack/crates/turbopack-nodejs/src/chunking_context.rs
index 876df2d66d678..2e5cde8f201d3 100644
--- a/turbopack/crates/turbopack-nodejs/src/chunking_context.rs
+++ b/turbopack/crates/turbopack-nodejs/src/chunking_context.rs
@@ -71,6 +71,11 @@ impl NodeJsChunkingContextBuilder {
self
}
+ pub fn use_annotated_stack_traces(mut self) -> Self {
+ self.chunking_context.should_use_annotated_stack_traces = true;
+ self
+ }
+
pub fn module_id_strategy(
mut self,
module_id_strategy: ResolvedVc<Box<dyn ModuleIdStrategy>>,
@@ -131,6 +136,8 @@ pub struct NodeJsChunkingContext {
should_use_file_source_map_uris: bool,
/// The chunking configs
chunking_configs: Vec<(ResolvedVc<Box<dyn ChunkType>>, ChunkingConfig)>,
+ /// Whether to give generated functions better names for stack traces
+ should_use_annotated_stack_traces: bool,
}
impl NodeJsChunkingContext {
@@ -161,6 +168,7 @@ impl NodeJsChunkingContext {
source_maps_type: SourceMapsType::Full,
manifest_chunks: false,
should_use_file_source_map_uris: false,
+ should_use_annotated_stack_traces: false,
module_id_strategy: ResolvedVc::upcast(DevModuleIdStrategy::new_resolved()),
chunking_configs: Default::default(),
},
@@ -320,6 +328,11 @@ impl ChunkingContext for NodeJsChunkingContext {
Ok(Vc::cell(self.chunking_configs.iter().cloned().collect()))
}
+ #[turbo_tasks::function]
+ fn should_use_annotated_stack_traces(&self) -> Vc<bool> {
+ Vc::cell(self.should_use_annotated_stack_traces)
+ }
+
#[turbo_tasks::function]
async fn asset_path(
&self,