diff --git a/Cargo.lock b/Cargo.lock index 9fc43452..f6c5cbe1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6422,7 +6422,7 @@ dependencies = [ "tokio", "tray-icon", "url", - "urlpattern", + "urlpattern 0.2.0", "uuid", "webkit2gtk", "webview2-com", @@ -6710,7 +6710,7 @@ dependencies = [ "thiserror", "tokio", "url", - "urlpattern", + "urlpattern 0.3.0", ] [[package]] @@ -7067,7 +7067,7 @@ dependencies = [ "thiserror", "toml 0.8.2", "url", - "urlpattern", + "urlpattern 0.2.0", "walkdir", ] @@ -7726,6 +7726,18 @@ dependencies = [ "url", ] +[[package]] +name = "urlpattern" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" +dependencies = [ + "regex", + "serde", + "unic-ucd-ident", + "url", +] + [[package]] name = "utf-8" version = "0.7.6" diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml index a1fb2a9a..e1e2eb38 100644 --- a/plugins/http/Cargo.toml +++ b/plugins/http/Cargo.toml @@ -18,7 +18,7 @@ tauri-plugin = { workspace = true, features = [ "build" ] } schemars = { workspace = true } serde = { workspace = true } url = { workspace = true } -urlpattern = "0.2" +urlpattern = "0.3" regex = "1" [dependencies] @@ -28,7 +28,7 @@ tauri = { workspace = true } thiserror = { workspace = true } tokio = { version = "1", features = ["sync", "macros"] } tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.1" } -urlpattern = "0.2" +urlpattern = "0.3" regex = "1" http = "1" reqwest = { version = "0.12", default-features = false } diff --git a/plugins/http/build.rs b/plugins/http/build.rs index e84a9001..5f12208d 100644 --- a/plugins/http/build.rs +++ b/plugins/http/build.rs @@ -59,6 +59,7 @@ impl From for scope::Entry { url: urlpattern::UrlPattern::parse( urlpattern::UrlPatternInit::parse_constructor_string::(&url, None) .unwrap(), + Default::default(), ) .unwrap(), } diff --git a/plugins/http/src/scope.rs b/plugins/http/src/scope.rs index 291cbfa3..b84831de 100644 --- a/plugins/http/src/scope.rs +++ b/plugins/http/src/scope.rs @@ -30,7 +30,7 @@ fn parse_url_pattern(s: &str) -> Result { { init.pathname.replace("*".to_string()); } - UrlPattern::parse(init) + UrlPattern::parse(init, Default::default()) } impl<'de> Deserialize<'de> for Entry {