Skip to content

Commit e34ee4c

Browse files
authored
fix(bundler): workspace detection, closes #1007 (#1235)
1 parent 855effa commit e34ee4c

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.changes/workspace-detection.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri-bundler": minor
3+
---
4+
5+
Fixes the bundler workspace detection.

cli/tauri-bundler/src/bundle/settings.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -507,19 +507,18 @@ impl Settings {
507507
/// Otherwise returns the current directory.
508508
pub fn get_workspace_dir(current_dir: &PathBuf) -> PathBuf {
509509
let mut dir = current_dir.clone();
510-
let project_name = CargoSettings::load(&dir).unwrap().package.unwrap().name;
510+
let project_path = current_dir.clone();
511511

512512
while dir.pop() {
513513
if let Ok(cargo_settings) = CargoSettings::load(&dir) {
514514
if let Some(workspace_settings) = cargo_settings.workspace {
515-
if workspace_settings.members.is_some()
516-
&& workspace_settings
517-
.members
518-
.expect("Couldn't get members")
515+
if let Some(members) = workspace_settings.members {
516+
if members
519517
.iter()
520-
.any(|member| member.as_str() == project_name)
521-
{
522-
return dir;
518+
.any(|member| dir.join(member) == project_path)
519+
{
520+
return dir;
521+
}
523522
}
524523
}
525524
}

0 commit comments

Comments
 (0)