Skip to content

Commit

Permalink
Fix assets folder workspace (#2821)
Browse files Browse the repository at this point in the history
* Fix the asset folder location in workspaces

* Fix where the asset folder is copied to in fullstack builds
  • Loading branch information
ealmloff authored Aug 12, 2024
1 parent 0bb81ab commit f10ba97
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/cli/src/builder/cargo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ impl BuildRequest {

pub fn copy_assets_dir(&self) -> anyhow::Result<()> {
tracing::info!("Copying public assets to the output directory...");
let out_dir = self.dioxus_crate.out_dir();
let out_dir = self.target_out_dir();
let asset_dir = self.dioxus_crate.asset_dir();

if asset_dir.is_dir() {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/dioxus_crate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ impl DioxusCrate {
/// Compose an asset directory. Represents the typical "public" directory
/// with publicly available resources (configurable in the `Dioxus.toml`).
pub fn asset_dir(&self) -> PathBuf {
self.workspace_dir()
self.crate_dir()
.join(&self.dioxus_config.application.asset_dir)
}

Expand Down

0 comments on commit f10ba97

Please sign in to comment.