From f9c2a50b32e4d44c296f2cdb26d920d23e33adb7 Mon Sep 17 00:00:00 2001 From: endrl <119058008+endrl@users.noreply.github.com> Date: Wed, 27 Sep 2023 16:53:44 +0200 Subject: [PATCH] fix(tauri): http for windows --- tauri/Cargo.lock | 92 ++++++++++++++++++++++++++++++++++++------------ tauri/Cargo.toml | 5 +++ 2 files changed, 74 insertions(+), 23 deletions(-) diff --git a/tauri/Cargo.lock b/tauri/Cargo.lock index 66170ea994e..3c2a4861745 100644 --- a/tauri/Cargo.lock +++ b/tauri/Cargo.lock @@ -1394,7 +1394,21 @@ checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ "log", "mac", - "markup5ever", + "markup5ever 0.10.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever 0.11.0", "proc-macro2", "quote", "syn 1.0.109", @@ -1704,7 +1718,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ "cssparser", - "html5ever", + "html5ever 0.25.2", + "matches", + "selectors", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever 0.26.0", + "indexmap 1.9.3", "matches", "selectors", ] @@ -1809,7 +1836,21 @@ checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", "string_cache", "string_cache_codegen", "tendril", @@ -2278,6 +2319,16 @@ dependencies = [ "phf_shared 0.8.0", ] +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + [[package]] name = "phf_generator" version = "0.8.0" @@ -2842,7 +2893,7 @@ dependencies = [ "log", "matches", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", "smallvec", @@ -3309,8 +3360,7 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" +source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d1858de7a00b093eb02cb4f75362800ecea0c464" dependencies = [ "anyhow", "bytes", @@ -3364,11 +3414,11 @@ dependencies = [ [[package]] name = "tauri-build" version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d2edd6a259b5591c8efdeb9d5702cb53515b82a6affebd55c7fd6d3a27b7d1b" +source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d1858de7a00b093eb02cb4f75362800ecea0c464" dependencies = [ "anyhow", "cargo_toml", + "dirs-next", "heck 0.4.1", "json-patch", "semver", @@ -3376,13 +3426,13 @@ dependencies = [ "serde_json", "tauri-utils", "tauri-winres", + "walkdir", ] [[package]] name = "tauri-codegen" version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" +source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d1858de7a00b093eb02cb4f75362800ecea0c464" dependencies = [ "base64 0.21.3", "brotli", @@ -3407,8 +3457,7 @@ dependencies = [ [[package]] name = "tauri-macros" version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb12a2454e747896929338d93b0642144bb51e0dddbb36e579035731f0d76b7" +source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d1858de7a00b093eb02cb4f75362800ecea0c464" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -3421,8 +3470,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "108683199cb18f96d2d4134187bb789964143c845d2d154848dda209191fd769" +source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d1858de7a00b093eb02cb4f75362800ecea0c464" dependencies = [ "gtk", "http", @@ -3442,8 +3490,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b" +source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d1858de7a00b093eb02cb4f75362800ecea0c464" dependencies = [ "cocoa", "gtk", @@ -3462,18 +3509,17 @@ dependencies = [ [[package]] name = "tauri-utils" version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03fc02bb6072bb397e1d473c6f76c953cda48b4a2d0cce605df284aa74a12e84" +source = "git+https://github.com/tauri-apps/tauri?branch=1.x#d1858de7a00b093eb02cb4f75362800ecea0c464" dependencies = [ "brotli", "ctor", "dunce", "glob", "heck 0.4.1", - "html5ever", + "html5ever 0.26.0", "infer", "json-patch", - "kuchiki", + "kuchikiki", "memchr", "phf 0.10.1", "proc-macro2", @@ -4445,9 +4491,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.24.3" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" +checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e" dependencies = [ "base64 0.13.1", "block", @@ -4459,7 +4505,7 @@ dependencies = [ "gio", "glib", "gtk", - "html5ever", + "html5ever 0.25.2", "http", "kuchiki", "libc", diff --git a/tauri/Cargo.toml b/tauri/Cargo.toml index 20957032fc5..169ba9a2fbd 100644 --- a/tauri/Cargo.toml +++ b/tauri/Cargo.toml @@ -19,6 +19,11 @@ tauri-build = { version = "=1.4.0", features = [] } [dependencies] tauri = { version = "=1.4.1", features = ["api-all"] } +# Remove with release of Tauri 1.5 +[patch.crates-io] +tauri = { git = "https://github.com/tauri-apps/tauri", branch = "1.x" } +tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "1.x" } + [features] default = ["custom-protocol"] custom-protocol = ["tauri/custom-protocol"]