Merge branch 'master' into master

This commit is contained in:
YuKun Liu authored and GitHub committed 2022-03-28 10:35:27 +08:00
commit d756a42cc1
5 files changed
+56 -36

No files matched your search

+3 -2
View File
@@ -122,8 +122,9 @@ impl CrateConfig {
let dioxus_config = DioxusConfig::load()?;
let crate_dir = crate::cargo::crate_root()?;
let workspace_dir = crate::cargo::workspace_root()?;
let target_dir = workspace_dir.join("target");
let meta = crate::cargo::Metadata::get()?;
let workspace_dir = meta.workspace_root;
let target_dir = meta.target_directory;
let out_dir = match dioxus_config.application.out_dir {
Some(ref v) => crate_dir.join(v),