Tauri v2 fixes, Restart App fix

Author: thinkdj

src-tauri/gen/schemas/acl-manifests.json

@@ -32,14 +32,21 @@ pub fn hide_window(app: AppHandle) -> Result<(), String> {
 pub async fn restart_app(app: AppHandle) -> Result<(), String> {
     #[cfg(debug_assertions)]
     {
-        // Only allow restart in debug mode
-        app.restart();
-        // This line is unreachable but needed for type checking
-        #[allow(unreachable_code)]
+        // In development mode, reload all windows instead of restarting the entire process
+        // This preserves the CLI dev server
+        println!("Reloading application (dev mode)...");
+        for (_label, window) in app.webview_windows() {
+            let _ = window.eval("window.location.reload()");
+        }
         Ok(())
     }
     #[cfg(not(debug_assertions))]
     {
-        Err("Restart is only available in development mode".to_string())
+        // In production mode, actually restart the application
+        println!("Restarting application (production mode)...");
+        app.restart();
+        // This line is unreachable but needed for type checking
+        #[allow(unreachable_code)]
+        Ok(())
     }
 }

src-tauri/gen/schemas/desktop-schema.json

@@ -104,16 +104,22 @@ macro_rules! feature_enabled {
 /// Tauri command to get enabled features at runtime
 #[tauri::command]
 pub fn get_enabled_features() -> Vec<&'static str> {
-    let mut v = Vec::new();
+    let mut features = Vec::new();
+    
     #[cfg(feature = "notifications")]
-    v.push("notifications");
+    features.push("notifications");
+    
     #[cfg(feature = "deep-links")]
-    v.push("deep-links");
+    features.push("deep-links");
+    
     #[cfg(feature = "clipboard")]
-    v.push("clipboard");
+    features.push("clipboard");
+    
     #[cfg(feature = "system-tray")]
-    v.push("system-tray");
+    features.push("system-tray");
+    
     #[cfg(feature = "window-manager")]
-    v.push("window-manager");
-    v
+    features.push("window-manager");
+    
+    features
 }

src-tauri/gen/schemas/windows-schema.json

@@ -45,7 +45,7 @@ fn main() {
     #[cfg(feature = "clipboard")]
     let builder = builder.plugin(tauri_plugin_clipboard_manager::init());
 
-    let mut app_builder = builder
+    let app_builder = builder
         .invoke_handler(tauri::generate_handler![
             greet,
             show_window,
@@ -121,9 +121,7 @@ fn main() {
         ]);
 
     #[cfg(feature = "window-manager")]
-    {
-        app_builder = app_builder.manage(init_window_state());
-    }
+    let app_builder = app_builder.manage(init_window_state());
 
     app_builder
         .setup(|app| {

src-tauri/src/commands.rs

@@ -77,7 +77,7 @@ pub fn create_app_menu(app: &App) -> Result<Menu<tauri::Wry>> {
         "Developer",
         true,
         &[
-            &MenuItem::with_id(app, "restart_app", "Restart App", true, Some("CmdOrCtrl+Shift+R"))?,
+            &MenuItem::with_id(app, "restart_app", "Reload App (Dev)", true, Some("CmdOrCtrl+Shift+R"))?,
             &PredefinedMenuItem::separator(app)?,
             &MenuItem::with_id(app, "reload_all", "Reload All Windows", true, Some("CmdOrCtrl+Shift+F5"))?,
         ],
@@ -98,7 +98,17 @@ pub fn handle_menu_event(app: &AppHandle, event: tauri::menu::MenuEvent) {
         "restart_app" => {
             #[cfg(debug_assertions)]
             {
-                println!("Restarting application...");
+                // In development mode, reload all windows instead of restarting the entire process
+                // This preserves the CLI dev server
+                println!("Reloading application (dev mode)...");
+                for (_label, window) in app.webview_windows() {
+                    let _ = window.eval("window.location.reload()");
+                }
+            }
+            #[cfg(not(debug_assertions))]
+            {
+                // In production mode, actually restart the application
+                println!("Restarting application (production mode)...");
                 app.restart();
             }
         }
@@ -117,12 +127,12 @@ pub fn handle_menu_event(app: &AppHandle, event: tauri::menu::MenuEvent) {
             }
         }
         "toggle_devtools" => {
+            #[cfg(debug_assertions)]
             if let Some(window) = app.get_webview_window("main") {
-                if window.is_devtools_open() {
-                    let _ = window.close_devtools();
-                } else {
-                    let _ = window.open_devtools();
-                }
+                // In Tauri v2, devtools are handled differently
+                // For now, we'll just focus the window
+                let _ = window.set_focus();
+                println!("DevTools toggle requested (not implemented in Tauri v2)");
             }
         }
         "about" => {

src-tauri/src/features.rs

@@ -16,7 +16,7 @@ pub fn create_tray_menu(app: &App) -> Result<Menu<tauri::Wry>> {
                 &MenuItem::with_id(app, "about_tray", "About", true, None::<&str>)?,
                 &MenuItem::with_id(app, "settings", "Settings", true, None::<&str>)?,
                 &PredefinedMenuItem::separator(app)?,
-                &MenuItem::with_id(app, "restart_app_tray", "Restart App", true, None::<&str>)?,
+                &MenuItem::with_id(app, "restart_app_tray", "Reload App (Dev)", true, None::<&str>)?,
                 &PredefinedMenuItem::separator(app)?,
                 &PredefinedMenuItem::quit(app, Some("Quit"))?,
             ],
@@ -71,7 +71,17 @@ pub fn handle_tray_menu_event(app: &AppHandle, event: tauri::menu::MenuEvent) {
         "restart_app_tray" => {
             #[cfg(debug_assertions)]
             {
-                println!("Restarting application from tray...");
+                // In development mode, reload all windows instead of restarting the entire process
+                // This preserves the CLI dev server
+                println!("Reloading application from tray (dev mode)...");
+                for (_label, window) in app.webview_windows() {
+                    let _ = window.eval("window.location.reload()");
+                }
+            }
+            #[cfg(not(debug_assertions))]
+            {
+                // In production mode, actually restart the application
+                println!("Restarting application from tray (production mode)...");
                 app.restart();
             }
         }