这是indexloc提供的服务,不要输入任何密码
Skip to content
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
3 changes: 3 additions & 0 deletions .github/workflows/turborepo-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ jobs:
- name: Install Global Turbo
uses: ./.github/actions/install-global-turbo

- name: Install Bun
uses: oven-sh/setup-bun@4bc047ad259df6fc24a6c9b0f9a0cb08cf17fbe5 # v2.0.1

- name: Setup Graphviz
uses: ts-graphviz/setup-graphviz@v2
with:
Expand Down
42 changes: 42 additions & 0 deletions crates/turborepo-lockfiles/fixtures/bun-catalog-v0.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"lockfileVersion": 0,
"workspaces": {
"": {
"name": "bun-catalog-test",
"devDependencies": {
"turbo": "^2.3.3"
}
},
"apps/web": {
"name": "web",
"dependencies": {
"react": "catalog:",
"lodash": "catalog:"
}
},
"apps/docs": {
"name": "docs",
"dependencies": {
"react": "catalog:frontend",
"next": "catalog:frontend"
}
}
},
"packages": {
"turbo": ["turbo@2.3.3", "", {}, "sha512-example"],
"react": ["react@18.2.0", "", {}, "sha512-react"],
"lodash": ["lodash@4.17.21", "", {}, "sha512-lodash"],
"docs/react": ["react@19.0.0", "", {}, "sha512-react19"],
"docs/next": ["next@14.0.0", "", {}, "sha512-next14"]
},
"catalog": {
"react": "^18.2.0",
"lodash": "^4.17.21"
},
"catalogs": {
"frontend": {
"react": "^19.0.0",
"next": "^14.0.0"
}
}
}
49 changes: 49 additions & 0 deletions crates/turborepo-lockfiles/fixtures/bun-v1-1.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"lockfileVersion": 1,
"workspaces": {
"": {
"name": "bun-v1-test",
"devDependencies": {
"turbo": "^2.3.3"
}
},
"apps/web": {
"name": "web",
"version": "1.0.0",
"dependencies": {
"@repo/ui": "packages/ui",
"react": "^18.0.0"
}
},
"apps/docs": {
"name": "docs",
"version": "1.0.0",
"dependencies": {
"@repo/ui": "packages/ui",
"@repo/shared-utils": "packages/shared-utils"
}
},
"packages/ui": {
"name": "@repo/ui",
"version": "0.1.0",
"dependencies": {
"react": "^18.0.0"
},
"devDependencies": {
"@repo/shared-utils": "packages/shared-utils"
}
},
"packages/shared-utils": {
"name": "@repo/shared-utils",
"version": "0.2.0",
"dependencies": {
"lodash": "^4.17.21"
}
}
},
"packages": {
"turbo": ["turbo@2.3.3", {}, "sha512-turbo"],
"react": ["react@18.0.0", {}, "sha512-react"],
"lodash": ["lodash@4.17.21", {}, "sha512-lodash"]
}
}
710 changes: 710 additions & 0 deletions crates/turborepo-lockfiles/fixtures/bun-v1-create-turbo.lock

Large diffs are not rendered by default.

921 changes: 921 additions & 0 deletions crates/turborepo-lockfiles/fixtures/bun-v1-issue-10410.lock

Large diffs are not rendered by default.

87 changes: 84 additions & 3 deletions crates/turborepo-lockfiles/src/bun/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ mod test {
use test_case::test_case;

use super::*;
use crate::{BunLockfile, bun::WorkspaceEntry};
use crate::{BunLockfile, Lockfile, bun::WorkspaceEntry};

macro_rules! fixture {
($name:ident, $kind:ty, $cons:expr) => {
Expand Down Expand Up @@ -216,15 +216,96 @@ mod test {

#[test]
fn test_full_parse() {
let contents = include_str!("../../fixtures/basic-bun.lock");
let contents = include_str!("../../fixtures/basic-bun-v0.lock");
let result = BunLockfile::from_str(contents);
assert!(result.is_ok(), "{}", result.unwrap_err());
}

#[test]
fn test_patch() {
let contents = include_str!("../../fixtures/bun-patch.lock");
let contents = include_str!("../../fixtures/bun-patch-v0.lock");
let result = BunLockfile::from_str(contents);
assert!(result.is_ok(), "{}", result.unwrap_err());
}

#[test]
fn test_v1_create_turbo() {
let contents = include_str!("../../fixtures/bun-v1-create-turbo.lock");
let result = BunLockfile::from_str(contents);
assert!(result.is_ok(), "{}", result.unwrap_err());

let lockfile = result.unwrap();

// Test transitive closure calculation to ensure all dependencies can be
// resolved
for (workspace_path, workspace_entry) in &lockfile.data.workspaces {
let mut unresolved_deps = std::collections::HashMap::new();

if let Some(deps) = &workspace_entry.dependencies {
unresolved_deps.extend(deps.clone());
}
if let Some(dev_deps) = &workspace_entry.dev_dependencies {
unresolved_deps.extend(dev_deps.clone());
}

if !unresolved_deps.is_empty() {
let closure =
crate::transitive_closure(&lockfile, workspace_path, unresolved_deps, false);
assert!(
closure.is_ok(),
"Transitive closure failed for workspace '{}': {}",
workspace_path,
closure.unwrap_err()
);
}
}
}

#[test]
fn test_v1_issue_10410() {
let contents = include_str!("../../fixtures/bun-v1-issue-10410.lock");
let result = BunLockfile::from_str(contents);
assert!(result.is_ok(), "{}", result.unwrap_err());

let lockfile = result.unwrap();

let result = lockfile.all_dependencies("@tailwindcss/oxide-wasm32-wasi@4.1.13");
assert!(
result.is_ok(),
"Failed to get dependencies for @tailwindcss/oxide-wasm32-wasi: {}",
result.unwrap_err()
);

// Test full transitive closure for each workspace
for (workspace_path, workspace_entry) in &lockfile.data.workspaces {
let mut unresolved_deps = std::collections::HashMap::new();

if let Some(deps) = &workspace_entry.dependencies {
unresolved_deps.extend(deps.clone());
}
if let Some(dev_deps) = &workspace_entry.dev_dependencies {
unresolved_deps.extend(dev_deps.clone());
}

if !unresolved_deps.is_empty() {
let closure =
crate::transitive_closure(&lockfile, workspace_path, unresolved_deps, false);
assert!(
closure.is_ok(),
"Transitive closure failed for workspace '{}': {}. This likely means a \
package entry is missing or bundled dependencies are not being resolved \
correctly.",
workspace_path,
closure.unwrap_err()
);

// Verify we got some packages in the closure
let closure = closure.unwrap();
assert!(
!closure.is_empty(),
"Expected non-empty transitive closure for workspace '{workspace_path}'"
);
}
}
}
}
Loading
Loading