Skip to content

[pull] canary from vercel:canary #248

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

Merged
merged 2 commits into from
Aug 2, 2025
Merged

[pull] canary from vercel:canary #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
825753a
Turbopack: name the module factory function (#73553)
sokra Aug 2, 2025
da7cbb1
[turbopack] Use Arrays instead of objects to bootstrap chunks (#81877)
lukesandberg Aug 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion packages/next/src/next-devtools/dev-overlay/components/code-frame/code-frame.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ export const CODE_FRAME_STYLES = `
}

.code-frame-link [data-text] {
display: inline-flex;
text-align: left;
margin: auto 6px;
}
Expand Down
15 changes: 7 additions & 8 deletions test/development/acceptance-app/ReactRefreshLogBox.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ describe('ReactRefreshLogBox app', () => {
"description": "no",
"environmentLabel": null,
"label": "Runtime Error",
"source": "index.js (3:7) @ [project]/index.js [app-client] (ecmascript)
"source": "index.js (3:7) @ {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 evaluation} index.js (3:7)",
"{module evaluation} app/page.js (2:1)",
],
}
`)
Expand Down Expand Up @@ -938,8 +938,7 @@ describe('ReactRefreshLogBox app', () => {
"description": "test",
"environmentLabel": null,
"label": "Runtime Error",
"source": "index.js (3:11) @
{default export}
"source": "index.js (3:11) @ {default export}
> 3 | throw new Error('test')
| ^",
"stack": [
Expand Down Expand Up @@ -1570,12 +1569,12 @@ export default function Home() {
"description": "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 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 evaluation} app/utils.ts (1:7)",
"{module evaluation} app/page.js (2:1)",
],
}
`)
Expand Down
16 changes: 8 additions & 8 deletions test/development/acceptance/ReactRefreshLogBox.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ describe('ReactRefreshLogBox', () => {
"description": "no",
"environmentLabel": null,
"label": "Runtime Error",
"source": "index.js (3:7) @ [project]/index.js [ssr] (ecmascript)
"source": "index.js (3:7) @ {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 evaluation} index.js (3:7)",
"{module evaluation} pages/index.js (1:1)",
"{module evaluation} pages/index.js (1:1)",
"<FIXME-next-dist-dir>",
],
}
Expand Down Expand Up @@ -162,13 +162,13 @@ describe('ReactRefreshLogBox', () => {
"description": "no",
"environmentLabel": null,
"label": "Runtime Error",
"source": "index.js (3:7) @ [project]/index.js [ssr] (ecmascript)
"source": "index.js (3:7) @ {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 evaluation} index.js (3:7)",
"{module evaluation} pages/index.js (1:1)",
"{module evaluation} pages/index.js (1:1)",
"<FIXME-next-dist-dir>",
],
}
Expand Down
3 changes: 1 addition & 2 deletions test/development/acceptance/ReactRefreshRegression.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,7 @@ describe('ReactRefreshRegression', () => {
"description": "boom",
"environmentLabel": null,
"label": "Runtime Error",
"source": "pages/index.js (1:36) @
{default export}
"source": "pages/index.js (1:36) @ {default export}
> 1 | export default function () { throw new Error('boom'); }
| ^",
"stack": [
Expand Down
78 changes: 39 additions & 39 deletions test/development/app-dir/ssr-in-rsc/ssr-in-rsc.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "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) @ {module evaluation}

> 1 | import * as ReactDOMServerNode from 'react-dom/server.node'
| ^
Expand All @@ -369,16 +369,16 @@ describe('react-dom/server in React Server environment', () => {
`)
} else {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "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": "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 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 {
Expand Down Expand Up @@ -498,7 +498,7 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "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) @ {module evaluation}

> 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
| ^
Expand All @@ -509,16 +509,16 @@ describe('react-dom/server in React Server environment', () => {
`)
} else {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "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": "react-dom/server is not supported in React Server Components.",
"source": "internal-pkg/server.node.js (1:1) @ {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 {
Expand Down Expand Up @@ -796,27 +796,27 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "Cannot read properties of undefined (reading 'ReactCurrentDispatcher')",
"source": "internal-pkg/server.node.js (1:1) @ [project]/internal-pkg/server.node.js [app-rsc] (ecmascript)

> 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 |",
}
"source": "internal-pkg/server.node.js (1:1) @ {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 |",
}
`)
} else {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "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": "react-dom/server is not supported in React Server Components.",
"source": "internal-pkg/server.node.js (1:1) @ {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 {
Expand Down Expand Up @@ -854,7 +854,7 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "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) @ {module evaluation}

> 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
| ^
Expand All @@ -867,7 +867,7 @@ describe('react-dom/server in React Server environment', () => {
expect(redbox).toMatchInlineSnapshot(`
{
"description": "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 evaluation}

> 1 | import * as ReactDOMServerEdge from 'react-dom/server.node'
| ^
Expand Down
9 changes: 4 additions & 5 deletions test/development/middleware-errors/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ describe('middleware - development errors', () => {
"description": "boom",
"environmentLabel": null,
"label": "Runtime Error",
"source": "middleware.js (3:15) @
{default export}
"source": "middleware.js (3:15) @ {default export}
> 3 | throw new Error('boom')
| ^",
"stack": [
Expand Down Expand Up @@ -268,7 +267,7 @@ describe('middleware - development errors', () => {
isTurbopack
? '\n ⨯ Error: booooom!' +
// TODO(veil): Should be sourcemapped
'\n at [project]/middleware.js [middleware-edge] (ecmascript)'
'\n at __TURBOPACK__module__evaluation__ (middleware.js:3:13)'
: '\n ⨯ Error: booooom!' +
// TODO: Should be anonymous method without a method name
'\n at <unknown> (middleware.js:3)' +
Expand All @@ -288,11 +287,11 @@ describe('middleware - development errors', () => {
"description": "booooom!",
"environmentLabel": null,
"label": "Runtime Error",
"source": "middleware.js (3:13) @ [project]/middleware.js [middleware-edge] (ecmascript)
"source": "middleware.js (3:13) @ {module evaluation}
> 3 | throw new Error('booooom!')
| ^",
"stack": [
"[project]/middleware.js [middleware-edge] (ecmascript) middleware.js (3:13)",
"{module evaluation} middleware.js (3:13)",
],
}
`)
Expand Down
20 changes: 10 additions & 10 deletions test/development/pages-dir/client-navigation/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ describe('Client Navigation', () => {
})
await browser.elementByCss('#empty-props').click()
await expect(browser).toDisplayRedbox(`
{
"description": ""EmptyInitialPropsPage.getInitialProps()" should resolve to an object. But found "null" instead.",
"environmentLabel": null,
"label": "Runtime Error",
"source": null,
"stack": [],
}
`)
{
"description": ""EmptyInitialPropsPage.getInitialProps()" should resolve to an object. But found "null" instead.",
"environmentLabel": null,
"label": "Runtime Error",
"source": null,
"stack": [],
}
`)
expect(pageErrors).toEqual([
expect.objectContaining({
message:
Expand Down Expand Up @@ -353,11 +353,11 @@ describe('Client Navigation', () => {
"description": "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 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 evaluation} pages/error-in-the-browser-global-scope.js (2:9)",
],
}
`)
Expand Down
7 changes: 3 additions & 4 deletions test/development/pages-dir/client-navigation/rendering.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ describe('Client Navigation rendering', () => {
"description": "This is an expected error",
"environmentLabel": null,
"label": "Runtime Error",
"source": "pages/error-inside-page.js (2:9) @
{default export}
"source": "pages/error-inside-page.js (2:9) @ {default export}
> 2 | throw new Error('This is an expected error')
| ^",
"stack": [
Expand Down Expand Up @@ -274,11 +273,11 @@ describe('Client Navigation rendering', () => {
"description": "aa is not defined",
"environmentLabel": null,
"label": "Runtime ReferenceError",
"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 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 evaluation} pages/error-in-the-global-scope.js (1:1)",
"<FIXME-next-dist-dir>",
],
}
Expand Down
Loading
Loading