Skip to content

Commit

Permalink
chore: apply cargo machete systematically (leptos-rs#671)
Browse files Browse the repository at this point in the history
gbj authored Mar 13, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 666d53e commit 38daaf3
Showing 20 changed files with 33 additions and 100 deletions.
3 changes: 1 addition & 2 deletions examples/counter_isomorphic/Cargo.toml
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@ actix-web = { version = "4", optional = true, features = ["macros"] }
broadcaster = "1"
console_log = "0.2"
console_error_panic_hook = "0.1"
serde = { version = "1", features = ["derive"] }
futures = "0.3"
cfg-if = "1"
lazy_static = "1"
@@ -23,9 +22,9 @@ leptos_actix = { path = "../../integrations/actix", optional = true }
leptos_meta = { path = "../../meta", default-features = false }
leptos_router = { path = "../../router", default-features = false }
log = "0.4"
simple_logger = "4.0.0"
gloo-net = { git = "https://github.com/rustwasm/gloo" }
wasm-bindgen = "0.2"
serde = { version = "1", features = ["derive"] }

[features]
default = []
9 changes: 1 addition & 8 deletions examples/errors_axum/Cargo.toml
Original file line number Diff line number Diff line change
@@ -7,31 +7,24 @@ edition = "2021"
crate-type = ["cdylib", "rlib"]

[dependencies]
anyhow = "1.0.66"
console_log = "0.2.0"
console_error_panic_hook = "0.1.7"
futures = "0.3.25"
cfg-if = "1.0.0"
leptos = { path = "../../../leptos/leptos", default-features = false, features = [
"serde",
] }
leptos_axum = { path = "../../../leptos/integrations/axum", default-features = false, optional = true }
leptos_meta = { path = "../../../leptos/meta", default-features = false }
leptos_router = { path = "../../../leptos/router", default-features = false }
leptos_reactive = { path = "../../../leptos/leptos_reactive", default-features = false }
log = "0.4.17"
serde = { version = "1", features = ["derive"] }
simple_logger = "4.0.0"
serde = { version = "1.0.148", features = ["derive"] }
serde_json = "1.0.89"
gloo-net = { version = "0.2.5", features = ["http"] }
reqwest = { version = "0.11.13", features = ["json"] }
axum = { version = "0.6.1", optional = true }
tower = { version = "0.4.13", optional = true }
tower-http = { version = "0.4", features = ["fs"], optional = true }
tokio = { version = "1.22.0", features = ["full"], optional = true }
http = { version = "0.2.8" }
thiserror = "1.0.38"
tracing = "0.1.37"
wasm-bindgen = "0.2"

[features]
6 changes: 1 addition & 5 deletions examples/hackernews/Cargo.toml
Original file line number Diff line number Diff line change
@@ -7,12 +7,10 @@ edition = "2021"
crate-type = ["cdylib", "rlib"]

[dependencies]
anyhow = "1"
actix-files = { version = "0.6", optional = true }
actix-web = { version = "4", optional = true, features = ["macros"] }
console_log = "0.2"
console_error_panic_hook = "0.1"
futures = "0.3"
cfg-if = "1"
leptos = { path = "../../leptos", default-features = false, features = [
"serde",
@@ -21,15 +19,13 @@ leptos_meta = { path = "../../meta", default-features = false }
leptos_actix = { path = "../../integrations/actix", default-features = false, optional = true }
leptos_router = { path = "../../router", default-features = false }
log = "0.4"
simple_logger = "4.0.0"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
gloo-net = { version = "0.2", features = ["http"] }
reqwest = { version = "0.11", features = ["json"] }
tracing = "0.1"
# openssl = { version = "0.10", features = ["v110"] }
wasm-bindgen = "0.2"
web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
tracing = "0.1"

[features]
csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
5 changes: 1 addition & 4 deletions examples/hackernews_axum/Cargo.toml
Original file line number Diff line number Diff line change
@@ -7,10 +7,8 @@ edition = "2021"
crate-type = ["cdylib", "rlib"]

[dependencies]
anyhow = "1.0.66"
console_log = "0.2.0"
console_error_panic_hook = "0.1.7"
futures = "0.3.25"
cfg-if = "1.0.0"
leptos = { path = "../../leptos", default-features = false, features = [
"serde",
@@ -21,7 +19,7 @@ leptos_router = { path = "../../router", default-features = false }
log = "0.4.17"
simple_logger = "4.0.0"
serde = { version = "1.0.148", features = ["derive"] }
serde_json = "1.0.89"
tracing = "0.1"
gloo-net = { version = "0.2.5", features = ["http"] }
reqwest = { version = "0.11.13", features = ["json"] }
axum = { version = "0.6.1", optional = true }
@@ -31,7 +29,6 @@ tokio = { version = "1.22.0", features = ["full"], optional = true }
http = { version = "0.2.8", optional = true }
web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
wasm-bindgen = "0.2"
tracing = "0.1"

[features]
default = ["csr"]
25 changes: 12 additions & 13 deletions examples/session_auth_axum/Cargo.toml
Original file line number Diff line number Diff line change
@@ -13,19 +13,15 @@ rand = { version = "0.8.5", features = ["min_const_gen"], optional = true }
console_error_panic_hook = "0.1.7"
futures = "0.3.25"
cfg-if = "1.0.0"
leptos = { version = "0.2.0", default-features = false, features = [
"serde",
leptos = { path = "../../leptos", default-features = false, features = [
"serde",
] }
leptos_meta = { version = "0.2.0", default-features = false }
leptos_axum = { version = "0.2.0", optional = true }
leptos_router = { version = "0.2.0", default-features = false }
leptos_reactive = { version = "0.2.0", default-features = false }
leptos_meta = { path = "../../meta", default-features = false }
leptos_axum = { path = "../../integrations/axum", optional = true }
leptos_router = { path = "../../router", default-features = false }
log = "0.4.17"
simple_logger = "4.0.0"
serde = { version = "1.0.148", features = ["derive"] }
serde_json = "1.0.89"
gloo-net = { version = "0.2.5", features = ["http"] }
reqwest = { version = "0.11.13", features = ["json"] }
axum = { version = "0.6.1", optional = true }
tower = { version = "0.4.13", optional = true }
tower-http = { version = "0.4", features = ["fs"], optional = true }
@@ -36,12 +32,15 @@ sqlx = { version = "0.6.2", features = [
"sqlite",
], optional = true }
thiserror = "1.0.38"
tracing = "0.1.37"
wasm-bindgen = "0.2"
axum_sessions_auth = { version = "7.0.0", features = [ "sqlite-rustls" ], optional = true }
axum_database_sessions = { version = "7.0.0", features = [ "sqlite-rustls" ], optional = true }
axum_sessions_auth = { version = "7.0.0", features = [
"sqlite-rustls",
], optional = true }
axum_database_sessions = { version = "7.0.0", features = [
"sqlite-rustls",
], optional = true }
bcrypt = { version = "0.14", optional = true }
async-trait = {version = "0.1.64", optional = true }
async-trait = { version = "0.1.64", optional = true }

[features]
default = ["csr"]
1 change: 0 additions & 1 deletion examples/ssr_modes/Cargo.toml
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ leptos_actix = { path = "../../integrations/actix", default-features = false, op
leptos_router = { path = "../../router", default-features = false }
log = "0.4"
serde = { version = "1", features = ["derive"] }
simple_logger = "4"
thiserror = "1"
tokio = { version = "1", features = ["time"] }
wasm-bindgen = "0.2"
3 changes: 1 addition & 2 deletions examples/ssr_modes_axum/Cargo.toml
Original file line number Diff line number Diff line change
@@ -19,12 +19,11 @@ leptos_axum = { path = "../../integrations/axum", default-features = false, opti
leptos_router = { path = "../../router", default-features = false }
log = "0.4"
serde = { version = "1", features = ["derive"] }
simple_logger = "4"
thiserror = "1"
axum = { version = "0.6.1", optional = true }
tower = { version = "0.4.13", optional = true }
tower-http = { version = "0.4", features = ["fs"], optional = true }
tokio = { version = "1", features = ["time"], optional = true}
tokio = { version = "1", features = ["time"], optional = true }
wasm-bindgen = "0.2"

[features]
8 changes: 1 addition & 7 deletions examples/todo_app_sqlite_axum/Cargo.toml
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ edition = "2021"
crate-type = ["cdylib", "rlib"]

[dependencies]
anyhow = "1.0.66"
console_log = "0.2.0"
console_error_panic_hook = "0.1.7"
futures = "0.3.25"
@@ -18,13 +17,9 @@ leptos = { path = "../../leptos", default-features = false, features = [
leptos_axum = { path = "../../integrations/axum", default-features = false, optional = true }
leptos_meta = { path = "../../meta", default-features = false }
leptos_router = { path = "../../router", default-features = false }
leptos_reactive = { path = "../../leptos_reactive", default-features = false }
log = "0.4.17"
simple_logger = "4.0.0"
serde = { version = "1.0.148", features = ["derive"] }
serde_json = "1.0.89"
gloo-net = { version = "0.2.5", features = ["http"] }
reqwest = { version = "0.11.13", features = ["json"] }
serde = { version = "1", features = ["derive"] }
axum = { version = "0.6.1", optional = true }
tower = { version = "0.4.13", optional = true }
tower-http = { version = "0.4", features = ["fs"], optional = true }
@@ -35,7 +30,6 @@ sqlx = { version = "0.6.2", features = [
"sqlite",
], optional = true }
thiserror = "1.0.38"
tracing = "0.1.37"
wasm-bindgen = "0.2"

[features]
15 changes: 5 additions & 10 deletions examples/todo_app_sqlite_viz/Cargo.toml
Original file line number Diff line number Diff line change
@@ -7,33 +7,28 @@ edition = "2021"
crate-type = ["cdylib", "rlib"]

[dependencies]
anyhow = "1.0.66"
console_log = "0.2.0"
console_error_panic_hook = "0.1.7"
futures = "0.3.25"
cfg-if = "1.0.0"
leptos = { path = "../../leptos", default-features = false, features = [
"serde",
"serde",
] }
leptos_viz = { path = "../../integrations/viz", default-features = false, optional = true }
leptos_meta = { path = "../../meta", default-features = false }
leptos_router = { path = "../../router", default-features = false }
leptos_reactive = { path = "../../leptos_reactive", default-features = false }
log = "0.4.17"
simple_logger = "4.0.0"
serde = { version = "1.0.148", features = ["derive"] }
serde_json = "1.0.89"
gloo-net = { version = "0.2.5", features = ["http"] }
reqwest = { version = "0.11.13", features = ["json"] }
serde = { version = "1", features = ["derive"] }
viz = { version = "0.4.8", features = ["serve"], optional = true }
tokio = { version = "1.25.0", features = ["full"], optional = true }
http = { version = "0.2.8" }
sqlx = { version = "0.6.2", features = [
"runtime-tokio-rustls",
"sqlite",
"runtime-tokio-rustls",
"sqlite",
], optional = true }
thiserror = "1.0.38"
tracing = "0.1.37"
wasm-bindgen = "0.2"

[features]
@@ -47,7 +42,7 @@ ssr = [
"leptos/ssr",
"leptos_meta/ssr",
"leptos_router/ssr",
"dep:leptos_viz"
"dep:leptos_viz",
]

[package.metadata.cargo-all-features]
1 change: 0 additions & 1 deletion integrations/axum/Cargo.toml
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ hyper = "0.14.23"
leptos = { workspace = true, features = ["ssr"] }
leptos_meta = { workspace = true, features = ["ssr"] }
leptos_router = { workspace = true, features = ["ssr"] }
leptos_config = { workspace = true }
leptos_integration_utils = { workspace = true }
tokio = { version = "1", features = ["full"] }
parking_lot = "0.12.1"
1 change: 0 additions & 1 deletion integrations/utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -12,5 +12,4 @@ futures = "0.3"
leptos = { workspace = true, features = ["ssr"] }
leptos_hot_reload = { workspace = true }
leptos_meta = { workspace = true, features = ["ssr"] }
leptos_router = { workspace = true, features = ["ssr"] }
leptos_config = { workspace = true }
1 change: 0 additions & 1 deletion integrations/viz/Cargo.toml
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ hyper = "0.14.23"
leptos = { workspace = true, features = ["ssr"] }
leptos_meta = { workspace = true, features = ["ssr"] }
leptos_router = { workspace = true, features = ["ssr"] }
leptos_config = { workspace = true }
leptos_integration_utils = { workspace = true }
tokio = { version = "1", features = ["full"] }
parking_lot = "0.12.1"
6 changes: 2 additions & 4 deletions leptos_dom/examples/hydration-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -10,14 +10,12 @@ crate-type = ["cdylib", "rlib"]
leptos = { path = "../../../leptos", default-features = false }
actix-web = { version = "4", optional = true }
actix-files = { version = "0.6", optional = true }
wasm-bindgen = { version = "0.2", optional = true}
wasm-bindgen = { version = "0.2", optional = true }
gloo = { version = "0.8", optional = true }
console_error_panic_hook = "0.1.7"
cfg-if = "1.0.0"
gloo-timers = { version = "0.2", features = ["futures"] }
futures = "0.3"

[features]
default = ["ssr"]
ssr = ["leptos/ssr", "dep:actix-files", "dep:actix-web"]
hydrate = ["leptos/hydrate", "dep:wasm-bindgen", "dep:gloo"]
hydrate = ["leptos/hydrate", "dep:wasm-bindgen", "dep:gloo"]
2 changes: 0 additions & 2 deletions leptos_dom/examples/test-bench/Cargo.toml
Original file line number Diff line number Diff line change
@@ -9,7 +9,5 @@ gloo = { version = "0.8", features = ["futures"] }
leptos = { path = "../../../leptos", features = ["tracing"] }
tracing = "0.1"
tracing-subscriber = "0.3"
wasm-bindgen-futures = "0.4"
web-sys = "0.3"

[workspace]
14 changes: 4 additions & 10 deletions leptos_macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -22,9 +22,7 @@ proc-macro2 = "1"
quote = "1"
syn = { version = "1", features = ["full"] }
syn-rsx = "0.9"
leptos_dom = { workspace = true }
leptos_hot_reload = { workspace = true }
leptos_reactive = { workspace = true }
server_fn_macro = { workspace = true }
convert_case = "0.6.0"
uuid = { version = "1", features = ["v4"] }
@@ -37,14 +35,10 @@ leptos = { path = "../leptos" }

[features]
default = ["ssr"]
csr = ["leptos_dom/web", "leptos_reactive/csr"]
hydrate = ["leptos_dom/web", "leptos_reactive/hydrate"]
ssr = ["leptos_dom/ssr", "leptos_reactive/ssr"]
stable = [
"leptos_dom/stable",
"leptos_reactive/stable",
"server_fn_macro/stable",
]
csr = []
hydrate = []
ssr = []
stable = ["server_fn_macro/stable"]
tracing = []

[package.metadata.cargo-all-features]
27 changes: 4 additions & 23 deletions leptos_server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -9,39 +9,20 @@ description = "RPC for the Leptos web framework."
readme = "../README.md"

[dependencies]
leptos_dom = { workspace = true }
leptos_reactive = { workspace = true }
server_fn = { workspace = true }
lazy_static = "1"
serde = { version = "1", features = ["derive"] }
serde_urlencoded = "0.7"
thiserror = "1"

[dev-dependencies]
leptos = { path = "../leptos" }

[features]
csr = [
#"leptos/csr",
"leptos_dom/web",
"leptos_reactive/csr",
]
hydrate = [
#"leptos/hydrate",
"leptos_dom/web",
"leptos_reactive/hydrate",
]
ssr = [
#"leptos/ssr",
"leptos_reactive/ssr",
"server_fn/ssr",
]
stable = [
#"leptos/stable",
"leptos_dom/stable",
"leptos_reactive/stable",
"server_fn/stable",
]
csr = ["leptos_reactive/csr"]
hydrate = ["leptos_reactive/hydrate"]
ssr = ["leptos_reactive/ssr", "server_fn/ssr"]
stable = ["leptos_reactive/stable", "server_fn/stable"]

[package.metadata.cargo-all-features]
denylist = ["stable"]
1 change: 0 additions & 1 deletion meta/Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@ description = "Tools to set HTML metadata in the Leptos web framework."
cfg-if = "1"
leptos = { workspace = true }
tracing = "0.1"
typed-builder = "0.14"
wasm-bindgen = "0.2"

[dependencies.web-sys]
2 changes: 0 additions & 2 deletions server_fn/Cargo.toml
Original file line number Diff line number Diff line change
@@ -10,15 +10,13 @@ readme = "../README.md"

[dependencies]
server_fn_macro_default = { workspace = true }
form_urlencoded = "1"
serde = { version = "1", features = ["derive"] }
serde_urlencoded = "0.7"
thiserror = "1"
serde_json = "1.0.89"
quote = "1"
syn = { version = "1", features = ["full", "parsing", "extra-traits"] }
proc-macro2 = "1"
cfg-if = "1"
ciborium = "0.2.0"
xxhash-rust = { version = "0.8.6", features = ["const_xxh64"] }
const_format = "0.2.30"
1 change: 0 additions & 1 deletion server_fn/server_fn_macro_default/Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@ description = "The default implementation of the server_fn macro without a conte
proc-macro = true

[dependencies]
proc-macro2 = "1"
syn = { version = "1", features = ["full"] }
server_fn_macro = { workspace = true }

2 changes: 0 additions & 2 deletions server_fn_macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -10,8 +10,6 @@ readme = "../README.md"

[dependencies]
serde = { version = "1", features = ["derive"] }
serde_urlencoded = "0.7"
serde_json = "1.0.89"
quote = "1"
syn = { version = "1", features = ["full", "parsing", "extra-traits"] }
proc-macro2 = "1"

0 comments on commit 38daaf3

Please sign in to comment.