Compare commits

...

2 Commits

Author SHA1 Message Date
73fa2c4faf Move server-specific main to server module
Some checks failed
Push Workflows / build (push) Failing after 4s
Push Workflows / rustfmt (push) Successful in 6s
Push Workflows / test (push) Failing after 39s
Push Workflows / clippy (push) Failing after 36s
Push Workflows / docs (push) Failing after 43s
Push Workflows / nix-build (push) Failing after 2m6s
2026-06-15 18:00:49 -04:00
d92900de43 Add diesel_migrations
Only include on server feature
2026-06-15 17:46:05 -04:00
5 changed files with 78 additions and 6 deletions

70
Cargo.lock generated
View File

@@ -1004,6 +1004,17 @@ dependencies = [
"syn 2.0.117", "syn 2.0.117",
] ]
[[package]]
name = "diesel_migrations"
version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d0f4a98124ba6d4ca75da535f65984badec16a003b6e2f94a01e31a79490b8"
dependencies = [
"diesel",
"migrations_internals",
"migrations_macros",
]
[[package]] [[package]]
name = "diesel_table_macro_syntax" name = "diesel_table_macro_syntax"
version = "0.3.0" version = "0.3.0"
@@ -3226,6 +3237,7 @@ name = "libretunes"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"diesel", "diesel",
"diesel_migrations",
"dioxus", "dioxus",
"dotenvy", "dotenvy",
"lucide-dioxus", "lucide-dioxus",
@@ -3482,6 +3494,27 @@ dependencies = [
"autocfg", "autocfg",
] ]
[[package]]
name = "migrations_internals"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36c791ecdf977c99f45f23280405d7723727470f6689a5e6dbf513ac547ae10d"
dependencies = [
"serde",
"toml 0.9.12+spec-1.1.0",
]
[[package]]
name = "migrations_macros"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36fc5ac76be324cfd2d3f2cf0fdf5d5d3c4f14ed8aaebadb09e304ba42282703"
dependencies = [
"migrations_internals",
"proc-macro2",
"quote",
]
[[package]] [[package]]
name = "mime" name = "mime"
version = "0.3.17" version = "0.3.17"
@@ -4985,6 +5018,15 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "serde_spanned"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
dependencies = [
"serde_core",
]
[[package]] [[package]]
name = "serde_urlencoded" name = "serde_urlencoded"
version = "0.7.1" version = "0.7.1"
@@ -5343,7 +5385,7 @@ dependencies = [
"cfg-expr", "cfg-expr",
"heck 0.5.0", "heck 0.5.0",
"pkg-config", "pkg-config",
"toml", "toml 0.8.2",
"version-compare", "version-compare",
] ]
@@ -5640,11 +5682,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
dependencies = [ dependencies = [
"serde", "serde",
"serde_spanned", "serde_spanned 0.6.9",
"toml_datetime 0.6.3", "toml_datetime 0.6.3",
"toml_edit 0.20.2", "toml_edit 0.20.2",
] ]
[[package]]
name = "toml"
version = "0.9.12+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
dependencies = [
"serde_core",
"serde_spanned 1.1.1",
"toml_datetime 0.7.5+spec-1.1.0",
"toml_parser",
"winnow 0.7.15",
]
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "0.6.3" version = "0.6.3"
@@ -5654,6 +5709,15 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "toml_datetime"
version = "0.7.5+spec-1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
dependencies = [
"serde_core",
]
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "1.1.1+spec-1.1.0" version = "1.1.1+spec-1.1.0"
@@ -5682,7 +5746,7 @@ checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
dependencies = [ dependencies = [
"indexmap", "indexmap",
"serde", "serde",
"serde_spanned", "serde_spanned 0.6.9",
"toml_datetime 0.6.3", "toml_datetime 0.6.3",
"winnow 0.5.40", "winnow 0.5.40",
] ]

View File

@@ -6,6 +6,7 @@ edition = "2024"
[dependencies] [dependencies]
diesel = { version = "2.3.10", optional = true, features = [ "postgres" ] } diesel = { version = "2.3.10", optional = true, features = [ "postgres" ] }
diesel_migrations = { version = "2.3.2", optional = true, features = [ "postgres" ] }
dioxus = { version = "0.7.9", features = ["router", "fullstack"] } dioxus = { version = "0.7.9", features = ["router", "fullstack"] }
dotenvy = { version = "0.15.7", optional = true } dotenvy = { version = "0.15.7", optional = true }
lucide-dioxus = "3.11.0" lucide-dioxus = "3.11.0"
@@ -19,5 +20,6 @@ mobile = ["dioxus/mobile"]
server = [ server = [
"dioxus/server", "dioxus/server",
"dep:diesel", "dep:diesel",
"dep:diesel_migrations",
"dep:dotenvy", "dep:dotenvy",
] ]

View File

@@ -42,9 +42,7 @@ fn main() {
dioxus::logger::init(tracing::Level::DEBUG).expect("Failed to initialize tracing logger"); dioxus::logger::init(tracing::Level::DEBUG).expect("Failed to initialize tracing logger");
#[cfg(feature = "server")] #[cfg(feature = "server")]
if let Err(e) = dotenvy::dotenv() { server::main();
tracing::warn!("Error reading .env: {e}");
}
dioxus::launch(App); dioxus::launch(App);
} }

6
src/server/main.rs Normal file
View File

@@ -0,0 +1,6 @@
pub fn main() {
#[cfg(feature = "server")]
if let Err(e) = dotenvy::dotenv() {
tracing::warn!("Error reading .env: {e}");
}
}

View File

@@ -1 +1,3 @@
pub mod main;
pub use main::main;