work

Author: dmail

docs/users/c_build/c_build.md

@@ -475,12 +475,12 @@ Minification reduces file size and is enabled by default.
 
 The minifiers used are:
 
-| File type                | Minifier used                                                              |
-| ------------------------ | -------------------------------------------------------------------------- |
-| js module and js classic | [terser](https://github.com/terser/terser)<sup>↗</sup>                     |
-| html and svg             | [html-minifier](https://github.com/kangax/html-minifier)<sup>↗</sup>       |
-| css                      | [lightningcss](https://github.com/parcel-bundler/lightningcss)<sup>↗</sup> |
-| json                     | White spaces are removed using JSON.stringify                              |
+| File type                | Minifier used                                                                      |
+| ------------------------ | ---------------------------------------------------------------------------------- |
+| js module and js classic | [terser](https://github.com/terser/terser)<sup>↗</sup>                             |
+| html and svg             | [html-minifier-terser](https://github.com/terser/html-minifier-terser)<sup>↗</sup> |
+| css                      | [lightningcss](https://github.com/parcel-bundler/lightningcss)<sup>↗</sup>         |
+| json                     | White spaces are removed using JSON.stringify                                      |
 
 You can configure which files to minify:
 
@@ -507,6 +507,32 @@ await build({
 
 To disable minification, use `minification: false`.
 
+### HTML comments
+
+HTML is minified with comments removed. Some comments are meaningful after the
+build though: a marker a server looks for to inject content, a server side
+include, a legal banner. These are preserved:
+
+```html
+<!--! kept: starts with "!" -->
+<!--# kept: server side include -->
+<!-- removed -->
+```
+
+Use `keepComments` to change which comments survive; the comment text, without
+`<!--` and `-->`, is tested against each regexp:
+
+```js
+minification: {
+  html: {
+    // keep "<!-- INJECT_HERE -->" on top of the default ones
+    keepComments: [/^!/, /^\s*#/, /INJECT/],
+  },
+},
+```
+
+Use `html: { removeComments: false }` to keep every comment.
+
 ## 2.5 Build urls
 
 By default, URLs in the build are absolute and versioned:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "41.5.0",
+  "version": "41.5.1",
   "type": "module",
   "description": "Tool to develop, test and build js projects",
   "repository": {
@@ -76,7 +76,7 @@
     "@jsenv/ast": "6.10.0",
     "@jsenv/js-module-fallback": "1.6.0",
     "@jsenv/plugin-bundling": "2.10.20",
-    "@jsenv/plugin-minification": "1.7.13",
+    "@jsenv/plugin-minification": "1.7.14",
     "@jsenv/plugin-supervisor": "1.8.16",
     "@jsenv/plugin-transpilation": "1.7.0",
     "@jsenv/server": "17.6.3",

packages/internal/plugin-minification/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-minification",
-  "version": "1.7.13",
+  "version": "1.7.14",
   "type": "module",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
     "@jsenv/ast": "6.10.0",
     "@jsenv/sourcemap": "1.4.3",
     "@jsenv/urls": "2.9.10",
-    "html-minifier": "4.0.0",
+    "html-minifier-terser": "7.2.0",
     "lightningcss": "1.33.0",
     "terser": "5.49.0"
   },

packages/internal/plugin-minification/src/html/html_minification.js

@@ -1,9 +1,6 @@
-import { createRequire } from "node:module";
-
-// https://github.com/kangax/html-minifier#options-quick-reference
-export const minifyHtml = (htmlUrlInfo, options = {}) => {
-  const require = createRequire(import.meta.url);
-  const { minify } = require("html-minifier");
+// https://github.com/terser/html-minifier-terser#options-quick-reference
+export const minifyHtml = async (htmlUrlInfo, options = {}) => {
+  const { minify } = await import("html-minifier-terser");
 
   const {
     // usually HTML will contain a few markup, it's better to keep white spaces
@@ -16,13 +13,21 @@ export const minifyHtml = (htmlUrlInfo, options = {}) => {
     preserveLineBreaks = true,
     removeComments = true,
     conservativeCollapse = false,
+    // comments are sometimes meaningful to whoever reads the HTML after the build:
+    // a server injecting content at a marker, an SSI directive, a legal banner, ...
+    // these are kept even when removeComments is true.
+    // the comment text (without "<!--" and "-->") is tested against each regexp
+    // "<!--! ... -->" -> legal/banner comments, same convention as CSS and JS minifiers
+    // "<!--# ... -->" -> server side includes
+    keepComments = [/^!/, /^\s*#/],
   } = options;
 
-  const htmlMinified = minify(htmlUrlInfo.content, {
+  const htmlMinified = await minify(htmlUrlInfo.content, {
     collapseWhitespace,
     conservativeCollapse,
     removeComments,
     preserveLineBreaks,
+    ignoreCustomComments: keepComments,
   });
   return htmlMinified;
 };

packages/related/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/cli",
-  "version": "0.3.161",
+  "version": "0.3.162",
   "type": "module",
   "description": "Command Line Interface for jsenv",
   "repository": {

packages/related/cli/template-node-package/package.json

@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@jsenv/assert": "4.5.7",
-    "@jsenv/core": "41.5.0",
+    "@jsenv/core": "41.5.1",
     "@jsenv/eslint-config-relax": "2.0.0",
     "@jsenv/test": "3.7.39",
     "eslint": "10.9.1",

packages/related/cli/template-web-components/package.json

@@ -17,9 +17,9 @@
   "devDependencies": {
     "@jsenv/custom-elements-redefine": "0.1.0",
     "@jsenv/assert": "4.5.7",
-    "@jsenv/core": "41.5.0",
+    "@jsenv/core": "41.5.1",
     "@jsenv/plugin-bundling": "2.10.20",
-    "@jsenv/plugin-minification": "1.7.13",
+    "@jsenv/plugin-minification": "1.7.14",
     "@jsenv/eslint-config-relax": "2.0.0",
     "@jsenv/test": "3.7.39",
     "eslint": "10.9.1",

packages/related/cli/template-web-preact/package.json

@@ -20,10 +20,10 @@
   "devDependencies": {
     "@babel/plugin-transform-react-jsx": "8.0.1",
     "@jsenv/assert": "4.5.7",
-    "@jsenv/core": "41.5.0",
+    "@jsenv/core": "41.5.1",
     "@jsenv/plugin-preact": "1.9.0",
     "@jsenv/plugin-bundling": "2.10.20",
-    "@jsenv/plugin-minification": "1.7.13",
+    "@jsenv/plugin-minification": "1.7.14",
     "@jsenv/eslint-config-relax": "2.0.0",
     "@jsenv/test": "3.7.39",
     "eslint": "10.9.1",

packages/related/cli/template-web-react/package.json

@@ -21,10 +21,10 @@
   "devDependencies": {
     "@babel/plugin-transform-react-jsx": "8.0.1",
     "@jsenv/assert": "4.5.7",
-    "@jsenv/core": "41.5.0",
+    "@jsenv/core": "41.5.1",
     "@jsenv/plugin-react": "1.9.0",
     "@jsenv/plugin-bundling": "2.10.20",
-    "@jsenv/plugin-minification": "1.7.13",
+    "@jsenv/plugin-minification": "1.7.14",
     "@jsenv/eslint-config-relax": "2.0.0",
     "@jsenv/test": "3.7.39",
     "eslint": "10.9.1",

packages/related/cli/template-web/package.json

@@ -15,10 +15,10 @@
   },
   "devDependencies": {
     "@jsenv/assert": "4.5.7",
-    "@jsenv/core": "41.5.0",
+    "@jsenv/core": "41.5.1",
     "@jsenv/eslint-config-relax": "2.0.0",
     "@jsenv/plugin-bundling": "2.10.20",
-    "@jsenv/plugin-minification": "1.7.13",
+    "@jsenv/plugin-minification": "1.7.14",
     "@jsenv/test": "3.7.39",
     "eslint": "10.9.1",
     "open": "11.0.1",