Mirrors/dioxus
2
0
Fork 0
mirror of https://github.com/DioxusLabs/dioxus synced 2024-11-27 06:30:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

update to git dioxus

Browse source
This commit is contained in:
Evan Almloff 2023-06-26 08:53:45 -07:00
parent 5f35fa6e16
commit 9fbeb84921
3 changed files with 58 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Cargo.lock generated
View file

@ -400,6 +400,15 @@ dependencies = [
"jobserver",
]
[[package]]
name = "cfg-expr"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bbc13bf6290a6b202cc3efb36f7ec2b739a80634215630c8053a313edf6abef"
dependencies = [
"smallvec",
]
[[package]]
name = "cfg-if"
version = "1.0.0"
@ -727,8 +736,7 @@ dependencies = [
[[package]]
name = "dioxus-autofmt"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "935ac336dd077436505f2eda7b7b81515093e8a3fb352ac514cd6901dbd302e7"
source = "git+https://github.com/DioxusLabs/dioxus#11c9abcf7ce731ccb4a44c52de383c090ab319af"
dependencies = [
"dioxus-rsx",
"prettier-please",
@ -795,8 +803,7 @@ dependencies = [
[[package]]
name = "dioxus-core"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e4d15b0bb9c58d015b2295f240600dd76e427758377569fa33783afc295706a"
source = "git+https://github.com/DioxusLabs/dioxus#11c9abcf7ce731ccb4a44c52de383c090ab319af"
dependencies = [
"bumpalo",
"bumpslab",
@ -814,8 +821,7 @@ dependencies = [
[[package]]
name = "dioxus-html"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7682a6615e4e5a460cd3293ce420451abffb719c84c4b54e297b17365f601fb4"
source = "git+https://github.com/DioxusLabs/dioxus#11c9abcf7ce731ccb4a44c52de383c090ab319af"
dependencies = [
"async-trait",
"dioxus-core",
@ -831,11 +837,11 @@ dependencies = [
[[package]]
name = "dioxus-rsx"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8544632e20f462a64f26502c91e7cf6ae3b30d82956e70543644d2c16b6659d"
source = "git+https://github.com/DioxusLabs/dioxus#11c9abcf7ce731ccb4a44c52de383c090ab319af"
dependencies = [
"dioxus-core",
"internment",
"krates",
"proc-macro2",
"quote",
"serde",
@ -1011,6 +1017,12 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "fixedbitset"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
version = "1.0.26"
@ -1680,6 +1692,18 @@ dependencies = [
"libc",
]
[[package]]
name = "krates"
version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "942c43a6cba1c201dfe81a943c89fa5c9140b34993e0c027f542c80b92e319a7"
dependencies = [
"cargo_metadata",
"cfg-expr",
"petgraph",
"semver",
]
[[package]]
name = "lazy_static"
version = "1.4.0"
@ -2180,6 +2204,16 @@ dependencies = [
"sha2",
]
[[package]]
name = "petgraph"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
dependencies = [
"fixedbitset",
"indexmap",
]
[[package]]
name = "pin-project"
version = "1.0.12"
@ -2454,8 +2488,7 @@ dependencies = [
[[package]]
name = "rsx-rosetta"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "593810f58a97e3a45e23b84437d5323c2420b46f73cf38fe49133eb59a7524bb"
source = "git+https://github.com/DioxusLabs/dioxus#11c9abcf7ce731ccb4a44c52de383c090ab319af"
dependencies = [
"convert_case",
"dioxus-autofmt",

10
Cargo.toml
View file

@ -77,11 +77,11 @@ ctrlc = "3.2.3"
# dioxus-rsx = "0.0.1"
gitignore = "1.0.7"
dioxus-rsx = { version = "0.0.3" }
dioxus-html = { version = "0.3", features = ["hot-reload-context"] }
dioxus-core = { version = "0.3", features = ["serialize"] }
dioxus-autofmt = "0.3.0"
rsx-rosetta = { version = "0.3" }
dioxus-rsx = { git = "https://github.com/DioxusLabs/dioxus" }
dioxus-html = { git = "https://github.com/DioxusLabs/dioxus", features = ["hot-reload-context"] }
dioxus-core = { git = "https://github.com/DioxusLabs/dioxus", features = ["serialize"] }
dioxus-autofmt = { git = "https://github.com/DioxusLabs/dioxus" }
rsx-rosetta = { git = "https://github.com/DioxusLabs/dioxus" }
open = "4.1.0"
[[bin]]

16
src/server/mod.rs
View file

@ -150,10 +150,10 @@ pub async fn startup_hot_reload(
let dist_path = config.out_dir.clone();
let (reload_tx, _) = broadcast::channel(100);
let map = FileMap::<HtmlCtx>::new(config.crate_dir.clone());
// for err in errors {
// log::error!("{}", err);
// }
let FileMapBuildResult { map, errors } = FileMap::<HtmlCtx>::create(config.crate_dir.clone()).unwrap();
for err in errors {
log::error!("{}", err);
}
let file_map = Arc::new(Mutex::new(map));
let build_manager = Arc::new(BuildManager {
config: config.clone(),
@ -219,10 +219,11 @@ pub async fn startup_hot_reload(
let mut map = file_map.lock().unwrap();
match map.update_rsx(&path, &crate_dir) {
UpdateResult::UpdatedRsx(msgs) => {
Ok( UpdateResult::UpdatedRsx(msgs) )=> {
messages.extend(msgs);
}
UpdateResult::NeedsRebuild => {
Ok(UpdateResult::NeedsRebuild) => {
match build_manager.rebuild() {
Ok(res) => {
print_console_info(
@ -242,6 +243,9 @@ pub async fn startup_hot_reload(
}
return;
}
Err(err) => {
log::error!("{}", err);
}
}
}
for msg in messages {