diff --git a/.changes/pre.json b/.changes/pre.json index 9deca7551..865cea754 100644 --- a/.changes/pre.json +++ b/.changes/pre.json @@ -1,6 +1,7 @@ { "tag": "beta", "changes": [ + ".changes/UriSchemeResponder-export.md", ".changes/acl-default-permission-verification.md", ".changes/acl-platform-refactor.md", ".changes/acl-scope-refactor.md", @@ -17,7 +18,9 @@ ".changes/api-webview-window-new-methods.md", ".changes/api-webview-window.md", ".changes/api-window-on-filedrop.md", + ".changes/app-handle-set-activation-policy.md", ".changes/app-manifest.md", + ".changes/app-region-drag.md", ".changes/assets-setup.md", ".changes/beta.md", ".changes/better-error-for-invalid-plugin-config.md", @@ -25,6 +28,7 @@ ".changes/bundler-deep-link-reg-path.md", ".changes/bundler-license.md", ".changes/bundler-long_description.md", + ".changes/bundler-nsis-deep-links.md", ".changes/bundler-nsis-tauri-utils.md", ".changes/bundler-r-flag.md", ".changes/bundler-resources-unix.md", @@ -96,9 +100,11 @@ ".changes/fix-acl-webview-check.md", ".changes/fix-add-child-deadlock.md", ".changes/fix-capability-schema-definitions.md", + ".changes/fix-capability-totokens.md", ".changes/fix-channel-buffer-processing.md", ".changes/fix-channel-ipc-response.md", ".changes/fix-clear-residual-listeners.md", + ".changes/fix-cli-add-more-plugins.md", ".changes/fix-cli-migration-http-acl.md", ".changes/fix-codegen-rerun-if-changed.md", ".changes/fix-config-arg.md", @@ -114,6 +120,7 @@ ".changes/fix-migrate-updater.md", ".changes/fix-mobile-cmd-case.md", ".changes/fix-mobile-process-spawn.md", + ".changes/fix-pnpm-check.md", ".changes/fix-process-ipc-message-fn.md", ".changes/fix-proxy-url-totokens-impl.md", ".changes/fix-remote-domain-url.md", @@ -143,11 +150,14 @@ ".changes/inline-plugins.md", ".changes/ios-signing-optional.md", ".changes/ipc-allow-headers.md", + ".changes/ipc-only-main-frame.md", ".changes/ipc-post-message-fallback.md", ".changes/ipc-request-param-refactor.md", ".changes/isolation-pattern-key-extractable.md", ".changes/isolation-script-remove-itself.md", ".changes/mobile-watcher.md", + ".changes/monitor-from-point-js.md", + ".changes/monitor-from-point.md", ".changes/multiwebview-bounds-fixes.md", ".changes/nsis-append-product-name.md", ".changes/nsis-dpi-aware.md", @@ -171,6 +181,7 @@ ".changes/rerun-if-permission-created.md", ".changes/resources_table_access.md", ".changes/revert-fix-visibility-change.md", + ".changes/rpm-compression-level.md", ".changes/runner-config.md", ".changes/runtime-add-capability.md", ".changes/runtime-capability-dynamic.md", diff --git a/Cargo.lock b/Cargo.lock index e8828d363..4ad676f10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3527,7 +3527,7 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tauri" -version = "2.0.0-beta.19" +version = "2.0.0-beta.20" dependencies = [ "anyhow", "bytes", @@ -3585,7 +3585,7 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" dependencies = [ "anyhow", "cargo_toml", @@ -3607,7 +3607,7 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" dependencies = [ "base64 0.22.0", "brotli", @@ -3644,7 +3644,7 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3656,7 +3656,7 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" dependencies = [ "anyhow", "glob", @@ -3671,7 +3671,7 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.16" +version = "2.0.0-beta.17" dependencies = [ "dpi", "gtk", @@ -3688,7 +3688,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.16" +version = "2.0.0-beta.17" dependencies = [ "cocoa", "gtk", @@ -3711,7 +3711,7 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" dependencies = [ "aes-gcm", "brotli", diff --git a/core/tauri-build/CHANGELOG.md b/core/tauri-build/CHANGELOG.md index 45924250e..04ffdcd35 100644 --- a/core/tauri-build/CHANGELOG.md +++ b/core/tauri-build/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[2.0.0-beta.16] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-beta.16` +- Upgraded to `tauri-codegen@2.0.0-beta.16` + ## \[2.0.0-beta.15] ### Dependencies diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index 689634fb5..da1442be9 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-build" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" 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.15", path = "../tauri-codegen", optional = true } -tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils", features = [ "build", "resources" ] } +tauri-codegen = { version = "2.0.0-beta.16", path = "../tauri-codegen", optional = true } +tauri-utils = { version = "2.0.0-beta.16", path = "../tauri-utils", features = [ "build", "resources" ] } cargo_toml = "0.17" serde = "1" serde_json = "1" diff --git a/core/tauri-codegen/CHANGELOG.md b/core/tauri-codegen/CHANGELOG.md index 5a58b288d..5d4dd4313 100644 --- a/core/tauri-codegen/CHANGELOG.md +++ b/core/tauri-codegen/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-beta.16] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-beta.16` + ## \[2.0.0-beta.15] ### Dependencies diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml index b73cf1523..a64c4fbe1 100644 --- a/core/tauri-codegen/Cargo.toml +++ b/core/tauri-codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-codegen" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" 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.15", path = "../tauri-utils", features = [ "build" ] } +tauri-utils = { version = "2.0.0-beta.16", path = "../tauri-utils", features = [ "build" ] } thiserror = "1" walkdir = "2" brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] } diff --git a/core/tauri-macros/CHANGELOG.md b/core/tauri-macros/CHANGELOG.md index 9bcadbca1..69f1f4ae3 100644 --- a/core/tauri-macros/CHANGELOG.md +++ b/core/tauri-macros/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## \[2.0.0-beta.16] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-beta.16` +- Upgraded to `tauri-codegen@2.0.0-beta.16` + ## \[2.0.0-beta.15] ### Dependencies diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml index 115b3fa52..2f3d836d9 100644 --- a/core/tauri-macros/Cargo.toml +++ b/core/tauri-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-macros" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" 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.15", default-features = false, path = "../tauri-codegen" } -tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils" } +tauri-codegen = { version = "2.0.0-beta.16", default-features = false, path = "../tauri-codegen" } +tauri-utils = { version = "2.0.0-beta.16", path = "../tauri-utils" } [features] custom-protocol = [ ] diff --git a/core/tauri-plugin/CHANGELOG.md b/core/tauri-plugin/CHANGELOG.md index 0b215abf9..9b26df169 100644 --- a/core/tauri-plugin/CHANGELOG.md +++ b/core/tauri-plugin/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-beta.16] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-beta.16` + ## \[2.0.0-beta.15] ### Dependencies diff --git a/core/tauri-plugin/Cargo.toml b/core/tauri-plugin/Cargo.toml index 54b400b85..2f412d586 100644 --- a/core/tauri-plugin/Cargo.toml +++ b/core/tauri-plugin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" description = "Build script and runtime Tauri plugin definitions" authors = { workspace = true } homepage = { workspace = true } @@ -30,7 +30,7 @@ runtime = [ ] [dependencies] anyhow = { version = "1", optional = true } serde = { version = "1", optional = true } -tauri-utils = { version = "2.0.0-beta.15", default-features = false, features = [ "build" ], path = "../tauri-utils" } +tauri-utils = { version = "2.0.0-beta.16", 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 } diff --git a/core/tauri-runtime-wry/CHANGELOG.md b/core/tauri-runtime-wry/CHANGELOG.md index 7ce6dc4c9..56bbf1317 100644 --- a/core/tauri-runtime-wry/CHANGELOG.md +++ b/core/tauri-runtime-wry/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## \[2.0.0-beta.17] + +### Security fixes + +- [`d950ac123`](https://www.github.com/tauri-apps/tauri/commit/d950ac1239817d17324c035e5c4769ee71fc197d) Only process IPC commands from the main frame. + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-beta.16` +- Upgraded to `tauri-runtime@2.0.0-beta.17` + ## \[2.0.0-beta.16] ### New Features diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index 9778020e8..73e4a9977 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-runtime-wry" -version = "2.0.0-beta.16" +version = "2.0.0-beta.17" 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.40", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] } tao = { version = "0.28", default-features = false, features = [ "rwh_06" ] } -tauri-runtime = { version = "2.0.0-beta.16", path = "../tauri-runtime" } -tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils" } +tauri-runtime = { version = "2.0.0-beta.17", path = "../tauri-runtime" } +tauri-utils = { version = "2.0.0-beta.16", path = "../tauri-utils" } raw-window-handle = "0.6" http = "1.1" url = "2" diff --git a/core/tauri-runtime/CHANGELOG.md b/core/tauri-runtime/CHANGELOG.md index a832dd2ec..de555bb6d 100644 --- a/core/tauri-runtime/CHANGELOG.md +++ b/core/tauri-runtime/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-beta.17] + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-beta.16` + ## \[2.0.0-beta.16] ### New Features diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml index 5fea0bab8..8b0aac356 100644 --- a/core/tauri-runtime/Cargo.toml +++ b/core/tauri-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-runtime" -version = "2.0.0-beta.16" +version = "2.0.0-beta.17" 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.15", path = "../tauri-utils" } +tauri-utils = { version = "2.0.0-beta.16", path = "../tauri-utils" } http = "1.1" raw-window-handle = "0.6" url = { version = "2" } diff --git a/core/tauri-utils/CHANGELOG.md b/core/tauri-utils/CHANGELOG.md index 963d5b7ae..0e4fa8f36 100644 --- a/core/tauri-utils/CHANGELOG.md +++ b/core/tauri-utils/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-beta.16] + +### Bug Fixes + +- [`be95d8d37`](https://www.github.com/tauri-apps/tauri/commit/be95d8d37c4b1a420c0d28a83b7efa40ab0b0ab5)([#9782](https://www.github.com/tauri-apps/tauri/pull/9782)) Fixes the `ToTokens` implementation for `Capability`. + ## \[2.0.0-beta.15] ### Bug Fixes diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml index 449dc09c9..6a5c7e156 100644 --- a/core/tauri-utils/Cargo.toml +++ b/core/tauri-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-utils" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" description = "Utilities for Tauri" exclude = [ "CHANGELOG.md", "/target" ] readme = "README.md" diff --git a/core/tauri/CHANGELOG.md b/core/tauri/CHANGELOG.md index d4dd942c5..eda99987a 100644 --- a/core/tauri/CHANGELOG.md +++ b/core/tauri/CHANGELOG.md @@ -1,5 +1,32 @@ # Changelog +## \[2.0.0-beta.20] + +### New Features + +- [`ae6b13dfc`](https://www.github.com/tauri-apps/tauri/commit/ae6b13dfc0590dcaedbdb619c148072f072df050)([#9789](https://www.github.com/tauri-apps/tauri/pull/9789)) Add `app-region: drag` to HTML elements with `data-tauri-drag-region` on Windows, only WebView2 123+, which should fix dragging using touch. +- [`ec0e092ec`](https://www.github.com/tauri-apps/tauri/commit/ec0e092ecd23b547c756c7476f23a0d95be6db80)([#9770](https://www.github.com/tauri-apps/tauri/pull/9770)) Add `App/AppHandle/Window/Webview/WebviewWindow::monitor_from_point(x, y)` getter to get the monitor from a given point. + +### Enhancements + +- [`5d20530c9`](https://www.github.com/tauri-apps/tauri/commit/5d20530c91495e548ecc9cb4369da09977a9a962)([#9842](https://www.github.com/tauri-apps/tauri/pull/9842)) Added `AppHandle::set_activation_policy` for macOS. + +### Bug Fixes + +- [`0b690f242`](https://www.github.com/tauri-apps/tauri/commit/0b690f242f3a9fdffc268ee66464151b3466d00b)([#9845](https://www.github.com/tauri-apps/tauri/pull/9845)) Export `tauri::UriSchemeResponder`. + +### Security fixes + +- [`d950ac123`](https://www.github.com/tauri-apps/tauri/commit/d950ac1239817d17324c035e5c4769ee71fc197d) Only process IPC commands from the main frame. + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-beta.16` +- Upgraded to `tauri-runtime-wry@2.0.0-beta.17` +- Upgraded to `tauri-runtime@2.0.0-beta.17` +- Upgraded to `tauri-macros@2.0.0-beta.16` +- Upgraded to `tauri-build@2.0.0-beta.16` + ## \[2.0.0-beta.19] ### New Features diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 7e31aeb4f..bf896c220 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri" -version = "2.0.0-beta.19" +version = "2.0.0-beta.20" 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.16", path = "../tauri-runtime" } -tauri-macros = { version = "2.0.0-beta.15", path = "../tauri-macros" } -tauri-utils = { version = "2.0.0-beta.15", features = [ "resources" ], path = "../tauri-utils" } -tauri-runtime-wry = { version = "2.0.0-beta.16", path = "../tauri-runtime-wry", optional = true } +tauri-runtime = { version = "2.0.0-beta.17", path = "../tauri-runtime" } +tauri-macros = { version = "2.0.0-beta.16", path = "../tauri-macros" } +tauri-utils = { version = "2.0.0-beta.16", features = [ "resources" ], path = "../tauri-utils" } +tauri-runtime-wry = { version = "2.0.0-beta.17", 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.15" } -tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.15", features = [ "build" ] } +tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.16" } +tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.16", features = [ "build" ] } [dev-dependencies] proptest = "1.4.0" diff --git a/core/tauri/src/app.rs b/core/tauri/src/app.rs index 39aec0cf0..049885558 100644 --- a/core/tauri/src/app.rs +++ b/core/tauri/src/app.rs @@ -1064,7 +1064,7 @@ pub struct Builder { invoke_responder: Option>>, /// The script that initializes the `window.__TAURI_INTERNALS__.postMessage` function. - invoke_initialization_script: String, + pub(crate) invoke_initialization_script: String, /// The setup hook. setup: SetupHook, @@ -1098,19 +1098,19 @@ pub struct Builder { /// The device event filter. device_event_filter: DeviceEventFilter, - invoke_key: String, + pub(crate) invoke_key: String, } #[derive(Template)] #[default_template("../scripts/ipc-protocol.js")] -struct InvokeInitializationScript<'a> { +pub(crate) struct InvokeInitializationScript<'a> { /// The function that processes the IPC message. #[raw] - process_ipc_message_fn: &'a str, - os_name: &'a str, - fetch_channel_data_command: &'a str, - linux_ipc_protocol_enabled: bool, - invoke_key: &'a str, + pub(crate) process_ipc_message_fn: &'a str, + pub(crate) os_name: &'a str, + pub(crate) fetch_channel_data_command: &'a str, + pub(crate) linux_ipc_protocol_enabled: bool, + pub(crate) invoke_key: &'a str, } /// Make `Wry` the default `Runtime` for `Builder` diff --git a/core/tauri/src/manager/mod.rs b/core/tauri/src/manager/mod.rs index d6335c70d..36a2b54f3 100644 --- a/core/tauri/src/manager/mod.rs +++ b/core/tauri/src/manager/mod.rs @@ -663,6 +663,7 @@ mod test { Default::default(), Default::default(), (None, "".into()), + crate::generate_invoke_key().unwrap(), ); #[cfg(custom_protocol)] diff --git a/core/tauri/src/test/mod.rs b/core/tauri/src/test/mod.rs index 37f35ef56..2fa7a141a 100644 --- a/core/tauri/src/test/mod.rs +++ b/core/tauri/src/test/mod.rs @@ -42,6 +42,7 @@ //! url: "http://tauri.localhost".parse().unwrap(), //! body: tauri::ipc::InvokeBody::default(), //! headers: Default::default(), +//! invoke_key: tauri::test::INVOKE_KEY.to_string(), //! }, //! ).map(|b| b.deserialize::().unwrap()); //! } @@ -52,6 +53,7 @@ mod mock_runtime; pub use mock_runtime::*; use serde::Serialize; +use serialize_to_javascript::DefaultTemplate; use std::{borrow::Cow, collections::HashMap, fmt::Debug}; @@ -66,6 +68,9 @@ use tauri_utils::{ config::{AppConfig, Config}, }; +/// The invoke key used for tests. +pub const INVOKE_KEY: &str = "__invoke-key__"; + /// An empty [`Assets`] implementation. pub struct NoopAsset { assets: HashMap>, @@ -148,7 +153,22 @@ pub fn mock_context>(assets: A) -> crate::Context { /// } /// ``` pub fn mock_builder() -> Builder { - Builder::::new().enable_macos_default_menu(false) + let mut builder = Builder::::new().enable_macos_default_menu(false); + + builder.invoke_initialization_script = crate::app::InvokeInitializationScript { + process_ipc_message_fn: crate::manager::webview::PROCESS_IPC_MESSAGE_FN, + os_name: std::env::consts::OS, + fetch_channel_data_command: crate::ipc::channel::FETCH_CHANNEL_DATA_COMMAND, + linux_ipc_protocol_enabled: cfg!(feature = "linux-ipc-protocol"), + invoke_key: INVOKE_KEY, + } + .render_default(&Default::default()) + .unwrap() + .into_string(); + + builder.invoke_key = INVOKE_KEY.to_string(); + + builder } /// Creates a new [`App`] for testing using the [`mock_context`] with a [`noop_assets`]. @@ -190,6 +210,7 @@ pub fn mock_app() -> App { /// url: "http://tauri.localhost".parse().unwrap(), /// body: tauri::ipc::InvokeBody::default(), /// headers: Default::default(), +/// invoke_key: tauri::test::INVOKE_KEY.to_string(), /// }, /// Ok("pong") /// ); @@ -247,6 +268,7 @@ pub fn assert_ipc_response< /// url: "http://tauri.localhost".parse().unwrap(), /// body: tauri::ipc::InvokeBody::default(), /// headers: Default::default(), +/// invoke_key: tauri::test::INVOKE_KEY.to_string(), /// }, /// ); /// assert!(res.is_ok()); diff --git a/core/tauri/src/webview/mod.rs b/core/tauri/src/webview/mod.rs index 1a3791a89..70adee590 100644 --- a/core/tauri/src/webview/mod.rs +++ b/core/tauri/src/webview/mod.rs @@ -124,7 +124,8 @@ pub struct InvokeRequest { pub body: InvokeBody, /// The request headers. pub headers: HeaderMap, - pub(crate) invoke_key: String, + /// The invoke key. Must match what was passed to the app manager. + pub invoke_key: String, } /// The platform webview handle. Accessed with [`Webview#method.with_webview`]; diff --git a/tooling/api/CHANGELOG.md b/tooling/api/CHANGELOG.md index 37f8149bc..0b3ddf4de 100644 --- a/tooling/api/CHANGELOG.md +++ b/tooling/api/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-beta.12] + +### New Features + +- [`ec0e092ec`](https://www.github.com/tauri-apps/tauri/commit/ec0e092ecd23b547c756c7476f23a0d95be6db80)([#9770](https://www.github.com/tauri-apps/tauri/pull/9770)) Add `monitorFromPoint` function in `window` module to get the monitor from a given point. + ## \[2.0.0-beta.11] ### Bug Fixes diff --git a/tooling/api/package.json b/tooling/api/package.json index ed2128caa..9e1354146 100644 --- a/tooling/api/package.json +++ b/tooling/api/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/api", - "version": "2.0.0-beta.11", + "version": "2.0.0-beta.12", "description": "Tauri API definitions", "funding": { "type": "opencollective", diff --git a/tooling/bundler/CHANGELOG.md b/tooling/bundler/CHANGELOG.md index 3ad16fcd5..4c0bac112 100644 --- a/tooling/bundler/CHANGELOG.md +++ b/tooling/bundler/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## \[2.0.1-beta.14] + +### Enhancements + +- [`781d74799`](https://www.github.com/tauri-apps/tauri/commit/781d74799a543def205a255fa6fced19967c9872)([#9840](https://www.github.com/tauri-apps/tauri/pull/9840)) Reduced the compression level for rpm bundles from 9 (max) to 6. This has almost no effect on file size but should reduce build time by roughly 25%. + +### Bug Fixes + +- [`d0d974fa5`](https://www.github.com/tauri-apps/tauri/commit/d0d974fa5ef250b2a9219e4c6a2ca175f495e88f)([#9833](https://www.github.com/tauri-apps/tauri/pull/9833)) Fix NSIS installer deep links registration. + +### Dependencies + +- Upgraded to `tauri-utils@2.0.0-beta.16` + ## \[2.0.1-beta.13] ### Dependencies diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index 8aab7ceae..28ad149ac 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -2,7 +2,7 @@ workspace = { } [package] name = "tauri-bundler" -version = "2.0.1-beta.13" +version = "2.0.1-beta.14" authors = [ "George Burton ", "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.15", path = "../../core/tauri-utils", features = [ "resources" ] } +tauri-utils = { version = "2.0.0-beta.16", path = "../../core/tauri-utils", features = [ "resources" ] } image = "0.24.9" flate2 = "1.0" anyhow = "1.0" diff --git a/tooling/cli/CHANGELOG.md b/tooling/cli/CHANGELOG.md index e71d53d2a..d4fb133ea 100644 --- a/tooling/cli/CHANGELOG.md +++ b/tooling/cli/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## \[2.0.0-beta.18] + +### Bug Fixes + +- [`beda18bce`](https://www.github.com/tauri-apps/tauri/commit/beda18bce95fd6e10543b2d8f1eca5fb7ca0655b)([#9855](https://www.github.com/tauri-apps/tauri/pull/9855)) Fixed an issue that caused `tauri add` to fail for multiple rust-only and platform-specific plugins. +- [`4a33bc6a6`](https://www.github.com/tauri-apps/tauri/commit/4a33bc6a62d2ed9371191c8a7f78ff3f33930455)([#9553](https://www.github.com/tauri-apps/tauri/pull/9553)) Fixes `pnpm` detection when initializing and running a mobile project. + +### Dependencies + +- Upgraded to `tauri-bundler@2.0.1-beta.14` +- Upgraded to `tauri-utils@2.0.0-beta.16` + ## \[2.0.0-beta.17] ### Dependencies diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index e767a166b..23e589bf6 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -4853,7 +4853,7 @@ dependencies = [ [[package]] name = "tauri-bundler" -version = "2.0.1-beta.13" +version = "2.0.1-beta.14" dependencies = [ "anyhow", "ar", @@ -4881,7 +4881,7 @@ dependencies = [ "strsim 0.11.0", "tar", "tauri-icns", - "tauri-utils 2.0.0-beta.15", + "tauri-utils 2.0.0-beta.16", "tempfile", "thiserror", "time", @@ -4895,7 +4895,7 @@ dependencies = [ [[package]] name = "tauri-cli" -version = "2.0.0-beta.17" +version = "2.0.0-beta.18" dependencies = [ "anyhow", "axum", @@ -4946,7 +4946,7 @@ dependencies = [ "tauri-bundler", "tauri-icns", "tauri-utils 1.5.4", - "tauri-utils 2.0.0-beta.15", + "tauri-utils 2.0.0-beta.16", "tokio", "toml 0.8.10", "toml_edit 0.22.6", @@ -5009,7 +5009,7 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-beta.15" +version = "2.0.0-beta.16" dependencies = [ "aes-gcm", "ctor", diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index 8360f556e..715a804d8 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -3,7 +3,7 @@ members = [ "node" ] [package] name = "tauri-cli" -version = "2.0.0-beta.17" +version = "2.0.0-beta.18" authors = [ "Tauri Programme within The Commons Conservancy" ] edition = "2021" rust-version = "1.70" @@ -48,7 +48,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.13", default-features = false, path = "../bundler" } +tauri-bundler = { version = "2.0.1-beta.14", default-features = false, path = "../bundler" } colored = "2.1" serde = { version = "1.0", features = [ "derive" ] } serde_json = { version = "1.0", features = [ "preserve_order" ] } @@ -58,7 +58,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.15", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } +tauri-utils = { version = "2.0.0-beta.16", 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" diff --git a/tooling/cli/metadata-v2.json b/tooling/cli/metadata-v2.json index 3625ec824..f880e9220 100644 --- a/tooling/cli/metadata-v2.json +++ b/tooling/cli/metadata-v2.json @@ -1,9 +1,9 @@ { "cli.js": { - "version": "2.0.0-beta.17", + "version": "2.0.0-beta.18", "node": ">= 10.0.0" }, - "tauri": "2.0.0-beta.19", - "tauri-build": "2.0.0-beta.15", - "tauri-plugin": "2.0.0-beta.15" + "tauri": "2.0.0-beta.20", + "tauri-build": "2.0.0-beta.16", + "tauri-plugin": "2.0.0-beta.16" } diff --git a/tooling/cli/node/CHANGELOG.md b/tooling/cli/node/CHANGELOG.md index 239d42877..724661ff9 100644 --- a/tooling/cli/node/CHANGELOG.md +++ b/tooling/cli/node/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## \[2.0.0-beta.18] + +### Bug Fixes + +- [`beda18bce`](https://www.github.com/tauri-apps/tauri/commit/beda18bce95fd6e10543b2d8f1eca5fb7ca0655b)([#9855](https://www.github.com/tauri-apps/tauri/pull/9855)) Fixed an issue that caused `tauri add` to fail for multiple rust-only and platform-specific plugins. +- [`4a33bc6a6`](https://www.github.com/tauri-apps/tauri/commit/4a33bc6a62d2ed9371191c8a7f78ff3f33930455)([#9553](https://www.github.com/tauri-apps/tauri/pull/9553)) Fixes `pnpm` detection when initializing and running a mobile project. + +### Dependencies + +- Upgraded to `tauri-cli@2.0.0-beta.18` + ## \[2.0.0-beta.17] ### Dependencies diff --git a/tooling/cli/node/package.json b/tooling/cli/node/package.json index 52196808f..c347cd66c 100644 --- a/tooling/cli/node/package.json +++ b/tooling/cli/node/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/cli", - "version": "2.0.0-beta.17", + "version": "2.0.0-beta.18", "description": "Command line interface for building Tauri apps", "funding": { "type": "opencollective",