From 6c5340f8b2549dfe89f19656304e65cd670afc92 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucas@tauri.app>
Date: Sun, 15 Sep 2024 08:35:38 -0300
Subject: [PATCH] feat(cli): add log plugin to the app template (#11004)

* feat(cli): add log plugin to the app template

The log plugin is really important for mobile development - without it you don't have a clue about logs and stdout for iOS apps

* patch tauri dep for local testing

* clippy
---
 .changes/cli-template-log-plugin.md                    |  6 ++++++
 crates/tauri-cli/src/init.rs                           |  9 ++++++---
 .../templates/app/src-tauri/Cargo.crate-manifest       |  6 ++++++
 crates/tauri-cli/templates/app/src-tauri/src/lib.rs    | 10 ++++++++++
 crates/tauri/src/process.rs                            |  2 +-
 5 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 .changes/cli-template-log-plugin.md

diff --git a/.changes/cli-template-log-plugin.md b/.changes/cli-template-log-plugin.md
new file mode 100644
index 000000000..aa5988517
--- /dev/null
+++ b/.changes/cli-template-log-plugin.md
@@ -0,0 +1,6 @@
+---
+"@tauri-apps/cli": patch:enhance
+"tauri-cli": patch:enhance
+---
+
+Added the `log` plugin to the app template, which is required to visualize logs on Android and iOS.
diff --git a/crates/tauri-cli/src/init.rs b/crates/tauri-cli/src/init.rs
index b4a439a2b..3edc5cf20 100644
--- a/crates/tauri-cli/src/init.rs
+++ b/crates/tauri-cli/src/init.rs
@@ -196,15 +196,15 @@ pub fn command(mut options: Options) -> Result<()> {
       template_target_path
     );
   } else {
-    let (tauri_dep, tauri_build_dep) = if let Some(tauri_path) = options.tauri_path {
+    let (tauri_dep, tauri_build_dep) = if let Some(tauri_path) = &options.tauri_path {
       (
         format!(
           r#"{{  path = {:?} }}"#,
-          resolve_tauri_path(&tauri_path, "crates/tauri")
+          resolve_tauri_path(tauri_path, "crates/tauri")
         ),
         format!(
           "{{  path = {:?} }}",
-          resolve_tauri_path(&tauri_path, "crates/tauri-build")
+          resolve_tauri_path(tauri_path, "crates/tauri-build")
         ),
       )
     } else {
@@ -220,6 +220,9 @@ pub fn command(mut options: Options) -> Result<()> {
 
     let mut data = BTreeMap::new();
     data.insert("tauri_dep", to_json(tauri_dep));
+    if options.tauri_path.is_some() {
+      data.insert("patch_tauri_dep", to_json(true));
+    }
     data.insert("tauri_build_dep", to_json(tauri_build_dep));
     data.insert(
       "frontend_dist",
diff --git a/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest b/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest
index 9f3082260..b7356a789 100644
--- a/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest
+++ b/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest
@@ -20,4 +20,10 @@ tauri-build = {{  tauri_build_dep  }}
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
+log = "0.4"
 tauri = {{  tauri_dep  }}
+tauri-plugin-log = "2.0.0-rc"
+{{#if patch_tauri_dep}}
+[patch.crates-io]
+tauri = {{ tauri_dep }}
+{{/if}}
diff --git a/crates/tauri-cli/templates/app/src-tauri/src/lib.rs b/crates/tauri-cli/templates/app/src-tauri/src/lib.rs
index cfef8d12b..9c3118c5d 100644
--- a/crates/tauri-cli/templates/app/src-tauri/src/lib.rs
+++ b/crates/tauri-cli/templates/app/src-tauri/src/lib.rs
@@ -1,6 +1,16 @@
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
   tauri::Builder::default()
+    .setup(|app| {
+      if cfg!(debug_assertions) {
+        app.handle().plugin(
+          tauri_plugin_log::Builder::default()
+            .level(log::LevelFilter::Info)
+            .build(),
+        )?;
+      }
+      Ok(())
+    })
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
 }
diff --git a/crates/tauri/src/process.rs b/crates/tauri/src/process.rs
index 47fdd3412..4206df174 100644
--- a/crates/tauri/src/process.rs
+++ b/crates/tauri/src/process.rs
@@ -92,7 +92,7 @@ pub fn restart(env: &Env) -> ! {
 }
 
 #[cfg(target_os = "macos")]
-fn restart_macos_app(current_binary: &PathBuf, env: &Env) {
+fn restart_macos_app(current_binary: &std::path::Path, env: &Env) {
   use std::process::{exit, Command};
 
   if let Some(macos_directory) = current_binary.parent() {