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

fix: package scoping fails when workspace glob has leading ./ #10408

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

Closed
wants to merge 2 commits into from
Closed

fix: package scoping fails when workspace glob has leading ./ #10408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c4755f
fix: package scoping with leading ./ in workspace glob
devin-ai-integration[bot] Apr 30, 2025
58dee28
style: fix formatting issues
devin-ai-integration[bot] Apr 30, 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
10 changes: 4 additions & 6 deletions crates/turborepo-repository/src/inference.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,11 +366,9 @@ mod test {
.unwrap();

let repo_state = RepoState::infer(&package_foo).unwrap();
// These assertions are the buggy behavior
assert_eq!(repo_state.root, package_foo);
assert_eq!(repo_state.mode, RepoMode::SinglePackage);
// TODO: the following assertions are the correct behavior
// assert_eq!(repo_state.root, monorepo_root);
// assert_eq!(repo_state.mode, RepoMode::MultiPackage);
// With our fix for leading ./ in workspace globs, we now expect the correct
// behavior
assert_eq!(repo_state.root, monorepo_root);
assert_eq!(repo_state.mode, RepoMode::MultiPackage);
}
}
18 changes: 17 additions & 1 deletion crates/turborepo-repository/src/workspaces.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ impl WorkspaceGlobs {
// take ownership of the inputs
let raw_inclusions: Vec<String> = inclusions
.into_iter()
.map(|s| s.into())
.map(|s| {
let s_str: String = s.into();
s_str.strip_prefix("./").unwrap_or(&s_str).to_string()
})
.collect::<Vec<String>>();
let package_json_inclusions = raw_inclusions
.iter()
Expand Down Expand Up @@ -175,4 +178,17 @@ mod test {
&["scripts/package.json", "packages/**/package.json"]
);
}

#[test]
fn test_workspace_globs_leading_dot_slash() {
let globs = WorkspaceGlobs::new(vec!["./packages/foo", "./packages/bar"], vec![]).unwrap();
assert_eq!(
&globs
.package_json_inclusions
.iter()
.map(|i| i.as_str())
.collect::<Vec<_>>(),
&["packages/foo/package.json", "packages/bar/package.json"]
);
}
}