adam/leptos-use
1
0
Fork 0
mirror of https://github.com/adoyle0/leptos-use.git synced 2025-02-02 10:54:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #70 from rakshith-ravi/feature/version-upgrade

Browse source
This commit is contained in:
Marc-Stefan Cassola 2024-01-27 10:41:54 +00:00 • committed by GitHub
commit 352203bbe8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Cargo.toml
View file

@ -21,11 +21,12 @@ default-struct-builder = "0.5"
futures-util = "0.3" futures-util = "0.3"
gloo-timers = { version = "0.3.0", features = ["futures"] } gloo-timers = { version = "0.3.0", features = ["futures"] }
gloo-utils = { version = "0.2.0" } gloo-utils = { version = "0.2.0" }
http = { version = "1", optional = true } http1 = { version = "1", optional = true, package = "http" }
http0_2 = { version = "0.2", optional = true, package = "http" }
js-sys = "0.3" js-sys = "0.3"
lazy_static = "1" lazy_static = "1"
leptos = "0.6.0-beta" leptos = "0.6"
leptos_axum = { version = "0.6.0-beta", optional = true } leptos_axum = { version = "0.6", optional = true }
num = { version = "0.4", optional = true } num = { version = "0.4", optional = true }
paste = "1" paste = "1"
prost = { version = "0.12", optional = true } prost = { version = "0.12", optional = true }
@ -36,7 +37,7 @@ wasm-bindgen = "0.2.88"
wasm-bindgen-futures = "0.4" wasm-bindgen-futures = "0.4"
[dependencies.web-sys] [dependencies.web-sys]
version = "0.3.67" version = "0.3"
features = [ features = [
"AddEventListenerOptions", "AddEventListenerOptions",
"BinaryType", "BinaryType",
@ -104,13 +105,13 @@ features = [
] ]
[features] [features]
actix = ["dep:actix-web"] actix = ["dep:actix-web", "dep:http0_2"]
axum = ["dep:leptos_axum"] axum = ["dep:leptos_axum", "dep:http1"]
docs = [] docs = []
math = ["num"] math = ["num"]
prost = ["base64", "dep:prost"] prost = ["base64", "dep:prost"]
serde = ["dep:serde", "serde_json"] serde = ["dep:serde", "serde_json"]
ssr = ["dep:http"] ssr = []
[package.metadata.docs.rs] [package.metadata.docs.rs]
all-features = true all-features = true

15
src/use_cookie.rs
View file

@ -43,9 +43,18 @@ pub fn use_cookie(cookie_name: &str) -> Option<Cookie<'static>> {
let cookies; let cookies;
#[cfg(feature = "ssr")] #[cfg(feature = "ssr")]
{ {
use http::HeaderValue;
use leptos::expect_context; use leptos::expect_context;
#[cfg(feature = "actix")]
const COOKIE: http0_2::HeaderName = http0_2::header::COOKIE;
#[cfg(feature = "axum")]
const COOKIE: http1::HeaderName = http1::header::COOKIE;
#[cfg(feature = "actix")]
type HeaderValue = http0_2::HeaderValue;
#[cfg(feature = "axum")]
type HeaderValue = http1::HeaderValue;
let headers; let headers;
#[cfg(feature = "actix")] #[cfg(feature = "actix")]
{ {
@ -53,10 +62,10 @@ pub fn use_cookie(cookie_name: &str) -> Option<Cookie<'static>> {
} }
#[cfg(feature = "axum")] #[cfg(feature = "axum")]
{ {
headers = expect_context::<http::request::Parts>().headers; headers = expect_context::<http1::request::Parts>().headers;
} }
cookies = headers cookies = headers
.get(http::header::COOKIE) .get(COOKIE)
.cloned() .cloned()
.unwrap_or_else(|| HeaderValue::from_static("")) .unwrap_or_else(|| HeaderValue::from_static(""))
.to_str() .to_str()