diff --git a/Cargo.lock b/Cargo.lock index 60e34b719f901..3519c8e61101f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -400,7 +400,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "serde", ] @@ -3463,7 +3463,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "serde", @@ -7104,7 +7104,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "auto-hash-map", @@ -7135,7 +7135,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "cargo-lock", @@ -7147,7 +7147,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "bytes", @@ -7162,7 +7162,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "dotenvy", @@ -7176,7 +7176,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "indexmap", @@ -7193,7 +7193,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "auto-hash-map", @@ -7223,7 +7223,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "base16", "hex", @@ -7235,7 +7235,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7249,7 +7249,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "proc-macro2", "quote", @@ -7259,7 +7259,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "mimalloc", ] @@ -7267,7 +7267,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "auto-hash-map", @@ -7290,7 +7290,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "auto-hash-map", @@ -7302,7 +7302,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "async-recursion", @@ -7332,7 +7332,7 @@ dependencies = [ [[package]] name = "turbopack-bench" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "chromiumoxide", @@ -7362,7 +7362,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "auto-hash-map", "mdxjs", @@ -7404,7 +7404,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "indexmap", @@ -7424,7 +7424,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "clap 4.1.11", @@ -7448,7 +7448,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "async-trait", @@ -7476,7 +7476,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "clap 4.1.11", @@ -7489,7 +7489,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "async-trait", @@ -7511,7 +7511,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "indexmap", @@ -7535,7 +7535,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "async-compression", @@ -7570,7 +7570,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "async-trait", @@ -7603,7 +7603,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "async-trait", @@ -7626,7 +7626,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "indoc", @@ -7643,7 +7643,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "indexmap", @@ -7659,7 +7659,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "base64 0.21.0", @@ -7679,7 +7679,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "serde", @@ -7694,7 +7694,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "mdxjs", @@ -7709,7 +7709,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "async-stream", @@ -7744,7 +7744,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "serde", @@ -7760,7 +7760,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "swc_core", "turbo-tasks", @@ -7771,7 +7771,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230622.2#08aba99a2796b37324cabf18b6ea9eff886d93b4" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/route-tree#0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93" dependencies = [ "anyhow", "once_cell", @@ -7789,8 +7789,8 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", - "rand 0.8.5", + "cfg-if 1.0.0", + "rand 0.4.6", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index 40e3989b9b62d..d123d1fe2a9c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,11 +42,11 @@ swc_core = { version = "0.76.46" } testing = { version = "0.33.13" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230622.2" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "sokra/route-tree" } # last tag: "turbopack-230622.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-230622.2" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "sokra/route-tree" } # last tag: "turbopack-230622.2" # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230622.2" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "sokra/route-tree" } # last tag: "turbopack-230622.2" # General Deps diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json index a67e4a46eef5a..aa89c856254af 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-230622.2", - "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93", + "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93", "anser": "^2.1.1", "css.escape": "^1.5.1", "next": "*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 92a42ef2d8e33..2d981c13bc31f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -984,8 +984,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-230622.2 - '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2 + '@vercel/turbopack-ecmascript-runtime': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93 + '@vercel/turbopack-node': https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93 anser: ^2.1.1 css.escape: ^1.5.1 find-up: ^6.3.0 @@ -997,8 +997,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-230622.2_react-refresh@0.12.0' - '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2' + '@vercel/turbopack-ecmascript-runtime': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93_react-refresh@0.12.0' + '@vercel/turbopack-node': '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93' anser: 2.1.1 css.escape: 1.5.1 next: link:../../../../next @@ -25553,9 +25553,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-230622.2_react-refresh@0.12.0': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230622.2} - id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230622.2' + '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93_react-refresh@0.12.0': + resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93} + id: '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-ecmascript-runtime/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: @@ -25566,8 +25566,8 @@ packages: - webpack dev: false - '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2': - resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230622.2} + '@gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93': + resolution: {tarball: https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?0edf5f88e53845ee0ab2c018f7dcfc0e0b33ab93} name: '@vercel/turbopack-node' version: 0.0.0 dependencies: