fix: ensure that the target-path is applied to hrefs

Author: ctron

src/pipelines/copy_file.rs

@@ -69,7 +69,13 @@ impl CopyFile {
 
         let _ = self
             .asset
-            .copy(&dir_out, false, false, AssetFileType::Other)
+            .copy(
+                &self.cfg.staging_dist,
+                &dir_out,
+                false,
+                false,
+                AssetFileType::Other,
+            )
             .await?;
         tracing::debug!(path = ?rel_path, "finished copying file");
 

src/pipelines/css.rs

@@ -86,11 +86,17 @@ impl Css {
 
         let file = self
             .asset
-            .copy(&result_path, self.cfg.filehash, minify, AssetFileType::Css)
+            .copy(
+                &self.cfg.staging_dist,
+                &result_path,
+                self.cfg.filehash,
+                minify,
+                AssetFileType::Css,
+            )
             .await?;
         tracing::debug!(path = ?rel_path, "finished copying & hashing css");
 
-        let result_file = result_path.join(&file);
+        let result_file = self.cfg.staging_dist.join(&file);
         let integrity = OutputDigest::generate(self.integrity, || std::fs::read(&result_file))
             .with_context(|| {
                 format!(

src/pipelines/icon.rs

@@ -79,14 +79,15 @@ impl Icon {
         let file = self
             .asset
             .copy(
+                &self.cfg.staging_dist,
                 &result_dir,
                 self.cfg.filehash,
                 self.cfg.release && !self.cfg.no_minification,
                 AssetFileType::Icon(image_type),
             )
             .await?;
 
-        let result_file = result_dir.join(&file);
+        let result_file = self.cfg.staging_dist.join(&file);
         let integrity = OutputDigest::generate(self.integrity, || std::fs::read(&result_file))
             .with_context(|| {
                 format!(

src/pipelines/js.rs

@@ -86,6 +86,7 @@ impl Js {
         let file = self
             .asset
             .copy(
+                &self.cfg.staging_dist,
                 &result_dir,
                 self.cfg.filehash,
                 minify,
@@ -96,9 +97,9 @@ impl Js {
                 },
             )
             .await?;
-        tracing::debug!(path = ?rel_path, "finished copying & hashing js");
+        tracing::debug!(path = ?rel_path, file = ?file, "finished copying & hashing js");
 
-        let result_file = result_dir.join(&file);
+        let result_file = self.cfg.staging_dist.join(&file);
         let integrity = OutputDigest::generate(self.integrity, || std::fs::read(&result_file))
             .with_context(|| {
                 format!(

src/pipelines/mod.rs

@@ -243,10 +243,11 @@ impl AssetFile {
     /// Copy this asset to the target dir. If hashing is enabled, create a hash from the file
     /// contents and include it as hex string in the destination file name.
     ///
-    /// The base file name (stripped path, without any parent folders) is returned if the operation
+    /// The base file name (stripped path, relative to the base dist dir) is returned if the operation
     /// was successful.
     pub async fn copy(
         &self,
+        dist: &Path,
         to_dir: &Path,
         with_hash: bool,
         minify: bool,
@@ -287,6 +288,17 @@ impl AssetFile {
         };
 
         let file_path = to_dir.join(&file_name);
+        let file_name = file_path
+            .strip_prefix(dist)
+            .with_context(|| {
+                format!(
+                    "unable to create a relative path of '{}' in '{}'",
+                    file_path.display(),
+                    dist.display()
+                )
+            })?
+            .to_string_lossy()
+            .to_string();
 
         fs::write(&file_path, bytes)
             .await

src/pipelines/sass.rs

@@ -1,6 +1,10 @@
 //! Sass/Scss asset pipeline.
 
-use super::{AssetFile, AttrWriter, Attrs, TrunkAssetPipelineOutput, ATTR_HREF, ATTR_INLINE};
+use super::{
+    data_target_path, AssetFile, AttrWriter, Attrs, TrunkAssetPipelineOutput, ATTR_HREF,
+    ATTR_INLINE,
+};
+use crate::common::target_path;
 use crate::{
     common,
     config::RtcBuild,
@@ -28,6 +32,8 @@ pub struct Sass {
     other_attrs: Attrs,
     /// The required integrity setting
     integrity: IntegrityType,
+    /// Optional target path inside the dist dir.
+    target_path: Option<PathBuf>,
 }
 
 impl Sass {
@@ -50,6 +56,7 @@ impl Sass {
         let use_inline = attrs.get(ATTR_INLINE).is_some();
 
         let integrity = IntegrityType::from_attrs(&attrs, &cfg)?;
+        let target_path = data_target_path(&attrs)?;
 
         Ok(Self {
             id,
@@ -58,6 +65,7 @@ impl Sass {
             use_inline,
             other_attrs: attrs,
             integrity,
+            target_path,
         })
     }
 
@@ -128,7 +136,10 @@ impl Sass {
                 .filehash
                 .then(|| format!("{}-{:x}.css", &self.asset.file_stem.to_string_lossy(), hash))
                 .unwrap_or(temp_target_file_name);
-            let file_path = self.cfg.staging_dist.join(&file_name);
+
+            let result_dir =
+                target_path(&self.cfg.staging_dist, self.target_path.as_deref(), None).await?;
+            let file_path = result_dir.join(&file_name);
 
             let integrity = OutputDigest::generate_from(self.integrity, css.as_bytes());