weboptimizer 2.0.1101 → 2.0.1110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1101",
+  "version": "2.0.1110",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -136,7 +136,6 @@
     "favicons": "*",
     "favicons-webpack-plugin": "*",
     "image-minimizer-webpack-plugin": "*",
-    "imagemin": "*",
     "jest": "*",
     "jsdoc": "*",
     "mini-css-extract-plugin": "*",
@@ -490,6 +489,8 @@
               "'**/plugins/*'",
               "--ignore-pattern",
               "'*.d.ts'",
+              "--resolve-plugins-relative-to",
+              ".",
               "'**/*.{jsx,ts,tsx}'"
             ],
             "command": "eslint",
@@ -1002,35 +1003,37 @@
           "image": {
             "content": {
               "minimizer": {
-                "plugins": [
-                  [
-                    "gifsicle",
-                    {
-                      "colors": 256,
-                      "interlanced": false,
-                      "optimizationLevel": 3
-                    }
-                  ],
-                  [
-                    "jpegtran",
-                    {
-                      "arithmetic": true,
-                      "progressive": true
-                    }
-                  ],
-                  [
-                    "optipng",
-                    {
-                      "optimizationLevel": 7
-                    }
-                  ],
-                  [
-                    "svgo",
-                    {
-                      "plugins": []
-                    }
+                "options": {
+                  "plugins": [
+                    [
+                      "gifsicle",
+                      {
+                        "colors": 256,
+                        "interlanced": false,
+                        "optimizationLevel": 3
+                      }
+                    ],
+                    [
+                      "jpegtran",
+                      {
+                        "arithmetic": true,
+                        "progressive": true
+                      }
+                    ],
+                    [
+                      "optipng",
+                      {
+                        "optimizationLevel": 7
+                      }
+                    ],
+                    [
+                      "svgo",
+                      {
+                        "plugins": []
+                      }
+                    ]
                   ]
-                ]
+                }
               },
               "exclude": {
                 "__evaluate__": "self.debug || 2 < self.givenCommandLineArguments.length && self.givenCommandLineArguments[2] !== 'build' ? /.*/ : self.debug && console.warn(`Image compression disabled. Use configuration: \"{module:{optimizer:{image:{content:{exclude:undefined}}}}}\" to enable default image file including.`) || /.*/"
@@ -1038,11 +1041,7 @@
             },
             "loader": []
           },
-          "minimize": true,
-          "minimizer": {
-            "#": "HTML-Templates shouldn't be transformed via terser to avoid html webpack plugin throwing to not get markup as intermediate result.",
-            "__evaluate__": "[new (require('terser-webpack-plugin'))({exclude: /\\.html(?:\\.js)?(?:\\?.*)?$/, extractComments: false, parallel: true})]"
-          }
+          "minimize": true
         },
         "preprocessor": {
           "cascadingStyleSheet": {
@@ -1357,6 +1356,24 @@
             "__evaluate__": "self.files.compose.image ? path.resolve(self.path.source.asset.image, path.relative(self.path.target.asset.image, self.files.compose.image)) : null"
           }
         ],
+        "tidyUpGlobs": {
+          "options": {
+            "glob": {
+              "ignore": [
+                "node_modules/**/*.css.js",
+                "**/node_modules/**/*.css.js"
+              ]
+            }
+          },
+          "pattern": [
+            {
+              "__evaluate__": "path.resolve(self.path.target.base, '*.css.js')"
+            },
+            {
+              "__evaluate__": "path.resolve(self.path.target.base, '**/*.css.js')"
+            }
+          ]
+        },
         "tidyUpOnClear": [
           {
             "__evaluate__": "path.resolve(self.path.target.base, 'yarn-error.log')"
@@ -1634,7 +1651,7 @@
       "files": {
         "compose": {
           "cascadingStyleSheet": {
-            "__evaluate__": "self.debug && 2 < self.givenCommandLineArguments.length && ['serve', 'test:browser'].includes(self.givenCommandLineArguments[2]) ? null : `${path.resolve(self.path.target.asset.cascadingStyleSheet, `[name]${self.path.target.asset.cascadingStyleSheet === self.path.source.asset.cascadingStyleSheet ? '.compiled' : ''}.css`)}?${self.hashAlgorithm}=[chunkhash]`"
+            "__evaluate__": "self.debug && 2 < self.givenCommandLineArguments.length && ['serve', 'test:browser'].includes(self.givenCommandLineArguments[2]) ? null : ({chunk: {name}}) => `${path.relative(self.path.target.base, path.resolve(self.path.target.asset.cascadingStyleSheet, `${path.basename(name, '.css')}${self.path.target.asset.cascadingStyleSheet === self.path.source.asset.cascadingStyleSheet ? '.compiled' : ''}.css`))}?${self.hashAlgorithm}=[chunkhash]`"
           }
         },
         "defaultHTML": {

package/stylelintConfigurator.js

@@ -27,7 +27,8 @@ exports["default"] = void 0;
 var _configurator = _interopRequireDefault(require("./configurator"));
 
 // endregion
-module.exports = _configurator["default"].stylelint;
+var configuration = (0, _configurator["default"])();
+module.exports = configuration.stylelint;
 var _default = module.exports; // region vim modline
 // vim: set tabstop=4 shiftwidth=4 expandtab:
 // vim: foldmethod=marker foldmarker=region,endregion:

package/type.d.ts

@@ -8,6 +8,7 @@ import ImageMinimizerWebpackPlugin from 'image-minimizer-webpack-plugin';
 import { JSDOM } from 'jsdom';
 import MiniCSSExtractPlugin from 'mini-css-extract-plugin';
 import { Options as RemoveDirectoryRecursivelyOptions } from 'rimraf';
+import TerserWebpackPlugin from 'terser-webpack-plugin';
 import { DefinePlugin as WebpackDefinePlugin, Configuration as BaseWebpackConfiguration, IgnorePlugin as WebpackIgnorePlugin, library as webpackLibrary, ModuleOptions as WebpackModuleOptions, RuleSetRule as WebpackRuleSetRule, RuleSetUseItem as WebpackRuleSetUseItem, WebpackOptionsNormalized } from 'webpack';
 import OfflinePlugin, { CommonOptions as WorkboxCommonOptions, GenerateSWOptions as WorkboxGenerateSWOptions, InjectManifestOptions as WorkboxInjectManifestOptions } from 'workbox-webpack-plugin';
 export interface Browser {
@@ -108,6 +109,10 @@ export interface PathConfiguration extends BasePathConfiguration {
     context: string;
     ignore: Array<string>;
     tidyUp: Array<string>;
+    tidyUpGlobs: {
+        options: RemoveDirectoryRecursivelyOptions;
+        pattern: Array<string>;
+    };
     tidyUpOnClear: Array<string>;
     tidyUpOnClearGlobs: {
         options: RemoveDirectoryRecursivelyOptions;
@@ -278,7 +283,7 @@ export interface ResolvedConfiguration {
     files: {
         additionalPaths: Array<string>;
         compose: {
-            cascadingStyleSheet: string;
+            cascadingStyleSheet: string | ((_asset: unknown) => string);
             image: string;
             javaScript: string;
         };
@@ -450,6 +455,7 @@ export declare type WebpackPlugins = Mapping<WebpackPlugin> & {
         InjectManifest: typeof OfflinePlugin.InjectManifest;
     };
     MiniCSSExtract?: typeof MiniCSSExtractPlugin;
+    Terser?: typeof TerserWebpackPlugin;
 };
 export declare type WebpackResolveData = Parameters<WebpackIgnorePlugin['checkIgnore']>[0];
 export declare type WebpackExtendedResolveData = WebpackResolveData & {

package/type.js

@@ -15,7 +15,7 @@
     See https://creativecommons.org/licenses/by/3.0/deed.de
     endregion
 */
-// region imports
+// region import s
 
 Object.defineProperty(exports, "__esModule", {
   value: true