Merge branch 'dev' into feat/emitter-listener

.changes/cli-icon-non-0-exit.md

@@ -0,0 +1,6 @@
+---
+"tauri-cli": "patch:bug"
+"@tauri-apps/cli": "patch:bug"
+---
+
+Exit `tauri icon` with non-zero code when it fails.

.changes/fix-proxy-url-totokens-impl.md

@@ -0,0 +1,5 @@
+---
+"tauri-utils": patch:bug
+---
+
+Fixes the ToTokens implementation of the window configuration `proxy_url` field.

.changes/fix-schemars-compatibility.md

@@ -0,0 +1,5 @@
+---
+tauri-utils: "patch:bug"
+---
+
+Fixes `schemars` compilation issue.

.changes/pre.json

@@ -20,6 +20,7 @@
     ".changes/app-manifest.md",
     ".changes/assets-setup.md",
     ".changes/beta.md",
+    ".changes/better-error-for-invalid-plugin-config.md",
     ".changes/build-schema-generation.md",
     ".changes/bundler-deep-link-reg-path.md",
     ".changes/bundler-license.md",
@@ -40,6 +41,7 @@
     ".changes/cli-ds-store-dev-watch.md",
     ".changes/cli-empty-responses.md",
     ".changes/cli-frontend-dist-expected-path.md",
+    ".changes/cli-icon-non-0-exit.md",
     ".changes/cli-include-dir-cargo-manifest-dir.md",
     ".changes/cli-migrate-non-utf8.md",
     ".changes/cli-migrate-unknown-plugins.md",
@@ -80,6 +82,8 @@
     ".changes/deb-rpm-post-pre-scripts-bundler.md",
     ".changes/deb-rpm-post-pre-scripts-config.md",
     ".changes/deb-rpm-provides-conflicts-replaces.md",
+    ".changes/default-generic-for-menu.md",
+    ".changes/default-generic-for-tray.md",
     ".changes/dev-fn.md",
     ".changes/downgrade-minisign.md",
     ".changes/drop-nsis-applicationid.md",
@@ -112,6 +116,7 @@
     ".changes/fix-reparent.md",
     ".changes/fix-rewrite-schema.md",
     ".changes/fix-runtime-wry-32bit.md",
+    ".changes/fix-schemars-compatibility.md",
     ".changes/fix-scope-resolution.md",
     ".changes/fix-tauri-build-license-field.md",
     ".changes/fix-tauri-build-unix.md",
@@ -130,6 +135,7 @@
     ".changes/image-crate.md",
     ".changes/image-rgba-uint8array.md",
     ".changes/image-size-refactor.md",
+    ".changes/improve-errors-for-missing-links-property.md",
     ".changes/inline-plugins.md",
     ".changes/ios-signing-optional.md",
     ".changes/ipc-allow-headers.md",
@@ -188,6 +194,7 @@
     ".changes/tauri-utils-capability-refactor.md",
     ".changes/tauri-utils-plugin-module.md",
     ".changes/tauri-webview-events.md",
+    ".changes/tray-icon-rect.md",
     ".changes/tray-rect.md",
     ".changes/truncate-before-write-buildtask.md",
     ".changes/unstable-child-webview.md",

.changes/tray-icon-rect.md

@@ -0,0 +1,5 @@
+---
+"tauri": "minor:feat"
+---
+
+Add `TrayIcon::rect` method to retrieve the tray icon rectangle

.changes/url-result-runtime.md

@@ -0,0 +1,6 @@
+---
+"tauri-runtime": "patch"
+"tauri-runtime-wry": "patch"
+---
+
+Changed `WebviewDispatch::url` getter to return a result.

.changes/url-result.md

@@ -0,0 +1,5 @@
+---
+"tauri": "patch:breaking"
+---
+
+Changed `WebviewWindow::url` and `Webview::url` getter to return a result.

Cargo.lock

@@ -2989,9 +2989,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
+checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef"
 dependencies = [
  "dyn-clone",
  "indexmap 1.9.3",
@@ -3003,14 +3003,14 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
+checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 1.0.109",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -3099,13 +3099,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.26.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.57",
 ]
 
 [[package]]
@@ -3527,7 +3527,7 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "tauri"
-version = "2.0.0-beta.17"
+version = "2.0.0-beta.18"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3585,7 +3585,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -3607,7 +3607,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "base64 0.22.0",
  "brotli",
@@ -3644,7 +3644,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -3656,7 +3656,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "anyhow",
  "glob",
@@ -3671,7 +3671,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "dpi",
  "gtk",
@@ -3688,7 +3688,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "cocoa",
  "gtk",
@@ -3711,7 +3711,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "aes-gcm",
  "brotli",
