Allow package configuration

This commit is contained in:
Joshua Kifer committed 2022-03-25 08:37:02 -06:00
1 parent 962ab2726a
commit 20148c5de6
1 file changed
+7 -1
+7 -1
View File
@@ -34,6 +34,7 @@ impl Default for DioxusConfig {
default_platform: "web".to_string(),
out_dir: Some(PathBuf::from("dist")),
asset_dir: Some(PathBuf::from("public")),
package: None,
},
web: WebConfig {
app: WebAppConfing {
@@ -62,6 +63,7 @@ pub struct ApplicationConfig {
pub default_platform: String,
pub out_dir: Option<PathBuf>,
pub asset_dir: Option<PathBuf>,
pub package: Option<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -119,7 +121,11 @@ impl CrateConfig {
pub fn new() -> Result<Self> {
let dioxus_config = DioxusConfig::load()?;
let crate_dir = crate::cargo::crate_root()?;
let crate_dir = if let Some(package) = &dioxus_config.application.package {
crate::cargo::crate_root()?.join(package)
} else {
crate::cargo::crate_root()?
};
let meta = crate::cargo::Metadata::get()?;
let workspace_dir = meta.workspace_root;
let target_dir = meta.target_directory;