mirror of
https://github.com/tauri-apps/tauri.git
synced 2024-08-17 03:40:23 +03:00
fix: process logs not showing on iOS (#8977)
This commit is contained in:
parent
9cc014f2df
commit
cbd9755e09
6
.changes/fix-ios-dev-logs.md
Normal file
6
.changes/fix-ios-dev-logs.md
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
"@tauri-apps/cli": patch:bug
|
||||||
|
"tauri-cli": patch:bug
|
||||||
|
---
|
||||||
|
|
||||||
|
Fixes process logs not showing on `ios dev`.
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -3616,7 +3616,7 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri"
|
name = "tauri"
|
||||||
version = "2.0.0-beta.5"
|
version = "2.0.0-beta.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
|
@ -2723,6 +2723,15 @@ fn handle_user_message<T: UserEvent>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Message::Webview(window_id, webview_id, webview_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 {
|
if let WebviewMessage::Reparent(new_parent_window_id) = webview_message {
|
||||||
let webview_handle = windows.0.borrow_mut().get_mut(&window_id).and_then(|w| {
|
let webview_handle = windows.0.borrow_mut().get_mut(&window_id).and_then(|w| {
|
||||||
w.webviews
|
w.webviews
|
||||||
|
@ -37,11 +37,19 @@ public class Logger {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static func debug(_ items: Any..., category: String = "app") {
|
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)
|
Logger.log(items, category: category, type: OSLogType.debug)
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
public static func info(_ items: Any..., category: String = "app") {
|
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)
|
Logger.log(items, category: category, type: OSLogType.info)
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
public static func error(_ items: Any..., category: String = "app") {
|
public static func error(_ items: Any..., category: String = "app") {
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
true)
|
true)
|
||||||
|
|
||||||
const action = () => {
|
const action = () => {
|
||||||
window.window.__TAURI_INTERNALS__.ipc({
|
window.__TAURI_INTERNALS__.ipc({
|
||||||
cmd,
|
cmd,
|
||||||
callback,
|
callback,
|
||||||
error,
|
error,
|
||||||
|
16
examples/api/src-tauri/Cargo.lock
generated
16
examples/api/src-tauri/Cargo.lock
generated
@ -3254,7 +3254,7 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri"
|
name = "tauri"
|
||||||
version = "2.0.0-beta.4"
|
version = "2.0.0-beta.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
@ -3305,7 +3305,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-build"
|
name = "tauri-build"
|
||||||
version = "2.0.0-beta.3"
|
version = "2.0.0-beta.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"cargo_toml",
|
"cargo_toml",
|
||||||
@ -3327,7 +3327,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-codegen"
|
name = "tauri-codegen"
|
||||||
version = "2.0.0-beta.3"
|
version = "2.0.0-beta.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
"brotli",
|
"brotli",
|
||||||
@ -3352,7 +3352,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-macros"
|
name = "tauri-macros"
|
||||||
version = "2.0.0-beta.3"
|
version = "2.0.0-beta.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heck",
|
"heck",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@ -3364,7 +3364,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin"
|
name = "tauri-plugin"
|
||||||
version = "2.0.0-beta.3"
|
version = "2.0.0-beta.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"glob",
|
"glob",
|
||||||
@ -3404,7 +3404,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-runtime"
|
name = "tauri-runtime"
|
||||||
version = "2.0.0-beta.3"
|
version = "2.0.0-beta.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gtk",
|
"gtk",
|
||||||
"http",
|
"http",
|
||||||
@ -3420,7 +3420,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-runtime-wry"
|
name = "tauri-runtime-wry"
|
||||||
version = "2.0.0-beta.3"
|
version = "2.0.0-beta.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cocoa",
|
"cocoa",
|
||||||
"gtk",
|
"gtk",
|
||||||
@ -3441,7 +3441,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-utils"
|
name = "tauri-utils"
|
||||||
version = "2.0.0-beta.3"
|
version = "2.0.0-beta.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes-gcm",
|
"aes-gcm",
|
||||||
"brotli",
|
"brotli",
|
||||||
|
4
tooling/cli/Cargo.lock
generated
4
tooling/cli/Cargo.lock
generated
@ -459,9 +459,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cargo-mobile2"
|
name = "cargo-mobile2"
|
||||||
version = "0.10.2"
|
version = "0.10.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "099563294a8f548dc70c2e5aecf61039c54e2af64526c0af348f2da41a6da622"
|
checksum = "9b4151a9a0e09e3acc2695c326cfdcf0b5ce5b04ab617cea6405a085f639b001"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"colored",
|
"colored",
|
||||||
"core-foundation",
|
"core-foundation",
|
||||||
|
@ -39,7 +39,7 @@ name = "cargo-tauri"
|
|||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
|
|
||||||
[dependencies]
|
[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 = { version = "0.20", features = [ "server" ] }
|
||||||
jsonrpsee-core = "0.20"
|
jsonrpsee-core = "0.20"
|
||||||
jsonrpsee-client-transport = { version = "0.20", features = [ "ws" ] }
|
jsonrpsee-client-transport = { version = "0.20", features = [ "ws" ] }
|
||||||
|
Loading…
Reference in New Issue
Block a user