dnrops
/
leptos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: update gloo-net and reqwest to http 1.0 (closes #2688) (leptos 0.6) (#2751)

This commit is contained in:
Saber Haj Rabiee 2024-08-01 16:39:54 -07:00 committed by GitHub
parent c9d4ea9307
commit d50012f8d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 81 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/action-form-error-handling/Cargo.toml
View File

@ -11,7 +11,7 @@ actix-files = { version = "0.6", optional = true }
actix-web = { version = "4", optional = true, features = ["macros"] } actix-web = { version = "4", optional = true, features = ["macros"] }
console_error_panic_hook = "0.1" console_error_panic_hook = "0.1"
cfg-if = "1" cfg-if = "1"
http = { version = "0.2", optional = true } http = { version = "1.0", optional = true }
leptos = { path = "../../leptos" } leptos = { path = "../../leptos" }
leptos_meta = { path = "../../meta" } leptos_meta = { path = "../../meta" }
leptos_actix = { path = "../../integrations/actix", optional = true } leptos_actix = { path = "../../integrations/actix", optional = true }

16
examples/counter_isomorphic/Cargo.toml
View File

@ -24,7 +24,7 @@ leptos_meta = { path = "../../meta" }
leptos_router = { path = "../../router" } leptos_router = { path = "../../router" }
log = "0.4" log = "0.4"
once_cell = "1.18" once_cell = "1.18"
gloo-net = { git = "https://github.com/rustwasm/gloo" } gloo-net = { version = "0.6" }
wasm-bindgen = "0.2" wasm-bindgen = "0.2"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
simple_logger = "4.3" simple_logger = "4.3"
@ -33,13 +33,13 @@ tracing = { version = "0.1", optional = true }
[features] [features]
hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"] hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
ssr = [ ssr = [
"dep:actix-files", "dep:actix-files",
"dep:actix-web", "dep:actix-web",
"dep:tracing", "dep:tracing",
"leptos/ssr", "leptos/ssr",
"leptos_actix", "leptos_actix",
"leptos_meta/ssr", "leptos_meta/ssr",
"leptos_router/ssr", "leptos_router/ssr",
] ]
[package.metadata.cargo-all-features] [package.metadata.cargo-all-features]

16
examples/hackernews/Cargo.toml
View File

@ -21,8 +21,8 @@ leptos_actix = { path = "../../integrations/actix", optional = true }
leptos_router = { path = "../../router" } leptos_router = { path = "../../router" }
log = "0.4" log = "0.4"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
gloo-net = { version = "0.2", features = ["http"] } gloo-net = { version = "0.6", features = ["http"] }
reqwest = { version = "0.11", features = ["json"] } reqwest = { version = "0.12", features = ["json"] }
tracing = "0.1" tracing = "0.1"
# openssl = { version = "0.10", features = ["v110"] } # openssl = { version = "0.10", features = ["v110"] }
wasm-bindgen = "0.2" wasm-bindgen = "0.2"
@ -32,12 +32,12 @@ web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"] csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"] hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
ssr = [ ssr = [
"dep:actix-files", "dep:actix-files",
"dep:actix-web", "dep:actix-web",
"dep:leptos_actix", "dep:leptos_actix",
"leptos/ssr", "leptos/ssr",
"leptos_meta/ssr", "leptos_meta/ssr",
"leptos_router/ssr", "leptos_router/ssr",
] ]
[profile.wasm-release] [profile.wasm-release]

4
examples/hackernews_axum/Cargo.toml
View File

@ -21,8 +21,8 @@ log = "0.4"
simple_logger = "4.0" simple_logger = "4.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
tracing = "0.1" tracing = "0.1"
gloo-net = { version = "0.4", features = ["http"] } gloo-net = { version = "0.6", features = ["http"] }
reqwest = { version = "0.11", features = ["json"] } reqwest = { version = "0.12", features = ["json"] }
axum = { version = "0.7", optional = true } axum = { version = "0.7", optional = true }
tower = { version = "0.4", optional = true } tower = { version = "0.4", optional = true }
tower-http = { version = "0.5", features = ["fs"], optional = true } tower-http = { version = "0.5", features = ["fs"], optional = true }

16
examples/hackernews_islands_axum/Cargo.toml
View File

