refactor(cli): use cargo run for tauri dev (tauri-apps#11694)

* x * todo * lint * lint * rename fn * lint * lint --------- Co-authored-by: Lucas Nogueira <[email protected]>
ebfork · Dec 5, 2024 · 2b8a981 · 2b8a981
1 parent 1f65fd2
commit 2b8a981
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 199 deletions.
diff --git a/crates/tauri-bundler/src/bundle/linux/appimage.rs b/crates/tauri-bundler/src/bundle/linux/appimage.rs
@@ -12,7 +12,6 @@ use crate::{
 use anyhow::Context;
 use std::{
   fs,
-  io::Write,
   path::{Path, PathBuf},
   process::Command,
 };

diff --git a/crates/tauri-bundler/src/bundle/macos/dmg/mod.rs b/crates/tauri-bundler/src/bundle/macos/dmg/mod.rs
@@ -178,7 +178,6 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
     if let Some(value) = env::var_os("CI") {
       if value == "true" {
         bundle_dmg_cmd.arg("--skip-jenkins");
-      } else {
       }
     }
   }

diff --git a/crates/tauri-cli/src/dev.rs b/crates/tauri-cli/src/dev.rs
@@ -10,7 +10,7 @@ use crate::{
       get as get_config, reload as reload_config, BeforeDevCommand, ConfigHandle, FrontendDist,
     },
   },
-  interface::{AppInterface, DevProcess, ExitReason, Interface},
+  interface::{AppInterface, ExitReason, Interface},
   CommandExt, ConfigValue, Result,
 };
 
@@ -338,35 +338,8 @@ pub fn setup(interface: &AppInterface, options: &mut Options, config: ConfigHand
   Ok(())
 }
 
-pub fn wait_dev_process<
-  C: DevProcess + Send + 'static,
-  F: Fn(Option<i32>, ExitReason) + Send + Sync + 'static,
->(
-  child: C,
-  on_exit: F,
-) {
-  std::thread::spawn(move || {
-    let code = child
-      .wait()
-      .ok()
-      .and_then(|status| status.code())
-      .or(Some(1));
-    on_exit(
-      code,
-      if child.manually_killed_process() {
-        ExitReason::TriggeredKill
-      } else {
-        ExitReason::NormalExit
-      },
-    );
-  });
-}
-
 pub fn on_app_exit(code: Option<i32>, reason: ExitReason, exit_on_panic: bool, no_watch: bool) {
-  if no_watch
-    || (!matches!(reason, ExitReason::TriggeredKill)
-      && (exit_on_panic || matches!(reason, ExitReason::NormalExit)))
-  {
+  if no_watch || exit_on_panic || matches!(reason, ExitReason::NormalExit) {
     kill_before_dev_process();
     exit(code.unwrap_or(0));
   }

diff --git a/crates/tauri-cli/src/interface/mod.rs b/crates/tauri-cli/src/interface/mod.rs
@@ -20,7 +20,10 @@ pub use rust::{MobileOptions, Options, Rust as AppInterface};
 pub trait DevProcess {
   fn kill(&self) -> std::io::Result<()>;
   fn try_wait(&self) -> std::io::Result<Option<ExitStatus>>;
+  // TODO:
+  #[allow(unused)]
   fn wait(&self) -> std::io::Result<ExitStatus>;
+  #[allow(unused)]
   fn manually_killed_process(&self) -> bool;
 }
 
@@ -84,7 +87,7 @@ pub trait AppSettings {
 #[derive(Debug)]
 pub enum ExitReason {
   /// Killed manually.
-  TriggeredKill,
+  // TriggeredKill,
   /// App compilation failed.
   CompilationFailed,
   /// Regular exit.

diff --git a/crates/tauri-cli/src/interface/rust.rs b/crates/tauri-cli/src/interface/rust.rs
@@ -363,6 +363,7 @@ fn lookup<F: FnMut(FileType, PathBuf)>(dir: &Path, mut f: F) {
 }
 
 fn shared_options(
+  desktop_dev: bool,
   mobile: bool,
   args: &mut Vec<String>,
   features: &mut Option<Vec<String>>,
@@ -374,7 +375,9 @@ fn shared_options(
       .get_or_insert(Vec::new())
       .push("tauri/rustls-tls".into());
   } else {
-    args.push("--bins".into());
+    if !desktop_dev {
+      args.push("--bins".into());
+    }
     let all_features = app_settings
       .manifest
       .lock()
@@ -408,7 +411,7 @@ fn dev_options(
   }
   *args = dev_args;
 
-  shared_options(mobile, args, features, app_settings);
+  shared_options(true, mobile, args, features, app_settings);
 
   if !args.contains(&"--no-default-features".into()) {
     let manifest_features = app_settings.manifest.lock().unwrap().features();
@@ -488,7 +491,7 @@ impl Rust {
     features
       .get_or_insert(Vec::new())
       .push("tauri/custom-protocol".into());
-    shared_options(mobile, args, features, &self.app_settings);
+    shared_options(false, mobile, args, features, &self.app_settings);
   }
 
   fn run_dev<F: Fn(Option<i32>, ExitReason) + Send + Sync + 'static>(
@@ -502,8 +505,6 @@ impl Rust {
       run_args,
       &mut self.available_targets,
       self.config_features.clone(),
-      &self.app_settings,
-      self.main_binary_name.clone(),
       on_exit,
     )
     .map(|c| Box::new(c) as Box<dyn DevProcess + Send>)