这是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
5 changes: 5 additions & 0 deletions crates/turborepo-repository/src/discovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ impl LocalPackageDiscoveryBuilder {
pub fn with_allow_no_package_manager(&mut self, allow_missing_package_manager: bool) {
self.allow_missing_package_manager = allow_missing_package_manager;
}

pub fn with_package_manager(&mut self, package_manager: Option<PackageManager>) -> &mut Self {
self.package_manager = package_manager;
self
}
}

impl PackageDiscoveryBuilder for LocalPackageDiscoveryBuilder {
Expand Down
6 changes: 6 additions & 0 deletions crates/turborepo-repository/src/package_graph/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ impl<'a> PackageGraphBuilder<'a, LocalPackageDiscoveryBuilder> {
.with_allow_no_package_manager(allow_no_package_manager);
self
}

pub fn with_package_manager(mut self, package_manager: PackageManager) -> Self {
self.package_discovery
.with_package_manager(Some(package_manager));
self
}
}

impl<'a, P> PackageGraphBuilder<'a, P> {
Expand Down
16 changes: 16 additions & 0 deletions packages/turbo-repository/__tests__/affected-packages.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,22 @@ describe("affectedPackages", () => {
});
}

it("does not require packageManager for npm", async () => {
const dir = path.resolve(__dirname, "./fixtures/npm-monorepo");
const workspace = await Workspace.find(dir);

const reduced: PackageReduced[] = (
await workspace.affectedPackages(["apps/app/file.txt"])
).map((pkg) => {
return {
name: pkg.name,
relativePath: pkg.relativePath,
};
});

assert.deepEqual(reduced, [{ name: "app-a", relativePath: "apps/app" }]);
});

describe("optimizedLockfileUpdates", () => {
it("errors if not provided comparison ref", async () => {
const dir = path.resolve(__dirname, "./fixtures/monorepo");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "app-a",
"dependencies": {
"ui": "*"
}
}

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "basic",
"private": true,
"workspaces": ["apps/*", "packages/*"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"//": "missing name field in this package.json"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name": "ui"
}
19 changes: 11 additions & 8 deletions packages/turbo-repository/rust/src/internal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,22 @@ impl Workspace {
})?;
let workspace_state = WorkspaceState::infer(&reference_dir)?;
let is_multi_package = workspace_state.mode == WorkspaceType::MultiPackage;
let package_manager_name = workspace_state
.package_manager
.as_ref()
.map_err(|error| Error::PackageManager {
error: error.to_string(),
path: workspace_state.root.clone(),
})?
.name();
let package_manager =
workspace_state
.package_manager
.as_ref()
.map_err(|error| Error::PackageManager {
error: error.to_string(),
path: workspace_state.root.clone(),
})?;

let package_manager_name = package_manager.name();

let workspace_root = &workspace_state.root;
let root_package_json = PackageJson::load(&workspace_root.join_component("package.json"))?;
let package_graph = PackageGraphBuilder::new(workspace_root, root_package_json)
.with_single_package_mode(!is_multi_package)
.with_package_manager(package_manager.clone())
.build()
.await?;

Expand Down
Loading