archive/rsnext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix error handling and hanging problems (#47457)

Browse source 
### What?

see https://github.com/vercel/turbo/pull/4324
This commit is contained in:
Tobias Koppers 2023-03-25 00:37:32 +01:00 committed by GitHub
parent 4b4dd8b33a
commit df228500f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 94 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
packages/next-swc/Cargo.lock generated
View file

@ -337,7 +337,7 @@ dependencies = [
[[package]] [[package]]
name = "auto-hash-map" name = "auto-hash-map"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -455,9 +455,9 @@ dependencies = [
[[package]] [[package]]
name = "binding_macros" name = "binding_macros"
version = "0.44.21" version = "0.44.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecc1f7ebb45c51627084dd823c48a396c67f28c42ad3543f4ecc066979e5e996" checksum = "df018ae4a80a06cef289384bf89614451c4f30c6238976ce5c00c1f4379b8eca"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"console_error_panic_hook", "console_error_panic_hook",
@ -2944,9 +2944,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
[[package]] [[package]]
name = "napi" name = "napi"
version = "2.12.0" version = "2.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "564ad12389dd08b0f5e95b9e8b5e88e5e42a234d326639cfa7b0fe643562e0d7" checksum = "8de689526aff547ad70ad7feef42f1a5ccaa6f768910fd93984dae25a3fc9699"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bitflags 2.0.2", "bitflags 2.0.2",
@ -3281,7 +3281,7 @@ dependencies = [
[[package]] [[package]]
name = "node-file-trace" name = "node-file-trace"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap 4.1.11", "clap 4.1.11",
@ -5023,9 +5023,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_bundler" name = "swc_bundler"
version = "0.208.17" version = "0.208.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06d3a1a590a46a8ffbbdf8c9a14ba7c62304b7f09edb318536ac90fd8cdccac8" checksum = "30d90393e5ac143a687f422f288bc706e3139a862d4c790cf301086aabd0cdf9"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",
@ -5727,9 +5727,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_testing" name = "swc_ecma_transforms_testing"
version = "0.125.12" version = "0.125.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5263a184443e798c90db91a2d49e93c062627931e692ee4d691ce32ebad720d9" checksum = "f07bfbd7b8739ad54b564b2c19476978cd4d48ada980307a20469021c3343938"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"anyhow", "anyhow",
@ -6600,7 +6600,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-malloc" name = "turbo-malloc"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"mimalloc", "mimalloc",
] ]
@ -6608,7 +6608,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks" name = "turbo-tasks"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -6638,7 +6638,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-build" name = "turbo-tasks-build"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cargo-lock", "cargo-lock",
@ -6650,7 +6650,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-bytes" name = "turbo-tasks-bytes"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -6665,7 +6665,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-env" name = "turbo-tasks-env"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"dotenvy", "dotenvy",
@ -6679,7 +6679,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-fetch" name = "turbo-tasks-fetch"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indexmap", "indexmap",
@ -6696,7 +6696,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-fs" name = "turbo-tasks-fs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -6725,7 +6725,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-hash" name = "turbo-tasks-hash"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"base16", "base16",
"hex", "hex",
@ -6737,7 +6737,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-macros" name = "turbo-tasks-macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"convert_case 0.6.0", "convert_case 0.6.0",
@ -6751,7 +6751,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-macros-shared" name = "turbo-tasks-macros-shared"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -6761,7 +6761,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-memory" name = "turbo-tasks-memory"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -6783,7 +6783,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-testing" name = "turbo-tasks-testing"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -6795,7 +6795,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack" name = "turbopack"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-recursion", "async-recursion",
@ -6821,7 +6821,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-cli-utils" name = "turbopack-cli-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap 4.1.11", "clap 4.1.11",
@ -6837,7 +6837,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-core" name = "turbopack-core"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -6864,7 +6864,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-create-test-app" name = "turbopack-create-test-app"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap 4.1.11", "clap 4.1.11",
@ -6877,7 +6877,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-css" name = "turbopack-css"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -6899,7 +6899,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-dev" name = "turbopack-dev"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indexmap", "indexmap",
@ -6918,7 +6918,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-dev-server" name = "turbopack-dev-server"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-compression", "async-compression",
@ -6952,7 +6952,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-ecmascript" name = "turbopack-ecmascript"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -6987,7 +6987,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-env" name = "turbopack-env"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -7002,7 +7002,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-json" name = "turbopack-json"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -7017,7 +7017,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-mdx" name = "turbopack-mdx"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"mdxjs", "mdxjs",
@ -7032,7 +7032,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-node" name = "turbopack-node"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-stream", "async-stream",
@ -7044,6 +7044,7 @@ dependencies = [
"mime", "mime",
"once_cell", "once_cell",
"owo-colors", "owo-colors",
"parking_lot",
"regex", "regex",
"serde", "serde",
"serde_json", "serde_json",
@ -7066,7 +7067,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-static" name = "turbopack-static"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -7082,7 +7083,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-swc-utils" name = "turbopack-swc-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"swc_core", "swc_core",
"turbo-tasks", "turbo-tasks",
@ -7093,7 +7094,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-test-utils" name = "turbopack-test-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230323.3#f11b983fb08dfc7c66b538c3815e9a0a7e972a84" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230324.5#f4b3d47ec0f5fd65489bc7f9d89e90d6391c9e0f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"once_cell", "once_cell",

64
packages/next-swc/Cargo.toml
View file

@ -46,38 +46,38 @@ swc_emotion = { version = "0.29.10" }
testing = { version = "0.31.31" } testing = { version = "0.31.31" }
# Turbo crates # Turbo crates
auto-hash-map = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } auto-hash-map = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
node-file-trace = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } node-file-trace = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
swc-ast-explorer = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } swc-ast-explorer = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3", default-features = false } turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5", default-features = false }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-tasks-build = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks-build = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-tasks-bytes = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks-bytes = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-tasks-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-tasks-fetch = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3", default-features = false } turbo-tasks-fetch = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5", default-features = false }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-tasks-hash = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks-hash = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-tasks-macros = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks-macros = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-tasks-macros-shared = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks-macros-shared = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-tasks-testing = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-tasks-testing = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbo-updater = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbo-updater = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-cli-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-cli-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-core = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-core = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-create-test-app = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-create-test-app = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-css = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-css = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-dev = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-dev = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-dev-server = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-dev-server = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-json = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-json = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-mdx = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-mdx = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-node = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-node = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-static = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-static = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-swc-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-swc-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-test-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-test-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
turbopack-tests = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" } turbopack-tests = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
# General Deps # General Deps

