Skip to content

Commit

Permalink
fix(deps): os webview not gated in wry feature (#12833)
Browse files Browse the repository at this point in the history
  • Loading branch information
Legend-Master authored Feb 27, 2025
1 parent 4bffc32 commit 4f26dcf
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .changes/os-webview-wry-feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
tauri: 'patch:bug'
---

Fix OS webviews (`webview2` and `webkit2gtk`) are always compiled with tauri even without `wry` feature
12 changes: 8 additions & 4 deletions crates/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ tray-icon = { version = "0.20", default-features = false, features = [
# linux
[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies]
gtk = { version = "0.18", features = ["v3_24"] }
webkit2gtk = { version = "=2.0.1", features = ["v2_40"] }
webkit2gtk = { version = "=2.0.1", features = ["v2_40"], optional = true }

# macOS
[target.'cfg(target_os = "macos")'.dependencies]
Expand All @@ -120,9 +120,13 @@ window-vibrancy = "0.6"

# windows
[target."cfg(windows)".dependencies]
webview2-com = "0.36"
webview2-com = { version = "0.36", optional = true }
window-vibrancy = "0.6"
windows = { version = "0.60", features = ["Win32_Foundation"] }
windows = { version = "0.60", features = [
"Win32_Foundation",
"Win32_UI",
"Win32_UI_WindowsAndMessaging",
] }

# mobile
[target.'cfg(any(target_os = "android", all(target_vendor = "apple", not(target_os = "macos"))))'.dependencies]
Expand Down Expand Up @@ -180,7 +184,7 @@ tray-icon = ["dep:tray-icon"]
tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry/tracing"]
test = []
compression = ["tauri-macros/compression", "tauri-utils/compression"]
wry = ["tauri-runtime-wry"]
wry = ["webview2-com", "webkit2gtk", "tauri-runtime-wry"]
# TODO: Remove in v3 - wry does not have this feature anymore
objc-exception = []
linux-libxdo = ["tray-icon/libxdo", "muda/libxdo"]
Expand Down

0 comments on commit 4f26dcf

Please sign in to comment.