From 20148c5de67d60e81a096a4d5db7687c1ca4fec2 Mon Sep 17 00:00:00 2001
From: Joshua Kifer <joshua@niarada.co>
Date: Fri, 25 Mar 2022 08:37:02 -0600
Subject: [PATCH 1/2] Allow package configuration

---
 src/config.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/config.rs b/src/config.rs
index 9d2bfb870..a74f02735 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -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;

From e487571ce2ea66dd4879636c5dabc54744c0e960 Mon Sep 17 00:00:00 2001
From: Joshua Kifer <joshua@niarada.co>
Date: Mon, 28 Mar 2022 06:55:04 -0600
Subject: [PATCH 2/2] Change config package to sub_package

---
 src/config.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index a74f02735..638e67414 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -34,7 +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,
+                sub_package: None,
             },
             web: WebConfig {
                 app: WebAppConfing {
@@ -63,7 +63,7 @@ pub struct ApplicationConfig {
     pub default_platform: String,
     pub out_dir: Option<PathBuf>,
     pub asset_dir: Option<PathBuf>,
-    pub package: Option<String>,
+    pub sub_package: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -121,7 +121,7 @@ impl CrateConfig {
     pub fn new() -> Result<Self> {
         let dioxus_config = DioxusConfig::load()?;
 
-        let crate_dir = if let Some(package) = &dioxus_config.application.package {
+        let crate_dir = if let Some(package) = &dioxus_config.application.sub_package {
             crate::cargo::crate_root()?.join(package)
         } else {
             crate::cargo::crate_root()?