Unverified Commit 60b60683 authored by Will Binns-Smith's avatar Will Binns-Smith Committed by GitHub

Update to `turbopack-240215.5` (#62119)

Includes:
- https://github.com/vercel/turbo/pull/7401

This makes “conversion to class component” Turbopack tests pass.
parent 3c4ec650
...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.8", features = [ ...@@ -37,11 +37,11 @@ swc_core = { version = "0.90.8", features = [
testing = { version = "0.35.18" } testing = { version = "0.35.18" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.4" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.5" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros.. # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.4" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.5" }
# [TODO]: need to refactor embed_directory! macro usage in next-core # [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.4" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240215.5" }
# General Deps # General Deps
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
"@types/ws": "8.2.0", "@types/ws": "8.2.0",
"@vercel/ncc": "0.34.0", "@vercel/ncc": "0.34.0",
"@vercel/nft": "0.26.4", "@vercel/nft": "0.26.4",
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.4", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.5",
"acorn": "8.5.0", "acorn": "8.5.0",
"amphtml-validator": "1.0.35", "amphtml-validator": "1.0.35",
"anser": "1.4.9", "anser": "1.4.9",
......
...@@ -1074,8 +1074,8 @@ importers: ...@@ -1074,8 +1074,8 @@ importers:
specifier: 0.26.4 specifier: 0.26.4
version: 0.26.4 version: 0.26.4
'@vercel/turbopack-ecmascript-runtime': '@vercel/turbopack-ecmascript-runtime':
specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.4 specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.5
version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.4(react-refresh@0.12.0)(webpack@5.90.0)' version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.5(react-refresh@0.12.0)(webpack@5.90.0)'
acorn: acorn:
specifier: 8.5.0 specifier: 8.5.0
version: 8.5.0 version: 8.5.0
...@@ -25639,9 +25639,9 @@ packages: ...@@ -25639,9 +25639,9 @@ packages:
/zwitch@2.0.4: /zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
'@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.4(react-refresh@0.12.0)(webpack@5.90.0)': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.5(react-refresh@0.12.0)(webpack@5.90.0)':
resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.4} resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.5}
id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.4' id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240215.5'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
......
...@@ -137,6 +137,17 @@ exports[`ReactRefreshLogBox app turbo boundaries 1`] = ` ...@@ -137,6 +137,17 @@ exports[`ReactRefreshLogBox app turbo boundaries 1`] = `
| ^" | ^"
`; `;
exports[`ReactRefreshLogBox app turbo conversion to class component (1) 1`] = `
"Child.js (4:11) @ ClickCount.render
2 | export default class ClickCount extends Component {
3 | render() {
> 4 | throw new Error()
| ^
5 | }
6 | }"
`;
exports[`ReactRefreshLogBox app turbo logbox: anchors links in error messages 1`] = `"Error: end http://nextjs.org"`; exports[`ReactRefreshLogBox app turbo logbox: anchors links in error messages 1`] = `"Error: end http://nextjs.org"`;
exports[`ReactRefreshLogBox app turbo logbox: anchors links in error messages 2`] = `"http://nextjs.org/"`; exports[`ReactRefreshLogBox app turbo logbox: anchors links in error messages 2`] = `"http://nextjs.org/"`;
......
...@@ -5,7 +5,7 @@ import { sandbox } from 'development-sandbox' ...@@ -5,7 +5,7 @@ import { sandbox } from 'development-sandbox'
import { outdent } from 'outdent' import { outdent } from 'outdent'
describe('Error overlay - RSC build errors', () => { describe('Error overlay - RSC build errors', () => {
const { next } = nextTestSetup({ const { next, isTurbopack } = nextTestSetup({
files: new FileRef(path.join(__dirname, 'fixtures', 'rsc-build-errors')), files: new FileRef(path.join(__dirname, 'fixtures', 'rsc-build-errors')),
dependencies: { dependencies: {
react: 'latest', react: 'latest',
...@@ -223,9 +223,23 @@ describe('Error overlay - RSC build errors', () => { ...@@ -223,9 +223,23 @@ describe('Error overlay - RSC build errors', () => {
await next.patchFile(file, uncomment) await next.patchFile(file, uncomment)
expect(await session.hasRedbox()).toBe(true) expect(await session.hasRedbox()).toBe(true)
if (isTurbopack) {
expect(await session.getRedboxSource()).toMatchInlineSnapshot(`
"./app/server-with-errors/client-only-in-server/client-only-lib.js:1:1
Parsing ecmascript source code failed
> 1 | import 'client-only'
| ^^^^^^^^^^^^^^^^^^^^
2 |
3 | export default function ClientOnlyLib() {
4 | return 'client-only-lib'
You're importing a component that imports client-only. It only works in a Client Component but none of its parents are marked with "use client", so they're Server Components by default.\\nLearn more: https://nextjs.org/docs/getting-started/react-essentials\\n\\n"
`)
} else {
expect(await session.getRedboxSource()).toInclude( expect(await session.getRedboxSource()).toInclude(
`You're importing a component that imports client-only. It only works in a Client Component but none of its parents are marked with "use client", so they're Server Components by default.` `You're importing a component that imports client-only. It only works in a Client Component but none of its parents are marked with "use client", so they're Server Components by default.`
) )
}
await cleanup() await cleanup()
}) })
......
...@@ -72,6 +72,8 @@ exports[`ReactRefreshLogBox default should strip whitespace correctly with newli ...@@ -72,6 +72,8 @@ exports[`ReactRefreshLogBox default should strip whitespace correctly with newli
exports[`ReactRefreshLogBox turbo boundaries 1`] = `null`; exports[`ReactRefreshLogBox turbo boundaries 1`] = `null`;
exports[`ReactRefreshLogBox turbo conversion to class component (1) 1`] = `null`;
exports[`ReactRefreshLogBox turbo logbox: anchors links in error messages 1`] = `"Error: end http://nextjs.org"`; exports[`ReactRefreshLogBox turbo logbox: anchors links in error messages 1`] = `"Error: end http://nextjs.org"`;
exports[`ReactRefreshLogBox turbo logbox: anchors links in error messages 2`] = `"http://nextjs.org/"`; exports[`ReactRefreshLogBox turbo logbox: anchors links in error messages 2`] = `"http://nextjs.org/"`;
......
...@@ -927,16 +927,14 @@ ...@@ -927,16 +927,14 @@
"ReactRefreshLogBox app turbo Should not show __webpack_exports__ when exporting anonymous arrow function", "ReactRefreshLogBox app turbo Should not show __webpack_exports__ when exporting anonymous arrow function",
"ReactRefreshLogBox app turbo Unhandled errors and rejections opens up in the minimized state", "ReactRefreshLogBox app turbo Unhandled errors and rejections opens up in the minimized state",
"ReactRefreshLogBox app turbo boundaries", "ReactRefreshLogBox app turbo boundaries",
"ReactRefreshLogBox app turbo conversion to class component (1)",
"ReactRefreshLogBox app turbo logbox: anchors links in error messages", "ReactRefreshLogBox app turbo logbox: anchors links in error messages",
"ReactRefreshLogBox app turbo module init error not shown", "ReactRefreshLogBox app turbo module init error not shown",
"ReactRefreshLogBox app turbo server component can recover from error thrown in the module", "ReactRefreshLogBox app turbo server component can recover from error thrown in the module",
"ReactRefreshLogBox app turbo should strip whitespace correctly with newline", "ReactRefreshLogBox app turbo should strip whitespace correctly with newline",
"ReactRefreshLogBox app turbo unterminated JSX" "ReactRefreshLogBox app turbo unterminated JSX"
], ],
"failed": [ "failed": ["ReactRefreshLogBox app turbo css syntax errors"],
"ReactRefreshLogBox app turbo conversion to class component (1)",
"ReactRefreshLogBox app turbo css syntax errors"
],
"pending": [ "pending": [
"ReactRefreshLogBox app default Call stack count is correct for client error", "ReactRefreshLogBox app default Call stack count is correct for client error",
"ReactRefreshLogBox app default Call stack count is correct for server error", "ReactRefreshLogBox app default Call stack count is correct for server error",
...@@ -1279,6 +1277,7 @@ ...@@ -1279,6 +1277,7 @@
"test/development/acceptance/ReactRefreshLogBox.test.ts": { "test/development/acceptance/ReactRefreshLogBox.test.ts": {
"passed": [ "passed": [
"ReactRefreshLogBox turbo boundaries", "ReactRefreshLogBox turbo boundaries",
"ReactRefreshLogBox turbo conversion to class component (1)",
"ReactRefreshLogBox turbo logbox: anchors links in error messages", "ReactRefreshLogBox turbo logbox: anchors links in error messages",
"ReactRefreshLogBox turbo module init error not shown", "ReactRefreshLogBox turbo module init error not shown",
"ReactRefreshLogBox turbo non-Error errors are handled properly", "ReactRefreshLogBox turbo non-Error errors are handled properly",
...@@ -1298,7 +1297,7 @@ ...@@ -1298,7 +1297,7 @@
"ReactRefreshLogBox default unterminated JSX", "ReactRefreshLogBox default unterminated JSX",
"ReactRefreshLogBox turbo internal package errors" "ReactRefreshLogBox turbo internal package errors"
], ],
"flakey": ["ReactRefreshLogBox turbo conversion to class component (1)"], "flakey": [],
"runtimeError": false "runtimeError": false
}, },
"test/development/acceptance/ReactRefreshLogBoxMisc.test.ts": { "test/development/acceptance/ReactRefreshLogBoxMisc.test.ts": {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment