weboptimizer 4.0.104 → 4.0.105-1

package/dist/ejsLoader.js

@@ -110,28 +110,39 @@ export const loader = async function (source) {
       }
       throw new Error(`Given template file "${template}" couldn't be resolved.`);
     };
-    const compressHTML = content => minifyHTML(content, extend(true, {
-      caseSensitive: true,
-      collapseInlineTagWhitespace: true,
-      collapseWhitespace: true,
-      conservativeCollapse: true,
-      minifyCSS: true,
-      minifyJS: true,
-      processScripts: ['text/ng-template', 'text/x-handlebars-template'],
-      removeAttributeQuotes: true,
-      removeComments: true,
-      removeRedundantAttributes: true,
-      removeScriptTypeAttributes: true,
-      removeStyleLinkTypeAttributes: true,
-      sortAttributes: true,
-      sortClassName: true,
+    const compressHTML = content => {
+      const minifierOptions = extend(true, {
+        caseSensitive: true,
+        collapseInlineTagWhitespace: true,
+        collapseWhitespace: true,
+        conservativeCollapse: true,
+        minifyCSS: true,
+        minifyJS: true,
+        processScripts: ['text/ng-template', 'text/x-handlebars-template'],
+        removeAttributeQuotes: true,
+        removeComments: true,
+        removeDefaultTypeAttributes: true,
+        removeRedundantAttributes: true,
+        sortAttributes: true,
+        sortClassNames: true,
+        // NOTE: Avoids whitespace around placeholder in tags.
+        trimCustomFragments: true,
+        useShortDoctype: true
+      }, givenOptions.compress?.html || {});
       /*
-          NOTE: Avoids whitespace around placeholder in
-          tags.
+          NOTE: Given options are shared with "html-webpack-plugin" and
+          "html-loader" which are based on "html-minifier-terser" so we
+          have to map its option names to "html-minifier".
       */
-      trimCustomFragments: true,
-      useShortDoctype: true
-    }, givenOptions.compress?.html || {}));
+      const renamedOptions = {};
+      for (const [oldName, newName] of [['removeScriptTypeAttributes', 'removeDefaultTypeAttributes'], ['removeStyleLinkTypeAttributes', 'removeDefaultTypeAttributes'], ['sortClassName', 'sortClassNames']]) if (Object.prototype.hasOwnProperty.call(minifierOptions, oldName)) {
+        renamedOptions[newName] = Boolean(renamedOptions[newName]) || Boolean(minifierOptions[oldName]);
+        delete minifierOptions[oldName];
+      }
+      Object.assign(minifierOptions, renamedOptions);
+      for (const name of ['html5', 'processConditionalComments', 'removeCDATASectionsFromCDATA', 'removeCommentsFromCDATA']) delete minifierOptions[name];
+      return minifyHTML(content, minifierOptions);
+    };
     let result = template;
     const isString = Boolean(options.isString);
     delete options.isString;
@@ -165,7 +176,7 @@ export const loader = async function (source) {
               encoding
             });
           }
-          if (step === compileSteps && givenOptions.compress?.html) result = compressHTML(result);
+          if (step === compileSteps && givenOptions.compress?.html) result = await compressHTML(result);
           if (step === compileSteps && compileSteps % 2) {
             /*
                 We have to use the templace class directly to get
@@ -235,7 +246,7 @@ export const loader = async function (source) {
         }
       } else {
         result = await result(scope);
-        if (givenOptions.compress?.html) result = compressHTML(result);
+        if (givenOptions.compress?.html) result = await compressHTML(result);
       }
     }
     if (compileSteps % 2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.104",
+  "version": "4.0.105-1",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -87,14 +87,14 @@
     "babel-loader": "^10.1.1",
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "babel-plugin-transform-rewrite-imports": "^1.5.4",
-    "clientnode": "4.0.1530",
+    "clientnode": "4.0.1531",
     "core-js": "^3.51.0",
     "ejs": "^7.0.2",
     "exports-loader": "^5.0.0",
     "extract-loader": "^5.1.0",
     "glob-all": "^3.3.1",
     "html-loader": "^5.1.0",
-    "html-minifier": "^4.0.0",
+    "html-minifier": "^5.0.1",
     "html-webpack-plugin": "^5.6.8",
     "imports-loader": "^5.0.0",
     "jest-environment-jsdom": "^30.5.2",
@@ -111,7 +111,6 @@
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/ejs": "^3.1.5",
     "@types/eslint": "^9.6.1",
-    "@types/html-minifier": "^4.0.6",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/imagemin": "^9.0.1",
     "@types/node": "^26.6.6",
@@ -124,7 +123,7 @@
     "cssnano": "^9.9.0",
     "eslint": "^10.14.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jsdoc": "^65.4.2",
+    "eslint-plugin-jsdoc": "^65.4.3",
     "favicons": "^7.3.1",
     "favicons-webpack-plugin": "^6.0.1",
     "globals": "^17.14.0",
@@ -143,20 +142,18 @@
     "postcss-url": "^10.1.4",
     "shx": "^0.4.0",
     "style-loader": "^4.0.0",
-    "stylelint": "^17.16.0",
-    "stylelint-config-standard": "^40.0.0",
-    "stylelint-config-standard-scss": "^17.0.0",
+    "stylelint": "^18.0.0",
+    "stylelint-config-standard": "^41.0.0",
     "terser-webpack-plugin": "^5.6.1",
     "typescript-eslint": "^8.72.1",
     "typescript-plugin-css-modules": "^5.3.0",
-    "web-documentation": "^1.0.71",
+    "web-documentation": "^1.0.72",
     "workbox-webpack-plugin": "^7.4.1"
   },
   "peerDependencies": {
     "@babel/eslint-parser": "*",
     "@eslint/js": "*",
     "@types/ejs": "*",
-    "@types/html-minifier": "*",
     "@types/imagemin": "*",
     "@types/node": "*",
     "@types/webpack-env": "*",
@@ -201,9 +198,6 @@
     "@types/ejs": {
       "optional": true
     },
-    "@types/html-minifier": {
-      "optional": true
-    },
     "@types/imagemin": {
       "optional": true
     },