swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change config flags from ssr to server to match the features

Browse Source
This commit is contained in:
Evan Almloff committed 2024-02-05 14:20:15 -06:00
1 parent 69e4ebe4ed
commit b63c14fab8
20 files changed
+80 -80
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/fullstack/src/adapters/salvo_adapter.rs
+7 -7
View File
@@ -9,7 +9,7 @@
//! fn main() {
//! #[cfg(feature = "web")]
//! dioxus_web::launch_cfg(app, dioxus_web::Config::new().hydrate(true));
//! #[cfg(feature = "ssr")]
//! #[cfg(feature = "server")]
//! {
//! use salvo::prelude::*;
//! tokio::runtime::Runtime::new()
@@ -301,7 +301,7 @@ impl DioxusRouterExt for Router {
let mut _dioxus_router = Router::with_path("_dioxus");
_dioxus_router =
_dioxus_router.push(Router::with_path("hot_reload").handle(HotReloadHandler));
#[cfg(all(debug_assertions, feature = "hot-reload", feature = "ssr"))]
#[cfg(all(debug_assertions, feature = "hot-reload", feature = "server"))]
{
_dioxus_router = _dioxus_router.push(Router::with_path("disconnect").handle(ignore_ws));
}
@@ -485,11 +485,11 @@ fn handle_error(error: impl Error + Send + Sync, res: &mut Response) {
}
/// A handler for Dioxus web hot reload websocket. This will send the updated static parts of the RSX to the client when they change.
#[cfg(not(all(debug_assertions, feature = "hot-reload", feature = "ssr")))]
#[cfg(not(all(debug_assertions, feature = "hot-reload", feature = "server")))]
#[derive(Default)]
pub struct HotReloadHandler;
#[cfg(not(all(debug_assertions, feature = "hot-reload", feature = "ssr")))]
#[cfg(not(all(debug_assertions, feature = "hot-reload", feature = "server")))]
#[handler]
impl HotReloadHandler {
async fn handle(
@@ -503,11 +503,11 @@ impl HotReloadHandler {
}
/// A handler for Dioxus web hot reload websocket. This will send the updated static parts of the RSX to the client when they change.
#[cfg(all(debug_assertions, feature = "hot-reload", feature = "ssr"))]
#[cfg(all(debug_assertions, feature = "hot-reload", feature = "server"))]
#[derive(Default)]
pub struct HotReloadHandler;
#[cfg(all(debug_assertions, feature = "hot-reload", feature = "ssr"))]
#[cfg(all(debug_assertions, feature = "hot-reload", feature = "server"))]
#[handler]
impl HotReloadHandler {
async fn handle(
@@ -561,7 +561,7 @@ impl HotReloadHandler {
}
}
#[cfg(all(debug_assertions, feature = "hot-reload", feature = "ssr"))]
#[cfg(all(debug_assertions, feature = "hot-reload", feature = "server"))]
#[handler]
async fn ignore_ws(req: &mut Request, res: &mut Response) -> Result<(), salvo::http::StatusError> {
use salvo::websocket::WebSocketUpgrade;