这是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
79 changes: 79 additions & 0 deletions crates/turborepo-lockfiles/fixtures/issue-10985.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"name": "monorepo",
"version": "1.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "monorepo",
"version": "1.0.0",
"workspaces": ["apps/*", "packages/*"]
},
"node_modules/next": {
"version": "14.2.5",
"resolved": "https://registry.npmjs.org/next/-/next-14.2.5.tgz",
"integrity": "sha512-test"
},
"node_modules/next-15": {
"version": "15.0.0",
"resolved": "https://registry.npmjs.org/next/-/next-15.0.0.tgz",
"integrity": "sha512-test"
},
"node_modules/@repo/components": {
"resolved": "packages/components",
"link": true
},
"apps/app-one": {
"name": "app-one",
"version": "1.0.0",
"dependencies": {
"@repo/components": "*",
"next": "^14.0.0"
}
},
"apps/app-one/node_modules/next": {
"version": "14.2.5",
"resolved": "https://registry.npmjs.org/next/-/next-14.2.5.tgz",
"integrity": "sha512-test"
},
"apps/app-two": {
"name": "app-two",
"version": "1.0.0",
"dependencies": {
"@repo/components": "*",
"next": "^15.0.0"
}
},
"apps/app-two/node_modules/next": {
"version": "15.0.0",
"resolved": "https://registry.npmjs.org/next/-/next-15.0.0.tgz",
"integrity": "sha512-test"
},
"packages/components": {
"name": "@repo/components",
"version": "1.0.0",
"peerDependencies": {
"next": "^14 || ^15"
}
}
},
"dependencies": {
"app-one": {
"version": "file:apps/app-one",
"requires": {
"@repo/components": "*",
"next": "^14.0.0"
}
},
"app-two": {
"version": "file:apps/app-two",
"requires": {
"@repo/components": "*",
"next": "^15.0.0"
}
},
"@repo/components": {
"version": "file:packages/components"
}
}
}
19 changes: 18 additions & 1 deletion crates/turborepo-lockfiles/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,23 @@ fn transitive_closure_helper<L: Lockfile + ?Sized>(
unresolved_deps: HashMap<String, impl AsRef<str>>,
resolved_deps: &mut HashSet<Package>,
ignore_missing_packages: bool,
) -> Result<(), Error> {
transitive_closure_helper_impl(
lockfile,
workspace_path,
unresolved_deps,
resolved_deps,
ignore_missing_packages,
)
}

/// Core transitive closure implementation that walks dependencies.
fn transitive_closure_helper_impl<L: Lockfile + ?Sized>(
lockfile: &L,
workspace_path: &str,
unresolved_deps: HashMap<String, impl AsRef<str>>,
resolved_deps: &mut HashSet<Package>,
ignore_missing_packages: bool,
) -> Result<(), Error> {
for (name, specifier) in unresolved_deps {
let pkg = match lockfile.resolve_package(workspace_path, &name, specifier.as_ref()) {
Expand All @@ -187,7 +204,7 @@ fn transitive_closure_helper<L: Lockfile + ?Sized>(
if let Some(deps) = all_deps {
// we've already found one unresolved dependency, so we can't ignore its set of
// dependencies.
transitive_closure_helper(
transitive_closure_helper_impl(
lockfile,
workspace_path,
deps,
Expand Down
61 changes: 61 additions & 0 deletions crates/turborepo-lockfiles/src/npm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,67 @@ mod test {
Ok(())
}

#[test]
fn test_issue_10985_peer_dependencies_with_different_versions() -> Result<(), Error> {
let lockfile = NpmLockfile::load(include_bytes!("../fixtures/issue-10985.json"))?;

let closures = crate::all_transitive_closures(
&lockfile,
vec![
(
"apps/app-one".into(),
vec![
("@repo/components".into(), "*".into()),
("next".into(), "^14.0.0".into()),
]
.into_iter()
.collect(),
),
(
"apps/app-two".into(),
vec![
("@repo/components".into(), "*".into()),
("next".into(), "^15.0.0".into()),
]
.into_iter()
.collect(),
),
]
.into_iter()
.collect(),
false,
)?;

let app_one_deps = closures.get("apps/app-one").unwrap();
let app_two_deps = closures.get("apps/app-two").unwrap();

assert!(app_one_deps.contains(&Package {
key: "apps/app-one/node_modules/next".into(),
version: "14.2.5".into()
}));
assert!(app_two_deps.contains(&Package {
key: "apps/app-two/node_modules/next".into(),
version: "15.0.0".into()
}));

assert!(
!app_one_deps.contains(&Package {
key: "apps/app-two/node_modules/next".into(),
version: "15.0.0".into()
}),
"app-one should not include next@15.0.0"
);
assert!(
!app_two_deps.contains(&Package {
key: "apps/app-one/node_modules/next".into(),
version: "14.2.5".into()
}),
"app-two should not include next@14.2.5"
);

Ok(())
}

#[test]
fn test_turbo_version() -> Result<(), Error> {
let lockfile = NpmLockfile::load(include_bytes!("../fixtures/npm-lock.json"))?;
Expand Down
Loading