@@ -4077,9 +4077,9 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
-version = "0.13.0"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8713f74e697917aa794800289e15bce534fc91450312ab2d3edf5b8907f7301a"
+checksum = "39240037d755a1832e752d64f99078c3b0b21c09a71c12405070c75ef4e7cd3c"
 dependencies = [
  "cocoa",
  "core-graphics",

SECURITY.md

@@ -10,8 +10,8 @@
 ## Reporting a Vulnerability
 
 If you have found a potential security threat, vulnerability or exploit in Tauri
-or one of its upstream dependencies, please DON’T create a pull-request, DON’T
-file an issue on GitHub, DON’T mention it on Discord and DON’T create a forum thread.
+or one of its upstream dependencies, please DON'T create a pull-request, DON'T
+file an issue on GitHub, DON'T mention it on Discord and DON'T create a forum thread.
 
 Please submit your report via the GitHub Private Vulnerability Disclosure functionality.
 

core/tauri-build/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-codegen@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### Bug Fixes

core/tauri-build/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-build"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "build time code to pair with https://crates.io/crates/tauri"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -28,8 +28,8 @@ rustdoc-args = [ "--cfg", "docsrs" ]
 [dependencies]
 anyhow = "1"
 quote = { version = "1", optional = true }
-tauri-codegen = { version = "2.0.0-beta.13", path = "../tauri-codegen", optional = true }
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils", features = [ "build", "resources" ] }
+tauri-codegen = { version = "2.0.0-beta.14", path = "../tauri-codegen", optional = true }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils", features = [ "build", "resources" ] }
 cargo_toml = "0.17"
 serde = "1"
 serde_json = "1"
@@ -41,7 +41,7 @@ semver = "1"
 dirs-next = "2"
 glob = "0.3"
 toml = "0.8"
-schemars = { version = "0.8", features = [ "preserve_order" ] }
+schemars = { version = "0.8.18", features = [ "preserve_order" ] }
 
 [features]
 default = [ "config-json" ]

core/tauri-build/src/manifest.rs

@@ -65,7 +65,7 @@ pub fn check(config: &Config, manifest: &mut Manifest) -> Result<()> {
     if deps.is_empty() {
       if let Some(alias) = &metadata.alias {
         deps = find_dependency(manifest, alias, metadata.kind);
-        name = alias.clone();
+        name.clone_from(alias)
       }
     }
 

core/tauri-codegen/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### Dependencies

core/tauri-codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-codegen"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,7 +20,7 @@ quote = "1"
 syn = "2"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils", features = [ "build" ] }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils", features = [ "build" ] }
 thiserror = "1"
 walkdir = "2"
 brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] }

core/tauri-config-schema/Cargo.toml

@@ -6,7 +6,7 @@ publish = false
 
 [build-dependencies]
 tauri-utils = { features = [ "schema" ], path = "../tauri-utils" }
