diff --git a/Cargo.lock b/Cargo.lock index e48efe0534d0a..9513d4a9828e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -412,7 +412,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "serde", ] @@ -3550,7 +3550,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "serde", @@ -7210,7 +7210,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "auto-hash-map", @@ -7241,7 +7241,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "cargo-lock", @@ -7253,7 +7253,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "bytes", @@ -7268,7 +7268,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "dotenvy", @@ -7282,7 +7282,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "indexmap", @@ -7299,7 +7299,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "auto-hash-map", @@ -7329,7 +7329,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "base16", "hex", @@ -7341,7 +7341,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7355,7 +7355,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "proc-macro2", "quote", @@ -7365,7 +7365,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "mimalloc", ] @@ -7373,7 +7373,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "auto-hash-map", @@ -7396,7 +7396,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "auto-hash-map", @@ -7408,7 +7408,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "async-recursion", @@ -7438,7 +7438,7 @@ dependencies = [ [[package]] name = "turbopack-bench" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "chromiumoxide", @@ -7468,7 +7468,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "auto-hash-map", "mdxjs", @@ -7510,7 +7510,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "indexmap", @@ -7530,7 +7530,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "clap 4.1.11", @@ -7554,7 +7554,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "async-trait", @@ -7582,7 +7582,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "clap 4.1.11", @@ -7595,7 +7595,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "async-trait", @@ -7617,7 +7617,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "indexmap", @@ -7641,7 +7641,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "async-compression", @@ -7677,7 +7677,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "async-trait", @@ -7710,7 +7710,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "async-trait", @@ -7733,7 +7733,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "indoc", @@ -7750,7 +7750,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "indexmap", @@ -7766,7 +7766,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "base64 0.21.0", @@ -7786,7 +7786,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "serde", @@ -7801,7 +7801,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "mdxjs", @@ -7816,7 +7816,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "async-stream", @@ -7851,7 +7851,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "serde", @@ -7867,7 +7867,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "swc_core", "turbo-tasks", @@ -7878,7 +7878,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230703.2#8936f1dc84c65349460263372a310fc97519a73a" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230702.1#c51c7abdcd4f5092ba2ab492b3cdc78c1a16b144" dependencies = [ "anyhow", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index b20b069b7e668..a2ff8575638f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,11 +42,11 @@ swc_core = { version = "0.78.24" } testing = { version = "0.33.19" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230703.2" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230702.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-230703.2" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230702.1" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230703.2" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230702.1" } # General Deps diff --git a/packages/next-swc/crates/next-build/src/next_build.rs b/packages/next-swc/crates/next-build/src/next_build.rs index b11ba5de1e023..d0e555a142b48 100644 --- a/packages/next-swc/crates/next-build/src/next_build.rs +++ b/packages/next-swc/crates/next-build/src/next_build.rs @@ -12,7 +12,7 @@ use next_core::{ }; use serde::Serialize; use turbo_tasks::{ - graph::{AdjacencyMap, GraphTraversal}, + graph::{GraphTraversal, ReverseTopological}, CollectiblesSource, CompletionVc, RawVc, TransientInstance, TransientValue, TryJoinIterExt, ValueToString, }; @@ -519,13 +519,13 @@ async fn handle_issues + CollectiblesSource + Copy>( #[turbo_tasks::function] async fn all_assets_from_entry(entry: AssetVc) -> Result { Ok(AssetsVc::cell( - AdjacencyMap::new() + ReverseTopological::new() .skip_duplicates() .visit([entry], get_referenced_assets) .await .completed()? .into_inner() - .into_reverse_topological() + .into_iter() .collect(), )) } @@ -535,13 +535,13 @@ async fn all_assets_from_entry(entry: AssetVc) -> Result { #[turbo_tasks::function] async fn all_assets_from_entries(entries: AssetsVc) -> Result { Ok(AssetsVc::cell( - AdjacencyMap::new() + ReverseTopological::new() .skip_duplicates() .visit(entries.await?.iter().copied(), get_referenced_assets) .await .completed()? .into_inner() - .into_reverse_topological() + .into_iter() .collect(), )) } diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json index 9fdbe24cba3d5..efea13e8a861c 100644 --- a/packages/next-swc/crates/next-core/js/package.json +++ b/packages/next-swc/crates/next-core/js/package.json @@ -10,8 +10,8 @@ "check": "tsc --noEmit" }, "dependencies": { - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2", - "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1", + "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1", "anser": "^2.1.1", "css.escape": "^1.5.1", "next": "*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c452000cbb71..71d008330f6b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -992,8 +992,8 @@ importers: '@types/react': 18.2.7 '@types/react-dom': 18.2.4 '@vercel/ncc': ^0.36.0 - '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2 - '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2 + '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1 + '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1 anser: ^2.1.1 css.escape: ^1.5.1 find-up: ^6.3.0 @@ -1005,8 +1005,8 @@ importers: stacktrace-parser: ^0.1.10 strip-ansi: ^7.0.1 dependencies: - '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2_react-refresh@0.12.0' - '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2' + '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1_react-refresh@0.12.0' + '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1' anser: 2.1.1 css.escape: 1.5.1 next: link:../../../../next @@ -25586,9 +25586,9 @@ packages: /zwitch/2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} - '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2_react-refresh@0.12.0': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2} - id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230703.2' + '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1_react-refresh@0.12.0': + resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1} + id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230702.1' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: @@ -25599,8 +25599,8 @@ packages: - webpack dev: false - '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230703.2} + '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1': + resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230702.1} name: '@vercel/turbopack-node' version: 0.0.0 dependencies: