From 5cfcd48fd175813b2417c530d12e4b5f6b6a0d96 Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Tue, 23 Jan 2024 14:44:29 +0100 Subject: [PATCH] Upgrade Turbopack --- Cargo.lock | 68 +++++++++++++++++++------------------- Cargo.toml | 6 ++-- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 +++--- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e7cedcccd13b62..51d9905630dfeb 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-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "serde", "smallvec", @@ -3500,7 +3500,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "serde", @@ -7540,7 +7540,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "async-trait", @@ -7572,7 +7572,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "cargo-lock", @@ -7584,7 +7584,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "bytes", @@ -7599,7 +7599,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "dotenvs", @@ -7613,7 +7613,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7630,7 +7630,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "auto-hash-map", @@ -7661,7 +7661,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "base16", "hex", @@ -7673,7 +7673,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7687,7 +7687,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "proc-macro2", "quote", @@ -7697,7 +7697,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "mimalloc", ] @@ -7705,7 +7705,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "auto-hash-map", @@ -7730,7 +7730,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "async-recursion", @@ -7762,7 +7762,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "auto-hash-map", "mdxjs", @@ -7803,7 +7803,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7827,7 +7827,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "clap 4.4.2", @@ -7845,7 +7845,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "async-recursion", @@ -7875,7 +7875,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "async-trait", @@ -7902,7 +7902,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7926,7 +7926,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "async-compression", @@ -7963,7 +7963,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "async-trait", @@ -7998,7 +7998,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "serde", "serde_json", @@ -8009,7 +8009,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "async-trait", @@ -8032,7 +8032,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "indoc", @@ -8049,7 +8049,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8065,7 +8065,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "base64 0.21.4", @@ -8085,7 +8085,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "serde", @@ -8100,7 +8100,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "mdxjs", @@ -8115,7 +8115,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "async-stream", @@ -8150,7 +8150,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "serde", @@ -8166,7 +8166,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "swc_core", "turbo-tasks", @@ -8177,7 +8177,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "crossbeam-channel", @@ -8193,7 +8193,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240122.1#50ebf6858e28cd8d1447292e08f4c84bc21f0225" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240123.3#31816d1f102caa1968b7d0962002413c6fd9a5ad" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index a8e9becdfe27ec..9134509cc16059 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.87.16", features = [ testing = { version = "0.35.14" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240122.1" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240123.3" } # [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-240122.1" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240123.3" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240122.1" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240123.3" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 5cf425019f70b3..393ef1a755a8cb 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -194,7 +194,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.26.2", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240122.1", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240123.3", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7acb0bc1845c5..a4207e6e562b89 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1077,8 +1077,8 @@ importers: specifier: 0.26.2 version: 0.26.2 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240122.1 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240122.1(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240123.3 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240123.3(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -25626,9 +25626,9 @@ 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-240122.1(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240122.1} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240122.1' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240123.3(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240123.3} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240123.3' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: