Merge branch 'main' into minor_ci_improvements

rukai · Jan 2, 2024 · b519e61 · b519e61
2 parents ca7be6f + d9ff9be
commit b519e61
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/website/Cargo.toml b/website/Cargo.toml
@@ -16,7 +16,7 @@ log = "0.4"
 # This guy has no idea how to semver, not worth my time updating
 handlebars = { version = "=4.2.2", features = ["dir_source"] }
 rayon = "1"
-minifier = "0.0"
+minifier = "0.3"
 sha2 = "0.10"
 futures = "0.3"
 subprocess = "0.2.7"

diff --git a/website/src/assets/mod.rs b/website/src/assets/mod.rs
@@ -41,7 +41,7 @@ impl AssetPaths {
         let style_css = {
             let contents = include_str!("style.css");
 
-            let minified = minifier::css::minify(contents).unwrap();
+            let minified = minifier::css::minify(contents).unwrap().to_string();
 
             let hash = hash(minified.as_bytes());
             dir.create_compressed_file(&format!("{hash}.css"), minified.as_bytes())