Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update axum and many dependencies #3825

Draft
wants to merge 31 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
761da58
Update many dependencies; includes prs 3820 (axum 0.8.1), 3810 (wry 0…
stevelr Mar 4, 2025
0a46acb
regenerated corrupt Cargo.lock. Set msrv for some crates to 1.71.1 as…
stevelr Mar 4, 2025
a38d377
roll back rand to 0.8.0
stevelr Mar 4, 2025
74171f5
fix doc testsj
stevelr Mar 4, 2025
f4c59e1
Fix span locations in ifmt and components (#3823)
ealmloff Mar 4, 2025
6a0ae17
Expose Outlet Context (#3788)
wheregmis Mar 4, 2025
9967118
Make GenericRouterContext pub (#3812)
3lpsy Mar 4, 2025
eccd75a
Switch the default server function codec to json (#3602)
ealmloff Mar 4, 2025
87d113b
adjust muda requirements to rely on a single version (#3533)
PhilTaken Mar 4, 2025
a2a009a
Update many dependencies; includes prs 3820 (axum 0.8.1), 3810 (wry 0…
stevelr Mar 4, 2025
7ddb1de
regenerated corrupt Cargo.lock. Set msrv for some crates to 1.71.1 as…
stevelr Mar 4, 2025
2f81991
roll back rand to 0.8.0
stevelr Mar 4, 2025
192583d
fix doc testsj
stevelr Mar 4, 2025
28cd921
Update many dependencies; includes prs 3820 (axum 0.8.1), 3810 (wry 0…
stevelr Mar 4, 2025
e22fa8e
fix doc testsj
stevelr Mar 4, 2025
62bd820
merge main into PR
stevelr Mar 4, 2025
bcd34e9
update: tauri-bundler, tauri-utils (#3801)
DogeDark Mar 4, 2025
8dbb652
update the server function crate to 0.7 (#3560)
ealmloff Mar 4, 2025
7c2cea9
Revision: Cleanup `Dioxus.toml` (#3802)
DogeDark Mar 4, 2025
df837c3
Squash branch
stevelr Mar 4, 2025
91a2180
Update wry version to 0.50.1 (#3810)
mzdk100 Mar 4, 2025
2735fda
Merge branch 'axum-and-other-deps' of ssh://github.com/stevelr/dioxus…
stevelr Mar 4, 2025
781087b
merge main into branch; update msrv
stevelr Mar 4, 2025
50ecaff
fix msrv
stevelr Mar 4, 2025
92bc246
fix doc testsj
stevelr Mar 4, 2025
dd7b3d6
Update many dependencies; includes prs 3820 (axum 0.8.1), 3810 (wry 0…
stevelr Mar 4, 2025
868928c
fix doc testsj
stevelr Mar 4, 2025
0629ba6
rebase
stevelr Mar 4, 2025
6a71160
merge with main
stevelr Mar 4, 2025
c804d53
fix merge conflicts
stevelr Mar 4, 2025
afedf76
fix merge conflict in DebianSettings.recommends
stevelr Mar 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,181 changes: 1,954 additions & 2,227 deletions Cargo.lock

Large diffs are not rendered by default.

373 changes: 187 additions & 186 deletions Cargo.toml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion example-projects/file-explorer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ publish = false

[dependencies]
dioxus = { workspace = true, features = ["desktop"] }
open = "5.1.2"
open = "5.3.2"
2 changes: 1 addition & 1 deletion example-projects/fullstack-hackernews/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false

[dependencies]
dioxus = { workspace = true, features = ["fullstack", "router"] }
chrono = { version = "0.4.38", features = ["serde"] }
chrono = { version = "0.4.40", features = ["serde"] }
reqwest = { workspace= true, features = ["json"] }
serde = { workspace = true, features = ["derive"] }

Expand Down
49 changes: 26 additions & 23 deletions examples/fullstack-auth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,46 +15,49 @@ dioxus-cli-config = { workspace = true, optional = true }
axum = { workspace = true, optional = true }
tokio = { workspace = true, features = ["full"], optional = true }
tower-http = { workspace = true, features = ["auth"], optional = true }
async-trait = { version = "0.1.71", optional = true }
sqlx = { version = "0.7.0", features = [
"macros",
"migrate",
"postgres",
"sqlite",
"_unstable-all-types",
"tls-native-tls",
"runtime-tokio",
async-trait = { version = "0.1.87", optional = true }
sqlx = { version = "0.8.3", features = [
"macros",
"migrate",
"postgres",
"sqlite",
"_unstable-all-types",
"tls-native-tls",
"runtime-tokio",
], optional = true }
http = { workspace = true, optional = true }
tower = { workspace = true, optional = true }

execute = "0.2.12"
execute = "0.2.13"
serde = { workspace = true }
anyhow = { workspace = true }

[dependencies.axum_session]
workspace = true
features = ["sqlite-rustls"]
optional = true

[dependencies.axum_session_sqlx]
workspace = true
features = ["sqlite"]
optional = true

[dependencies.axum_session_auth]
workspace = true
features = ["sqlite-rustls"]
optional = true

[features]
default = []
server = [
"dioxus-cli-config",
"axum",
"tokio",
"dioxus-fullstack/axum",
"tower-http",
"async-trait",
"sqlx",
"axum_session",
"axum_session_auth",
"http",
"tower",
"dioxus-cli-config",
"axum",
"tokio",
"dioxus-fullstack/axum",
"tower-http",
"async-trait",
"sqlx",
"axum_session",
"axum_session_auth",
"http",
"tower",
]
web = ["dioxus/web", "dioxus-web"]
5 changes: 3 additions & 2 deletions examples/fullstack-auth/src/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ use axum::{
routing::get,
Router,
};
use axum_session::{SessionConfig, SessionLayer, SessionSqlitePool, SessionStore};
use axum_session::{SessionConfig, SessionLayer, SessionStore};
use axum_session_auth::*;
use axum_session_sqlx::SessionSqlitePool;
use core::pin::Pin;
use dioxus_fullstack::prelude::*;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -195,7 +196,7 @@ pub async fn connect_to_database() -> SqlitePool {
pub type Session = axum_session_auth::AuthSession<
crate::auth::User,
i64,
axum_session_auth::SessionSqlitePool,
axum_session_sqlx::SessionSqlitePool,
sqlx::SqlitePool,
>;

Expand Down
4 changes: 2 additions & 2 deletions examples/fullstack-auth/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fn main() {
use axum_session::SessionConfig;
use axum_session::SessionStore;
use axum_session_auth::AuthConfig;
use axum_session_auth::SessionSqlitePool;
use axum_session_sqlx::SessionSqlitePool;
tokio::runtime::Runtime::new()
.unwrap()
.block_on(async move {
Expand All @@ -49,7 +49,7 @@ fn main() {
axum_session_auth::AuthSessionLayer::<
crate::auth::User,
i64,
axum_session_auth::SessionSqlitePool,
axum_session_sqlx::SessionSqlitePool,
sqlx::SqlitePool,
>::new(Some(pool))
.with_config(auth_config),
Expand Down
2 changes: 1 addition & 1 deletion examples/fullstack-desktop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false

[dependencies]
dioxus = { workspace = true, features = ["launch", "fullstack"] }
serde = "1.0.159"
serde = "1.0.218"

[features]
default = []
Expand Down
2 changes: 1 addition & 1 deletion examples/fullstack-hello-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false

[dependencies]
dioxus = { workspace = true, features = ["fullstack"]}
serde = "1.0.159"
serde = "1.0.218"
reqwest = { workspace = true }

[features]
Expand Down
2 changes: 1 addition & 1 deletion examples/fullstack-router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
dioxus = { workspace = true, features = ["fullstack", "router"] }
axum = { workspace = true, optional = true }
tokio = {workspace = true, features = ["full"], optional = true }
serde = { version = "1.0.159", features = ["derive"] }
serde = { version = "1.0.218", features = ["derive"] }

[features]
default = []
Expand Down
6 changes: 3 additions & 3 deletions packages/autofmt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ keywords = ["web", "desktop", "mobile", "gui", "wasm"]

[dependencies]
dioxus-rsx = { workspace = true }
proc-macro2 = { version = "1.0.6", features = ["span-locations"] }
proc-macro2 = { version = "1.0.94", features = ["span-locations"] }
quote = { workspace = true }
syn = { workspace = true, features = [
"full",
"extra-traits",
"visit",
"visit-mut",
] }
serde = { version = "1.0.136", features = ["derive"] }
serde = { version = "1.0.218", features = ["derive"] }
prettyplease = { workspace = true }

[dev-dependencies]
pretty_assertions = "1.2.1"
pretty_assertions = "1.4.1"

[package.metadata.docs.rs]
cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
4 changes: 2 additions & 2 deletions packages/check/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ syn = { workspace = true, features = ["full", "extra-traits", "visit"] }
owo-colors = { workspace = true, features = ["supports-colors"] }

[dev-dependencies]
indoc = "2.0.3"
pretty_assertions = "1.2.1"
indoc = "2.0.6"
pretty_assertions = "1.4.1"
12 changes: 6 additions & 6 deletions packages/cli-opt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@ keywords = ["dom", "ui", "gui", "react"]
anyhow = { workspace = true }
manganis = { workspace = true }
manganis-core = { workspace = true }
object = {version="0.36.0", features=["wasm"]}
object = {version="0.36.7", features=["wasm"]}
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
const-serialize = { workspace = true, features = ["serde"] }
tracing = { workspace = true }
rayon = "1.8.0"
rayon = "1.10.0"

# Image compression/conversion
# - JPEG
mozjpeg = { version = "0.10.7", default-features = false, features = [
mozjpeg = { version = "0.10.13", default-features = false, features = [
"parallel",
] }
# - PNG
imagequant = "4.2.0"
png = "0.17.9"
imagequant = "4.3.4"
png = "0.17.16"

# Image format/conversion
image = { version = "0.25", features = ["avif"] }

# CSS Minification
lightningcss = { version = "1.0.0-alpha.60", features = ["browserslist", "into_owned"] }
lightningcss = { version = "1.0.0-alpha.63", features = ["browserslist", "into_owned"] }

# SCSS Processing
grass = "0.13.4"
Expand Down
76 changes: 36 additions & 40 deletions packages/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "CLI for building fullstack web, desktop, and mobile apps with a s
repository = "https://github.com/DioxusLabs/dioxus/"
license = "MIT OR Apache-2.0"
keywords = ["mobile", "gui", "cli", "dioxus", "wasm"]
rust-version = "1.81.0"
#rust-version = "1.81.0"

[dependencies]
dioxus-autofmt = { workspace = true }
Expand All @@ -28,7 +28,7 @@ wasm-split-cli = { workspace = true }
clap = { workspace = true, features = ["derive", "cargo"] }
convert_case = { workspace = true }
thiserror = { workspace = true }
uuid = { version = "1.3.0", features = ["v4"] }
uuid = { version = "1.15.1", features = ["v4"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
toml = { workspace = true }
Expand All @@ -38,20 +38,20 @@ notify = { workspace = true, features = ["serde"] }
html_parser = { workspace = true }
cargo_metadata = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tokio-stream = "0.1.15"
chrono = "0.4.19"
tokio-stream = "0.1.17"
chrono = "0.4.40"
anyhow = { workspace = true }
hyper = { workspace = true }
hyper-util = "0.1.3"
hyper-util = "0.1.10"
hyper-rustls = { workspace = true }
rustls = { workspace = true }
rayon = "1.8.0"
console = "0.15.8"
ctrlc = "3.2.3"
rayon = "1.10.0"
console = "0.15.11"
ctrlc = "3.4.5"
futures-channel = { workspace = true }
krates = { version = "0.17.0" }
krates = { version = "0.17.5" }
cargo-config2 = { workspace = true, optional = true }
regex = "1.10.6"
regex = "1.11.1"

axum = { workspace = true, features = ["ws"] }
axum-server = { workspace = true, features = ["tls-rustls"] }
Expand All @@ -66,71 +66,67 @@ dunce = { workspace = true }

# tools download
dirs = { workspace = true }
reqwest = { workspace = true, features = [
"rustls-tls",
"trust-dns",
"json"
] }
reqwest = { workspace = true, features = ["rustls-tls", "trust-dns", "json"] }
tower = { workspace = true }
once_cell = "1.19.0"
once_cell = "1.20.3"

# path lookup
which = { version = "7.0.1" }
which = { version = "7.0.2" }

# plugin packages
open = "5.0.1"
cargo-generate = "=0.21.3"
toml_edit = "0.22.20"
open = "5.3.2"
cargo-generate = "0.22.1"
toml_edit = "0.22.24"

# formatting
# syn = { workspace = true }
prettyplease = { workspace = true }

# Assets
brotli = "6.0.0"
ignore = "0.4.22"
brotli = "7.0.0"
ignore = "0.4.23"
env_logger = { workspace = true }
const-serialize = { workspace = true, features = ["serde"] }

tracing-subscriber = { version = "0.3.18", features = ["std", "env-filter", "json", "registry", "fmt"] }
console-subscriber = { version = "0.3.0", optional = true }
tracing-subscriber = { version = "0.3.19", features = ["std", "env-filter", "json", "registry", "fmt"] }
console-subscriber = { version = "0.4.1", optional = true }
tracing = { workspace = true }
wasm-opt = { version = "0.116.1", optional = true }
crossterm = { version = "0.28.0", features = ["event-stream"] }
ansi-to-tui = "6.0"
ansi-to-html = "0.2.1"
crossterm = { version = "0.28.1", features = ["event-stream"] }
ansi-to-tui = "7.0.0"
ansi-to-html = "0.2.2"
path-absolutize = "3.1"
ratatui = { version = "0.28.0", features = ["crossterm", "unstable"] }
ratatui = { version = "0.29.0", features = ["crossterm", "unstable"] }

# disable `log` entirely since `walrus` uses it and is *much* slower with it enableda
log = { version = "0.4", features = ["max_level_off", "release_max_level_off"] }

# link intercept
tempfile = "3.3"
tempfile = "3.13"
manganis = { workspace = true }
manganis-core = { workspace = true }

# Extracting data from an executable
object = {version="0.36.0", features=["wasm"]}
tokio-util = { version = "0.7.11", features = ["full"] }
itertools = "0.13.0"
throbber-widgets-tui = "=0.7.0"
object = { version = "0.36.7", features = ["wasm"] }
tokio-util = { version = "0.7.13", features = ["full"] }
itertools = "0.14.0"
throbber-widgets-tui = "0.8.0"
unicode-segmentation = "1.12.0"
handlebars = "6.1.0"
strum = { version = "0.26.3", features = ["derive"] }
handlebars = "6.3.1"
strum = { version = "0.27.1", features = ["derive"] }

tauri-utils = { workspace = true }
tauri-bundler = { workspace = true }
include_dir = "0.7.4"
flate2 = "1.0.35"
tar = "0.4.43"
flate2 = "1.1.0"
tar = "0.4.44"
local-ip-address = "0.6.3"
dircpy = "0.3.19"
plist = "1.7.0"
memoize = "0.5.1"

[build-dependencies]
built = { version = "=0.7.4", features = ["git2"] }
built = { version = "0.7.5", features = ["git2"] }

[features]
default = []
Expand Down Expand Up @@ -162,5 +158,5 @@ pkg-fmt = "zip"

[package.metadata.docs.rs]
all-features = false
rustc-args = [ "--cfg", "docsrs" ]
rustdoc-args = [ "--cfg", "docsrs" ]
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs"]
Loading