From b64c0426bcc7281581782ea0be75cc0e2745a23c Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Sun, 22 Oct 2023 17:42:29 -0700 Subject: [PATCH] update turbopack (#57176) * https://github.com/vercel/turbo/pull/6241 * https://github.com/vercel/turbo/pull/6242 * https://github.com/vercel/turbo/pull/6228 * https://github.com/vercel/turbo/pull/6244 * https://github.com/vercel/turbo/pull/6246 Closes WEB-1819 --- Cargo.lock | 66 +++++++++++++++++++------------------- Cargo.toml | 6 ++-- packages/next/package.json | 2 +- pnpm-lock.yaml | 10 +++--- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8b0626960f6dc..5f46d9e6a182f 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-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "serde", "smallvec", @@ -3528,7 +3528,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "serde", @@ -7639,7 +7639,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "async-trait", @@ -7671,7 +7671,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "cargo-lock", @@ -7683,7 +7683,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "bytes", @@ -7698,7 +7698,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "dotenvs", @@ -7712,7 +7712,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7729,7 +7729,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "auto-hash-map", @@ -7759,7 +7759,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "base16", "hex", @@ -7771,7 +7771,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7785,7 +7785,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "proc-macro2", "quote", @@ -7795,7 +7795,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "mimalloc", ] @@ -7803,7 +7803,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "auto-hash-map", @@ -7828,7 +7828,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "async-recursion", @@ -7859,7 +7859,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "auto-hash-map", "mdxjs", @@ -7899,7 +7899,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7921,7 +7921,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "clap 4.4.2", @@ -7945,7 +7945,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "async-recursion", @@ -7975,7 +7975,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "async-trait", @@ -7997,7 +7997,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8021,7 +8021,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "async-compression", @@ -8058,7 +8058,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "async-trait", @@ -8092,7 +8092,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "serde", "serde_json", @@ -8103,7 +8103,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "async-trait", @@ -8126,7 +8126,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "indoc", @@ -8143,7 +8143,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8159,7 +8159,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "base64 0.21.4", @@ -8179,7 +8179,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "serde", @@ -8194,7 +8194,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "mdxjs", @@ -8209,7 +8209,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "async-stream", @@ -8244,7 +8244,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "serde", @@ -8260,7 +8260,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "swc_core", "turbo-tasks", @@ -8271,7 +8271,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231020.4#07e8e48458b553930be29b7d4a0da89204a4e59a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231022.2#a1f9184bbee4ef589c3cba47810cc331975ac8af" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 6392f39a306eb..8f261e172c620 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,11 +40,11 @@ swc_core = { version = "0.86.1", features = [ testing = { version = "0.35.0" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231020.4" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231022.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-231020.4" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231022.2" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231020.4" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231022.2" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 5df54a2c44b89..4512543928165 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -193,7 +193,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.22.6", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231020.4", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231022.2", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d3cf41e2ebfa7..845730126f7b6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1061,8 +1061,8 @@ importers: specifier: 0.22.6 version: 0.22.6 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231020.4 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231020.4(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231022.2 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231022.2(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -24947,9 +24947,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-231020.4(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {registry: https://registry.npmjs.org/, tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231020.4} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231020.4' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231022.2(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231022.2} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-231022.2' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: