Kaynağa Gözat

chore(deps): update to wry 0.37 (#8936)

Lucas Fernandes Nogueira 1 yıl önce
ebeveyn
işleme
d75713ac6c

+ 5 - 0
.changes/wry-0.37.md

@@ -0,0 +1,5 @@
+---
+"tauri-runtime-wry": patch:deps
+---
+
+Upgraded to `wry@0.37.0`

+ 4 - 3
Cargo.lock

@@ -3789,6 +3789,7 @@ dependencies = [
  "tauri-runtime",
  "tauri-utils",
  "tracing",
+ "url",
  "webkit2gtk",
  "webview2-com",
  "windows 0.52.0",
@@ -4935,9 +4936,9 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.36.0"
+version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9e7b81968555303086ef882a0c213896a76099de4ed0b86a798775c2d54304"
+checksum = "8b717040ba9771fd88eb428c6ea6b555f8e734ff8534f02c13e8f10d97f5935e"
 dependencies = [
  "base64",
  "block",
@@ -4961,6 +4962,7 @@ dependencies = [
  "objc",
  "objc_id",
  "once_cell",
+ "percent-encoding",
  "raw-window-handle 0.6.0",
  "serde",
  "serde_json",
@@ -4969,7 +4971,6 @@ dependencies = [
  "tao-macros",
  "thiserror",
  "tracing",
- "url",
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",

+ 2 - 1
core/tauri-runtime-wry/Cargo.toml

@@ -13,12 +13,13 @@ edition = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-wry = { version = "0.36", default-features = false, features = [ "file-drop", "protocol", "os-webview" ] }
+wry = { version = "0.37", default-features = false, features = [ "file-drop", "protocol", "os-webview" ] }
 tao = { version = "0.26", default-features = false, features = [ "rwh_06" ] }
 tauri-runtime = { version = "2.0.0-beta.3", path = "../tauri-runtime" }
 tauri-utils = { version = "2.0.0-beta.3", path = "../tauri-utils" }
 raw-window-handle = "0.6"
 http = "0.2"
+url = "2"
 tracing = { version = "0.1", optional = true }
 
 [target."cfg(windows)".dependencies]

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

@@ -60,8 +60,9 @@ use tao::{
 #[cfg(target_os = "macos")]
 use tauri_utils::TitleBarStyle;
 use tauri_utils::{config::WindowConfig, debug_eprintln, Theme};
+use url::Url;
 use wry::{
-  FileDropEvent as WryFileDropEvent, ProxyConfig, ProxyEndpoint, Url, WebContext, WebView,
+  FileDropEvent as WryFileDropEvent, ProxyConfig, ProxyEndpoint, WebContext, WebView,
   WebViewBuilder,
 };
 
@@ -2822,7 +2823,7 @@ fn handle_user_message<T: UserEvent>(
 
           // Getters
           WebviewMessage::Url(tx) => {
-            tx.send(webview.url()).unwrap();
+            tx.send(webview.url().parse().unwrap()).unwrap();
           }
           WebviewMessage::Position(tx) => {
             let bounds = webview.bounds();
@@ -3459,7 +3460,6 @@ fn create_webview<T: UserEvent>(
   let mut webview_builder = builder
     .with_focused(window.is_focused())
     .with_url(&url)
-    .unwrap() // safe to unwrap because we validate the URL beforehand
     .with_transparent(webview_attributes.transparent)
     .with_accept_first_mouse(webview_attributes.accept_first_mouse);