Merge branch 'master' into intigrate-collect-assets
This commit is contained in:
1 parent
ffb5de91d1
commit
f976e08f71
379 files changed
+1962
-13517
No files matched your search
@@ -12,8 +12,9 @@ dioxus-fullstack = { workspace = true }
|
||||
axum = { version = "0.6.12", optional = true }
|
||||
serde = "1.0.159"
|
||||
simple_logger = "4.2.0"
|
||||
wasm-logger = "0.2.0"
|
||||
log.workspace = true
|
||||
tracing-wasm = "0.2.1"
|
||||
tracing.workspace = true
|
||||
tracing-subscriber = "0.3.17"
|
||||
reqwest = "0.11.18"
|
||||
|
||||
[features]
|
||||
|
||||
@@ -12,7 +12,6 @@ use dioxus_fullstack::{
|
||||
prelude::*,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use wasm_logger::Config;
|
||||
|
||||
#[derive(Props, PartialEq, Debug, Default, Serialize, Deserialize, Clone)]
|
||||
struct AppProps {
|
||||
@@ -66,9 +65,9 @@ async fn get_server_data() -> Result<String, ServerFnError> {
|
||||
|
||||
fn main() {
|
||||
#[cfg(feature = "web")]
|
||||
wasm_logger::init(wasm_logger::Config::new(log::Level::Trace));
|
||||
tracing_wasm::set_as_global_default();
|
||||
#[cfg(feature = "ssr")]
|
||||
simple_logger::SimpleLogger::new().init().unwrap();
|
||||
tracing_subscriber::fmt::init();
|
||||
|
||||
LaunchBuilder::new_with_props(app, AppProps { count: 0 }).launch()
|
||||
}
|
||||
Reference in new issue
Block a user