-schemars = { version = "0.8", features = ["url", "preserve_order"] }
+schemars = { version = "0.8.18", features = ["url", "preserve_order"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 url = { version = "2.3", features = ["serde"] }

core/tauri-macros/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-codegen@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### Dependencies

core/tauri-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-macros"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "Macros for the tauri crate."
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,8 +20,8 @@ proc-macro2 = { version = "1", features = [ "span-locations" ] }
 quote = "1"
 syn = { version = "2", features = [ "full" ] }
 heck = "0.5"
-tauri-codegen = { version = "2.0.0-beta.13", default-features = false, path = "../tauri-codegen" }
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils" }
+tauri-codegen = { version = "2.0.0-beta.14", default-features = false, path = "../tauri-codegen" }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
 
 [features]
 custom-protocol = [ ]

core/tauri-plugin/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Enhancements
+
+- [`bf2635ab6`](https://www.github.com/tauri-apps/tauri/commit/bf2635ab6241a5b82569eafc939046d6e245f3ad)([#9632](https://www.github.com/tauri-apps/tauri/pull/9632)) Improve the error message that is shown when the `links` property is missing from a Tauri Plugin.
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### Dependencies

core/tauri-plugin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "Build script and runtime Tauri plugin definitions"
 authors = { workspace = true }
 homepage = { workspace = true }
@@ -30,11 +30,11 @@ runtime = [ ]
 [dependencies]
 anyhow = { version = "1", optional = true }
 serde = { version = "1", optional = true }
-tauri-utils = { version = "2.0.0-beta.13", default-features = false, features = [ "build" ], path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-beta.14", default-features = false, features = [ "build" ], path = "../tauri-utils" }
 serde_json = { version = "1", optional = true }
 glob = { version = "0.3", optional = true }
 toml = { version = "0.8", optional = true }
-schemars = { version = "0.8", features = [ "preserve_order" ] }
+schemars = { version = "0.8.18", features = [ "preserve_order" ] }
 walkdir = { version = "2", optional = true }
 
 [target."cfg(target_os = \"macos\")".dependencies]

core/tauri-runtime-wry/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-runtime@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### New Features

core/tauri-runtime-wry/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime-wry"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "Wry bindings to the Tauri runtime"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -15,8 +15,8 @@ rust-version = { workspace = true }
 [dependencies]
 wry = { version = "0.39.3", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] }
 tao = { version = "0.27", default-features = false, features = [ "rwh_06" ] }
-tauri-runtime = { version = "2.0.0-beta.14", path = "../tauri-runtime" }
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils" }
+tauri-runtime = { version = "2.0.0-beta.15", path = "../tauri-runtime" }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
 raw-window-handle = "0.6"
 http = "1.1"
 url = "2"

core/tauri-runtime-wry/src/lib.rs

@@ -1190,7 +1190,7 @@ pub enum WebviewMessage {
   SetAutoResize(bool),
   SetZoom(f64),
   // Getters
-  Url(Sender<Result<Url>>),
+  Url(Sender<Result<String>>),
   Bounds(Sender<Result<tauri_runtime::Rect>>),
   Position(Sender<Result<PhysicalPosition<i32>>>),
   Size(Sender<Result<PhysicalSize<u32>>>),
@@ -1305,7 +1305,7 @@ impl<T: UserEvent> WebviewDispatch<T> for WryWebviewDispatcher<T> {
 
   // Getters
 
-  fn url(&self) -> Result<Url> {
+  fn url(&self) -> Result<String> {
     webview_getter!(self, WebviewMessage::Url)?
   }
 
@@ -4107,7 +4107,7 @@ fn inner_size(
   webviews: &[WebviewWrapper],
   has_children: bool,
 ) -> TaoPhysicalSize<u32> {
-  if !has_children && webviews.len() > 0 {
+  if !has_children && !webviews.is_empty() {
     use wry::WebViewExtMacOS;
     let webview = webviews.first().unwrap();
     let view_frame = unsafe { cocoa::appkit::NSView::frame(webview.webview()) };

core/tauri-runtime/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+
 ## \[2.0.0-beta.14]
 
 ### New Features

core/tauri-runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "Runtime for Tauri applications"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -29,7 +29,7 @@ targets = [
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
 http = "1.1"
 raw-window-handle = "0.6"
 url = { version = "2" }

core/tauri-runtime/src/lib.rs

@@ -228,7 +228,7 @@ pub enum RunEvent<T: UserEvent> {
   Ready,
   /// Sent if the event loop is being resumed.
   Resumed,
-  /// Emitted when all of the event loop’s input events have been processed and redraw processing is about to begin.
+  /// Emitted when all of the event loop's input events have been processed and redraw processing is about to begin.
   ///
   /// This event is useful as a place to put your code that should be run after all state-changing events have been handled and you want to do stuff (updating state, performing calculations, etc) that happens as the “main body” of your event loop.
   MainEventsCleared,
@@ -445,7 +445,7 @@ pub trait WebviewDispatch<T: UserEvent>: Debug + Clone + Send + Sync + Sized + '
   // GETTERS
 
   /// Returns the webview's current URL.
-  fn url(&self) -> Result<Url>;
+  fn url(&self) -> Result<String>;
 
   /// Returns the webview's bounds.
   fn bounds(&self) -> Result<Rect>;
@@ -539,10 +539,10 @@ pub trait WindowDispatch<T: UserEvent>: Debug + Clone + Send + Sync + Sized + 's
   /// Gets the window's current focus state.
   fn is_focused(&self) -> Result<bool>;
 
-  /// Gets the window’s current decoration state.
+  /// Gets the window's current decoration state.
   fn is_decorated(&self) -> Result<bool>;
 
-  /// Gets the window’s current resizable state.
+  /// Gets the window's current resizable state.
   fn is_resizable(&self) -> Result<bool>;
 
   /// Gets the window's native maximize button state.
@@ -710,10 +710,10 @@ pub trait WindowDispatch<T: UserEvent>: Debug + Clone + Send + Sync + Sized + 's
   /// Resizes the window.
   fn set_size(&self, size: Size) -> Result<()>;
 
-  /// Updates the window min size.
+  /// Updates the window min inner size.
   fn set_min_size(&self, size: Option<Size>) -> Result<()>;
 
-  /// Updates the window max size.
+  /// Updates the window max inner size.
   fn set_max_size(&self, size: Option<Size>) -> Result<()>;
 
   /// Updates the window position.

core/tauri-utils/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Bug Fixes
+
+- [`3fbc1703f`](https://www.github.com/tauri-apps/tauri/commit/3fbc1703f107dfb2c5a75e848805dcf60d449eb1)([#9676](https://www.github.com/tauri-apps/tauri/pull/9676)) Fixes `schemars` compilation issue.
+
 ## \[2.0.0-beta.13]
 
 ### Bug Fixes

core/tauri-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-utils"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "Utilities for Tauri"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -23,7 +23,7 @@ html5ever = "0.26"
 kuchiki = { package = "kuchikiki", version = "0.8" }
 proc-macro2 = { version = "1", optional = true }
 quote = { version = "1", optional = true }
-schemars = { version = "0.8", features = [ "url" ], optional = true }
+schemars = { version = "0.8.18", features = [ "url" ], optional = true }
 serde_with = "3"
 aes-gcm = { version = "0.10", optional = true }
 getrandom = { version = "0.2", optional = true, features = [ "std" ] }

core/tauri-utils/src/config.rs

@@ -213,19 +213,13 @@ impl schemars::JsonSchema for BundleTarget {
         ..Default::default()
       }
       .into(),
-      schemars::_private::apply_metadata(
+      schemars::_private::metadata::add_description(
         gen.subschema_for::<Vec<BundleType>>(),
-        schemars::schema::Metadata {
-          description: Some("A list of bundle targets.".to_owned()),
-          ..Default::default()
-        },
+        "A list of bundle targets.",
       ),
-      schemars::_private::apply_metadata(
+      schemars::_private::metadata::add_description(
         gen.subschema_for::<BundleType>(),
-        schemars::schema::Metadata {
-          description: Some("A single bundle target.".to_owned()),
-          ..Default::default()
-        },
+        "A single bundle target.",
       ),
     ];
 
@@ -2249,7 +2243,7 @@ mod build {
       let minimizable = self.minimizable;
       let closable = self.closable;
       let title = str_lit(&self.title);
-      let proxy_url = opt_str_lit(self.proxy_url.as_ref());
+      let proxy_url = opt_lit(self.proxy_url.as_ref().map(url_lit).as_ref());
       let fullscreen = self.fullscreen;
       let focus = self.focus;
       let transparent = self.transparent;

core/tauri/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## \[2.0.0-beta.18]
+
+### New Features
+
+- [`07ff78c2d`](https://www.github.com/tauri-apps/tauri/commit/07ff78c2de74d3bd85328ce6536f8a858be89128)([#9615](https://www.github.com/tauri-apps/tauri/pull/9615)) Add `TrayIcon::rect` method to retrieve the tray icon rectangle
+
+### Enhancements
+
+- [`7f6d2698c`](https://www.github.com/tauri-apps/tauri/commit/7f6d2698c923019e4ce53f794e68aa7e56fd7b86)([#9631](https://www.github.com/tauri-apps/tauri/pull/9631)) Improve the error message that is shown when deserializing the Tauri plugin config.
+- [`8a71858eb`](https://www.github.com/tauri-apps/tauri/commit/8a71858eb2a9dc12a43d8fb56f803cdcae072b68)([#9630](https://www.github.com/tauri-apps/tauri/pull/9630)) Provide a default for the runtime generic on `Menu`, `MenuItem`, `Submenu`, `PredefinedMenuItem`, `CheckMenuItem` and `IconMenuItem`.
+- [`8a71858eb`](https://www.github.com/tauri-apps/tauri/commit/8a71858eb2a9dc12a43d8fb56f803cdcae072b68)([#9630](https://www.github.com/tauri-apps/tauri/pull/9630)) Provide a default for the runtime generic on `TrayIcon`.
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-runtime@2.0.0-beta.15`
+- Upgraded to `tauri-runtime-wry@2.0.0-beta.15`
+- Upgraded to `tauri-macros@2.0.0-beta.14`
+- Upgraded to `tauri-build@2.0.0-beta.14`
+
 ## \[2.0.0-beta.17]
 
 ### New Features

core/tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri"
-version = "2.0.0-beta.17"
+version = "2.0.0-beta.18"
 description = "Make tiny, secure apps for all desktop platforms with Tauri"
 exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -51,10 +51,10 @@ uuid = { version = "1", features = [ "v4" ], optional = true }
 url = "2"
 anyhow = "1.0"
 thiserror = "1.0"
-tauri-runtime = { version = "2.0.0-beta.14", path = "../tauri-runtime" }
-tauri-macros = { version = "2.0.0-beta.13", path = "../tauri-macros" }
-tauri-utils = { version = "2.0.0-beta.13", features = [ "resources" ], path = "../tauri-utils" }
-tauri-runtime-wry = { version = "2.0.0-beta.14", path = "../tauri-runtime-wry", optional = true }
+tauri-runtime = { version = "2.0.0-beta.15", path = "../tauri-runtime" }
+tauri-macros = { version = "2.0.0-beta.14", path = "../tauri-macros" }
+tauri-utils = { version = "2.0.0-beta.14", features = [ "resources" ], path = "../tauri-utils" }
+tauri-runtime-wry = { version = "2.0.0-beta.15", path = "../tauri-runtime-wry", optional = true }
 getrandom = "0.2"
 serde_repr = "0.1"
 state = "0.6"
@@ -110,8 +110,8 @@ swift-rs = "1.0.6"
 
 [build-dependencies]
 heck = "0.5"
-tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.13" }
-tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.13", features = [ "build" ] }
+tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.14" }
+tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.14", features = [ "build" ] }
 
 [dev-dependencies]
 proptest = "1.4.0"

core/tauri/src/app.rs

@@ -221,7 +221,7 @@ pub enum RunEvent {
   Ready,
   /// Sent if the event loop is being resumed.
   Resumed,
-  /// Emitted when all of the event loop’s input events have been processed and redraw processing is about to begin.
+  /// Emitted when all of the event loop's input events have been processed and redraw processing is about to begin.
   ///
   /// This event is useful as a place to put your code that should be run after all state-changing events have been handled and you want to do stuff (updating state, performing calculations, etc) that happens as the “main body” of your event loop.
   MainEventsCleared,

core/tauri/src/async_runtime.rs

@@ -42,7 +42,7 @@ impl GlobalRuntime {
     }
   }
 
-  fn spawn<F: Future>(&self, task: F) -> JoinHandle<F::Output>
+  fn spawn<F>(&self, task: F) -> JoinHandle<F::Output>
   where
     F: Future + Send + 'static,
     F::Output: Send + 'static,
@@ -96,7 +96,7 @@ impl Runtime {
   }
 
   /// Spawns a future onto the runtime.
-  pub fn spawn<F: Future>(&self, task: F) -> JoinHandle<F::Output>
+  pub fn spawn<F>(&self, task: F) -> JoinHandle<F::Output>
   where
     F: Future + Send + 'static,
     F::Output: Send + 'static,
@@ -189,7 +189,7 @@ impl RuntimeHandle {
   }
 
   /// Spawns a future onto the runtime.
-  pub fn spawn<F: Future>(&self, task: F) -> JoinHandle<F::Output>
+  pub fn spawn<F>(&self, task: F) -> JoinHandle<F::Output>
   where
     F: Future + Send + 'static,
     F::Output: Send + 'static,

core/tauri/src/menu/mod.rs

@@ -448,13 +448,13 @@ pub enum NativeIcon {
   Slideshow,
   /// A badge for a `smart` item.
   SmartBadge,
-  /// Small green indicator, similar to iChat’s available image.
+  /// Small green indicator, similar to iChat's available image.
   StatusAvailable,
   /// Small clear indicator.
   StatusNone,
-  /// Small yellow indicator, similar to iChat’s idle image.
+  /// Small yellow indicator, similar to iChat's idle image.
   StatusPartiallyAvailable,
-  /// Small red indicator, similar to iChat’s unavailable image.
+  /// Small red indicator, similar to iChat's unavailable image.
   StatusUnavailable,
   /// A stop progress template image.
   StopProgressFreestanding,

core/tauri/src/test/mock_runtime.rs

@@ -502,13 +502,8 @@ impl<T: UserEvent> WebviewDispatch<T> for MockWebviewDispatcher {
     Ok(())
   }
 
-  fn url(&self) -> Result<url::Url> {
-    self
-      .url
-      .lock()
-      .unwrap()
-      .parse()
-      .map_err(|_| Error::FailedToReceiveMessage)
+  fn url(&self) -> Result<String> {
+    Ok(self.url.lock().unwrap().clone())
   }
 
   fn bounds(&self) -> Result<tauri_runtime::Rect> {

core/tauri/src/tray/mod.rs

@@ -421,6 +421,20 @@ impl<R: Runtime> TrayIcon<R> {
       .set_show_menu_on_left_click(enable))?;
     Ok(())
   }
+
+  /// Get tray icon rect.
+  ///
+  /// ## Platform-specific:
+  ///
+  /// - **Linux**: Unsupported, always returns `None`.
+  pub fn rect(&self) -> crate::Result<Option<crate::Rect>> {
+    run_item_main_thread!(self, |self_: Self| self_.inner.rect().map(|rect| {
+      Rect {
+        position: rect.position.into(),
+        size: rect.size.into(),
+      }
+    }))
+  }
 }
 
 impl<R: Runtime> Resource for TrayIcon<R> {

core/tauri/src/webview/mod.rs

@@ -1074,9 +1074,12 @@ fn main() {
   }
 
   /// Returns the current url of the webview.
-  // TODO: in v2, change this type to Result
-  pub fn url(&self) -> Url {
-    self.webview.dispatcher.url().unwrap()
+  pub fn url(&self) -> crate::Result<Url> {
+    self
+      .webview
+      .dispatcher
+      .url()
+      .map(|url| url.parse().map_err(crate::Error::InvalidUrl))?
   }
 
   /// Navigates the webview to the defined url.

core/tauri/src/webview/webview_window.rs

@@ -1074,17 +1074,17 @@ impl<R: Runtime> WebviewWindow<R> {
     self.webview.window().is_focused()
   }
 
-  /// Gets the window’s current decoration state.
+  /// Gets the window's current decoration state.
   pub fn is_decorated(&self) -> crate::Result<bool> {
     self.webview.window().is_decorated()
   }
 
-  /// Gets the window’s current resizable state.
+  /// Gets the window's current resizable state.
   pub fn is_resizable(&self) -> crate::Result<bool> {
     self.webview.window().is_resizable()
   }
 
-  /// Gets the window’s native maximize button state
+  /// Gets the window's native maximize button state
   ///
   /// ## Platform-specific
   ///
@@ -1093,7 +1093,7 @@ impl<R: Runtime> WebviewWindow<R> {
     self.webview.window().is_maximizable()
   }
 
-  /// Gets the window’s native minimize button state
+  /// Gets the window's native minimize button state
   ///
   /// ## Platform-specific
   ///
@@ -1102,7 +1102,7 @@ impl<R: Runtime> WebviewWindow<R> {
     self.webview.window().is_minimizable()
   }
 
-  /// Gets the window’s native close button state
+  /// Gets the window's native close button state
   ///
   /// ## Platform-specific
   ///
@@ -1406,12 +1406,12 @@ impl<R: Runtime> WebviewWindow<R> {
     self.webview.window().set_size(size.into())
   }
 
-  /// Sets this window's minimum size.
+  /// Sets this window's minimum inner size.
   pub fn set_min_size<S: Into<Size>>(&self, size: Option<S>) -> crate::Result<()> {
     self.webview.window().set_min_size(size.map(|s| s.into()))
   }
 
-  /// Sets this window's maximum size.
+  /// Sets this window's maximum inner size.
   pub fn set_max_size<S: Into<Size>>(&self, size: Option<S>) -> crate::Result<()> {
     self.webview.window().set_max_size(size.map(|s| s.into()))
   }
@@ -1580,8 +1580,7 @@ impl<R: Runtime> WebviewWindow<R> {
   }
 
   /// Returns the current url of the webview.
-  // TODO: in v2, change this type to Result
-  pub fn url(&self) -> Url {
+  pub fn url(&self) -> crate::Result<Url> {
     self.webview.url()
   }
 

core/tauri/src/window/mod.rs

@@ -1379,17 +1379,17 @@ impl<R: Runtime> Window<R> {
     self.window.dispatcher.is_focused().map_err(Into::into)
   }
 
-  /// Gets the window’s current decoration state.
+  /// Gets the window's current decoration state.
   pub fn is_decorated(&self) -> crate::Result<bool> {
     self.window.dispatcher.is_decorated().map_err(Into::into)
   }
 
-  /// Gets the window’s current resizable state.
+  /// Gets the window's current resizable state.
   pub fn is_resizable(&self) -> crate::Result<bool> {
     self.window.dispatcher.is_resizable().map_err(Into::into)
   }
 
-  /// Gets the window’s native maximize button state
+  /// Gets the window's native maximize button state
   ///
   /// ## Platform-specific
   ///
@@ -1398,7 +1398,7 @@ impl<R: Runtime> Window<R> {
     self.window.dispatcher.is_maximizable().map_err(Into::into)
   }
 
-  /// Gets the window’s native minimize button state
+  /// Gets the window's native minimize button state
   ///
   /// ## Platform-specific
   ///
@@ -1407,7 +1407,7 @@ impl<R: Runtime> Window<R> {
     self.window.dispatcher.is_minimizable().map_err(Into::into)
   }
 
-  /// Gets the window’s native close button state
+  /// Gets the window's native close button state
   ///
   /// ## Platform-specific
   ///
@@ -1822,7 +1822,7 @@ tauri::Builder::default()
       .map_err(Into::into)
   }
 
-  /// Sets this window's minimum size.
+  /// Sets this window's minimum inner size.
   pub fn set_min_size<S: Into<Size>>(&self, size: Option<S>) -> crate::Result<()> {
     self
       .window
@@ -1831,7 +1831,7 @@ tauri::Builder::default()
       .map_err(Into::into)
   }
 
-  /// Sets this window's maximum size.
+  /// Sets this window's maximum inner size.
   pub fn set_max_size<S: Into<Size>>(&self, size: Option<S>) -> crate::Result<()> {
     self
       .window

tooling/api/src/menu/iconMenuItem.ts

@@ -103,13 +103,13 @@ export enum NativeIcon {
   Slideshow = 'Slideshow',
   /** A badge for a `smart` item. */
   SmartBadge = 'SmartBadge',
-  /** Small green indicator, similar to iChat’s available image. */
+  /** Small green indicator, similar to iChat's available image. */
   StatusAvailable = 'StatusAvailable',
   /** Small clear indicator. */
   StatusNone = 'StatusNone',
-  /** Small yellow indicator, similar to iChat’s idle image. */
+  /** Small yellow indicator, similar to iChat's idle image. */
   StatusPartiallyAvailable = 'StatusPartiallyAvailable',
-  /** Small red indicator, similar to iChat’s unavailable image. */
+  /** Small red indicator, similar to iChat's unavailable image. */
   StatusUnavailable = 'StatusUnavailable',
   /** A stop progress template image. */
   StopProgressFreestanding = 'StopProgressFreestanding',

tooling/api/src/menu/menu.ts

@@ -90,7 +90,7 @@ export class Menu extends MenuItemBase {
   /**
    * Add a menu item to the end of this menu.
    *
-   * ## Platform-spcific:
+   * ## Platform-specific:
    *
    * - **macOS:** Only {@linkcode Submenu}s can be added to a {@linkcode Menu}.
    */
@@ -119,7 +119,7 @@ export class Menu extends MenuItemBase {
   /**
    * Add a menu item to the beginning of this menu.
    *
-   * ## Platform-spcific:
+   * ## Platform-specific:
    *
    * - **macOS:** Only {@linkcode Submenu}s can be added to a {@linkcode Menu}.
    */
@@ -148,7 +148,7 @@ export class Menu extends MenuItemBase {
   /**
    * Add a menu item to the specified position in this menu.
    *
-   * ## Platform-spcific:
+   * ## Platform-specific:
    *
    * - **macOS:** Only {@linkcode Submenu}s can be added to a {@linkcode Menu}.
    */

tooling/api/src/menu/submenu.ts

@@ -90,7 +90,7 @@ export class Submenu extends MenuItemBase {
   /**
    * Add a menu item to the end of this submenu.
    *
-   * ## Platform-spcific:
+   * ## Platform-specific:
    *
    * - **macOS:** Only {@linkcode Submenu}s can be added to a {@linkcode Menu}.
    */
@@ -119,7 +119,7 @@ export class Submenu extends MenuItemBase {
   /**
    * Add a menu item to the beginning of this submenu.
    *
-   * ## Platform-spcific:
+   * ## Platform-specific:
    *
    * - **macOS:** Only {@linkcode Submenu}s can be added to a {@linkcode Menu}.
    */
@@ -148,7 +148,7 @@ export class Submenu extends MenuItemBase {
   /**
    * Add a menu item to the specified position in this submenu.
    *
-   * ## Platform-spcific:
+   * ## Platform-specific:
    *
    * - **macOS:** Only {@linkcode Submenu}s can be added to a {@linkcode Menu}.
    */

tooling/api/src/window.ts

@@ -673,7 +673,7 @@ class Window {
   }
 
   /**
-   * Gets the window’s native maximize button state.
+   * Gets the window's native maximize button state.
    *
    * #### Platform-specific
    *
@@ -694,7 +694,7 @@ class Window {
   }
 
   /**
-   * Gets the window’s native minimize button state.
+   * Gets the window's native minimize button state.
    *
    * #### Platform-specific
    *
@@ -715,7 +715,7 @@ class Window {
   }
 
   /**
-   * Gets the window’s native close button state.
+   * Gets the window's native close button state.
    *
    * #### Platform-specific
    *

tooling/bundler/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.1-beta.12]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+
 ## \[2.0.1-beta.11]
 
 ### Enhancements

tooling/bundler/Cargo.toml

@@ -2,7 +2,7 @@ workspace = { }
 
 [package]
 name = "tauri-bundler"
-version = "2.0.1-beta.11"
+version = "2.0.1-beta.12"
 authors = [
   "George Burton <burtonageo@gmail.com>",
   "Tauri Programme within The Commons Conservancy"
@@ -17,7 +17,7 @@ rust-version = "1.70"
 exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ]
 
 [dependencies]
-tauri-utils = { version = "2.0.0-beta.13", path = "../../core/tauri-utils", features = [ "resources" ] }
+tauri-utils = { version = "2.0.0-beta.14", path = "../../core/tauri-utils", features = [ "resources" ] }
 image = "0.24.9"
 flate2 = "1.0"
 anyhow = "1.0"

tooling/bundler/src/bundle/macos/templates/dmg/bundle_dmg

@@ -358,7 +358,7 @@ else
 			| perl -pe "s/APPLICATION_CLAUSE/$APPLICATION_CLAUSE/g" \
 			| perl -pe "s/HIDING_CLAUSE/$HIDING_CLAUSE/" \
 			> "$APPLESCRIPT_FILE"
-		sleep 2 # pause to workaround occasional "Can’t get disk" (-1728) issues
+		sleep 2 # pause to workaround occasional "Can't get disk" (-1728) issues
 		echo "Running AppleScript to make Finder stuff pretty: /usr/bin/osascript \"${APPLESCRIPT_FILE}\" \"${VOLUME_NAME}\""
 		if /usr/bin/osascript "${APPLESCRIPT_FILE}" "${VOLUME_NAME}"; then
 			# Okay, we're cool

tooling/bundler/src/bundle/windows/nsis.rs

@@ -230,8 +230,8 @@ fn build_nsis_app_installer(
   let mut custom_template_path = None;
   let mut custom_language_files = None;
   if let Some(nsis) = &settings.windows().nsis {
-    custom_template_path = nsis.template.clone();
-    custom_language_files = nsis.custom_language_files.clone();
+    custom_template_path.clone_from(&nsis.template);
+    custom_language_files.clone_from(&nsis.custom_language_files);
     install_mode = nsis.install_mode;
     if let Some(langs) = &nsis.languages {
       languages.clear();

tooling/cli/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## \[2.0.0-beta.16]
+
+### Bug Fixes
+
+- [`97ec422f2`](https://www.github.com/tauri-apps/tauri/commit/97ec422f22d069b9570931834241c7e47bc68cc3)([#9638](https://www.github.com/tauri-apps/tauri/pull/9638)) Exit `tauri icon` with non-zero code when it fails.
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-bundler@2.0.1-beta.12`
+
 ## \[2.0.0-beta.15]
 
 ### Bug Fixes

tooling/cli/Cargo.lock

@@ -4165,9 +4165,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
+checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef"
 dependencies = [
  "dyn-clone",
  "schemars_derive",
@@ -4178,14 +4178,14 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
+checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 1.0.109",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4300,13 +4300,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.26.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -4853,7 +4853,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-bundler"
-version = "2.0.1-beta.11"
+version = "2.0.1-beta.12"
 dependencies = [
  "anyhow",
  "ar",
@@ -4881,7 +4881,7 @@ dependencies = [
  "strsim 0.11.0",
  "tar",
  "tauri-icns",
- "tauri-utils 2.0.0-beta.13",
+ "tauri-utils 2.0.0-beta.14",
  "tempfile",
  "thiserror",
  "time",
@@ -4895,7 +4895,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-cli"
-version = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 dependencies = [
  "anyhow",
  "axum",
@@ -4945,8 +4945,8 @@ dependencies = [
  "sublime_fuzzy",
  "tauri-bundler",
  "tauri-icns",
- "tauri-utils 1.5.3",
- "tauri-utils 2.0.0-beta.13",
+ "tauri-utils 1.5.4",
+ "tauri-utils 2.0.0-beta.14",
  "thiserror",
  "tokio",
  "toml 0.8.10",
@@ -4981,15 +4981,15 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ad0bbb31fccd1f4c56275d0a5c3abdf1f59999f72cb4ef8b79b4ed42082a21"
+checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35"
 dependencies = [
  "aes-gcm",
  "ctor",
  "dunce",
  "getrandom 0.2.12",
- "heck 0.4.1",
+ "heck 0.5.0",
  "html5ever",
  "infer 0.13.0",
  "json-patch",
@@ -5012,7 +5012,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "aes-gcm",
  "ctor",

tooling/cli/Cargo.toml

@@ -3,7 +3,7 @@ members = [ "node" ]
 
 [package]
 name = "tauri-cli"
-version = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 edition = "2021"
 rust-version = "1.70"
@@ -49,7 +49,7 @@ sublime_fuzzy = "0.7"
 clap_complete = "4"
 clap = { version = "4.5", features = [ "derive", "env" ] }
 anyhow = "1.0"
-tauri-bundler = { version = "2.0.1-beta.11", default-features = false, path = "../bundler" }
+tauri-bundler = { version = "2.0.1-beta.12", default-features = false, path = "../bundler" }
 colored = "2.1"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = { version = "1.0", features = [ "preserve_order" ] }
@@ -59,7 +59,7 @@ shared_child = "1.0"
 duct = "0.13"
 toml_edit = { version = "0.22", features = [ "serde" ] }
 json-patch = "1.2"
-tauri-utils = { version = "2.0.0-beta.13", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
+tauri-utils = { version = "2.0.0-beta.14", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
 tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
 toml = "0.8"
 jsonschema = "0.17"

tooling/cli/metadata-v2.json

@@ -1,9 +1,9 @@
 {
   "cli.js": {
-    "version": "2.0.0-beta.15",
+    "version": "2.0.0-beta.16",
     "node": ">= 10.0.0"
   },
-  "tauri": "2.0.0-beta.17",
-  "tauri-build": "2.0.0-beta.13",
-  "tauri-plugin": "2.0.0-beta.13"
+  "tauri": "2.0.0-beta.18",
+  "tauri-build": "2.0.0-beta.14",
+  "tauri-plugin": "2.0.0-beta.14"
 }

tooling/cli/node/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## \[2.0.0-beta.16]
+
+### Bug Fixes
+
+- [`97ec422f2`](https://www.github.com/tauri-apps/tauri/commit/97ec422f22d069b9570931834241c7e47bc68cc3)([#9638](https://www.github.com/tauri-apps/tauri/pull/9638)) Exit `tauri icon` with non-zero code when it fails.
+
+### Dependencies
+
+- Upgraded to `tauri-cli@2.0.0-beta.16`
+
 ## \[2.0.0-beta.15]
 
 ### Dependencies

tooling/cli/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/cli",
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.16",
   "description": "Command line interface for building Tauri apps",
   "funding": {
     "type": "opencollective",

tooling/cli/src/dev.rs

@@ -469,7 +469,7 @@ pub fn kill_before_dev_process() {
     {
       use std::io::Write;
       let mut kill_children_script_path = std::env::temp_dir();
-      kill_children_script_path.push("kill-children.sh");
+      kill_children_script_path.push("tauri-stop-dev-processes.sh");
 
       if !kill_children_script_path.exists() {
         if let Ok(mut file) = std::fs::File::create(&kill_children_script_path) {

tooling/cli/src/icon.rs

@@ -138,11 +138,11 @@ pub fn command(options: Options) -> Result<()> {
       ))
     }
   } else {
-    panic!("Error loading image");
+    anyhow::bail!("Error loading image");
   };
 
   if source.height() != source.width() {
-    panic!("Source image must be square");
+    anyhow::bail!("Source image must be square");
   }
 
   if png_icon_sizes.is_empty() {