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

Revert "Revert "update turbopack"" (#50947)

Browse source 
Fixed in https://github.com/vercel/next.js/pull/50946

Reverts vercel/next.js#50942
This commit is contained in:
JJ Kasper 2023-06-07 21:02:03 -07:00 committed by GitHub
parent f24d0cb030
commit 22ea7d9909
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 94 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
Cargo.lock generated
View file

@ -400,7 +400,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -527,9 +527,9 @@ dependencies = [
[[package]] [[package]]
name = "binding_macros" name = "binding_macros"
version = "0.50.31" version = "0.50.35"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ee27f9ffe528bb0a1e94d858d70217ce12076ef01978f73ce4ed50a20dedcc" checksum = "a31f397ada59fbcd6cb7f0a9d5bab4a53bb7cfc3ee2277b9f93d0ea2c88704d6"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"console_error_panic_hook", "console_error_panic_hook",
@ -2033,6 +2033,16 @@ dependencies = [
"syn 1.0.109", "syn 1.0.109",
] ]
[[package]]
name = "gif"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
dependencies = [
"color_quant",
"weezl",
]
[[package]] [[package]]
name = "gimli" name = "gimli"
version = "0.26.2" version = "0.26.2"
@ -2420,6 +2430,7 @@ dependencies = [
"bytemuck", "bytemuck",
"byteorder", "byteorder",
"color_quant", "color_quant",
"gif",
"jpeg-decoder", "jpeg-decoder",
"num-rational", "num-rational",
"num-traits", "num-traits",
@ -3452,7 +3463,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -5373,9 +5384,9 @@ dependencies = [
[[package]] [[package]]
name = "swc" name = "swc"
version = "0.261.31" version = "0.261.35"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95cbbf554d5643f670e66ca9094dd375c7fc060106202b17da1729d36c1fb711" checksum = "56428a57e7898982bee4530923a85ba17ad2b555a1502bcdccf6dc7ae483621f"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",
@ -5441,9 +5452,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_bundler" name = "swc_bundler"
version = "0.214.23" version = "0.214.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc8061fcf233b059656a3c20e098971c6302346da23dc6cf21cb468335c27a1c" checksum = "1a20b862690e5c6c5e70fc0d56c156175514520c98e89220d408fc0e0d62759a"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",
@ -5547,9 +5558,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_core" name = "swc_core"
version = "0.76.37" version = "0.76.41"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18c40087bc20b5e2611bef9a02924ed990f04a446f0afc0d9a748382f797f948" checksum = "e8cd48cee857b467c1a7f3ff14ec26bfcdbe6a08f3218577e15d8157701da958"
dependencies = [ dependencies = [
"binding_macros", "binding_macros",
"swc", "swc",
@ -5834,9 +5845,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_minifier" name = "swc_ecma_minifier"
version = "0.181.23" version = "0.181.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f054b72aee9b9e92568c8045d8bd2f1622e7caed54a83c70613c36c25e209fd6" checksum = "4006ddfdcdcf8eb3a83f077ae03b6ee5a94bd9d55d52198bbed2228a6acafcbe"
dependencies = [ dependencies = [
"ahash", "ahash",
"arrayvec", "arrayvec",
@ -5890,9 +5901,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_preset_env" name = "swc_ecma_preset_env"
version = "0.195.22" version = "0.195.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c71c3e40213af349ff5c873963cc1aa03add9b2d1a891dca94590aaed889c216" checksum = "cfa9f2862180c733b633572be7d42b690cf2d878280a199a9b5f7cfba2cfd89e"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",
@ -5945,9 +5956,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms" name = "swc_ecma_transforms"
version = "0.218.20" version = "0.218.21"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f359eeb44c37ae4fda275f02a8e718c750ad2b0c8ce2254aca624925be8c8943" checksum = "1ef09fbed21e8bcdf22bbfd88e5ec83c2acc2c831c39ca2fde01e1f040a85167"
dependencies = [ dependencies = [
"swc_atoms", "swc_atoms",
"swc_common", "swc_common",
@ -6071,9 +6082,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_optimization" name = "swc_ecma_transforms_optimization"
version = "0.187.20" version = "0.187.21"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baa08d0945505263edb8f1fadc71a8afdf530f582d1a133c434055cc4d76298c" checksum = "8d27c12926427f235d149e60f9a9e67a2181fe1eb418c12b53b8e0778c5052a2"
dependencies = [ dependencies = [
"ahash", "ahash",
"dashmap", "dashmap",
@ -6169,9 +6180,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_typescript" name = "swc_ecma_transforms_typescript"
version = "0.177.20" version = "0.177.21"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "340cc027a6e87966715005b94e3a7ac95baf76c80b8aedad8afdd1c134740c80" checksum = "dd32915040ed6ffdfeafb7a63276529df9ed83d8b6e7a6ce22d95ce98d137a21"
dependencies = [ dependencies = [
"serde", "serde",
"swc_atoms", "swc_atoms",
@ -7069,7 +7080,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -7100,7 +7111,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cargo-lock", "cargo-lock",
@ -7112,7 +7123,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -7127,7 +7138,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"dotenvy", "dotenvy",
@ -7141,7 +7152,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indexmap", "indexmap",
@ -7158,7 +7169,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -7188,7 +7199,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"base16", "base16",
"hex", "hex",
@ -7200,7 +7211,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"convert_case 0.6.0", "convert_case 0.6.0",
@ -7214,7 +7225,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -7224,7 +7235,7 @@ dependencies = [
[[package]] [[package]]
name = "turbo-tasks-malloc" name = "turbo-tasks-malloc"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"mimalloc", "mimalloc",
] ]
@ -7232,7 +7243,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -7255,7 +7266,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -7267,7 +7278,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-recursion", "async-recursion",
@ -7297,7 +7308,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-bench" name = "turbopack-bench"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chromiumoxide", "chromiumoxide",
@ -7327,7 +7338,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-binding" name = "turbopack-binding"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"auto-hash-map", "auto-hash-map",
"mdxjs", "mdxjs",
@ -7368,7 +7379,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap 4.1.11", "clap 4.1.11",
@ -7392,7 +7403,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -7420,7 +7431,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap 4.1.11", "clap 4.1.11",
@ -7433,7 +7444,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -7455,7 +7466,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indexmap", "indexmap",
@ -7479,7 +7490,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-compression", "async-compression",
@ -7514,7 +7525,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -7547,7 +7558,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-ecmascript-plugins" name = "turbopack-ecmascript-plugins"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -7570,7 +7581,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-ecmascript-runtime" name = "turbopack-ecmascript-runtime"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indoc", "indoc",
@ -7587,7 +7598,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indexmap", "indexmap",
@ -7603,7 +7614,7 @@ dependencies = [
[[package]] [[package]]
name = "turbopack-image" name = "turbopack-image"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.0", "base64 0.21.0",
@ -7623,7 +7634,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -7638,7 +7649,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"mdxjs", "mdxjs",
@ -7653,7 +7664,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-stream", "async-stream",
@ -7688,7 +7699,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -7704,7 +7715,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"swc_core", "swc_core",
"turbo-tasks", "turbo-tasks",
@ -7715,7 +7726,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-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230608.1#a00ba87b486db48038e1d6e74775a29b920ef03b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"once_cell", "once_cell",

8
Cargo.toml
View file

@ -38,15 +38,15 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
# SWC crates # SWC crates
# Keep consistent with preset_env_base through swc_core # Keep consistent with preset_env_base through swc_core
swc_core = { version = "0.76.37" } swc_core = { version = "0.76.41" }
testing = { version = "0.33.13" } testing = { version = "0.33.13" }
# Turbo crates # Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230601.3" } turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230608.1" }
# [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-230601.3" } turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230608.1" }
# [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-230601.3" } turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230608.1" }
# General Deps # General Deps

4
packages/next-swc/crates/next-core/js/package.json
View file

@ -10,8 +10,8 @@
"check": "tsc --noEmit" "check": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3", "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",

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

@ -42,6 +42,7 @@ use turbopack_binding::{
}, },
env::ProcessEnvAssetVc, env::ProcessEnvAssetVc,
node::{ node::{
debug::should_debug,
execution_context::ExecutionContextVc, execution_context::ExecutionContextVc,
render::{ render::{
node_api_source::create_node_api_source, node_api_source::create_node_api_source,
@ -587,6 +588,7 @@ async fn create_app_page_source_for_route(
.into(), .into(),
fallback_page, fallback_page,
render_data, render_data,
should_debug("app_source"),
); );
Ok(source.issue_context(app_dir, &format!("Next.js App Page Route {pathname}"))) Ok(source.issue_context(app_dir, &format!("Next.js App Page Route {pathname}")))
@ -630,6 +632,7 @@ async fn create_app_not_found_page_source(
.into(), .into(),
fallback_page, fallback_page,
render_data, render_data,
should_debug("app_source"),
); );
Ok(source.issue_context(app_dir, "Next.js App Page Route /404")) Ok(source.issue_context(app_dir, "Next.js App Page Route /404"))
@ -673,6 +676,7 @@ async fn create_app_route_source_for_route(
.cell() .cell()
.into(), .into(),
render_data, render_data,
should_debug("app_source"),
); );
Ok(source.issue_context(app_dir, &format!("Next.js App Route {pathname}"))) Ok(source.issue_context(app_dir, &format!("Next.js App Route {pathname}")))

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

@ -31,6 +31,7 @@ use turbopack_binding::{
styled_components::StyledComponentsTransformConfig, styled_components::StyledComponentsTransformConfig,
}, },
node::{ node::{
debug::should_debug,
evaluate::evaluate, evaluate::evaluate,
execution_context::{ExecutionContext, ExecutionContextVc}, execution_context::{ExecutionContext, ExecutionContextVc},
transforms::webpack::{WebpackLoaderItem, WebpackLoaderItemsVc}, transforms::webpack::{WebpackLoaderItem, WebpackLoaderItemsVc},
@ -688,7 +689,7 @@ pub async fn load_next_config_internal(
None, None,
vec![], vec![],
config_changed, config_changed,
/* debug */ false, should_debug("next_config"),
) )
.await?; .await?;

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

@ -414,7 +414,7 @@ async fn get_mock_stylesheet(
ecmascript::{ ecmascript::{
EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc, EcmascriptInputTransformsVc, EcmascriptModuleAssetType, EcmascriptModuleAssetVc,
}, },
node::{evaluate::evaluate, execution_context::ExecutionContext}, node::{debug::should_debug, evaluate::evaluate, execution_context::ExecutionContext},
turbopack::evaluate_context::node_evaluate_asset_context, turbopack::evaluate_context::node_evaluate_asset_context,
}, },
}; };
@ -473,7 +473,7 @@ async fn get_mock_stylesheet(
None, None,
vec![], vec![],
CompletionVc::immutable(), CompletionVc::immutable(),
/* debug */ false, should_debug("next_font::google"),
) )
.await?; .await?;

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

@ -32,6 +32,7 @@ use turbopack_binding::{
}, },
env::ProcessEnvAssetVc, env::ProcessEnvAssetVc,
node::{ node::{
debug::should_debug,
execution_context::ExecutionContextVc, execution_context::ExecutionContextVc,
render::{ render::{
node_api_source::create_node_api_source, node_api_source::create_node_api_source,
@ -422,6 +423,7 @@ async fn create_page_source_for_file(
.cell() .cell()
.into(), .into(),
render_data, render_data,
should_debug("page_source"),
) )
} else { } else {
let data_pathname = pathname_for_path(client_root, client_path, PathType::Data); let data_pathname = pathname_for_path(client_root, client_path, PathType::Data);
@ -465,6 +467,7 @@ async fn create_page_source_for_file(
ssr_entry, ssr_entry,
fallback_page, fallback_page,
render_data, render_data,
should_debug("page_source"),
), ),
create_node_rendered_source( create_node_rendered_source(
project_path, project_path,
@ -476,6 +479,7 @@ async fn create_page_source_for_file(
ssr_data_entry, ssr_data_entry,
fallback_page, fallback_page,
render_data, render_data,
should_debug("page_source"),
), ),
create_page_loader( create_page_loader(
client_root, client_root,
@ -591,6 +595,7 @@ async fn create_not_found_page_source(
ssr_entry, ssr_entry,
fallback_page, fallback_page,
render_data, render_data,
should_debug("page_source"),
), ),
page_loader, page_loader,
]) ])

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

@ -30,6 +30,7 @@ use turbopack_binding::{
}, },
dev::DevChunkingContextVc, dev::DevChunkingContextVc,
node::{ node::{
debug::should_debug,
evaluate::evaluate, evaluate::evaluate,
execution_context::{ExecutionContext, ExecutionContextVc}, execution_context::{ExecutionContext, ExecutionContextVc},
source_map::{trace_stack, StructuredError}, source_map::{trace_stack, StructuredError},
@ -376,7 +377,7 @@ async fn route_internal(
JsonValueVc::cell(serde_json::to_value(ServerInfo::try_from(&*server_addr)?)?), JsonValueVc::cell(serde_json::to_value(ServerInfo::try_from(&*server_addr)?)?),
], ],
CompletionsVc::all(vec![next_config_changed, routes_changed]), CompletionsVc::all(vec![next_config_changed, routes_changed]),
/* debug */ false, should_debug("router"),
) )
.await?; .await?;

20
pnpm-lock.yaml
View file

@ -1012,8 +1012,8 @@ importers:
'@types/react': 18.2.7 '@types/react': 18.2.7
'@types/react-dom': 18.2.4 '@types/react-dom': 18.2.4
'@vercel/ncc': ^0.36.0 '@vercel/ncc': ^0.36.0
'@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3 '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3 '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1
anser: ^2.1.1 anser: ^2.1.1
css.escape: ^1.5.1 css.escape: ^1.5.1
find-up: ^6.3.0 find-up: ^6.3.0
@ -1025,8 +1025,8 @@ importers:
stacktrace-parser: ^0.1.10 stacktrace-parser: ^0.1.10
strip-ansi: ^7.0.1 strip-ansi: ^7.0.1
dependencies: dependencies:
'@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3_react-refresh@0.12.0' '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3' '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1'
anser: 2.1.1 anser: 2.1.1
css.escape: 1.5.1 css.escape: 1.5.1
next: link:../../../../next next: link:../../../../next
@ -5218,7 +5218,7 @@ packages:
'@jest/schemas': 29.4.3 '@jest/schemas': 29.4.3
'@types/istanbul-lib-coverage': 2.0.3 '@types/istanbul-lib-coverage': 2.0.3
'@types/istanbul-reports': 3.0.0 '@types/istanbul-reports': 3.0.0
'@types/node': 18.11.18 '@types/node': 20.2.5
'@types/yargs': 17.0.10 '@types/yargs': 17.0.10
chalk: 4.1.2 chalk: 4.1.2
dev: true dev: true
@ -25423,9 +25423,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.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3_react-refresh@0.12.0': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3} resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1}
id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3' id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230608.1'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
@ -25436,8 +25436,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3} resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230608.1}
name: '@vercel/turbopack-node' name: '@vercel/turbopack-node'
version: 0.0.0 version: 0.0.0
dependencies: dependencies: