Merge remote-tracking branch 'origin' into error-handling-for-channels-callback

oscartbeaumont · oscartbeaumont · commit 02cd31f286fe · 2025-04-28T11:33:54.000-07:00
diff --git a/.changes/feat-webview-auto-resize.md b/.changes/feat-webview-auto-resize.md
@@ -0,0 +1,7 @@
+---
+"tauri": "minor:feat"
+"@tauri-apps/api": "minor:feat"
+---
+
+Expose the `setAutoResize` API for webviews in `@tauri-apps/api`.
+
diff --git a/.changes/fix-frontenddir-target-error.md b/.changes/fix-frontenddir-target-error.md
@@ -0,0 +1,6 @@
+---
+"tauri-cli": "patch:bug"
+"@tauri-apps/cli": "patch:bug"
+---
+
+fix: allow the target directory to be inside frontendDir as long as it is not the Rust target directory inside frontendDir.
diff --git a/.changes/fix-path-join-error.md b/.changes/fix-path-join-error.md
@@ -0,0 +1,6 @@
+---
+"tauri": "minor:bug"
+"@tauri-apps/api": "minor:bug"
+---
+
+Fixed path joining behavior where `path.join('', 'a')` incorrectly returns "/a" instead of "a".
diff --git a/.changes/fix-tray-get-by-id.md b/.changes/fix-tray-get-by-id.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch:bug
+---
+
+Fix `TrayIcon.getById` returning a new resource ID instead of reusing a previously created id from `TrayIcon.new`.
diff --git a/crates/tauri-bundler/src/bundle/windows/nsis/languages/Hebrew.nsh b/crates/tauri-bundler/src/bundle/windows/nsis/languages/Hebrew.nsh
@@ -7,12 +7,12 @@ LangString chooseMaintenanceOption ${LANG_HEBREW} "בחר את פעולת התח
 LangString choowHowToInstall ${LANG_HEBREW} "בחר איך תרצה להתקין את ${PRODUCTNAME}."
 LangString createDesktop ${LANG_HEBREW} "צור קיצור דרך בשולחן העבודה"
 LangString dontUninstall ${LANG_HEBREW} "אל תסיר"
-LangString dontUninstallDowngrade ${LANG_HEBREW} "אל תסיר (התקנת גרסה ישנה ללא הסרת הגרסה הנוכחית מושעית עבור מותג זה)"
+LangString dontUninstallDowngrade ${LANG_HEBREW} "אל תסיר (התקנת גרסה ישנה ללא הסרת הגרסה הנוכחית מושעית עבור התקנה זו)"
 LangString failedToKillApp ${LANG_HEBREW} "עצירת ${PRODUCTNAME} נכשלה. נא לסגור את היישום ולנסות שוב."
 LangString installingWebview2 ${LANG_HEBREW} "מתקין את WebView2..."
-LangString newerVersionInstalled ${LANG_HEBREW} "גרסה חדשה יותר של ${PRODUCTNAME} כבר מותקנת! לא מומלץ להתקין גרסה ישנה. אם בכל זאת תרצה להתקין את הגרסה הזו, מומלץ קודם להסיר את הגרסה הנוכחית. בחר את הפעולה שברוצנך לבצע ולחץ הבא להמשך."
+LangString newerVersionInstalled ${LANG_HEBREW} "גרסה חדשה יותר של ${PRODUCTNAME} כבר מותקנת! לא מומלץ להתקין גרסה ישנה. אם בכל זאת תרצה להתקין את הגרסה הזו, מומלץ קודם להסיר את הגרסה הנוכחית. בחר את הפעולה שברצונך לבצע ולחץ הבא להמשך."
 LangString older ${LANG_HEBREW} "ישנה"
-LangString olderOrUnknownVersionInstalled ${LANG_HEBREW} "גרסה $R4 של ${PRODUCTNAME} מותקנת במערכת שלך. מומלץ להסיר את הגרסה הנוכחית לפני ההתקנה. בחר את הפעולה שברוצנך לבצע ולחץ הבא להמשך."
+LangString olderOrUnknownVersionInstalled ${LANG_HEBREW} "גרסה $R4 של ${PRODUCTNAME} מותקנת במערכת שלך. מומלץ להסיר את הגרסה הנוכחית לפני ההתקנה. בחר את הפעולה שברצונך לבצע ולחץ הבא להמשך."
 LangString silentDowngrades ${LANG_HEBREW} "התקנת גרסה ישנה לא נתמכת בהתקנה זו, אין אפשרות להמשיך עם ההתקנה השקטה, נא להמשיך עם ההתקנה בממשק הגרפי.$\n"
 LangString unableToUninstall ${LANG_HEBREW} "לא ניתן להסיר!"
 LangString uninstallApp ${LANG_HEBREW} "הסר את ${PRODUCTNAME}"
