From d9c8d3cc8d5ca67cd767ffc7a521f801b41ce201 Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:10:08 +0800 Subject: [PATCH] chore(deps): update infer, tray icon, urlpattern, image (#10902) --- .../update-trayicon-infer-urlpattern-image.md | 6 ++++ Cargo.lock | 36 ++++++------------- crates/tauri-utils/Cargo.toml | 4 +-- crates/tauri-utils/src/acl/mod.rs | 2 +- crates/tauri/Cargo.toml | 6 ++-- 5 files changed, 23 insertions(+), 31 deletions(-) create mode 100644 .changes/update-trayicon-infer-urlpattern-image.md diff --git a/.changes/update-trayicon-infer-urlpattern-image.md b/.changes/update-trayicon-infer-urlpattern-image.md new file mode 100644 index 000000000000..e88ea7a7d00b --- /dev/null +++ b/.changes/update-trayicon-infer-urlpattern-image.md @@ -0,0 +1,6 @@ +--- +"tauri": patch:deps +"tauri-utils": patch:deps +--- + +Update infer to 0.16, tray icon to 0.17, urlpattern to 0.3, image to 0.25 diff --git a/Cargo.lock b/Cargo.lock index efef97c1aa25..f4f53a700ba8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2961,19 +2961,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", - "png", -] - [[package]] name = "image" version = "0.25.2" @@ -3071,9 +3058,9 @@ dependencies = [ [[package]] name = "infer" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199" +checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" dependencies = [ "cfb", ] @@ -3621,7 +3608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -7036,7 +7023,7 @@ dependencies = [ "heck 0.5.0", "http 1.1.0", "http-range", - "image 0.24.9", + "image", "jni", "libc", "log", @@ -7111,7 +7098,7 @@ dependencies = [ "handlebars", "heck 0.5.0", "hex", - "image 0.25.2", + "image", "log", "md5", "native-tls", @@ -7165,7 +7152,7 @@ dependencies = [ "heck 0.5.0", "html5ever", "ignore", - "image 0.25.2", + "image", "include_dir", "insta", "itertools 0.13.0", @@ -7441,7 +7428,7 @@ dependencies = [ "getrandom 0.2.15", "glob", "html5ever", - "infer 0.15.0", + "infer 0.16.0", "json-patch 2.0.0", "json5", "kuchikiki", @@ -7917,9 +7904,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131a65b2cef2081bc14dbcd414c906edbfa3bb5323dd7e748cc298614681196b" +checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe" dependencies = [ "core-graphics 0.24.0", "crossbeam-channel", @@ -8176,11 +8163,10 @@ dependencies = [ [[package]] name = "urlpattern" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" +checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" dependencies = [ - "derive_more", "regex", "serde", "unic-ucd-ident", diff --git a/crates/tauri-utils/Cargo.toml b/crates/tauri-utils/Cargo.toml index 6da151610d0a..bb61f74739b2 100644 --- a/crates/tauri-utils/Cargo.toml +++ b/crates/tauri-utils/Cargo.toml @@ -35,12 +35,12 @@ json5 = { version = "0.4", optional = true } toml = { version = "0.8", features = ["parse"] } json-patch = "2.0" glob = "0.3" -urlpattern = "0.2" +urlpattern = "0.3" regex = "1" walkdir = { version = "2", optional = true } memchr = "2" semver = "1" -infer = "0.15" +infer = "0.16" dunce = "1" log = "0.4.21" cargo_metadata = { version = "0.18", optional = true } diff --git a/crates/tauri-utils/src/acl/mod.rs b/crates/tauri-utils/src/acl/mod.rs index 395aa6b37126..bd21c84c3376 100644 --- a/crates/tauri-utils/src/acl/mod.rs +++ b/crates/tauri-utils/src/acl/mod.rs @@ -251,7 +251,7 @@ impl FromStr for RemoteUrlPattern { { init.pathname.replace("*".to_string()); } - let pattern = urlpattern::UrlPattern::parse(init)?; + let pattern = urlpattern::UrlPattern::parse(init, Default::default())?; Ok(Self(Arc::new(pattern), s.to_string())) } } diff --git a/crates/tauri/Cargo.toml b/crates/tauri/Cargo.toml index e3e4a898ba0d..d6d637b2df84 100644 --- a/crates/tauri/Cargo.toml +++ b/crates/tauri/Cargo.toml @@ -76,11 +76,11 @@ reqwest = { version = "0.12", default-features = false, features = [ bytes = { version = "1", features = ["serde"] } raw-window-handle = { version = "0.6", features = ["std"] } glob = "0.3" -urlpattern = "0.2" +urlpattern = "0.3" mime = "0.3" data-url = { version = "0.3", optional = true } serialize-to-javascript = "=0.1.1" -image = { version = "0.24", default-features = false, optional = true } +image = { version = "0.25", default-features = false, optional = true } http-range = { version = "0.1.5", optional = true } tracing = { version = "0.1", optional = true } heck = "0.5" @@ -93,7 +93,7 @@ specta = { version = "^2.0.0-rc.16", optional = true, default-features = false, [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\", target_os = \"windows\", target_os = \"macos\"))".dependencies] muda = { version = "0.14", default-features = false, features = ["serde"] } -tray-icon = { version = "0.16", default-features = false, features = [ +tray-icon = { version = "0.17", default-features = false, features = [ "serde", ], optional = true }