From 32a03a91ac7856129c23e1ad6c59d839169dfb2e Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Tue, 30 Jul 2024 17:01:35 +0200 Subject: [PATCH] Upgrade Turbopack (#68327) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Donny/강동윤 - fix: Fix tree shaking even more (#8864) Benjamin Woodruff - Fix `ReadRef::cell` when `T` != `T::Read::Repr` (#8845) Benjamin Woodruff - Add/move tests for Vc generics (#8843) Niklas Mischkulnig - Support `module_resolution: "nodenext"` (#8748) Tobias Koppers - fix symlinks and dotfiles while reading glob (#8865) Tobias Koppers - allow to resolve symlinks on DirectoryEntry (#8851) Niklas Mischkulnig - Support monorepo package self-references (#8820) Tobias Koppers - fix: Use `hygiene_with_config` instead of `hygiene` (#8848) Benjamin Woodruff - Reduce macro usage in turbo-tasks-testing (#8832) Tobias Koppers - GC auto increase memory limit on inefficient GC (#8687) Donny/강동윤 - feat: Improve tree shaking (#8781) Tobias Koppers - avoid implementing Eq on Completion (#8818) Alexander Lyon - reduce memory and consolidate shared vs transient cells (#8263) --- Cargo.lock | 75 +++++++++++++++++++------------------- Cargo.toml | 6 +-- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 ++--- 4 files changed, 46 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a7e4b8f5b51b81..e62d50dbb823b0 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-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" 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-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" 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-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" 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-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" 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-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" 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-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "dotenvs", @@ -6976,10 +6976,9 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", - "lazy_static", "reqwest", "serde", "tokio", @@ -6992,7 +6991,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "auto-hash-map", @@ -7023,7 +7022,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "md4", "turbo-tasks-macros", @@ -7033,7 +7032,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "either", @@ -7048,7 +7047,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "proc-macro2", "quote", @@ -7058,7 +7057,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "mimalloc", ] @@ -7066,7 +7065,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "auto-hash-map", @@ -7094,7 +7093,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "async-recursion", @@ -7124,7 +7123,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "auto-hash-map", "mdxjs", @@ -7165,7 +7164,7 @@ dependencies = [ [[package]] name = "turbopack-browser" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7188,7 +7187,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "clap", @@ -7205,7 +7204,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "async-recursion", @@ -7234,7 +7233,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7261,7 +7260,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "async-compression", @@ -7297,7 +7296,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "async-trait", @@ -7332,7 +7331,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "serde", "serde_json", @@ -7343,7 +7342,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "async-trait", @@ -7368,7 +7367,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "indoc", @@ -7384,7 +7383,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7400,7 +7399,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "base64 0.21.4", @@ -7419,7 +7418,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "serde", @@ -7434,7 +7433,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "mdxjs", @@ -7449,7 +7448,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "async-stream", @@ -7483,7 +7482,7 @@ dependencies = [ [[package]] name = "turbopack-nodejs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7503,7 +7502,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7521,7 +7520,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "serde", @@ -7537,7 +7536,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "swc_core", "turbo-tasks", @@ -7548,7 +7547,7 @@ dependencies = [ [[package]] name = "turbopack-trace-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "either", @@ -7568,7 +7567,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "crossbeam-channel", @@ -7584,7 +7583,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240724.2#f32ebe9618ff7f3b45c7d086918185412cb4668b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240730.2#5c114596aff68c2da1badd163ff4318b5f447c84" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 28b2e5e336a275..ea5be836e248c5 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-240724.2" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240730.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-240724.2" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240730.2" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240724.2" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240730.2" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 4d5bfefb14c723..dc1748061c715d 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-240724.2", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240730.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 ca88442d65fd3c..cb73568908bd23 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-240724.2 - version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240724.2 + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240730.2 + version: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240730.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-240724.2': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240724.2} + '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240730.2': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240730.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-240724.2': + '@vercel/turbopack-ecmascript-runtime@https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240730.2': dependencies: '@types/node': 20.12.3