Update minify and respect HTML spec

components/utils/Cargo.toml

@@ -14,7 +14,7 @@ serde = { version = "1.0", features = ["derive"] }
 slug = "0.1"
 percent-encoding = "2"
 filetime = "0.2.12"
-minify-html = "0.4.2"
+minify-html = "0.5"
 
 errors = { path = "../errors" }
 

components/utils/src/minify.rs

@@ -1,23 +1,16 @@
 use errors::{bail, Result};
-use minify_html::{with_friendly_error, Cfg};
+use minify_html::{minify, Cfg};
 
 pub fn html(html: String) -> Result<String> {
-    let cfg = &Cfg { minify_js: false, minify_css: false };
-    let mut input_bytes = html.as_bytes().to_vec();
+    let mut cfg = Cfg::new();
+    cfg.ensure_spec_compliant_unquoted_attribute_values = true;
+    cfg.keep_spaces_between_attributes = true;
+    cfg.keep_html_and_head_opening_tags = true;
 
-    match with_friendly_error(&mut input_bytes, cfg) {
-        Ok(len) => match std::str::from_utf8(&input_bytes[..len]) {
-            Ok(result) => Ok(result.to_string()),
-            Err(err) => bail!("Failed to convert bytes to string : {}", err),
-        },
-        Err(minify_error) => {
-            bail!(
-                "Failed to truncate html at character {}: {} \n {}",
-                minify_error.position,
-                minify_error.message,
-                minify_error.code_context
-            );
-        }
+    let minified = minify(html.as_bytes(), &cfg);
+    match std::str::from_utf8(&minified) {
+        Ok(result) => Ok(result.to_string()),
+        Err(err) => bail!("Failed to convert bytes to string : {}", err),
     }
 }