diff --git a/Cargo.lock b/Cargo.lock index 802aecf8597c6..155e6a13bc718 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-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "serde", "smallvec", @@ -3396,7 +3396,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "serde", @@ -7373,7 +7373,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "async-trait", @@ -7405,7 +7405,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "cargo-lock", @@ -7417,7 +7417,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "bytes", @@ -7432,7 +7432,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "dotenvs", @@ -7446,7 +7446,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7463,7 +7463,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "auto-hash-map", @@ -7495,7 +7495,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "base16", "hex", @@ -7507,7 +7507,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7521,7 +7521,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "proc-macro2", "quote", @@ -7531,7 +7531,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "mimalloc", ] @@ -7539,7 +7539,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "auto-hash-map", @@ -7564,7 +7564,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "async-recursion", @@ -7597,7 +7597,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "auto-hash-map", "mdxjs", @@ -7637,7 +7637,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7662,7 +7662,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "clap 4.4.2", @@ -7681,7 +7681,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "async-recursion", @@ -7712,7 +7712,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "async-trait", @@ -7740,7 +7740,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7766,7 +7766,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "async-compression", @@ -7803,7 +7803,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "async-trait", @@ -7840,7 +7840,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "serde", "serde_json", @@ -7851,7 +7851,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "async-trait", @@ -7876,7 +7876,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "indoc", @@ -7893,7 +7893,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7909,7 +7909,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "base64 0.21.4", @@ -7929,7 +7929,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "serde", @@ -7944,7 +7944,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "mdxjs", @@ -7959,7 +7959,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "async-stream", @@ -7997,7 +7997,7 @@ dependencies = [ [[package]] name = "turbopack-resolve" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "async-recursion", @@ -8019,7 +8019,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "serde", @@ -8035,7 +8035,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "swc_core", "turbo-tasks", @@ -8046,7 +8046,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "crossbeam-channel", @@ -8062,7 +8062,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240307.1#703985d75d50dd187e1c9e1e4319fb7745269d8e" +source = "git+https://github.com/vercel/turbo.git?branch=kdy1/lcss-on#131e5c43af3f7c2e17ea4998dfc0df56fbb52ef1" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 3ad442f220a36..a3a61b133ee97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.90.17", features = [ testing = { version = "0.35.20" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.1" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/lcss-on" } # last tag: "turbopack-240307.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-240307.1" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/lcss-on" } # last tag: "turbopack-240307.1" # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240307.1" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "kdy1/lcss-on" } # last tag: "turbopack-240307.1" # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index d066c10259174..bf71cee73ea00 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -192,7 +192,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.26.4", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.1", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28dbe92d1af442d14332232cb27e837f629d44f1", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a2a25c24fa115..eb7c2dad2b491 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1071,8 +1071,8 @@ importers: specifier: 0.26.4 version: 0.26.4 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.1 - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.1' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28dbe92d1af442d14332232cb27e837f629d44f1 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28dbe92d1af442d14332232cb27e837f629d44f1' acorn: specifier: 8.5.0 version: 8.5.0 @@ -25569,8 +25569,8 @@ 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-240307.1': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240307.1} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28dbe92d1af442d14332232cb27e837f629d44f1': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?28dbe92d1af442d14332232cb27e837f629d44f1} name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: