weboptimizer 4.0.103 → 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/dist/plugins/RemoveStyleOnlyScripts.d.ts

@@ -0,0 +1,39 @@
+import type { Chunk, Compilation, Compiler, Module } from 'webpack';
+import type { RemoveStyleOnlyScriptsOptions } from '../type';
+/**
+ * Module type of modules representing extracted style sheets.
+ */
+export declare const EXTRACTED_STYLE_MODULE_TYPE = "css/mini-extract";
+/**
+ * Removes java script files of initial chunks which only consist of style
+ * sheets extracted into separate files like a dedicated "styles" entry. The
+ * remaining java script file would be (nearly) empty and useless.
+ */
+export declare class RemoveStyleOnlyScripts {
+    private defaultOptions;
+    private options;
+    constructor(options?: Partial<RemoveStyleOnlyScriptsOptions>);
+    /**
+     * Determines whether given module is an extracted style sheet or its
+     * empty java script counterpart created by the extraction loader.
+     * NOTE: Style sheet modules export their class name mapping which has to
+     * be kept.
+     * @param module - Module to check.
+     * @param compilation - Current compilation.
+     * @returns Indicator.
+     */
+    isExtractedStyle(module: Module, compilation: Compilation): boolean;
+    /**
+     * Determines whether java script files of given chunk can be removed
+     * safely.
+     * NOTE: Asynchronous chunks are still needed to load their style sheets
+     * and chunks hosting a runtime for other chunks are needed as well. Hot
+     * module replacement adds client modules so affected chunks are kept.
+     * @param chunk - Chunk to check.
+     * @param compilation - Current compilation.
+     * @returns Indicator.
+     */
+    isStyleOnly(chunk: Chunk, compilation: Compilation): boolean;
+    apply(compiler: Compiler): void;
+}
+export default RemoveStyleOnlyScripts;

package/dist/plugins/RemoveStyleOnlyScripts.js

@@ -0,0 +1,101 @@
+// #!/usr/bin/env babel-node
+// -*- coding: utf-8 -*-
+/** @module RemoveStyleOnlyScripts */
+'use strict';
+
+/* !
+    region header
+    Copyright Torben Sickert (info["~at~"]tsickert.com) 16.12.2012
+
+    License
+    -------
+
+    This library written by Torben Sickert stands under a creative commons
+    naming 3.0 unported license.
+    See https://creativecommons.org/licenses/by/3.0/deed.de
+    endregion
+*/
+// region imports
+function _defineProperty(r, t, o) { return (t = _toPropertyKey(t)) in r ? Object.defineProperty(r, t, { value: o, enumerable: !0, configurable: !0, writable: !0 }) : r[t] = o, r; }
+function _toPropertyKey(r) { var o = _toPrimitive(r, "string"); return "symbol" == typeof o ? o : o + ""; }
+function _toPrimitive(t, e) { if ("object" != typeof t || !t) return t; var r; if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) { var i = r.call(t, e || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === e ? String : Number)(t); }
+// endregion
+/**
+ * Module type of modules representing extracted style sheets.
+ */
+export const EXTRACTED_STYLE_MODULE_TYPE = 'css/mini-extract';
+/**
+ * Removes java script files of initial chunks which only consist of style
+ * sheets extracted into separate files like a dedicated "styles" entry. The
+ * remaining java script file would be (nearly) empty and useless.
+ */
+export class RemoveStyleOnlyScripts {
+  constructor(options = {}) {
+    _defineProperty(this, "defaultOptions", {
+      javaScriptFilePattern: /\.[cm]?js(?:\?.*)?$/
+    });
+    _defineProperty(this, "options", void 0);
+    this.options = {
+      ...this.defaultOptions,
+      ...options
+    };
+  }
+  /**
+   * Determines whether given module is an extracted style sheet or its
+   * empty java script counterpart created by the extraction loader.
+   * NOTE: Style sheet modules export their class name mapping which has to
+   * be kept.
+   * @param module - Module to check.
+   * @param compilation - Current compilation.
+   * @returns Indicator.
+   */
+  isExtractedStyle(module, compilation) {
+    if (module.type === EXTRACTED_STYLE_MODULE_TYPE) return true;
+    const loaders = module.loaders;
+    if (!(Array.isArray(loaders) && loaders.some(({
+      loader
+    }) => loader === this.options.loader))) return false;
+    const providedExports = compilation.moduleGraph.getProvidedExports(module);
+    return Array.isArray(providedExports) && providedExports.length === 0;
+  }
+  /**
+   * Determines whether java script files of given chunk can be removed
+   * safely.
+   * NOTE: Asynchronous chunks are still needed to load their style sheets
+   * and chunks hosting a runtime for other chunks are needed as well. Hot
+   * module replacement adds client modules so affected chunks are kept.
+   * @param chunk - Chunk to check.
+   * @param compilation - Current compilation.
+   * @returns Indicator.
+   */
+  isStyleOnly(chunk, compilation) {
+    if (!chunk.isOnlyInitial()) return false;
+    for (const group of chunk.groupsIterable) if (group.chunks.length !== 1) return false;
+    for (const entrypoint of compilation.entrypoints.values()) if (entrypoint.getRuntimeChunk() === chunk && !chunk.isInGroup(entrypoint)) return false;
+    const {
+      chunkGraph
+    } = compilation;
+    if (chunkGraph.getNumberOfChunkModules(chunk) === 0) return false;
+    for (const module of chunkGraph.getChunkModulesIterable(chunk)) if (!this.isExtractedStyle(module, compilation)) return false;
+    return true;
+  }
+  apply(compiler) {
+    const name = 'RemoveStyleOnlyScripts';
+    compiler.hooks.thisCompilation.tap(name, compilation => {
+      compilation.hooks.processAssets.tap({
+        name,
+        /*
+            NOTE: Has to run before html plugins determine
+            their asset tags and source maps are generated.
+        */
+        stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE
+      }, () => {
+        for (const chunk of compilation.chunks) if (this.isStyleOnly(chunk, compilation)) for (const file of Array.from(chunk.files)) if (this.options.javaScriptFilePattern.test(file)) {
+          chunk.files.delete(file);
+          compilation.deleteAsset(file);
+        }
+      });
+    });
+  }
+}
+export default RemoveStyleOnlyScripts;

package/dist/type.d.ts

@@ -87,6 +87,10 @@ export interface InPlaceAssetsIntoHTMLOptions {
     javaScript: InPlaceAssetConfiguration | null;
     htmlPlugin: typeof HtmlWebpackPlugin;
 }
+export interface RemoveStyleOnlyScriptsOptions {
+    javaScriptFilePattern: RegExp;
+    loader: string;
+}
 export interface AssetPathConfiguration {
     base: string;
     cascadingStyleSheet: string;

package/dist/webpackConfigurator.js

@@ -38,6 +38,7 @@ import getConfiguration from "./configurator.js";
 import { determineAssetType, determineExternalRequest, determineModuleFilePath, getClosestPackageDescriptor, isFilePathInLocation, normalizePaths, stripLoader } from "./helper.js";
 import InPlaceAssetsIntoHTML from "./plugins/InPlaceAssetsIntoHTML.js";
 import HTMLTransformation from "./plugins/HTMLTransformation.js";
+import RemoveStyleOnlyScripts from "./plugins/RemoveStyleOnlyScripts.js";
 
 // Wait until optional filesystem modules have been loaded.
 await importFilesystemAPI();
@@ -206,9 +207,18 @@ if (!(configuration.needed.javaScript || configuration.needed.javaScriptExtensio
 ///// endregion
 ///// region extract cascading style sheets
 const cssOutputPath = configuration.files.compose.cascadingStyleSheet;
-if (cssOutputPath && plugins.MiniCSSExtract) pluginInstances.push(new plugins.MiniCSSExtract({
-  filename: typeof cssOutputPath === 'string' ? relative(configuration.path.target.base, cssOutputPath) : cssOutputPath
-}));
+if (cssOutputPath && plugins.MiniCSSExtract) {
+  pluginInstances.push(new plugins.MiniCSSExtract({
+    filename: typeof cssOutputPath === 'string' ? relative(configuration.path.target.base, cssOutputPath) : cssOutputPath
+  }));
+  /*
+      NOTE: Chunks consisting of extracted style sheets only would result in
+      nearly empty and useless java script files.
+  */
+  pluginInstances.push(new RemoveStyleOnlyScripts({
+    loader: plugins.MiniCSSExtract.loader
+  }));
+}
 ///// endregion
 ///// region performs implicit external logic
 if (configuration.injection.external.modules === '__implicit__')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.103",
+  "version": "4.0.105-1",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -69,7 +69,7 @@
     "lint:base": "eslint --config dist/eslint.config.js --no-warn-ignored src/*.ts src/*/*.ts src/test/*/*.ts",
     "prepare": "yarn build",
     "prettify": "yarn lint:base --fix || true",
-    "test": "yarn build:test && node --experimental-vm-modules node_modules/.bin/jest --config ./weboptimizerJest.json --noStackTrace --root-dir './' --test-regex '/dist/test/.+\\\\.js$' dist/test/browser.js dist/test/configurator.js dist/test/ejsLoader.js dist/test/helper.js dist/test/HTMLTransformation.js dist/test/InPlaceAssetsIntoHTML.js dist/test/stylelintConfigurator.js dist/test/index.js dist/test/webpackConfigurator.js",
+    "test": "yarn build:test && node --experimental-vm-modules node_modules/.bin/jest --config ./weboptimizerJest.json --noStackTrace --root-dir './' --test-regex '/dist/test/.+\\\\.js$' dist/test/browser.js dist/test/configurator.js dist/test/ejsLoader.js dist/test/helper.js dist/test/HTMLTransformation.js dist/test/InPlaceAssetsIntoHTML.js dist/test/RemoveStyleOnlyScripts.js dist/test/stylelintConfigurator.js dist/test/index.js dist/test/webpackConfigurator.js",
     "test:coverage": "yarn test --ci --coverage --coverageReporters=text --coverageReporters=text-summary --silent --testLocationInResults",
     "test:coverage:report": "yarn test:coverage --coverageDirectory=.coverage --coverageReporters=lcov --outputFile=lcov.info",
     "test:watch": "yarn test --watch",
@@ -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
     },