From cbd9755e0926a7e47e59deb50f4bb93d621791a5 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Sun, 25 Feb 2024 17:38:27 -0300 Subject: [PATCH] fix: process logs not showing on iOS (#8977) --- .changes/fix-ios-dev-logs.md | 6 ++++++ Cargo.lock | 2 +- core/tauri-runtime-wry/src/lib.rs | 9 +++++++++ .../mobile/ios-api/Sources/Tauri/Logger.swift | 8 ++++++++ core/tauri/scripts/core.js | 2 +- examples/api/src-tauri/Cargo.lock | 16 ++++++++-------- tooling/cli/Cargo.lock | 4 ++-- tooling/cli/Cargo.toml | 2 +- 8 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 .changes/fix-ios-dev-logs.md diff --git a/.changes/fix-ios-dev-logs.md b/.changes/fix-ios-dev-logs.md new file mode 100644 index 000000000..eaa22703a --- /dev/null +++ b/.changes/fix-ios-dev-logs.md @@ -0,0 +1,6 @@ +--- +"@tauri-apps/cli": patch:bug +"tauri-cli": patch:bug +--- + +Fixes process logs not showing on `ios dev`. diff --git a/Cargo.lock b/Cargo.lock index 82a54d160..28ba327a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3616,7 +3616,7 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tauri" -version = "2.0.0-beta.5" +version = "2.0.0-beta.6" dependencies = [ "anyhow", "bytes", diff --git a/core/tauri-runtime-wry/src/lib.rs b/core/tauri-runtime-wry/src/lib.rs index 4e1a34f1d..97328dd9e 100644 --- a/core/tauri-runtime-wry/src/lib.rs +++ b/core/tauri-runtime-wry/src/lib.rs @@ -2723,6 +2723,15 @@ fn handle_user_message( } } Message::Webview(window_id, webview_id, webview_message) => { + #[cfg(any( + target_os = "macos", + windows, + target_os = "linux", + target_os = "dragonfly", + target_os = "freebsd", + target_os = "netbsd", + target_os = "openbsd" + ))] if let WebviewMessage::Reparent(new_parent_window_id) = webview_message { let webview_handle = windows.0.borrow_mut().get_mut(&window_id).and_then(|w| { w.webviews diff --git a/core/tauri/mobile/ios-api/Sources/Tauri/Logger.swift b/core/tauri/mobile/ios-api/Sources/Tauri/Logger.swift index 115359f8f..686255b25 100644 --- a/core/tauri/mobile/ios-api/Sources/Tauri/Logger.swift +++ b/core/tauri/mobile/ios-api/Sources/Tauri/Logger.swift @@ -37,11 +37,19 @@ public class Logger { } public static func debug(_ items: Any..., category: String = "app") { + #if DEBUG + Logger.log(items, category: category, type: OSLogType.default) + #else Logger.log(items, category: category, type: OSLogType.debug) + #endif } public static func info(_ items: Any..., category: String = "app") { + #if DEBUG + Logger.log(items, category: category, type: OSLogType.default) + #else Logger.log(items, category: category, type: OSLogType.info) + #endif } public static func error(_ items: Any..., category: String = "app") { diff --git a/core/tauri/scripts/core.js b/core/tauri/scripts/core.js index 3d09e3738..01b1def21 100644 --- a/core/tauri/scripts/core.js +++ b/core/tauri/scripts/core.js @@ -71,7 +71,7 @@ true) const action = () => { - window.window.__TAURI_INTERNALS__.ipc({ + window.__TAURI_INTERNALS__.ipc({ cmd, callback, error, diff --git a/examples/api/src-tauri/Cargo.lock b/examples/api/src-tauri/Cargo.lock index 1ae88bedf..fe6892a35 100644 --- a/examples/api/src-tauri/Cargo.lock +++ b/examples/api/src-tauri/Cargo.lock @@ -3254,7 +3254,7 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tauri" -version = "2.0.0-beta.4" +version = "2.0.0-beta.6" dependencies = [ "anyhow", "bytes", @@ -3305,7 +3305,7 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-beta.3" +version = "2.0.0-beta.4" dependencies = [ "anyhow", "cargo_toml", @@ -3327,7 +3327,7 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-beta.3" +version = "2.0.0-beta.4" dependencies = [ "base64", "brotli", @@ -3352,7 +3352,7 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.3" +version = "2.0.0-beta.4" dependencies = [ "heck", "proc-macro2", @@ -3364,7 +3364,7 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-beta.3" +version = "2.0.0-beta.4" dependencies = [ "anyhow", "glob", @@ -3404,7 +3404,7 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.3" +version = "2.0.0-beta.4" dependencies = [ "gtk", "http", @@ -3420,7 +3420,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.3" +version = "2.0.0-beta.4" dependencies = [ "cocoa", "gtk", @@ -3441,7 +3441,7 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-beta.3" +version = "2.0.0-beta.4" dependencies = [ "aes-gcm", "brotli", diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 00e6f11e6..01bacfe0c 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -459,9 +459,9 @@ dependencies = [ [[package]] name = "cargo-mobile2" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099563294a8f548dc70c2e5aecf61039c54e2af64526c0af348f2da41a6da622" +checksum = "9b4151a9a0e09e3acc2695c326cfdcf0b5ce5b04ab617cea6405a085f639b001" dependencies = [ "colored", "core-foundation", diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index d5072a3f2..206c408bd 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -39,7 +39,7 @@ name = "cargo-tauri" path = "src/main.rs" [dependencies] -cargo-mobile2 = { version = "0.10.2", default-features = false } +cargo-mobile2 = { version = "0.10.3", default-features = false } jsonrpsee = { version = "0.20", features = [ "server" ] } jsonrpsee-core = "0.20" jsonrpsee-client-transport = { version = "0.20", features = [ "ws" ] }