From 92284dbbbe270e9dd37a610281bf2547b185eea9 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Sun, 9 Jul 2023 07:08:53 +0000 Subject: [PATCH] link --- Cargo.lock | 70 +++++++++---------- Cargo.toml | 6 +- .../next-swc/crates/next-core/js/package.json | 4 +- pnpm-lock.yaml | 18 ++--- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d0db085054f1..220e410036772 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-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "serde", ] @@ -3553,7 +3553,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "serde", @@ -7213,7 +7213,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "auto-hash-map", @@ -7244,7 +7244,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "cargo-lock", @@ -7256,7 +7256,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "bytes", @@ -7271,7 +7271,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "dotenvs", @@ -7285,7 +7285,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "indexmap", @@ -7302,7 +7302,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "auto-hash-map", @@ -7332,7 +7332,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "base16", "hex", @@ -7344,7 +7344,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7358,7 +7358,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "proc-macro2", "quote", @@ -7368,7 +7368,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "mimalloc", ] @@ -7376,7 +7376,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "auto-hash-map", @@ -7399,7 +7399,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "auto-hash-map", @@ -7412,7 +7412,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "async-recursion", @@ -7442,7 +7442,7 @@ dependencies = [ [[package]] name = "turbopack-bench" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "chromiumoxide", @@ -7472,7 +7472,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "auto-hash-map", "mdxjs", @@ -7514,7 +7514,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "indexmap", @@ -7534,7 +7534,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "clap 4.1.11", @@ -7558,7 +7558,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "async-trait", @@ -7586,7 +7586,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "clap 4.1.11", @@ -7599,7 +7599,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "async-trait", @@ -7621,7 +7621,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "indexmap", @@ -7645,7 +7645,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "async-compression", @@ -7681,7 +7681,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "async-trait", @@ -7714,7 +7714,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "async-trait", @@ -7737,7 +7737,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "indoc", @@ -7754,7 +7754,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "indexmap", @@ -7770,7 +7770,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "base64 0.21.0", @@ -7790,7 +7790,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "serde", @@ -7805,7 +7805,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "mdxjs", @@ -7820,7 +7820,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "async-stream", @@ -7855,7 +7855,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "serde", @@ -7871,7 +7871,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "swc_core", "turbo-tasks", @@ -7882,7 +7882,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230707.3#96254ce90f90e31433226d055b2f2f32d5db27d9" +source = "git+https://github.com/vercel/turbo.git?branch=sokra/module-trait#3d69aa75b24064aca7c3fcae904c507c22f1abd7" dependencies = [ "anyhow", "once_cell", diff --git a/Cargo.toml b/Cargo.toml index bc882b8231e02..a9fce33521087 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,11 +42,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-230707.3" } +turbopack-binding = { git = "https://github.com/vercel/turbo.git", branch = "sokra/module-trait" } # last tag: "turbopack-230707.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", tag = "turbopack-230707.3" } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", branch = "sokra/module-trait" } # last tag: "turbopack-230707.3" # [TODO]: need to refactor embed_directory! macro usage in next-core -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230707.3" } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", branch = "sokra/module-trait" } # last tag: "turbopack-230707.3" # 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 aeb91faabb3c7..7298b8e725ad9 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-230707.3", - "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230707.3", + "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7", + "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7", "anser": "^2.1.1", "css.escape": "^1.5.1", "next": "*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 61190d453e1bf..462b38aa522ce 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-230707.3 - '@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230707.3 + '@vercel/turbopack-ecmascript-runtime': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7 + '@vercel/turbopack-node': https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7 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-230707.3_react-refresh@0.12.0' - '@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230707.3' + '@vercel/turbopack-ecmascript-runtime': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7_react-refresh@0.12.0' + '@vercel/turbopack-node': '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7' anser: 2.1.1 css.escape: 1.5.1 next: link:../../../../next @@ -25568,9 +25568,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-230707.3_react-refresh@0.12.0': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230707.3} - id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230707.3' + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7_react-refresh@0.12.0': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7} + id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7' name: '@vercel/turbopack-ecmascript-runtime' version: 0.0.0 dependencies: @@ -25581,8 +25581,8 @@ packages: - webpack dev: false - '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230707.3': - resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230707.3} + '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7': + resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?3d69aa75b24064aca7c3fcae904c507c22f1abd7} name: '@vercel/turbopack-node' version: 0.0.0 dependencies: