diff --git a/Cargo.lock b/Cargo.lock index f4607fe0a3eeb..bea97f3c5f498 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?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "serde", "smallvec", @@ -3497,7 +3497,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "serde", @@ -7537,7 +7537,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-trait", @@ -7569,7 +7569,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "cargo-lock", @@ -7581,7 +7581,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "bytes", @@ -7596,7 +7596,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "dotenvs", @@ -7610,7 +7610,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7627,7 +7627,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "auto-hash-map", @@ -7658,7 +7658,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "base16", "hex", @@ -7670,7 +7670,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7684,7 +7684,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "proc-macro2", "quote", @@ -7694,7 +7694,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "mimalloc", ] @@ -7702,7 +7702,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "auto-hash-map", @@ -7727,7 +7727,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-recursion", @@ -7759,7 +7759,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "auto-hash-map", "mdxjs", @@ -7800,7 +7800,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7824,7 +7824,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "clap 4.4.2", @@ -7842,7 +7842,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-recursion", @@ -7872,7 +7872,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-trait", @@ -7899,7 +7899,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7923,7 +7923,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-compression", @@ -7960,7 +7960,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-trait", @@ -7995,7 +7995,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "serde", "serde_json", @@ -8006,7 +8006,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-trait", @@ -8029,7 +8029,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indoc", @@ -8046,7 +8046,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8062,7 +8062,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "base64 0.21.4", @@ -8082,7 +8082,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "serde", @@ -8097,7 +8097,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "mdxjs", @@ -8112,7 +8112,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "async-stream", @@ -8147,7 +8147,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "serde", @@ -8163,7 +8163,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "swc_core", "turbo-tasks", @@ -8174,7 +8174,7 @@ dependencies = [ [[package]] name = "turbopack-trace-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "crossbeam-channel", @@ -8190,7 +8190,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?branch=01-16-Allow_skipping_postcss_relative_config_resolving#885d4141d366e54fb6c965692401eaa39a85663b" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240117.3#438bdd0b198163a37ff6050cf8ae2c7ca8b07753" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 4abdbcc42a8db..eb511e273c6be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,11 +37,11 @@ swc_core = { version = "0.87.16", features = [ testing = { version = "0.35.14" } # Turbo crates -turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "01-16-Allow_skipping_postcss_relative_config_resolving" } # last tag: "turbopack-240117.1" +turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.3" } # [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", branch = "01-16-Allow_skipping_postcss_relative_config_resolving" } # last tag: "turbopack-240117.1" +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.3" } # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "01-16-Allow_skipping_postcss_relative_config_resolving" } # last tag: "turbopack-240117.1" +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240117.3" } # General Deps diff --git a/packages/next/package.json b/packages/next/package.json index 17f1fb31a909d..a5ac3357b45af 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -194,7 +194,7 @@ "@types/ws": "8.2.0", "@vercel/ncc": "0.34.0", "@vercel/nft": "0.26.2", - "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3", "acorn": "8.5.0", "amphtml-validator": "1.0.35", "anser": "1.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e63c98d42fac5..a092636f7357d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1077,8 +1077,8 @@ importers: specifier: 0.26.2 version: 0.26.2 '@vercel/turbopack-ecmascript-runtime': - specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b - version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b(react-refresh@0.12.0)(webpack@5.86.0)' + specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3 + version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3(react-refresh@0.12.0)(webpack@5.86.0)' acorn: specifier: 8.5.0 version: 8.5.0 @@ -25649,9 +25649,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?885d4141d366e54fb6c965692401eaa39a85663b(react-refresh@0.12.0)(webpack@5.86.0)': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?885d4141d366e54fb6c965692401eaa39a85663b' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3(react-refresh@0.12.0)(webpack@5.86.0)': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240117.3' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: