From 2e42cc743c4b879e87b8efc42e863237d830e50f Mon Sep 17 00:00:00 2001 From: Ethan Girouard Date: Sun, 31 Mar 2024 11:56:38 -0400 Subject: [PATCH] Override gloo-net version In the git repository for gloo packages, gloo-net has been updated to use http 1.0, but this change is not published with the package yet. --- Cargo.lock | 26 +++++++++++++++----------- Cargo.toml | 7 +++++-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bad34a9..fcadb64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -499,6 +499,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -1215,14 +1221,13 @@ dependencies = [ [[package]] name = "gloo-net" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" +source = "git+https://github.com/rustwasm/gloo.git?rev=a823fab7ecc4068e9a28bd669da5eaf3f0a56380#a823fab7ecc4068e9a28bd669da5eaf3f0a56380" dependencies = [ "futures-channel", "futures-core", "futures-sink", "gloo-utils 0.2.0", - "http 0.2.11", + "http 1.0.0", "js-sys", "pin-project", "serde", @@ -1249,8 +1254,7 @@ dependencies = [ [[package]] name = "gloo-utils" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" +source = "git+https://github.com/rustwasm/gloo.git?rev=a823fab7ecc4068e9a28bd669da5eaf3f0a56380#a823fab7ecc4068e9a28bd669da5eaf3f0a56380" dependencies = [ "js-sys", "serde", @@ -2037,7 +2041,7 @@ dependencies = [ "diesel_migrations", "dotenv", "futures", - "http 0.2.11", + "http 1.0.0", "icondata", "lazy_static", "leptos", @@ -3353,9 +3357,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tower-sessions" -version = "0.10.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5dfd131ee564762468250d3dbb8a04f3bc933bcc9bd4f0958ce8acbfb578b73" +checksum = "32b7b53dbe4dc5cf64382fcbd1e8b8ca222949d757fcabec1bcc8de751bb611b" dependencies = [ "async-trait", "http 1.0.0", @@ -3370,12 +3374,12 @@ dependencies = [ [[package]] name = "tower-sessions-core" -version = "0.10.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed2607e4db384eed7a932a53c10f64202e73e9a970b6a7410bcbc018fd7c689" +checksum = "cec154be845cc7482fa002282813881732bdf17c75a8e85ff1bddaf387b668c5" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.0", "futures", "http 1.0.0", "parking_lot", diff --git a/Cargo.toml b/Cargo.toml index e48203f..7d91956 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ actix-files = { version = "0.6", optional = true } actix-web = { version = "4", optional = true, features = ["macros"] } console_error_panic_hook = "0.1" cfg-if = "1" -http = "0.2" +http = "1.0" leptos = { version = "0.6", features = ["nightly"] } leptos_meta = { version = "0.6", features = ["nightly"] } leptos_actix = { version = "0.6", optional = true } @@ -37,7 +37,10 @@ axum = { version = "0.7.5", optional = true } tower = { veresion = "0.4.13", optional = true } tower-http = { version = "0.4", optional = true, features = ["fs"] } thiserror = "1.0.57" -tower-sessions = { version = "0.10.4", default-features = false } +tower-sessions = { version = "0.12", default-features = false } + +[patch.crates-io] +gloo-net = { git = "https://github.com/rustwasm/gloo.git", rev = "a823fab7ecc4068e9a28bd669da5eaf3f0a56380" } [features] csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]