From 920133fc18570881140a011c9e3f12f7d5b00959 Mon Sep 17 00:00:00 2001
From: Wilson Lin <code@wilsonl.in>
Date: Sun, 8 Aug 2021 16:16:12 +1000
Subject: [PATCH] Improve CSS and JS minification

---
 src/minify/css.rs | 5 ++++-
 src/minify/js.rs  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/minify/css.rs b/src/minify/css.rs
index d5aebea..0ce9321 100644
--- a/src/minify/css.rs
+++ b/src/minify/css.rs
@@ -2,7 +2,7 @@
 use {
     crate::minify::esbuild::minify_using_esbuild,
     aho_corasick::{AhoCorasick, AhoCorasickBuilder},
-    esbuild_rs::{Loader, TransformOptions, TransformOptionsBuilder},
+    esbuild_rs::{Charset, Loader, SourceMap, TransformOptions, TransformOptionsBuilder},
     lazy_static::lazy_static,
     std::sync::Arc,
 };
@@ -16,10 +16,13 @@ lazy_static! {
         .build(&["</style"]);
     pub static ref MINIFY_CSS_TRANSFORM_OPTIONS: Arc<TransformOptions> = {
         let mut builder = TransformOptionsBuilder::new();
+        builder.charset = Charset::UTF8;
+        builder.legal_comments = LegalComments::None;
         builder.loader = Loader::CSS;
         builder.minify_identifiers = true;
         builder.minify_syntax = true;
         builder.minify_whitespace = true;
+        builder.source_map = SourceMap::None;
         builder.build()
     };
 }
diff --git a/src/minify/js.rs b/src/minify/js.rs
index ebc0f92..d5fabfc 100644
--- a/src/minify/js.rs
+++ b/src/minify/js.rs
@@ -2,7 +2,7 @@
 use {
     crate::minify::esbuild::minify_using_esbuild,
     aho_corasick::{AhoCorasick, AhoCorasickBuilder},
-    esbuild_rs::{TransformOptions, TransformOptionsBuilder},
+    esbuild_rs::{Charset, LegalComments, SourceMap, TransformOptions, TransformOptionsBuilder},
     lazy_static::lazy_static,
     std::sync::Arc,
 };
@@ -16,9 +16,12 @@ lazy_static! {
         .build(&["</script"]);
     static ref TRANSFORM_OPTIONS: Arc<TransformOptions> = {
         let mut builder = TransformOptionsBuilder::new();
+        builder.charset = Charset::UTF8;
+        builder.legal_comments = LegalComments::None;
         builder.minify_identifiers = true;
         builder.minify_syntax = true;
         builder.minify_whitespace = true;
+        builder.source_map = SourceMap::None;
         builder.build()
     };
 }