Merge pull request #1235 from epage/minify

chore: Upgrade html_minifier

Author: epage

Cargo.lock

@@ -175,7 +175,7 @@ notify = { version = "8", optional = true, default-features = false, features =
 
 sass-rs = { version = "0.2", optional = true }
 
-html-minifier = {version="3.0", optional = true }
+html-minifier = {version="5.0", optional = true }
 anyhow = "1.0.97"
 anstream = "0.6.18"
 chrono = "0.4.40"

Cargo.toml

@@ -82,13 +82,15 @@ fn copy_and_minify_css(src_file: &path::Path, dest_file: &path::Path, minify: bo
             dest_file.display()
         );
         let content = std::fs::read_to_string(src_file)?;
-        let minified = minify(&content).map_err(|e| {
-            anyhow::format_err!(
-                "Could not minify css file {} error {}",
-                src_file.to_string_lossy(),
-                e
-            )
-        })?;
+        let minified = minify(&content)
+            .map_err(|e| {
+                anyhow::format_err!(
+                    "Could not minify css file {} error {}",
+                    src_file.to_string_lossy(),
+                    e
+                )
+            })?
+            .to_string();
         std::fs::write(dest_file, minified)?;
     } else {
         files::copy_file(src_file, dest_file)?;
@@ -112,7 +114,8 @@ fn copy_and_minify_js(src_file: &path::Path, dest_file: &path::Path, minify: boo
             dest_file.display()
         );
         let content = std::fs::read_to_string(src_file)?;
-        std::fs::write(dest_file, minify(&content))?;
+        let minified = minify(&content).to_string();
+        std::fs::write(dest_file, minified)?;
     } else {
         files::copy_file(src_file, dest_file)?;
     }

src/cobalt_model/assets.rs

@@ -82,13 +82,15 @@ impl SassCompiler {
         #[cfg(feature = "html-minifier")]
         let content = if minify.css {
             use html_minifier::css::minify;
-            minify(&content).map_err(|e| {
-                anyhow::format_err!(
-                    "Could not minify saas file {} error {}",
-                    source.to_string_lossy(),
-                    e
-                )
-            })?
+            minify(&content)
+                .map_err(|e| {
+                    anyhow::format_err!(
+                        "Could not minify saas file {} error {}",
+                        source.to_string_lossy(),
+                        e
+                    )
+                })?
+                .to_string()
         } else {
             content
         };