diff --git a/crates/tauri-cli/src/build.rs b/crates/tauri-cli/src/build.rs
@@ -9,12 +9,12 @@ use crate::{
     app_paths::tauri_dir,
     config::{get as get_config, ConfigHandle, FrontendDist},
   },
-  interface::{AppInterface, Interface},
+  interface::{rust::get_cargo_target_dir, AppInterface, Interface},
   ConfigValue, Result,
 };
 use anyhow::Context;
 use clap::{ArgAction, Parser};
-use std::env::set_current_dir;
+use std::{env::set_current_dir, fs};
 use tauri_utils::platform::Target;
 
 #[derive(Debug, Clone, Parser)]
@@ -172,19 +172,32 @@ pub fn setup(
         ));
     }
 
+    // Issue #13287 - Allow the use of target dir inside frontendDist/distDir
+    // https://github.com/tauri-apps/tauri/issues/13287
+    let target_path = fs::canonicalize(get_cargo_target_dir(&options.args)?)?;
     let mut out_folders = Vec::new();
-    for folder in &["node_modules", "src-tauri", "target"] {
-      if web_asset_path.join(folder).is_dir() {
-        out_folders.push(folder.to_string());
+    if let Ok(web_asset_canonical) = web_asset_path.canonicalize() {
+      if let Ok(relative_path) = target_path.strip_prefix(&web_asset_canonical) {
+        let relative_str = relative_path.to_string_lossy();
+        if !relative_str.is_empty() {
+          out_folders.push(relative_str.to_string());
+        }
+      }
+
+      for folder in &["node_modules", "src-tauri"] {
+        let sub_path = web_asset_canonical.join(folder);
+        if sub_path.is_dir() {
+          out_folders.push(folder.to_string());
+        }
       }
     }
+
     if !out_folders.is_empty() {
       return Err(anyhow::anyhow!(
-          "The configured frontendDist includes the `{:?}` {}. Please isolate your web assets on a separate folder and update `tauri.conf.json > build > frontendDist`.",
-          out_folders,
-          if out_folders.len() == 1 { "folder" } else { "folders" }
-        )
-      );
+        "The configured frontendDist includes the `{:?}` {}. Please isolate your web assets on a separate folder and update `tauri.conf.json > build > frontendDist`.",
+        out_folders,
+        if out_folders.len() == 1 { "folder" } else { "folders" }
+      ));
     }
   }
 
diff --git a/crates/tauri-cli/src/interface/rust.rs b/crates/tauri-cli/src/interface/rust.rs
@@ -1148,22 +1148,29 @@ pub(crate) fn get_cargo_metadata() -> crate::Result<CargoMetadata> {
   Ok(serde_json::from_slice(&output.stdout)?)
 }
 
