use out_dir in a few more places

This commit is contained in:
Evan Almloff committed 2024-02-06 10:27:26 -06:00
1 parent ea9622a75c
commit 7f32809a96
4 files changed
+9 -21

No files matched your search

+1 -6
View File
@@ -111,12 +111,7 @@ impl Build {
let temp = gen_page(&crate_config, build_result.assets.as_ref(), false);
let mut file = std::fs::File::create(
crate_config
.crate_dir
.join(crate_config.dioxus_config.application.out_dir.clone())
.join("index.html"),
)?;
let mut file = std::fs::File::create(crate_config.out_dir().join("index.html"))?;
file.write_all(temp.as_bytes())?;
// #[cfg(feature = "plugin")]
+3 -3
View File
@@ -19,9 +19,9 @@ impl Clean {
return custom_error!("Cargo clean failed.");
}
let out_dir = &crate_config.dioxus_config.application.out_dir;
if crate_config.crate_dir.join(out_dir).is_dir() {
remove_dir_all(crate_config.crate_dir.join(out_dir))?;
let out_dir = &crate_config.out_dir();
if out_dir.is_dir() {
remove_dir_all(out_dir)?;
}
let fullstack_out_dir = crate_config.fullstack_out_dir();
+1 -3
View File
@@ -73,9 +73,7 @@ impl Serve {
) -> anyhow::Result<()> {
let serve_html = gen_page(crate_config, manifest, true);
let dist_path = crate_config
.crate_dir
.join(crate_config.dioxus_config.application.out_dir.clone());
let dist_path = crate_config.out_dir();
if !dist_path.is_dir() {
create_dir_all(&dist_path)?;
}
+4 -9
View File
@@ -289,14 +289,9 @@ async fn setup_router(
{
let body = Full::from(
// TODO: Cache/memoize this.
std::fs::read_to_string(
file_service_config
.crate_dir
.join(file_service_config.out_dir())
.join("index.html"),
)
.ok()
.unwrap(),
std::fs::read_to_string(file_service_config.out_dir().join("index.html"))
.ok()
.unwrap(),
)
.map_err(|err| match err {})
.boxed();
@@ -317,7 +312,7 @@ async fn setup_router(
Ok(response)
},
)
.service(ServeDir::new(config.crate_dir.join(config.out_dir())));
.service(ServeDir::new(config.out_dir()));
// Setup websocket
let mut router = Router::new().route("/_dioxus/ws", get(ws_handler));