From 4570da39455e39a8e0bb09c12d1848d85caf5f19 Mon Sep 17 00:00:00 2001
From: fi3ework <fi3ework@gmail.com>
Date: Sat, 13 Jul 2024 03:23:15 +0800
Subject: [PATCH] fix: restore html minimize options (#39)

---
 packages/builder-rsbuild/package.json         |  2 +-
 .../src/preview/iframe-rsbuild.config.ts      | 19 ++++++++-----------
 pnpm-lock.yaml                                | 10 +++++-----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/builder-rsbuild/package.json b/packages/builder-rsbuild/package.json
index a1e2125..af5d311 100644
--- a/packages/builder-rsbuild/package.json
+++ b/packages/builder-rsbuild/package.json
@@ -75,7 +75,7 @@
     "magic-string": "^0.30.5",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
-    "rsbuild-plugin-html-minifier-terser": "^1.0.0",
+    "rsbuild-plugin-html-minifier-terser": "^1.1.0",
     "style-loader": "^3.3.1",
     "ts-dedent": "^2.2.0",
     "url": "^0.11.0",
diff --git a/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts b/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts
index 1687306..71eb134 100644
--- a/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts
+++ b/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts
@@ -214,7 +214,14 @@ export default async (
     },
     plugins: [
       shouldCheckTs ? pluginTypeCheck(tsCheckOptions) : null,
-      pluginHtmlMinifierTerser(),
+      pluginHtmlMinifierTerser({
+        collapseWhitespace: true,
+        removeComments: true,
+        removeRedundantAttributes: true,
+        removeScriptTypeAttributes: false,
+        removeStyleLinkTypeAttributes: true,
+        useShortDoctype: true,
+      }),
     ].filter(Boolean),
     tools: {
       rspack: (config, { addRules, appendPlugins, rspack, mergeConfig }) => {
@@ -320,16 +327,6 @@ export default async (
           headHtmlSnippet,
           bodyHtmlSnippet,
         },
-        // FIXME: rsbuild stop supporting html minimizing since https://github.com/web-infra-dev/rsbuild/commit/848a57c9e213c612a9b196899af10ec40907820f
-        // Track in https://github.com/rspack-contrib/rsbuild-plugin-html-minifier-terser/pull/1
-        // minify: {
-        // collapseWhitespace: true,
-        // removeComments: true,
-        // removeRedundantAttributes: true,
-        // removeScriptTypeAttributes: false,
-        // removeStyleLinkTypeAttributes: true,
-        // useShortDoctype: true,
-        // },
       },
     },
   })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 27686e9..458a9b3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -75,8 +75,8 @@ importers:
         specifier: ^0.11.10
         version: 0.11.10
       rsbuild-plugin-html-minifier-terser:
-        specifier: ^1.0.0
-        version: 1.0.0(@rsbuild/core@1.0.0-alpha.9)
+        specifier: ^1.1.0
+        version: 1.1.0(@rsbuild/core@1.0.0-alpha.9)
       style-loader:
         specifier: ^3.3.1
         version: 3.3.4(webpack@5.92.1(esbuild@0.20.2))
@@ -4922,8 +4922,8 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
-  rsbuild-plugin-html-minifier-terser@1.0.0:
-    resolution: {integrity: sha512-qMAlq5OHSlufj7blMRq6UcTVti9dr7kMcHHgnmLa+jy18KaLAfvKRAWQxyv0TkmBSvEtzgjvMvYen6IoluE4qg==}
+  rsbuild-plugin-html-minifier-terser@1.1.0:
+    resolution: {integrity: sha512-HCpRf56k372xYD9F0kiuBO+n/Gxz9iDmTlPa88c6GdjEe6+pzyNbvhJmojJYp3/6tvDw0avWCPchW7uZ64FZwA==}
     peerDependencies:
       '@rsbuild/core': 1.x
     peerDependenciesMeta:
@@ -11331,7 +11331,7 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.17.2
       fsevents: 2.3.3
 
-  rsbuild-plugin-html-minifier-terser@1.0.0(@rsbuild/core@1.0.0-alpha.9):
+  rsbuild-plugin-html-minifier-terser@1.1.0(@rsbuild/core@1.0.0-alpha.9):
     dependencies:
       '@types/html-minifier-terser': 7.0.2
       html-minifier-terser: 7.2.0