@ -13,20 +13,18 @@ lto = true
[dependencies] [dependencies]
console_log = "1.0" console_log = "1.0"
console_error_panic_hook = "0.1" console_error_panic_hook = "0.1"
leptos = { path = "../../leptos", features = [ leptos = { path = "../../leptos", features = ["experimental-islands"] }
"experimental-islands",
] }
leptos_axum = { path = "../../integrations/axum", optional = true, features = [ leptos_axum = { path = "../../integrations/axum", optional = true, features = [
"experimental-islands", "experimental-islands",
] } ] }
leptos_meta = { path = "../../meta" } leptos_meta = { path = "../../meta" }
leptos_router = { path = "../../router"} leptos_router = { path = "../../router" }
log = "0.4" log = "0.4"
simple_logger = "4.0" simple_logger = "4.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
tracing = "0.1" tracing = "0.1"
gloo-net = { version = "0.4", features = ["http"] } gloo-net = { version = "0.6", features = ["http"] }
reqwest = { version = "0.11", features = ["json"] } reqwest = { version = "0.12", features = ["json"] }
axum = { version = "0.7", optional = true, features = ["http2"] } axum = { version = "0.7", optional = true, features = ["http2"] }
tower = { version = "0.4", optional = true } tower = { version = "0.4", optional = true }
tower-http = { version = "0.5", features = [ tower-http = { version = "0.5", features = [
@ -39,7 +37,11 @@ http = { version = "1.0", optional = true }
web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] } web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
wasm-bindgen = "0.2" wasm-bindgen = "0.2"
lazy_static = "1.4.0" lazy_static = "1.4.0"
rust-embed = { version = "8", features = ["axum", "mime_guess", "tokio"], optional = true } rust-embed = { version = "8", features = [
"axum",
"mime_guess",
"tokio",
], optional = true }
mime_guess = { version = "2.0.4", optional = true } mime_guess = { version = "2.0.4", optional = true }
[features] [features]

6
examples/hackernews_js_fetch/Cargo.toml
View File

@ -22,11 +22,11 @@ log = "0.4.17"
simple_logger = "4.0.0" simple_logger = "4.0.0"
serde = { version = "1.0.148", features = ["derive"] } serde = { version = "1.0.148", features = ["derive"] }
tracing = "0.1" tracing = "0.1"
gloo-net = { version = "0.4.0", features = ["http"] } gloo-net = { version = "0.6", features = ["http"] }
reqwest = { version = "0.11.13", features = ["json"] } reqwest = { version = "0.12", features = ["json"] }
axum = { version = "0.7", default-features = false, optional = true } axum = { version = "0.7", default-features = false, optional = true }
tower = { version = "0.4.13", optional = true } tower = { version = "0.4.13", optional = true }
http = { version = "0.2.11", optional = true } http = { version = "1.0", optional = true }
web-sys = { version = "0.3", features = [ web-sys = { version = "0.3", features = [
"AbortController", "AbortController",
"AbortSignal", "AbortSignal",

2
examples/login_with_token_csr_only/client/Cargo.toml
View File

@ -14,7 +14,7 @@ leptos_router = { path = "../../../router", features = ["csr"] }
log = "0.4" log = "0.4"
console_error_panic_hook = "0.1" console_error_panic_hook = "0.1"
console_log = "1" console_log = "1"
gloo-net = "0.5" gloo-net = "0.6"
gloo-storage = "0.3" gloo-storage = "0.3"
serde = "1.0" serde = "1.0"
thiserror = "1.0" thiserror = "1.0"

42
examples/sso_auth_axum/Cargo.toml
View File

@ -27,39 +27,39 @@ tower-http = { version = "0.5", features = ["fs"], optional = true }
tokio = { version = "1.22.0", features = ["full"], optional = true } tokio = { version = "1.22.0", features = ["full"], optional = true }
http = { version = "1" } http = { version = "1" }
sqlx = { version = "0.7", features = [ sqlx = { version = "0.7", features = [
"runtime-tokio-rustls", "runtime-tokio-rustls",
"sqlite", "sqlite",
], optional = true } ], optional = true }
thiserror = "1.0.38" thiserror = "1.0.38"
wasm-bindgen = "0.2" wasm-bindgen = "0.2"
axum_session_auth = { version = "0.12", features = [ axum_session_auth = { version = "0.12", features = [
"sqlite-rustls", "sqlite-rustls",
], optional = true } ], optional = true }
axum_session = { version = "0.12", features = [ axum_session = { version = "0.12", features = [
"sqlite-rustls", "sqlite-rustls",
], optional = true } ], optional = true }
async-trait = { version = "0.1.64", optional = true } async-trait = { version = "0.1.64", optional = true }
reqwest = { version = "0.11", optional = true, features = ["json"] } reqwest = { version = "0.12", optional = true, features = ["json"] }
[features] [features]
hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"] hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
ssr = [ ssr = [
"dep:serde_json", "dep:serde_json",
"dep:axum", "dep:axum",
"dep:tower", "dep:tower",
"dep:tower-http", "dep:tower-http",
"dep:tokio", "dep:tokio",
"dep:reqwest", "dep:reqwest",
"dep:oauth2", "dep:oauth2",
"dep:axum_session_auth", "dep:axum_session_auth",
"dep:axum_session", "dep:axum_session",
"dep:async-trait", "dep:async-trait",
"dep:sqlx", "dep:sqlx",
"dep:rand", "dep:rand",
"leptos/ssr", "leptos/ssr",
"leptos_meta/ssr", "leptos_meta/ssr",
"leptos_router/ssr", "leptos_router/ssr",
"dep:leptos_axum", "dep:leptos_axum",
] ]
[package.metadata.cargo-all-features] [package.metadata.cargo-all-features]

2
examples/tailwind_actix/Cargo.toml
View File

@ -13,7 +13,7 @@ leptos = { path = "../../leptos" }
leptos_actix = { path = "../../integrations/actix", optional = true } leptos_actix = { path = "../../integrations/actix", optional = true }
leptos_meta = { path = "../../meta" } leptos_meta = { path = "../../meta" }
leptos_router = { path = "../../router" } leptos_router = { path = "../../router" }
gloo-net = { version = "0.2", features = ["http"] } gloo-net = { version = "0.6", features = ["http"] }
log = "0.4" log = "0.4"
# dependencies for client (enable when csr or hydrate set) # dependencies for client (enable when csr or hydrate set)

2
examples/tailwind_csr/Cargo.toml
View File

@ -8,7 +8,7 @@ leptos = { path = "../../leptos", features = ["csr"] }
leptos_meta = { path = "../../meta", features = ["csr"] } leptos_meta = { path = "../../meta", features = ["csr"] }
leptos_router = { path = "../../router", features = ["csr"] } leptos_router = { path = "../../router", features = ["csr"] }
log = "0.4" log = "0.4"
gloo-net = { version = "0.5", features = ["http"] } gloo-net = { version = "0.6", features = ["http"] }
# dependencies for client (enable when csr or hydrate set) # dependencies for client (enable when csr or hydrate set)
wasm-bindgen = { version = "0.2" } wasm-bindgen = { version = "0.2" }

28
projects/ory-kratos/Cargo.toml
View File

@ -1,6 +1,6 @@
[workspace] [workspace]
resolver = "2" resolver = "2"
members = ["app", "frontend", "ids", "server","e2e"] members = ["app", "frontend", "ids", "server", "e2e"]
# need to be applied only to wasm build # need to be applied only to wasm build
[profile.release] [profile.release]
@ -13,34 +13,38 @@ leptos = { version = "0.6.9", features = ["nightly"] }
leptos_meta = { version = "0.6.9", features = ["nightly"] } leptos_meta = { version = "0.6.9", features = ["nightly"] }
leptos_router = { version = "0.6.9", features = ["nightly"] } leptos_router = { version = "0.6.9", features = ["nightly"] }
leptos_axum = { version = "0.6.9" } leptos_axum = { version = "0.6.9" }
leptos-use = {version = "0.10.5"} leptos-use = { version = "0.10.5" }
axum = "0.7" axum = "0.7"
axum-server = {version = "0.6", features = ["tls-rustls"]} axum-server = { version = "0.6", features = ["tls-rustls"] }
axum-extra = { version = "0.9.2", features=["cookie"]} axum-extra = { version = "0.9.2", features = ["cookie"] }
cfg-if = "1" cfg-if = "1"
console_error_panic_hook = "0.1.7" console_error_panic_hook = "0.1.7"
console_log = "1" console_log = "1"
http = "1" http = "1"
ids = {path="./ids"} ids = { path = "./ids" }
# this goes to this personal branch because of https://github.com/ory/sdk/issues/325#issuecomment-1960834676 # this goes to this personal branch because of https://github.com/ory/sdk/issues/325#issuecomment-1960834676
ory-kratos-client = {git="https://github.com/sjud/kratos-client-rust"} ory-kratos-client = { git = "https://github.com/sjud/kratos-client-rust" }
ory-keto-client = {version = "0.11.0-alpha.0"} ory-keto-client = { version = "0.11.0-alpha.0" }
reqwest = { version = "0.11.24", features = ["json","cookies"] } reqwest = { version = "0.12", features = ["json", "cookies"] }
serde = "1.0.197" serde = "1.0.197"
serde_json = "1.0.114" serde_json = "1.0.114"
sqlx = {version= "0.7.3", features=["runtime-tokio","sqlite","macros"]} sqlx = { version = "0.7.3", features = ["runtime-tokio", "sqlite", "macros"] }
thiserror = "1" thiserror = "1"
time = "0.3.34" time = "0.3.34"
tokio = { version = "1.33.0", features = ["full"] } tokio = { version = "1.33.0", features = ["full"] }
tower = { version = "0.4.13", features = ["full"] } tower = { version = "0.4.13", features = ["full"] }
tower-http = { version = "0.5", features = ["full"] } tower-http = { version = "0.5", features = ["full"] }
tracing = "0.1.40" tracing = "0.1.40"
tracing-subscriber = {version="0.3.18", features=["env-filter"]} tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
url = "2.5.0" url = "2.5.0"
uuid = {version = "1.7.0", features=["v4","serde"]} uuid = { version = "1.7.0", features = ["v4", "serde"] }
wasm-bindgen = "0.2.92" wasm-bindgen = "0.2.92"
web-sys = {version = "0.3.69", features=["HtmlDocument","HtmlFormElement","FormData"]} web-sys = { version = "0.3.69", features = [
"HtmlDocument",
"HtmlFormElement",
"FormData",
] }
# See https://github.com/akesson/cargo-leptos for documentation of all the parameters. # See https://github.com/akesson/cargo-leptos for documentation of all the parameters.

16
projects/ory-kratos/e2e/Cargo.toml
View File

@ -6,19 +6,21 @@ edition = "2021"
[dev-dependencies] [dev-dependencies]
anyhow = "1.0.72" anyhow = "1.0.72"
async-trait = "0.1.72" async-trait = "0.1.72"
cucumber = {version="0.20.2",features=["tracing","macros"]} cucumber = { version = "0.20.2", features = ["tracing", "macros"] }
pretty_assertions = "1.4.0" pretty_assertions = "1.4.0"
serde_json = "1.0.104" serde_json = "1.0.104"
tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "time"] } tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "time"] }
url = "2.4.0" url = "2.4.0"
reqwest = "0.11.25" reqwest = "0.12"
tracing = "0.1.40" tracing = "0.1.40"
chromiumoxide = {version = "0.5.7", default-features = false, features=["tokio-runtime"]} chromiumoxide = { version = "0.5.7", default-features = false, features = [
"tokio-runtime",
] }
ids.workspace = true ids.workspace = true
fake = "2.9.2" fake = "2.9.2"
tokio-tungstenite = "0.21.0" tokio-tungstenite = "0.21.0"
futures-util = "0.3.30" futures-util = "0.3.30"
uuid = {version="1.7.0",features=["serde"]} uuid = { version = "1.7.0", features = ["serde"] }
once_cell = "1.19.0" once_cell = "1.19.0"
futures = "0.3.30" futures = "0.3.30"
@ -28,13 +30,9 @@ harness = false # Allow Cucumber to print output instead of libtest
[features] [features]
#vscode thing to get autocomplete #vscode thing to get autocomplete
ssr=[] ssr = []
[dependencies] [dependencies]
once_cell = "1.19.0" once_cell = "1.19.0"
regex = "1.10.3" regex = "1.10.3"
serde.workspace = true serde.workspace = true

2
router/Cargo.toml
View File

@ -15,7 +15,7 @@ leptos_integration_utils = { workspace = true, optional = true }
leptos_meta = { workspace = true, optional = true } leptos_meta = { workspace = true, optional = true }
cached = { version = "0.45.0", optional = true } cached = { version = "0.45.0", optional = true }
cfg-if = "1" cfg-if = "1"
gloo-net = { version = "0.5", features = ["http"] } gloo-net = { version = "0.6", features = ["http"] }
lazy_static = "1" lazy_static = "1"
linear-map = { version = "1", features = ["serde_impl"] } linear-map = { version = "1", features = ["serde_impl"] }
once_cell = "1.18" once_cell = "1.18"

4
server_fn/Cargo.toml
View File

@ -57,7 +57,7 @@ rkyv = { version = "0.7", features = [
rmp-serde = { version = "1.1", optional = true } rmp-serde = { version = "1.1", optional = true }
# client # client
gloo-net = { version = "0.5", optional = true } gloo-net = { version = "0.6", optional = true }
js-sys = { version = "0.3", optional = true } js-sys = { version = "0.3", optional = true }
wasm-bindgen = { version = "0.2", optional = true } wasm-bindgen = { version = "0.2", optional = true }
wasm-bindgen-futures = { version = "0.4", optional = true } wasm-bindgen-futures = { version = "0.4", optional = true }
@ -69,7 +69,7 @@ web-sys = { version = "0.3", optional = true, features = [
] } ] }
# reqwest client # reqwest client
reqwest = { version = "0.11", default-features = false, optional = true, features = [ reqwest = { version = "0.12", default-features = false, optional = true, features = [
"multipart", "multipart",
"stream", "stream",
] } ] }