File tree 2 files changed +12
-8
lines changed
cli/tauri-bundler/src/bundle
2 files changed +12
-8
lines changed Original file line number Diff line number Diff line change
1
+ ---
2
+ " tauri-bundler " : minor
3
+ ---
4
+
5
+ Fixes the bundler workspace detection.
Original file line number Diff line number Diff line change @@ -507,19 +507,18 @@ impl Settings {
507
507
/// Otherwise returns the current directory.
508
508
pub fn get_workspace_dir ( current_dir : & PathBuf ) -> PathBuf {
509
509
let mut dir = current_dir. clone ( ) ;
510
- let project_name = CargoSettings :: load ( & dir ) . unwrap ( ) . package . unwrap ( ) . name ;
510
+ let project_path = current_dir . clone ( ) ;
511
511
512
512
while dir. pop ( ) {
513
513
if let Ok ( cargo_settings) = CargoSettings :: load ( & dir) {
514
514
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
519
517
. 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
+ }
523
522
}
524
523
}
525
524
}
You can’t perform that action at this time.
0 commit comments