Skip to content
Merged
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
11 changes: 7 additions & 4 deletions packages/tauri-app/src-tauri/src/cli_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1215,10 +1215,7 @@ fn resolve_dev_entry(_app: &AppHandle) -> Option<String> {
}

fn resolve_prod_entry(_app: &AppHandle) -> Option<String> {
let base = workspace_root();
let mut candidates = vec![base
.as_ref()
.map(|p| p.join("packages/server/dist/bin.js"))];
let mut candidates = Vec::new();

if let Ok(exe) = std::env::current_exe() {
if let Some(dir) = exe.parent() {
Expand All @@ -1236,6 +1233,12 @@ fn resolve_prod_entry(_app: &AppHandle) -> Option<String> {
}
}

let base = workspace_root();
candidates.push(
base.as_ref()
.map(|p| p.join("packages/server/dist/bin.js")),
);

first_existing(candidates)
}

Expand Down
Loading