这是indexloc提供的服务，不要输入任何密码
Skip to content

fix(lockfiles): include bundled dependencies in Bun lockfile subgraphs #10915

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 2, 2025
Merged

fix(lockfiles): include bundled dependencies in Bun lockfile subgraphs #10915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b344960
fix(lockfiles): include bundled dependencies in Bun lockfile subgraphs
anthonyshew Oct 2, 2025
e94860c
fix: address clippy lints in bun lockfile code
anthonyshew Oct 2, 2025
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
116 changes: 115 additions & 1 deletion crates/turborepo-lockfiles/src/bun/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,9 @@ impl BunLockfile {
// Filter out packages that are not in the subgraph. Note that _multiple_
// entries can correspond to the same ident.
let idents: HashSet<_> = packages.iter().collect();
let new_packages: Map<_, _> = self

// First, collect packages that match the idents
let mut new_packages: Map<_, _> = self
.data
.packages
.iter()
Expand All @@ -620,6 +622,24 @@ impl BunLockfile {
})
.collect();

// Then, for each included package, also include any scoped bundled dependencies
// Bundled dependencies are stored as "<parent_key>/<dep_name>" in the packages
// map and have "bundled": true in their metadata
let parent_keys: Vec<_> = new_packages.keys().cloned().collect();
for parent_key in parent_keys {
let prefix = format!("{parent_key}/");
for (key, entry) in self.data.packages.iter() {
if key.starts_with(&prefix) && !new_packages.contains_key(key) {
// Check if this is a bundled dependency
if let Some(info) = &entry.info
&& info.other.get("bundled") == Some(&Value::Bool(true))
{
new_packages.insert(key.clone(), entry.clone());
}
}
}
}

let new_patched_dependencies = self
.data
.patched_dependencies
Expand Down Expand Up @@ -3690,6 +3710,100 @@ mod test {
assert_eq!(common_info.cpu, Negatable::None);
}

#[test]
fn test_bundled_dependencies_included_in_subgraph() {
let contents = serde_json::to_string(&json!({
"lockfileVersion": 1,
"workspaces": {
"": {
"name": "test-app",
"dependencies": {
"@tailwindcss/oxide-wasm32-wasi": "^4.1.13"
}
}
},
"packages": {
"@tailwindcss/oxide-wasm32-wasi": [
"@tailwindcss/oxide-wasm32-wasi@4.1.13",
"",
{
"dependencies": {
"@emnapi/core": "^1.4.5",
"@emnapi/runtime": "^1.4.5"
}
},
"sha512-test"
],
"@tailwindcss/oxide-wasm32-wasi/@emnapi/core": [
"@emnapi/core@1.5.0",
"",
{
"dependencies": {
"tslib": "^2.4.0"
},
"bundled": true
},
"sha512-bundled-core"
],
"@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime": [
"@emnapi/runtime@1.5.0",
"",
{
"dependencies": {
"tslib": "^2.4.0"
},
"bundled": true
},
"sha512-bundled-runtime"
],
"@tailwindcss/oxide-wasm32-wasi/tslib": [
"tslib@2.8.1",
"",
{
"bundled": true
},
"sha512-bundled-tslib"
]
}
}))
.unwrap();

let lockfile = BunLockfile::from_str(&contents).unwrap();

// Create subgraph including @tailwindcss/oxide-wasm32-wasi
let subgraph = lockfile
.subgraph(&[], &["@tailwindcss/oxide-wasm32-wasi@4.1.13".into()])
.unwrap();
let subgraph_data = subgraph.lockfile().unwrap();

// Verify the main package is included
assert!(
subgraph_data
.packages
.contains_key("@tailwindcss/oxide-wasm32-wasi")
);

// Verify bundled dependencies are included
assert!(
subgraph_data
.packages
.contains_key("@tailwindcss/oxide-wasm32-wasi/@emnapi/core")
);
assert!(
subgraph_data
.packages
.contains_key("@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime")
);
assert!(
subgraph_data
.packages
.contains_key("@tailwindcss/oxide-wasm32-wasi/tslib")
);

// Verify the count is correct (1 main + 3 bundled)
assert_eq!(subgraph_data.packages.len(), 4);
}

#[test]
fn test_complex_platform_constraints() {
let contents = serde_json::to_string(&json!({
Expand Down
Loading