Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

port(turborepo): New Turbopath #4439

Merged
merged 19 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ pnpm-lock.yaml
# crates in alphabetical order
/crates @vercel/web-tooling
# overrides for crates that are owned by turbo-oss
/crates/turbopath @vercel/turbo-oss
/crates/turborepo @vercel/turbo-oss
/crates/turborepo-api-client @vercel/turbo-oss
/crates/turborepo-ffi @vercel/turbo-oss
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ jobs:
timeout-minutes: 120
# We exclude turbo as it requires linking Go and all logic resides in turborepo-lib
run: |
cargo test -p turborepo-lib -p turborepo-scm -p turborepo-lockfiles -p turborepo-api-client --features rustls-tls
cargo test -p turborepo-lib -p turborepo-scm -p turborepo-lockfiles -p turbopath -p turborepo-api-client --features rustls-tls

turbopack_rust_test1:
needs: [determine_jobs, rust_prepare]
Expand Down Expand Up @@ -641,12 +641,12 @@ jobs:
- name: Build nextest
timeout-minutes: 120
run: |
cargo nextest run --no-run --workspace --release --exclude turbo --exclude turborepo-ffi --exclude turborepo-lib --exclude turborepo-scm --exclude turborepo-paths --exclude turborepo-lockfiles --exclude turborepo-api-client
cargo nextest run --no-run --workspace --release --exclude turbo --exclude turborepo-ffi --exclude turborepo-lib --exclude turborepo-scm --exclude turbopath --exclude turborepo-lockfiles --exclude turborepo-api-client

- name: Run nextest
timeout-minutes: 120
run: |
cargo nextest run --workspace --release --no-fail-fast --exclude turbo --exclude turborepo-ffi --exclude turborepo-lib --exclude turborepo-scm --exclude turborepo-paths --exclude turborepo-lockfiles --exclude turborepo-api-client
cargo nextest run --workspace --release --no-fail-fast --exclude turbo --exclude turborepo-ffi --exclude turborepo-lib --exclude turborepo-scm --exclude turbopath --exclude turborepo-lockfiles --exclude turborepo-api-client

turbopack_rust_test2:
needs: [determine_jobs, rust_prepare]
Expand Down Expand Up @@ -705,13 +705,13 @@ jobs:
timeout-minutes: 120
# We exclude turbo as it requires linking Go and all logic resides in turborepo-lib
run: |
cargo nextest run --no-run --workspace --release --exclude turbo --exclude turborepo-ffi --exclude turborepo-lib --exclude turborepo-scm --exclude turborepo-paths --exclude turborepo-lockfiles --exclude turborepo-api-client
cargo nextest run --no-run --workspace --release --exclude turbo --exclude turborepo-ffi --exclude turborepo-lib --exclude turborepo-scm --exclude turbopath --exclude turborepo-lockfiles --exclude turborepo-api-client

- name: Run nextest
timeout-minutes: 120
# We exclude turbo as it requires linking Go and all logic resides in turborepo-lib
run: |
cargo nextest run --workspace --release --no-fail-fast --exclude turbo --exclude turborepo-ffi --exclude turborepo-lib --exclude turborepo-scm --exclude turborepo-paths --exclude turborepo-lockfiles --exclude turborepo-api-client
cargo nextest run --workspace --release --no-fail-fast --exclude turbo --exclude turborepo-ffi --exclude turborepo-lib --exclude turborepo-scm --exclude turbopath --exclude turborepo-lockfiles --exclude turborepo-api-client

turbopack_rust_test_bench1:
needs: [determine_jobs, rust_prepare]
Expand Down
168 changes: 18 additions & 150 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ members = [
"crates/turbopack-swc-utils",
"crates/turbopack-test-utils",
"crates/turbopack-tests",
"crates/turbopath",
"crates/turborepo",
"crates/turborepo-api-client",
"crates/turborepo-ffi",
"crates/turborepo-lib",
"crates/turborepo-lockfiles",
"crates/turborepo-scm",
"crates/turborepo-paths",
"xtask",
]

Expand Down Expand Up @@ -133,6 +133,7 @@ turbopack-static = { path = "crates/turbopack-static" }
turbopack-swc-utils = { path = "crates/turbopack-swc-utils" }
turbopack-test-utils = { path = "crates/turbopack-test-utils" }
turbopack-tests = { path = "crates/turbopack-tests" }
turbopath = { path = "crates/turbopath" }
turborepo = { path = "crates/turborepo" }
turborepo-api-client = { path = "crates/turborepo-api-client" }
turborepo-ffi = { path = "crates/turborepo-ffi" }
Expand Down
13 changes: 13 additions & 0 deletions crates/turbopath/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "turbopath"
version = "0.1.0"
license = "MPL-2.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
path-slash = "0.2.1"
# TODO: Make this a crate feature
serde = { workspace = true }
thiserror = { workspace = true }
Loading