Fix outdir not work when run dx bundle --platform web --outdir mydir (#3572)

* Make legacy asset dir optional
* properly implement outdir

---------

Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
Co-authored-by:  Nathy-bajo <bajon7680@gmail.com>
This commit is contained in:
authored and GitHub committed 2025-01-16 15:17:33 -08:00
1 parent db16de15c5
commit 19d5fae12d
9 files changed
+152 -143

No files matched your search

+4 -5
View File
@@ -3,13 +3,12 @@ use std::path::PathBuf;
#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) struct ApplicationConfig {
#[serde(default = "asset_dir_default")]
pub(crate) asset_dir: PathBuf,
#[serde(default)]
pub(crate) asset_dir: Option<PathBuf>,
#[serde(default)]
pub(crate) sub_package: Option<String>,
}
pub(crate) fn asset_dir_default() -> PathBuf {
PathBuf::from("assets")
#[serde(default)]
pub(crate) out_dir: Option<PathBuf>,
}
+2 -1
View File
@@ -22,8 +22,9 @@ impl Default for DioxusConfig {
fn default() -> Self {
Self {
application: ApplicationConfig {
asset_dir: asset_dir_default(),
asset_dir: None,
sub_package: None,
out_dir: None,
},
web: WebConfig {
app: WebAppConfig {