-/// This function determines the 'target' directory and suffixes it with the profile
-/// to determine where the compiled binary will be located.
-fn get_target_dir(triple: Option<&str>, options: &Options) -> crate::Result<PathBuf> {
-  let mut path = if let Some(target) = get_cargo_option(&options.args, "--target-dir") {
+/// Get the cargo target directory based on the provided arguments.
+/// If "--target-dir" is specified in args, use it as the target directory (relative to current directory).
+/// Otherwise, use the target directory from cargo metadata.
+pub(crate) fn get_cargo_target_dir(args: &[String]) -> crate::Result<PathBuf> {
+  let path = if let Some(target) = get_cargo_option(args, "--target-dir") {
     std::env::current_dir()?.join(target)
   } else {
-    let mut path = get_cargo_metadata()
+    get_cargo_metadata()
       .with_context(|| "failed to get cargo metadata")?
-      .target_directory;
+      .target_directory
+  };
 
-    if let Some(triple) = triple {
-      path.push(triple);
-    }
+  Ok(path)
+}
 
-    path
-  };
+/// This function determines the 'target' directory and suffixes it with the profile
+/// to determine where the compiled binary will be located.
+fn get_target_dir(triple: Option<&str>, options: &Options) -> crate::Result<PathBuf> {
+  let mut path = get_cargo_target_dir(&options.args)?;
+
+  if let Some(triple) = triple {
+    path.push(triple);
+  }
 
   path.push(get_profile_dir(options));
 
@@ -1633,7 +1640,10 @@ mod tests {
     );
     assert_eq!(
       get_target_dir(Some("x86_64-pc-windows-msvc"), &options).unwrap(),
-      current_dir.join("path/to/some/dir/release")
+      current_dir
+        .join("path/to/some/dir")
+        .join("x86_64-pc-windows-msvc")
+        .join("release")
     );
 
     let options = Options {
diff --git a/crates/tauri-runtime-wry/src/monitor/macos.rs b/crates/tauri-runtime-wry/src/monitor/macos.rs
@@ -2,19 +2,28 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use tauri_runtime::dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalRect};
+use tauri_runtime::dpi::{LogicalSize, PhysicalRect};
 
 impl super::MonitorExt for tao::monitor::MonitorHandle {
   fn work_area(&self) -> PhysicalRect<i32, u32> {
     use objc2_app_kit::NSScreen;
     use tao::platform::macos::MonitorHandleExtMacOS;
     if let Some(ns_screen) = self.ns_screen() {
       let ns_screen: &NSScreen = unsafe { &*ns_screen.cast() };
-      let rect = ns_screen.visibleFrame();
+      let screen_frame = ns_screen.frame();
+      let visible_frame = ns_screen.visibleFrame();
+
       let scale_factor = self.scale_factor();
+
+      let mut position = self.position().to_logical::<f64>(scale_factor);
+
+      position.x += visible_frame.origin.x - screen_frame.origin.x;
+      position.y += visible_frame.origin.y - screen_frame.origin.y;
+
       PhysicalRect {
-        size: LogicalSize::new(rect.size.width, rect.size.height).to_physical(scale_factor),
-        position: LogicalPosition::new(rect.origin.x, rect.origin.y).to_physical(scale_factor),
+        size: LogicalSize::new(visible_frame.size.width, visible_frame.size.height)
+          .to_physical(scale_factor),
+        position: position.to_physical(scale_factor),
       }
     } else {
       PhysicalRect {
diff --git a/crates/tauri/build.rs b/crates/tauri/build.rs
@@ -135,6 +135,7 @@ const PLUGINS: &[(&str, &[(&str, bool)])] = &[
       ("set_webview_size", false),
       ("set_webview_position", false),
       ("set_webview_focus", false),
+      ("set_webview_auto_resize", false),
       ("set_webview_zoom", false),
       ("webview_hide", false),
       ("webview_show", false),
diff --git a/crates/tauri/permissions/webview/autogenerated/reference.md b/crates/tauri/permissions/webview/autogenerated/reference.md
@@ -203,6 +203,32 @@ Denies the reparent command without any pre-configured scope.
 <tr>
 <td>
 
+`core:webview:allow-set-webview-auto-resize`
+
+</td>
+<td>
+
+Enables the set_webview_auto_resize command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`core:webview:deny-set-webview-auto-resize`
+
+</td>
+<td>
+
+Denies the set_webview_auto_resize command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
 `core:webview:allow-set-webview-background-color`
 
 </td>
diff --git a/crates/tauri/scripts/bundle.global.js b/crates/tauri/scripts/bundle.global.js
diff --git a/crates/tauri/src/path/plugin.rs b/crates/tauri/src/path/plugin.rs
@@ -132,19 +132,19 @@ pub fn normalize(path: String) -> String {
 }
 
 #[command(root = "crate")]
-pub fn join(mut paths: Vec<String>) -> String {
+pub fn join(paths: Vec<String>) -> String {
   let path = PathBuf::from(
     paths
-      .iter_mut()
-      .map(|p| {
-        // Add a `MAIN_SEPARATOR` if it doesn't already have one.
+      .into_iter()
+      .map(|mut p| {
+        // Add a `MAIN_SEPARATOR` if it doesn't already have one and is not an empty string.
         // Doing this to ensure that the vector elements are separated in
         // the resulting string so path.components() can work correctly when called
         // in `normalize_path_no_absolute()` later on.
-        if !p.ends_with('/') && !p.ends_with('\\') {
+        if !p.is_empty() && !p.ends_with('/') && !p.ends_with('\\') {
           p.push(MAIN_SEPARATOR);
         }
-        p.to_string()
+        p
       })
       .collect::<String>(),
   );
@@ -287,4 +287,27 @@ mod tests {
       "some-json-file.json.html"
     );
   }
+
+  #[test]
+  fn join() {
+    fn check(paths: Vec<&str>, expected_unix: &str, expected_windows: &str) {
+      let expected = if cfg!(windows) {
+        expected_windows
+      } else {
+        expected_unix
+      };
+      let paths = paths.into_iter().map(String::from).collect();
+      assert_eq!(super::join(paths), expected);
+    }
+
+    check(vec![""], ".", ".");
+    check(vec!["", ""], ".", ".");
+    check(vec!["a"], "a", "a");
+    check(vec!["", "a"], "a", "a");
+    check(vec!["a", "b"], "a/b", r"a\b");
+    check(vec!["a", "", "b"], "a/b", r"a\b");
+    check(vec!["a", "/b", "c"], "a/b/c", r"a\b\c");
+    check(vec!["a", "b/c", "d"], "a/b/c/d", r"a\b\c\d");
+    check(vec!["a/", "b"], "a/b", r"a\b");
+  }
 }
diff --git a/crates/tauri/src/tray/mod.rs b/crates/tauri/src/tray/mod.rs
@@ -598,6 +598,13 @@ impl<R: Runtime> TrayIcon<R> {
 
 impl<R: Runtime> Resource for TrayIcon<R> {
   fn close(self: std::sync::Arc<Self>) {
+    self
+      .app_handle
+      .state::<plugin::TrayIcons>()
+      .icons
+      .lock()
+      .unwrap()
+      .remove(&self.id.0);
     self.app_handle.remove_tray_by_id(&self.id);
   }
 }
diff --git a/crates/tauri/src/tray/plugin.rs b/crates/tauri/src/tray/plugin.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use std::path::PathBuf;
+use std::{collections::HashMap, path::PathBuf, sync::Mutex};
 
 use serde::Deserialize;
 
@@ -14,11 +14,15 @@ use crate::{
   plugin::{Builder, TauriPlugin},
   resources::ResourceId,
   tray::TrayIconBuilder,
-  AppHandle, Manager, Runtime, Webview,
+  AppHandle, Manager, Runtime, State, Webview,
 };
 
 use super::{TrayIcon, TrayIconEvent};
 
+pub(crate) struct TrayIcons {
+  pub(crate) icons: Mutex<HashMap<String, ResourceId>>,
+}
+
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct TrayIconOptions {
@@ -36,6 +40,7 @@ struct TrayIconOptions {
 #[command(root = "crate")]
 fn new<R: Runtime>(
   webview: Webview<R>,
+  icons: State<'_, TrayIcons>,
   options: TrayIconOptions,
   handler: Channel<TrayIconEvent>,
 ) -> crate::Result<(ResourceId, String)> {
@@ -91,20 +96,35 @@ fn new<R: Runtime>(
   let id = tray.id().as_ref().to_string();
   let rid = resources_table.add(tray);
 
+  icons.icons.lock().unwrap().insert(id.clone(), rid);
+
   Ok((rid, id))
 }
 
 #[command(root = "crate")]
 fn get_by_id<R: Runtime>(
   app: AppHandle<R>,
   webview: Webview<R>,
+  icons: State<'_, TrayIcons>,
   id: &str,
 ) -> crate::Result<Option<ResourceId>> {
+  // if the icon was created by this plugin, return the resource id
+  // this lets a getById call match the rid of a TrayIcon.new call
+  // which allows it to close a previously created icon
+  if let Some(rid) = icons.icons.lock().unwrap().get(id) {
+    return Ok(Some(*rid));
+  }
+
   let tray = app.tray_by_id(id);
   let maybe_rid = tray.map(|tray| {
     let mut resources_table = webview.resources_table();
     resources_table.add(tray)
   });
+
+  if let Some(rid) = maybe_rid {
+    icons.icons.lock().unwrap().insert(id.to_string(), rid);
+  }
+
   Ok(maybe_rid)
 }
 
@@ -226,6 +246,12 @@ fn set_show_menu_on_left_click<R: Runtime>(
 
 pub(crate) fn init<R: Runtime>() -> TauriPlugin<R> {
   Builder::new("tray")
+    .setup(|app, _api| {
+      app.manage(TrayIcons {
+        icons: Default::default(),
+      });
+      Ok(())
+    })
     .invoke_handler(crate::generate_handler![
       #![plugin(tray)]
       new,
diff --git a/crates/tauri/src/webview/plugin.rs b/crates/tauri/src/webview/plugin.rs
@@ -220,6 +220,7 @@ mod desktop_commands {
   setter!(set_webview_size, set_size, Size);
   setter!(set_webview_position, set_position, Position);
   setter!(set_webview_focus, set_focus);
+  setter!(set_webview_auto_resize, set_auto_resize, bool);
   setter!(webview_hide, hide);
   setter!(webview_show, show);
   setter!(set_webview_zoom, set_zoom, f64);
@@ -310,6 +311,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
         desktop_commands::set_webview_size,
         desktop_commands::set_webview_position,
         desktop_commands::set_webview_focus,
+        desktop_commands::set_webview_auto_resize,
         desktop_commands::set_webview_background_color,
         desktop_commands::set_webview_zoom,
         desktop_commands::webview_hide,
diff --git a/packages/api/package.json b/packages/api/package.json
diff --git a/packages/api/src/webview.ts b/packages/api/src/webview.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"tauri": patch:bug
 +---
++
 +Fix `TrayIcon.getById` returning a new resource ID instead of reusing a previously created id from `TrayIcon.new`.