From b3f6d62254ec8738a63b51e58ac0a3ffa97759f1 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Tue, 30 Apr 2024 09:59:44 +0200 Subject: [PATCH] update turbopack (#65191) * https://github.com/vercel/turbo/pull/8020 * https://github.com/vercel/turbo/pull/8029 --- Cargo.lock | 70 +++++++++++++++++++------------------- Cargo.toml | 6 ++-- packages/next/package.json | 2 +- pnpm-lock.yaml | 8 ++--- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02526248785695..b6d9a32d641c53 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-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "serde", "smallvec", @@ -3094,7 +3094,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "serde", @@ -6943,7 +6943,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "async-trait", @@ -6974,7 +6974,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "cargo-lock", @@ -6986,7 +6986,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "bytes", @@ -7000,7 +7000,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "dotenvs", @@ -7014,7 +7014,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "lazy_static", @@ -7030,7 +7030,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "auto-hash-map", @@ -7062,7 +7062,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "base16", "hex", @@ -7074,7 +7074,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "proc-macro-error", @@ -7087,7 +7087,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "proc-macro2", "quote", @@ -7097,7 +7097,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "mimalloc", ] @@ -7105,7 +7105,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "auto-hash-map", @@ -7130,7 +7130,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "async-recursion", @@ -7160,7 +7160,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "auto-hash-map", "mdxjs", @@ -7200,7 +7200,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7223,7 +7223,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "clap", @@ -7240,7 +7240,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "async-recursion", @@ -7269,7 +7269,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7296,7 +7296,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "async-compression", @@ -7332,7 +7332,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "async-trait", @@ -7367,7 +7367,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "serde", "serde_json", @@ -7378,7 +7378,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "async-trait", @@ -7402,7 +7402,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "indoc", @@ -7418,7 +7418,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7434,7 +7434,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "base64 0.21.4", @@ -7453,7 +7453,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "serde", @@ -7468,7 +7468,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "mdxjs", @@ -7483,7 +7483,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "async-stream", @@ -7517,7 +7517,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7537,7 +7537,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7555,7 +7555,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "serde", @@ -7571,7 +7571,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "swc_core", "turbo-tasks", @@ -7582,7 +7582,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "crossbeam-channel", @@ -7598,7 +7598,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240423.1#5c3b511e921c59cbcf5b9937b9747ac7276ccb12" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 570e48db36200d..1c864e00973fa4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.90.33", features = [ testing = { version = "0.35.22" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240423.1" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240429.1" } # [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-240423.1" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240429.1" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240423.1" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240429.1" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 927434bc655393..66e6ab81bd8b8e 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -200,7 +200,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.26.4", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240423.1", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240429.1", "acorn": "8.11.3", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 97ca79966885d6..738e9f080f57af 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1069,8 +1069,8 @@ importers: specifier: 0.26.4 version: 0.26.4 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240423.1 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240423.1' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240429.1 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240429.1' acorn: specifier: 8.11.3 version: 8.11.3 @@ -25757,8 +25757,8 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240423.1': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240423.1} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240429.1': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240429.1} name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: