tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-09-22 05:39:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(bundler): workspace detection, closes #1007 (#1235)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira 2021-02-14 17:57:59 -03:00 committed by GitHub
parent 855effadd9
commit e34ee4c29c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/workspace-detection.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri-bundler": minor
---
Fixes the bundler workspace detection.

15
cli/tauri-bundler/src/bundle/settings.rs
View File

@ -507,19 +507,18 @@ impl Settings {
/// Otherwise returns the current directory.
pub fn get_workspace_dir(current_dir: &PathBuf) -> PathBuf {
let mut dir = current_dir.clone();
let project_name = CargoSettings::load(&dir).unwrap().package.unwrap().name;
let project_path = current_dir.clone();
while dir.pop() {
if let Ok(cargo_settings) = CargoSettings::load(&dir) {
if let Some(workspace_settings) = cargo_settings.workspace {
if workspace_settings.members.is_some()
&& workspace_settings
.members
.expect("Couldn't get members")
if let Some(members) = workspace_settings.members {
if members
.iter()
.any(|member| member.as_str() == project_name)
{
return dir;
.any(|member| dir.join(member) == project_path)
{
return dir;
}
}
}
}