4
packages/next-swc/crates/next-core/src/next_config.rs
View file

@ -1,4 +1,4 @@
use anyhow::Result; use anyhow::{Context, Result};
use indexmap::IndexMap; use indexmap::IndexMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
@ -604,7 +604,7 @@ pub async fn load_next_config_internal(
) )
.await?; .await?;
let SingleValue::Single(Ok(val)) = config_value.into_single().await else { let SingleValue::Single(val) = config_value.try_into_single().await.context("Evaluation of Next.js config failed")? else {
return Ok(NextConfig::default().cell()); return Ok(NextConfig::default().cell());
}; };
let next_config: NextConfig = parse_json_with_source_context(val.to_str()?)?; let next_config: NextConfig = parse_json_with_source_context(val.to_str()?)?;

12
packages/next-swc/crates/next-core/src/next_font/google/mod.rs
View file

@ -67,7 +67,11 @@ impl ImportMappingReplacement for NextFontGoogleReplacer {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn result(&self, request: RequestVc) -> Result<ImportMapResultVc> { async fn result(
&self,
_context: FileSystemPathVc,
request: RequestVc,
) -> Result<ImportMapResultVc> {
let request = &*request.await?; let request = &*request.await?;
let Request::Module { let Request::Module {
module: _, module: _,
@ -154,7 +158,11 @@ impl ImportMappingReplacement for NextFontGoogleCssModuleReplacer {
} }
#[turbo_tasks::function] #[turbo_tasks::function]
async fn result(&self, request: RequestVc) -> Result<ImportMapResultVc> { async fn result(
&self,
_context: FileSystemPathVc,
request: RequestVc,
) -> Result<ImportMapResultVc> {
let request = &*request.await?; let request = &*request.await?;
let Request::Module { let Request::Module {
module: _, module: _,

22
packages/next-swc/crates/next-core/src/router.rs
View file

@ -1,10 +1,11 @@
use anyhow::{bail, Context, Result}; use anyhow::{anyhow, bail, Context, Result};
use futures::StreamExt; use futures::StreamExt;
use indexmap::indexmap; use indexmap::indexmap;
use serde::Deserialize; use serde::Deserialize;
use serde_json::json; use serde_json::json;
use turbo_tasks::{ use turbo_tasks::{
primitives::{JsonValueVc, StringsVc}, primitives::{JsonValueVc, StringsVc},
util::SharedError,
CompletionVc, CompletionsVc, Value, CompletionVc, CompletionsVc, Value,
}; };
use turbo_tasks_bytes::{Bytes, Stream}; use turbo_tasks_bytes::{Bytes, Stream};
@ -110,17 +111,17 @@ enum RouterIncomingMessage {
Error(StructuredError), Error(StructuredError),
} }
#[turbo_tasks::value(shared)] #[turbo_tasks::value(eq = "manual", cell = "new", serialization = "none")]
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
pub struct MiddlewareResponse { pub struct MiddlewareResponse {
pub status_code: u16, pub status_code: u16,
pub headers: Vec<(String, String)>, pub headers: Vec<(String, String)>,
#[turbo_tasks(trace_ignore)] #[turbo_tasks(trace_ignore)]
pub body: Stream<Result<Bytes, String>>, pub body: Stream<Result<Bytes, SharedError>>,
} }
#[derive(Debug)] #[derive(Debug)]
#[turbo_tasks::value] #[turbo_tasks::value(eq = "manual", cell = "new", serialization = "none")]
pub enum RouterResult { pub enum RouterResult {
Rewrite(RewriteResponse), Rewrite(RewriteResponse),
Middleware(MiddlewareResponse), Middleware(MiddlewareResponse),
@ -391,17 +392,16 @@ async fn route_internal(
// a buffer directly into the IPC message without having to wrap it in an // a buffer directly into the IPC message without having to wrap it in an
// object. // object.
let body = read.map(|data| { let body = read.map(|data| {
let chunk: RouterIncomingMessage = match data? let chunk: RouterIncomingMessage = data?
.to_str() .to_str()
.context("error decoding string") .context("error decoding string")
.and_then(parse_json_with_source_context) .and_then(parse_json_with_source_context)?;
{
Ok(c) => c,
Err(e) => return Err(e.to_string()),
};
match chunk { match chunk {
RouterIncomingMessage::MiddlewareBody { data } => Ok(Bytes::from(data)), RouterIncomingMessage::MiddlewareBody { data } => Ok(Bytes::from(data)),
m => Err(format!("unexpected message type: {:#?}", m)), m => Err(SharedError::new(anyhow!(
"unexpected message type: {:#?}",
m
))),
} }
}); });
let middleware = MiddlewareResponse { let middleware = MiddlewareResponse {

5
packages/next-swc/crates/next-core/src/router_source.rs
View file

@ -153,10 +153,7 @@ impl ContentSource for NextRouterContentSource {
headers: data.headers.clone(), headers: data.headers.clone(),
body: Body::from_stream(data.body.read().map(|chunk| { body: Body::from_stream(data.body.read().map(|chunk| {
chunk.map_err(|e| { chunk.map_err(|e| {
BodyError::new(format!( BodyError::new(format!("error streaming proxied contents: {}", e))
"error streaming proxied contents: {}",
e.as_str()
))
}) })
})), })),
} }