diff --git a/Cargo.lock b/Cargo.lock index 1de0fb802f3be9..73be769b965b71 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-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "serde", ] @@ -3599,7 +3599,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "serde", @@ -7259,7 +7259,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "async-trait", @@ -7291,7 +7291,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "cargo-lock", @@ -7303,7 +7303,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "bytes", @@ -7318,7 +7318,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "dotenvs", @@ -7332,7 +7332,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "indexmap", @@ -7349,7 +7349,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "auto-hash-map", @@ -7379,7 +7379,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "base16", "hex", @@ -7391,7 +7391,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7405,7 +7405,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "proc-macro2", "quote", @@ -7415,7 +7415,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "mimalloc", ] @@ -7423,7 +7423,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "auto-hash-map", @@ -7446,7 +7446,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "auto-hash-map", @@ -7459,7 +7459,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "async-recursion", @@ -7489,7 +7489,7 @@ dependencies = [ [[package]] name = "turbopack-bench" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "chromiumoxide", @@ -7519,7 +7519,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "auto-hash-map", "mdxjs", @@ -7561,7 +7561,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "indexmap", @@ -7581,7 +7581,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "clap 4.1.11", @@ -7605,7 +7605,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "async-trait", @@ -7633,7 +7633,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "clap 4.1.11", @@ -7646,7 +7646,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "async-trait", @@ -7668,7 +7668,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "indexmap", @@ -7692,7 +7692,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "async-compression", @@ -7728,7 +7728,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "async-trait", @@ -7761,7 +7761,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "async-trait", @@ -7784,7 +7784,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "indoc", @@ -7801,7 +7801,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "indexmap", @@ -7817,7 +7817,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "base64 0.21.0", @@ -7837,7 +7837,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "serde", @@ -7852,7 +7852,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "mdxjs", @@ -7867,7 +7867,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "async-stream", @@ -7902,7 +7902,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "serde", @@ -7918,7 +7918,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "swc_core", "turbo-tasks", @@ -7929,7 +7929,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230716.2#8433a321545de30374b5374320625b92c663f5dc" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/asset-ident#29bca3b0c7c1cce464068b917a3e010b24d5c7dc" dependencies = [ "anyhow", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index c1bc91600e8919..e69705d598e503 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,11 +44,11 @@ swc_core = { version = "0.79.13" } testing = { version = "0.33.20" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230716.2" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "sokra/asset-ident" } # last tag: "turbopack-230716.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-230716.2" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "sokra/asset-ident" } # last tag: "turbopack-230716.2" # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230716.2" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "sokra/asset-ident" } # last tag: "turbopack-230716.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 b11bcbe69dfa69..e8ed7422c153b9 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-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230716.2", - "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230716.2", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc", + "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc", "anser": "^2.1.1", "css.escape": "^1.5.1", "next": "*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 23ca3a5e37891d..366361dd34a63b 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-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230716.2 - '@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230716.2 + '@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc + '@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc 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-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230716.2_react-refresh@0.12.0' - '@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230716.2' + '@vercel/turbopack-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc_react-refresh@0.12.0' + '@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc' anser: 2.1.1 css.escape: 1.5.1 next: link:../../../../next @@ -25498,9 +25498,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-230716.2_react-refresh@0.12.0': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230716.2} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230716.2' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc_react-refresh@0.12.0': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: @@ -25511,8 +25511,8 @@ packages: - webpack dev: false - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230716.2': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230716.2} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?29bca3b0c7c1cce464068b917a3e010b24d5c7dc} name: '@vercel/turbopack-node' version: 0.0.0 dependencies: