fix: thing

Author: Princesseuh

.sampo/config.toml

@@ -1,3 +1,12 @@
 [packages]
 linked = [["maudit", "maudit-macros"]]
-ignore = ["benchmarks/*", "examples/*", "maudit-website", "root", "e2e/fixtures/*", "xtask", "@maudit/e2e", "maudit-cli-packages"]
+ignore = [
+	"benchmarks/*",
+	"examples/*",
+	"maudit-website",
+	"root",
+	"e2e/fixtures/*",
+	"xtask",
+	"@maudit/e2e",
+	"maudit-cli-packages",
+]

crates/maudit-cli/src/dev/server.rs

@@ -311,11 +311,7 @@ async fn add_dev_client_script(
     res
 }
 
-async fn apply_headers_file(
-    req: Request,
-    next: Next,
-    headers_file: Arc<HeadersFile>,
-) -> Response {
+async fn apply_headers_file(req: Request, next: Next, headers_file: Arc<HeadersFile>) -> Response {
     if headers_file.is_empty() {
         return next.run(req).await;
     }

crates/maudit/src/assets.rs

@@ -12,15 +12,13 @@ pub(crate) mod css;
 mod image;
 pub mod image_cache;
 pub mod prefetch;
-mod sanitize_filename;
+pub(crate) mod sanitize_filename;
 mod script;
 mod style;
 mod tailwind;
 pub use image::{Image, ImageFormat, ImageOptions, ImagePlaceholder, RenderWithAlt, RenderedImage};
 pub use prefetch::PrefetchPlugin;
 pub use script::Script;
-pub(crate) use script::make_placeholder_url as make_script_placeholder_url;
-pub(crate) use style::make_placeholder_url as make_style_placeholder_url;
 pub use style::{Style, StyleOptions};
 pub use tailwind::run_tailwind;
 

crates/maudit/src/assets/css.rs

@@ -196,11 +196,7 @@ mod tests {
         let dir = tempfile::tempdir().unwrap();
 
         // Create a simple CSS file
-        fs::write(
-            dir.path().join("style.css"),
-            "body { color: red; }",
-        )
-        .unwrap();
+        fs::write(dir.path().join("style.css"), "body { color: red; }").unwrap();
 
         // Create a font file referenced by CSS
         fs::write(dir.path().join("font.woff2"), b"fake-font-data").unwrap();
@@ -213,11 +209,7 @@ mod tests {
         .unwrap();
 
         // Create CSS files for @import testing
-        fs::write(
-            dir.path().join("_partial.css"),
-            "h1 { font-size: 2em; }",
-        )
-        .unwrap();
+        fs::write(dir.path().join("_partial.css"), "h1 { font-size: 2em; }").unwrap();
         fs::write(
             dir.path().join("main.css"),
             "@import \"_partial.css\";\nbody { color: blue; }",
@@ -250,16 +242,14 @@ mod tests {
         let dir = setup_css_dir();
         let output_dir = tempfile::tempdir().unwrap();
 
-        let result = bundle_css(
-            &dir.path().join("main.css"),
-            None,
-            false,
-            output_dir.path(),
-        )
-        .unwrap();
+        let result =
+            bundle_css(&dir.path().join("main.css"), None, false, output_dir.path()).unwrap();
 
         // The bundled output should contain both the partial and the main styles
-        assert!(result.code.contains("font-size"), "should contain @imported partial");
+        assert!(
+            result.code.contains("font-size"),
+            "should contain @imported partial"
+        );
         assert!(result.code.contains("color"), "should contain main styles");
     }
 
@@ -277,7 +267,10 @@ mod tests {
         .unwrap();
 
         // url() should have been rewritten to a fingerprinted filename
-        assert!(!result.code.contains("url(font.woff2)"), "original url should be rewritten");
+        assert!(
+            !result.code.contains("url(font.woff2)"),
+            "original url should be rewritten"
+        );
         assert_eq!(result.copied_asset_filenames.len(), 1);
         assert!(result.copied_asset_filenames[0].contains("font"));
         assert!(result.copied_asset_filenames[0].ends_with(".woff2"));
@@ -305,13 +298,8 @@ mod tests {
         )
         .unwrap();
 
-        let minified = bundle_css(
-            &dir.path().join("style.css"),
-            None,
-            true,
-            output_dir.path(),
-        )
-        .unwrap();
+        let minified =
+            bundle_css(&dir.path().join("style.css"), None, true, output_dir.path()).unwrap();
 
         assert!(
             minified.code.len() <= not_minified.code.len(),
@@ -338,10 +326,18 @@ mod tests {
         .unwrap();
 
         // Should contain the tailwind output, not the original file content
-        assert!(result.code.contains("margin"), "should use source_css content");
+        assert!(
+            result.code.contains("margin"),
+            "should use source_css content"
+        );
         // url() should still be rewritten and asset copied
         assert_eq!(result.copied_asset_filenames.len(), 1);
-        assert!(output_dir.path().join(&result.copied_asset_filenames[0]).exists());
+        assert!(
+            output_dir
+                .path()
+                .join(&result.copied_asset_filenames[0])
+                .exists()
+        );
     }
 
     #[test]

crates/maudit/src/assets/script.rs

@@ -1,6 +1,6 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
-use crate::assets::{RouteAssetsOptions, make_filename, make_final_path};
+use crate::assets::{RouteAssetsOptions, make_filename, make_final_path, make_final_url};
 
 #[derive(Clone, PartialEq, Eq, Hash)]
 pub struct Script {
@@ -22,10 +22,9 @@ impl Script {
     ) -> Self {
         let filename = make_filename(&path, &hash, Some("js"));
         let build_path = make_final_path(&route_assets_options.output_assets_dir, &filename);
-        // URL is a deterministic placeholder; the real filename is determined by Rolldown's
-        // content hash after bundling (so it reflects transitive asset deps like WASM imports).
-        // A post-bundle pass rewrites these placeholders in any HTML that referenced them.
-        let url = make_placeholder_url(&route_assets_options.assets_dir, &hash);
+        // Library mode treats this URL as final and copies the source to `build_path`.
+        // Coronate's post-bundle pass rewrites it to the content-hashed Rolldown filename.
+        let url = make_final_url(&route_assets_options.assets_dir, &filename);
 
         Self {
             path,
@@ -36,24 +35,4 @@ impl Script {
             build_path,
         }
     }
-
-    /// The chunk name passed to Rolldown's `[name]` filename pattern. Encodes the source-content
-    /// hash so we can match `result.assets` entries back to their originating Script.
-    pub(crate) fn chunk_name(&self) -> String {
-        self.filename
-            .with_extension("")
-            .to_string_lossy()
-            .into_owned()
-    }
-}
-
-/// Token embedded in HTML during render in place of a script's final URL. Replaced after
-/// bundling with `/<assets_dir>/<rolldown-emitted-filename>`. URL-shaped so it survives any
-/// templating layer that expects a path.
-pub(crate) fn make_placeholder_url(assets_dir: &Path, source_hash: &str) -> String {
-    format!(
-        "/{}/__maudit_script_{}__.js",
-        assets_dir.display(),
-        source_hash
-    )
 }

crates/maudit/src/assets/style.rs

@@ -1,6 +1,6 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
-use crate::assets::{RouteAssetsOptions, make_filename, make_final_path};
+use crate::assets::{RouteAssetsOptions, make_filename, make_final_path, make_final_url};
 
 #[derive(Clone, PartialEq, Eq, Hash, Default)]
 pub struct StyleOptions {
@@ -29,10 +29,8 @@ impl Style {
     ) -> Self {
         let filename = make_filename(&path, &hash, Some("css"));
         let build_path = make_final_path(&route_assets_options.output_assets_dir, &filename);
-        // Placeholder URL; replaced after CSS bundling with a content-hashed final URL
-        // so that Tailwind-scanned classes (which change the bundled bytes without
-        // changing the source file) cascade into a new filename.
-        let url = make_placeholder_url(&route_assets_options.assets_dir, &hash);
+        // See `Script::new`.
+        let url = make_final_url(&route_assets_options.assets_dir, &filename);
 
         Self {
             path,
@@ -45,11 +43,3 @@ impl Style {
         }
     }
 }
-
-pub(crate) fn make_placeholder_url(assets_dir: &Path, source_hash: &str) -> String {
-    format!(
-        "/{}/__maudit_style_{}__.css",
-        assets_dir.display(),
-        source_hash
-    )
-}