feat(cli): change app template to only set default menu on macOS (#4518)

lucasfernog · web-flow · commit 5105b428c472 · 2022-06-29T14:03:42.000-03:00
diff --git a/.changes/change-template-menu.md b/.changes/change-template-menu.md
@@ -0,0 +1,6 @@
+---
+"cli.rs": patch
+"cli.js": patch
+---
+
+The app template now only sets the default menu on macOS.
diff --git a/.github/workflows/test-cli-js.yml b/.github/workflows/test-cli-js.yml
@@ -13,7 +13,7 @@ on:
     paths:
       - '.github/workflows/test-cli-js.yml'
       # currently cli.js only tests the template
-      - 'tooling/cli/templates/app'
+      - 'tooling/cli/templates/app/**'
 
 env:
   RUST_BACKTRACE: 1
diff --git a/examples/commands/main.rs b/examples/commands/main.rs
@@ -159,7 +159,11 @@ fn borrow_cmd_async(argument: &str) -> &str {
 fn main() {
   let context = tauri::generate_context!("../../examples/commands/tauri.conf.json");
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .manage(MyState {
       value: 0,
       label: "Tauri!".into(),
diff --git a/examples/helloworld/main.rs b/examples/helloworld/main.rs
@@ -10,7 +10,11 @@
 fn main() {
   let context = tauri::generate_context!("../../examples/helloworld/tauri.conf.json");
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .run(context)
     .expect("error while running tauri application");
 }
diff --git a/examples/isolation/main.rs b/examples/isolation/main.rs
@@ -23,7 +23,11 @@ fn main() {
 fn main() {
   let context = tauri::generate_context!("../../examples/isolation/tauri.conf.json");
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .invoke_handler(tauri::generate_handler![ping])
     .run(context)
     .expect("error while running tauri application");
diff --git a/examples/multiwindow/main.rs b/examples/multiwindow/main.rs
@@ -12,7 +12,11 @@ use tauri::WindowBuilder;
 fn main() {
   let context = tauri::generate_context!("../../examples/multiwindow/tauri.conf.json");
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .on_page_load(|window, _payload| {
       let label = window.label().to_string();
       window.listen("clicked".to_string(), move |_payload| {
diff --git a/examples/navigation/main.rs b/examples/navigation/main.rs
@@ -10,7 +10,11 @@
 fn main() {
   let context = tauri::generate_context!("../../examples/navigation/tauri.conf.json");
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .run(context)
     .expect("error while running tauri application");
 }
diff --git a/examples/parent-window/main.rs b/examples/parent-window/main.rs
@@ -26,7 +26,11 @@ async fn create_child_window(id: String, window: Window) {
 fn main() {
   let context = tauri::generate_context!("../../examples/parent-window/tauri.conf.json");
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .on_page_load(|window, _payload| {
       let label = window.label().to_string();
       window.listen("clicked".to_string(), move |_payload| {
diff --git a/examples/resources/src-tauri/src/main.rs b/examples/resources/src-tauri/src/main.rs
@@ -16,7 +16,11 @@ fn main() {
   let context = tauri::generate_context!();
 
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .setup(move |app| {
       let window = app.get_window("main").unwrap();
       let script_path = app
diff --git a/examples/sidecar/src-tauri/src/main.rs b/examples/sidecar/src-tauri/src/main.rs
@@ -15,7 +15,11 @@ use tauri::{
 fn main() {
   let context = tauri::generate_context!();
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .setup(|app| {
       let window = app.get_window("main").unwrap();
       tauri::async_runtime::spawn(async move {
diff --git a/examples/splashscreen/main.rs b/examples/splashscreen/main.rs
@@ -19,7 +19,11 @@ mod rust {
   pub fn main() {
     let context = tauri::generate_context!("../../examples/splashscreen/tauri.conf.json");
     tauri::Builder::default()
-      .menu(tauri::Menu::os_default(&context.package_info().name))
+      .menu(if cfg!(target_os = "macos") {
+        tauri::Menu::os_default(&context.package_info().name)
+      } else {
+        tauri::Menu::default()
+      })
       .setup(|app| {
         let splashscreen_window = app.get_window("splashscreen").unwrap();
         let main_window = app.get_window("main").unwrap();
@@ -66,7 +70,11 @@ mod ui {
   pub fn main() {
     let context = tauri::generate_context!("../../examples/splashscreen/tauri.conf.json");
     tauri::Builder::default()
-      .menu(tauri::Menu::os_default(&context.package_info().name))
+      .menu(if cfg!(target_os = "macos") {
+        tauri::Menu::os_default(&context.package_info().name)
+      } else {
+        tauri::Menu::default()
+      })
       .setup(|app| {
         // set the splashscreen and main windows to be globally available with the tauri state API
         app.manage(SplashscreenWindow(Arc::new(Mutex::new(
diff --git a/examples/state/main.rs b/examples/state/main.rs
@@ -71,7 +71,11 @@ fn db_read(key: String, db: State<'_, Database>) -> Option<String> {
 fn main() {
   let context = tauri::generate_context!("../../examples/state/tauri.conf.json");
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .manage(Counter(AtomicUsize::new(0)))
     .manage(Database(Default::default()))
     .manage(Connection(Default::default()))
diff --git a/examples/streaming/main.rs b/examples/streaming/main.rs
@@ -41,7 +41,11 @@ fn main() {
   let context = tauri::generate_context!("../../examples/streaming/tauri.conf.json");
 
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .register_uri_scheme_protocol("stream", move |_app, request| {
       // prepare our response
       let mut response = ResponseBuilder::new();
diff --git a/examples/tauri-dynamic-lib/src-tauri/src/lib.rs b/examples/tauri-dynamic-lib/src-tauri/src/lib.rs
@@ -14,7 +14,11 @@
 pub extern "C" fn run_tauri() {
   let context = tauri::generate_context!("./tauri.conf.json");
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .run(context)
     .expect("error while running tauri application");
 }
diff --git a/examples/updater/src-tauri/src/main.rs b/examples/updater/src-tauri/src/main.rs
@@ -15,7 +15,11 @@ fn my_custom_command(argument: String) {
 fn main() {
   let context = tauri::generate_context!();
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .invoke_handler(tauri::generate_handler![my_custom_command])
     .run(context)
     .expect("error while running tauri application");
diff --git a/tooling/cli/templates/app/src-tauri/src/main.rs b/tooling/cli/templates/app/src-tauri/src/main.rs
@@ -6,7 +6,11 @@
 fn main() {
   let context = tauri::generate_context!();
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .run(context)
     .expect("error while running tauri application");
 }
diff --git a/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/src/main.rs b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/src/main.rs
@@ -6,7 +6,11 @@
 fn main() {
   let context = tauri::generate_context!();
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .plugin(tauri_plugin_{{ plugin_name_snake_case }}::init())
     .run(context)
     .expect("error while running tauri application");
diff --git a/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/src/main.rs b/tooling/cli/templates/plugin/with-api/examples/svelte-app/src-tauri/src/main.rs
@@ -6,7 +6,11 @@
 fn main() {
   let context = tauri::generate_context!();
   tauri::Builder::default()
-    .menu(tauri::Menu::os_default(&context.package_info().name))
+    .menu(if cfg!(target_os = "macos") {
+      tauri::Menu::os_default(&context.package_info().name)
+    } else {
+      tauri::Menu::default()
+    })
     .plugin(tauri_plugin_{{ plugin_name_snake_case }}::init())
     .run(context)
     .expect("failed to run app");
