From 9fd90dcb5288c659bca2f433c8c24a71df05ac56 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 e1642c1a24460d..ffa589e82ba0b6 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", @@ -3099,7 +3099,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", @@ -6896,12 +6896,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", @@ -6935,7 +6935,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", @@ -6948,7 +6948,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", @@ -6962,7 +6962,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", @@ -6976,7 +6976,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", @@ -6991,7 +6991,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", @@ -7022,7 +7022,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", @@ -7032,7 +7032,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", @@ -7047,7 +7047,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", @@ -7057,7 +7057,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", ] @@ -7065,7 +7065,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", @@ -7093,7 +7093,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", @@ -7123,7 +7123,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", @@ -7164,7 +7164,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", @@ -7187,7 +7187,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", @@ -7204,7 +7204,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", @@ -7233,7 +7233,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", @@ -7260,7 +7260,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", @@ -7296,7 +7296,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", @@ -7331,7 +7331,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", @@ -7342,7 +7342,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", @@ -7367,7 +7367,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", @@ -7383,7 +7383,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", @@ -7399,7 +7399,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", @@ -7418,7 +7418,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", @@ -7433,9 +7433,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", @@ -7448,7 +7449,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", @@ -7482,7 +7483,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", @@ -7502,7 +7503,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", @@ -7520,7 +7521,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", @@ -7536,7 +7537,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", @@ -7547,7 +7548,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", @@ -7567,7 +7568,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", @@ -7583,7 +7584,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 9d20cc9289a265..8543409f42052c 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 e1fce5b0461d4c..4803f0a7cce255 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -202,7 +202,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 3e80a90336208b..70b8c7a3c0f185 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1104,8 +1104,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 @@ -4670,8 +4670,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': @@ -18424,7 +18424,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