From 344ddbf093e575e0c92521ecc8c82deb0c072fd3 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Thu, 1 Aug 2024 16:39:21 +0200 Subject: [PATCH] update turbopack (#68399) * https://github.com/vercel/turbo/pull/8879 * https://github.com/vercel/turbo/pull/8873 * https://github.com/vercel/turbo/pull/8890 --- Cargo.lock | 75 +++++++++++++++++++------------------- Cargo.toml | 6 +-- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 ++--- 4 files changed, 47 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a99bd92a78617..6594531ce61d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -321,7 +321,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "serde", "smallvec", @@ -3090,7 +3090,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "serde", @@ -6888,12 +6888,12 @@ dependencies = [ [[package]] name = "turbo-prehash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "async-trait", @@ -6927,7 +6927,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "cargo-lock", @@ -6940,7 +6940,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "bytes", @@ -6954,7 +6954,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "dotenvs", @@ -6968,7 +6968,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "reqwest", @@ -6983,7 +6983,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "auto-hash-map", @@ -7014,7 +7014,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "md4", "turbo-tasks-macros", @@ -7024,7 +7024,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "either", @@ -7039,7 +7039,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "proc-macro2", "quote", @@ -7049,7 +7049,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "mimalloc", ] @@ -7057,7 +7057,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "auto-hash-map", @@ -7085,7 +7085,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "async-recursion", @@ -7115,7 +7115,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "auto-hash-map", "mdxjs", @@ -7156,7 +7156,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7179,7 +7179,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "clap", @@ -7196,7 +7196,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "async-recursion", @@ -7225,7 +7225,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7252,7 +7252,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "async-compression", @@ -7288,7 +7288,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "async-trait", @@ -7323,7 +7323,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "serde", "serde_json", @@ -7334,7 +7334,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "async-trait", @@ -7359,7 +7359,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "indoc", @@ -7375,7 +7375,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7391,7 +7391,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "base64 0.21.4", @@ -7410,7 +7410,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "serde", @@ -7425,9 +7425,10 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", + "markdown", "mdxjs", "serde", "turbo-tasks", @@ -7440,7 +7441,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "async-stream", @@ -7474,7 +7475,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7494,7 +7495,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7512,7 +7513,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "serde", @@ -7528,7 +7529,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "swc_core", "turbo-tasks", @@ -7539,7 +7540,7 @@ dependencies = [ [[package]] name = "turbopack-trace-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "either", @@ -7559,7 +7560,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "crossbeam-channel", @@ -7575,7 +7576,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240731.3#727d5e0668c930e7a86487f51c2391856c710ad9" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240801.2#d4f2a5ff262c654a299304d0a36483814a4e524f" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 9d20cc9289a26..8543409f42052 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,11 +38,11 @@ swc_core = { version = "0.96.9", features = [ testing = { version = "0.36.0" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240731.3" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240801.2" } # [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-240731.3" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240801.2" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240731.3" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240801.2" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 68a4d2f572c5a..1096c9aa5be80 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -208,7 +208,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.27.1", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240731.3", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240801.2", "acorn": "8.11.3", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c6b65270512d7..a41ae733b8d73 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1119,8 +1119,8 @@ importers: specifier: 0.27.1 version: 0.27.1(encoding@0.1.13) '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240731.3 - version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240731.3 + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240801.2 + version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240801.2 acorn: specifier: 8.11.3 version: 8.11.3 @@ -5238,8 +5238,8 @@ packages: resolution: {integrity: sha512-OTe0KE37F5Y2eTys6eMnfopC+P4qr2ooXUTFyFPTplYSPwowmFk/HLD1FXtbKLjqsIH0SgekcJWad+C5uX4nkg==} engines: {node: '>=16'} - '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240731.3': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240731.3} + '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240801.2': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240801.2} version: 0.0.0 '@webassemblyjs/ast@1.11.6': @@ -19851,7 +19851,7 @@ snapshots: satori: 0.10.9 yoga-wasm-web: 0.3.3 - '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240731.3': + '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240801.2': dependencies: '@types/node': 20.12.3