Merge pull request #23 from naturalethic/configure-package
Allow package configuration
This commit is contained in:
1 file changed
+7
-1
+7
-1
@@ -34,6 +34,7 @@ impl Default for DioxusConfig {
|
|||||||
default_platform: "web".to_string(),
|
default_platform: "web".to_string(),
|
||||||
out_dir: Some(PathBuf::from("dist")),
|
out_dir: Some(PathBuf::from("dist")),
|
||||||
asset_dir: Some(PathBuf::from("public")),
|
asset_dir: Some(PathBuf::from("public")),
|
||||||
|
sub_package: None,
|
||||||
},
|
},
|
||||||
web: WebConfig {
|
web: WebConfig {
|
||||||
app: WebAppConfing {
|
app: WebAppConfing {
|
||||||
@@ -62,6 +63,7 @@ pub struct ApplicationConfig {
|
|||||||
pub default_platform: String,
|
pub default_platform: String,
|
||||||
pub out_dir: Option<PathBuf>,
|
pub out_dir: Option<PathBuf>,
|
||||||
pub asset_dir: Option<PathBuf>,
|
pub asset_dir: Option<PathBuf>,
|
||||||
|
pub sub_package: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
@@ -119,7 +121,11 @@ impl CrateConfig {
|
|||||||
pub fn new() -> Result<Self> {
|
pub fn new() -> Result<Self> {
|
||||||
let dioxus_config = DioxusConfig::load()?;
|
let dioxus_config = DioxusConfig::load()?;
|
||||||
|
|
||||||
let crate_dir = crate::cargo::crate_root()?;
|
let crate_dir = if let Some(package) = &dioxus_config.application.sub_package {
|
||||||
|
crate::cargo::crate_root()?.join(package)
|
||||||
|
} else {
|
||||||
|
crate::cargo::crate_root()?
|
||||||
|
};
|
||||||
let meta = crate::cargo::Metadata::get()?;
|
let meta = crate::cargo::Metadata::get()?;
|
||||||
let workspace_dir = meta.workspace_root;
|
let workspace_dir = meta.workspace_root;
|
||||||
let target_dir = meta.target_directory;
|
let target_dir = meta.target_directory;
|
||||||
|
|||||||
Reference in new issue
Block a user