[turbopack]: Use tip-of-branch for benchmarks (#50615)

With vercel/turbo#5156, we'll be able to install our the locally built `next` package. Before, we'd test the tip-of-branch `next-dev` binary against the last cut `next` canary, which causes headaches when we make breaking changes.

With this PR, we'll now test tip-of-branch `next-dev` binary against a tip-of-branch `next` package, and breaking changes can be properly benched.

Fixes WEB-1133
This commit is contained in:
Justin Ridgewell 2023-06-06 16:36:11 -04:00 committed by GitHub
parent 115f927b9b
commit 1a2fac2b5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 122 additions and 59 deletions

114
Cargo.lock generated
View file

@ -136,6 +136,12 @@ dependencies = [
"backtrace", "backtrace",
] ]
[[package]]
name = "arrayref"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
[[package]] [[package]]
name = "arrayvec" name = "arrayvec"
version = "0.7.2" version = "0.7.2"
@ -394,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -573,6 +579,20 @@ dependencies = [
"wyz", "wyz",
] ]
[[package]]
name = "blake3"
version = "1.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef"
dependencies = [
"arrayref",
"arrayvec",
"cc",
"cfg-if 1.0.0",
"constant_time_eq",
"digest",
]
[[package]] [[package]]
name = "block-buffer" name = "block-buffer"
version = "0.10.4" version = "0.10.4"
@ -1014,6 +1034,12 @@ dependencies = [
"unicode-xid", "unicode-xid",
] ]
[[package]]
name = "constant_time_eq"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b"
[[package]] [[package]]
name = "convert_case" name = "convert_case"
version = "0.5.0" version = "0.5.0"
@ -1518,6 +1544,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [ dependencies = [
"block-buffer", "block-buffer",
"crypto-common", "crypto-common",
"subtle",
] ]
[[package]] [[package]]
@ -3425,7 +3452,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -5310,6 +5337,12 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "subtle"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
[[package]] [[package]]
name = "supports-color" name = "supports-color"
version = "1.3.1" version = "1.3.1"
@ -6338,6 +6371,7 @@ dependencies = [
"swc_plugin_proxy", "swc_plugin_proxy",
"tracing", "tracing",
"wasmer", "wasmer",
"wasmer-cache",
"wasmer-compiler-cranelift", "wasmer-compiler-cranelift",
"wasmer-wasix", "wasmer-wasix",
] ]
@ -7035,7 +7069,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -7066,7 +7100,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cargo-lock", "cargo-lock",
@ -7078,7 +7112,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -7093,7 +7127,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"dotenvy", "dotenvy",
@ -7107,7 +7141,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indexmap", "indexmap",
@ -7124,7 +7158,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -7154,7 +7188,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"base16", "base16",
"hex", "hex",
@ -7166,7 +7200,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"convert_case 0.6.0", "convert_case 0.6.0",
@ -7180,7 +7214,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -7190,7 +7224,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"mimalloc", "mimalloc",
] ]
@ -7198,7 +7232,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -7221,7 +7255,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-hash-map", "auto-hash-map",
@ -7233,7 +7267,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-recursion", "async-recursion",
@ -7263,7 +7297,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chromiumoxide", "chromiumoxide",
@ -7293,7 +7327,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"auto-hash-map", "auto-hash-map",
"mdxjs", "mdxjs",
@ -7334,7 +7368,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap 4.1.11", "clap 4.1.11",
@ -7358,7 +7392,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -7386,7 +7420,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"clap 4.1.11", "clap 4.1.11",
@ -7399,7 +7433,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -7421,7 +7455,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indexmap", "indexmap",
@ -7445,7 +7479,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-compression", "async-compression",
@ -7480,7 +7514,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -7513,7 +7547,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@ -7536,7 +7570,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indoc", "indoc",
@ -7553,7 +7587,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"indexmap", "indexmap",
@ -7569,7 +7603,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.0", "base64 0.21.0",
@ -7589,7 +7623,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -7604,7 +7638,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"mdxjs", "mdxjs",
@ -7619,7 +7653,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-stream", "async-stream",
@ -7654,7 +7688,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
@ -7670,7 +7704,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"swc_core", "swc_core",
"turbo-tasks", "turbo-tasks",
@ -7681,7 +7715,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-230531.2#9f86f2ed10c4d20e7d1b696cce7dc9ed928be0c2" source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230601.3#6ae2258480d2a1f1a0c893f7a63014aa50b3d90b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"once_cell", "once_cell",
@ -8226,6 +8260,18 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "wasmer-cache"
version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f0de969b05cc3c11196beeb46e5868a3712a187d777ee94113f7258c2ec121c"
dependencies = [
"blake3",
"hex",
"thiserror",
"wasmer",
]
[[package]] [[package]]
name = "wasmer-compiler" name = "wasmer-compiler"
version = "3.3.0" version = "3.3.0"

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-230531.2", "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3",
"@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230531.2", "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3",
"anser": "^2.1.1", "anser": "^2.1.1",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"next": "*", "next": "*",

View file

@ -1,6 +1,7 @@
use std::{ use std::{
fs, fs,
path::Path, io::{self, Write},
path::{Path, PathBuf},
process::{Child, Command, Stdio}, process::{Child, Command, Stdio},
}; };
@ -44,17 +45,29 @@ impl Bundler for TurboNext {
} }
fn prepare(&self, install_dir: &Path) -> Result<()> { fn prepare(&self, install_dir: &Path) -> Result<()> {
let package_json = include_str!("../../../../next/package.json"); let repo_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
let data: serde_json::Value = serde_json::from_str(package_json)?; .join("../../../..")
let version = data .canonicalize()?;
.as_object()
.unwrap() let build = Command::new("pnpm")
.get("version") .args(["build"])
.unwrap() .current_dir(&repo_path)
.as_str() .output()?;
.unwrap();
npm::install(install_dir, &[NpmPackage::new("next", version)]) npm::install(
.context("failed to install from npm")?; install_dir,
&[NpmPackage::new(
"next",
&repo_path.join("packages/next").to_string_lossy(),
)],
)
.context("failed to install from npm")?;
if !build.status.success() {
io::stdout().write_all(&build.stdout)?;
io::stderr().write_all(&build.stderr)?;
return Err(anyhow!("pnpm build failed. See above."));
}
fs::write( fs::write(
install_dir.join("next.config.js"), install_dir.join("next.config.js"),

View file

@ -298,7 +298,11 @@ async fn source(
) -> Result<ContentSourceVc> { ) -> Result<ContentSourceVc> {
let output_fs = output_fs(&project_dir); let output_fs = output_fs(&project_dir);
let fs = project_fs(&root_dir); let fs = project_fs(&root_dir);
let project_relative = project_dir.strip_prefix(&root_dir).unwrap(); let project_relative = project_dir.strip_prefix(&root_dir).unwrap_or_else(|| {
panic!(
"project directory '{project_dir}' exists outside of the root directory '{root_dir}'"
)
});
let project_relative = project_relative let project_relative = project_relative
.strip_prefix(MAIN_SEPARATOR) .strip_prefix(MAIN_SEPARATOR)
.unwrap_or(project_relative) .unwrap_or(project_relative)

View file

@ -1014,8 +1014,8 @@ importers:
'@types/react': 18.2.5 '@types/react': 18.2.5
'@types/react-dom': 18.2.3 '@types/react-dom': 18.2.3
'@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-230531.2 '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3
'@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230531.2 '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3
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
@ -1027,8 +1027,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-230531.2_react-refresh@0.12.0' '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3_react-refresh@0.12.0'
'@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230531.2' '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3'
anser: 2.1.1 anser: 2.1.1
css.escape: 1.5.1 css.escape: 1.5.1
next: link:../../../../next next: link:../../../../next
@ -23751,7 +23751,7 @@ packages:
hasBin: true hasBin: true
dependencies: dependencies:
'@jridgewell/source-map': 0.3.2 '@jridgewell/source-map': 0.3.2
acorn: 8.8.0 acorn: 8.8.2
commander: 2.20.3 commander: 2.20.3
source-map-support: 0.5.20 source-map-support: 0.5.20
@ -25524,9 +25524,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-230531.2_react-refresh@0.12.0': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3_react-refresh@0.12.0':
resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230531.2} resolution: {tarball: https://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-230531.2' id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230601.3'
name: '@vercel/turbopack-ecmascript-runtime' name: '@vercel/turbopack-ecmascript-runtime'
version: 0.0.0 version: 0.0.0
dependencies: dependencies:
@ -25537,8 +25537,8 @@ packages:
- webpack - webpack
dev: false dev: false
'@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230531.2': '@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-230531.2} resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230601.3}
name: '@vercel/turbopack-node' name: '@vercel/turbopack-node'
version: 0.0.0 version: 0.0.0
dependencies: dependencies: