fix error handling and hanging problems (#47457)
### What? see https://github.com/vercel/turbo/pull/4324
This commit is contained in:
Tobias Koppers
GitHub
parent
4b4dd8b33a
commit
df228500f1
6 changed files with 94 additions and 88 deletions
75
packages/next-swc/Cargo.lock
generated
75
packages/next-swc/Cargo.lock
generated
|
|
@ -337,7 +337,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "auto-hash-map"
|
||||
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 = [
|
||||
"serde",
|
||||
]
|
||||
|
|
@ -455,9 +455,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "binding_macros"
|
||||
version = "0.44.21"
|
||||
version = "0.44.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ecc1f7ebb45c51627084dd823c48a396c67f28c42ad3543f4ecc066979e5e996"
|
||||
checksum = "df018ae4a80a06cef289384bf89614451c4f30c6238976ce5c00c1f4379b8eca"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"console_error_panic_hook",
|
||||
|
|
@ -2944,9 +2944,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
|
|||
|
||||
[[package]]
|
||||
name = "napi"
|
||||
version = "2.12.0"
|
||||
version = "2.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "564ad12389dd08b0f5e95b9e8b5e88e5e42a234d326639cfa7b0fe643562e0d7"
|
||||
checksum = "8de689526aff547ad70ad7feef42f1a5ccaa6f768910fd93984dae25a3fc9699"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bitflags 2.0.2",
|
||||
|
|
@ -3281,7 +3281,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "node-file-trace"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"clap 4.1.11",
|
||||
|
|
@ -5023,9 +5023,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "swc_bundler"
|
||||
version = "0.208.17"
|
||||
version = "0.208.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06d3a1a590a46a8ffbbdf8c9a14ba7c62304b7f09edb318536ac90fd8cdccac8"
|
||||
checksum = "30d90393e5ac143a687f422f288bc706e3139a862d4c790cf301086aabd0cdf9"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"anyhow",
|
||||
|
|
@ -5727,9 +5727,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "swc_ecma_transforms_testing"
|
||||
version = "0.125.12"
|
||||
version = "0.125.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5263a184443e798c90db91a2d49e93c062627931e692ee4d691ce32ebad720d9"
|
||||
checksum = "f07bfbd7b8739ad54b564b2c19476978cd4d48ada980307a20469021c3343938"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"anyhow",
|
||||
|
|
@ -6600,7 +6600,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-malloc"
|
||||
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 = [
|
||||
"mimalloc",
|
||||
]
|
||||
|
|
@ -6608,7 +6608,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"auto-hash-map",
|
||||
|
|
@ -6638,7 +6638,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-build"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"cargo-lock",
|
||||
|
|
@ -6650,7 +6650,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-bytes"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"bytes",
|
||||
|
|
@ -6665,7 +6665,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-env"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"dotenvy",
|
||||
|
|
@ -6679,7 +6679,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-fetch"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"indexmap",
|
||||
|
|
@ -6696,7 +6696,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-fs"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"auto-hash-map",
|
||||
|
|
@ -6725,7 +6725,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-hash"
|
||||
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 = [
|
||||
"base16",
|
||||
"hex",
|
||||
|
|
@ -6737,7 +6737,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-macros"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"convert_case 0.6.0",
|
||||
|
|
@ -6751,7 +6751,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-macros-shared"
|
||||
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 = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -6761,7 +6761,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-memory"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"auto-hash-map",
|
||||
|
|
@ -6783,7 +6783,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbo-tasks-testing"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"auto-hash-map",
|
||||
|
|
@ -6795,7 +6795,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"async-recursion",
|
||||
|
|
@ -6821,7 +6821,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-cli-utils"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"clap 4.1.11",
|
||||
|
|
@ -6837,7 +6837,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-core"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
|
|
@ -6864,7 +6864,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-create-test-app"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"clap 4.1.11",
|
||||
|
|
@ -6877,7 +6877,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-css"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
|
|
@ -6899,7 +6899,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-dev"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"indexmap",
|
||||
|
|
@ -6918,7 +6918,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-dev-server"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"async-compression",
|
||||
|
|
@ -6952,7 +6952,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-ecmascript"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
|
|
@ -6987,7 +6987,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-env"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"serde",
|
||||
|
|
@ -7002,7 +7002,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-json"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"serde",
|
||||
|
|
@ -7017,7 +7017,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-mdx"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"mdxjs",
|
||||
|
|
@ -7032,7 +7032,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-node"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"async-stream",
|
||||
|
|
@ -7044,6 +7044,7 @@ dependencies = [
|
|||
"mime",
|
||||
"once_cell",
|
||||
"owo-colors",
|
||||
"parking_lot",
|
||||
"regex",
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
|
@ -7066,7 +7067,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-static"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"serde",
|
||||
|
|
@ -7082,7 +7083,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-swc-utils"
|
||||
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 = [
|
||||
"swc_core",
|
||||
"turbo-tasks",
|
||||
|
|
@ -7093,7 +7094,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "turbopack-test-utils"
|
||||
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 = [
|
||||
"anyhow",
|
||||
"once_cell",
|
||||
|
|
|
|||
|
|
@ -46,38 +46,38 @@ swc_emotion = { version = "0.29.10" }
|
|||
testing = { version = "0.31.31" }
|
||||
|
||||
# Turbo crates
|
||||
auto-hash-map = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
node-file-trace = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
swc-ast-explorer = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3", default-features = false }
|
||||
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-tasks-build = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-tasks-bytes = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-tasks-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-tasks-fetch = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3", default-features = false }
|
||||
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-tasks-hash = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-tasks-macros = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-tasks-macros-shared = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-tasks-testing = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbo-updater = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-cli-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-core = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-create-test-app = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-css = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-dev = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-dev-server = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-json = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-mdx = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-node = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-static = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-swc-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-test-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230323.3" }
|
||||
turbopack-tests = { 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-230324.5" }
|
||||
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-230324.5", default-features = false }
|
||||
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-230324.5" }
|
||||
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-230324.5" }
|
||||
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-230324.5" }
|
||||
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-230324.5" }
|
||||
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-230324.5" }
|
||||
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-230324.5" }
|
||||
turbopack = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
|
||||
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-230324.5" }
|
||||
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-230324.5" }
|
||||
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-230324.5" }
|
||||
turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
|
||||
turbopack-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
|
||||
turbopack-json = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
|
||||
turbopack-mdx = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
|
||||
turbopack-node = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230324.5" }
|
||||
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-230324.5" }
|
||||
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-230324.5" }
|
||||
|
||||
# General Deps
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use anyhow::Result;
|
||||
use anyhow::{Context, Result};
|
||||
use indexmap::IndexMap;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value as JsonValue;
|
||||
|
|
@ -604,7 +604,7 @@ pub async fn load_next_config_internal(
|
|||
)
|
||||
.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());
|
||||
};
|
||||
let next_config: NextConfig = parse_json_with_source_context(val.to_str()?)?;
|
||||
|
|
|
|||
|
|
@ -67,7 +67,11 @@ impl ImportMappingReplacement for NextFontGoogleReplacer {
|
|||
}
|
||||
|
||||
#[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::Module {
|
||||
module: _,
|
||||
|
|
@ -154,7 +158,11 @@ impl ImportMappingReplacement for NextFontGoogleCssModuleReplacer {
|
|||
}
|
||||
|
||||
#[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::Module {
|
||||
module: _,
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
use anyhow::{bail, Context, Result};
|
||||
use anyhow::{anyhow, bail, Context, Result};
|
||||
use futures::StreamExt;
|
||||
use indexmap::indexmap;
|
||||
use serde::Deserialize;
|
||||
use serde_json::json;
|
||||
use turbo_tasks::{
|
||||
primitives::{JsonValueVc, StringsVc},
|
||||
util::SharedError,
|
||||
CompletionVc, CompletionsVc, Value,
|
||||
};
|
||||
use turbo_tasks_bytes::{Bytes, Stream};
|
||||
|
|
@ -110,17 +111,17 @@ enum RouterIncomingMessage {
|
|||
Error(StructuredError),
|
||||
}
|
||||
|
||||
#[turbo_tasks::value(shared)]
|
||||
#[turbo_tasks::value(eq = "manual", cell = "new", serialization = "none")]
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub struct MiddlewareResponse {
|
||||
pub status_code: u16,
|
||||
pub headers: Vec<(String, String)>,
|
||||
#[turbo_tasks(trace_ignore)]
|
||||
pub body: Stream<Result<Bytes, String>>,
|
||||
pub body: Stream<Result<Bytes, SharedError>>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
#[turbo_tasks::value]
|
||||
#[turbo_tasks::value(eq = "manual", cell = "new", serialization = "none")]
|
||||
pub enum RouterResult {
|
||||
Rewrite(RewriteResponse),
|
||||
Middleware(MiddlewareResponse),
|
||||
|
|
@ -391,17 +392,16 @@ async fn route_internal(
|
|||
// a buffer directly into the IPC message without having to wrap it in an
|
||||
// object.
|
||||
let body = read.map(|data| {
|
||||
let chunk: RouterIncomingMessage = match data?
|
||||
let chunk: RouterIncomingMessage = data?
|
||||
.to_str()
|
||||
.context("error decoding string")
|
||||
.and_then(parse_json_with_source_context)
|
||||
{
|
||||
Ok(c) => c,
|
||||
Err(e) => return Err(e.to_string()),
|
||||
};
|
||||
.and_then(parse_json_with_source_context)?;
|
||||
match chunk {
|
||||
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 {
|
||||
|
|
|
|||
|
|
@ -153,10 +153,7 @@ impl ContentSource for NextRouterContentSource {
|
|||
headers: data.headers.clone(),
|
||||
body: Body::from_stream(data.body.read().map(|chunk| {
|
||||
chunk.map_err(|e| {
|
||||
BodyError::new(format!(
|
||||
"error streaming proxied contents: {}",
|
||||
e.as_str()
|
||||
))
|
||||
BodyError::new(format!("error streaming proxied contents: {}", e))
|
||||
})
|
||||
})),
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue