feat: add data-target-path to the css step

Author: ctron

examples/target-path/index.html

@@ -6,7 +6,7 @@
   <title>Trunk | target-path</title>
 
   <link data-trunk rel="scss" href="src/index.scss"/>
-  <link data-trunk rel="css" href="src/app.css"/>
+  <link data-trunk rel="css" href="src/app.css" data-target-path="static"/>
   <link data-trunk data-no-minify rel="css" href="src/not_minified.css"/>
   <base data-trunk-public-url/>
 </head>

site/content/assets.md

@@ -55,6 +55,7 @@ This will typically look like: `<link data-trunk rel="{type}" href="{path}" ..ot
   - In the future, Trunk will resolve local `@imports`, will handle minification (see [trunk#7](https://github.com/trunk-rs/trunk/issues/7)), and we may even look into a pattern where any CSS found in the source tree will be bundled, which would enable a nice zero-config "component styles" pattern. See [trunk#3](https://github.com/trunk-rs/trunk/issues/3) for more details.
   - `data-integrity`: (optional) the `integrity` digest type for code & script resources. Defaults to plain `sha384`.
   - `data-no-minify`: (optional) by default, CSS files are minified in `--release` mode (unless building with `--no-minification`). Setting this attribute disables minification for that particular file. Defaults to false.
+  - `data-target-path`: (optional) Path where the directory is placed inside the dist dir. If not present the directory is placed in the dist root. The path must be a relative path without `..`.
 
 ## tailwind
 

src/pipelines/css.rs

@@ -1,6 +1,7 @@
 //! CSS asset pipeline.
 
 use super::{AssetFile, AttrWriter, Attrs, TrunkAssetPipelineOutput, ATTR_HREF, ATTR_MINIFY};
+use crate::common::target_path;
 use crate::{
     config::RtcBuild,
     pipelines::AssetFileType,
@@ -26,6 +27,8 @@ pub struct Css {
     integrity: IntegrityType,
     /// Whether to minify or not
     minify: bool,
+    /// Optional target path inside the dist dir.
+    target_path: Option<PathBuf>,
 }
 
 impl Css {
@@ -49,13 +52,19 @@ impl Css {
 
         let minify = attrs.get(ATTR_MINIFY).is_none();
 
+        let target_path = attrs
+            .get("data-target-path")
+            .map(|val| val.parse())
+            .transpose()?;
+
         Ok(Self {
             id,
             cfg,
             asset,
             attrs,
             integrity,
             minify,
+            target_path,
         })
     }
 
@@ -71,18 +80,17 @@ impl Css {
         let rel_path = crate::common::strip_prefix(&self.asset.path);
         tracing::debug!(path = ?rel_path, "copying & hashing css");
         let minify = self.cfg.release && self.minify && !self.cfg.no_minification;
+
+        let result_path =
+            target_path(&self.cfg.staging_dist, self.target_path.as_deref(), None).await?;
+
         let file = self
             .asset
-            .copy(
-                &self.cfg.staging_dist,
-                self.cfg.filehash,
-                minify,
-                AssetFileType::Css,
-            )
+            .copy(&result_path, self.cfg.filehash, minify, AssetFileType::Css)
             .await?;
         tracing::debug!(path = ?rel_path, "finished copying & hashing css");
 
-        let result_file = self.cfg.staging_dist.join(&file);
+        let result_file = result_path.join(&file);
         let integrity = OutputDigest::generate(self.integrity, || std::fs::read(&result_file))
             .with_context(|| {
                 format!(