weboptimizer 2.0.1098 → 2.0.1107

package/ejsLoader.js

@@ -48,9 +48,9 @@ var _configurator = _interopRequireDefault(require("./configurator"));
 
 var _helper = _interopRequireDefault(require("./helper"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 // endregion
 

package/helper.js

@@ -38,9 +38,9 @@ var _fs = require("fs");
 
 var _path = require("path");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 

package/index.js

@@ -60,9 +60,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 // endregion
 // NOTE: Environment variables can only be strings.
@@ -714,7 +714,7 @@ var main = /*#__PURE__*/function () {
   };
 }();
 
-if (require.main === module) main().then(_clientnode["default"].noop, _clientnode["default"].noop);
+if (require.main === module) void main();
 var _default = main; // region vim modline
 // vim: set tabstop=4 shiftwidth=4 expandtab:
 // vim: foldmethod=marker foldmarker=region,endregion:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1098",
+  "version": "2.0.1107",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -114,6 +114,7 @@
     "@types/favicons": "*",
     "@types/html-minifier": "*",
     "@types/html-minifier-terser": "*",
+    "@types/imagemin": "*",
     "@types/jest": "*",
     "@types/jsdom": "*",
     "@types/mini-css-extract-plugin": "*",
@@ -160,6 +161,7 @@
     "@types/ejs": "*",
     "@types/favicons": "*",
     "@types/html-minifier": "*",
+    "@types/imagemin": "*",
     "@types/jest": "*",
     "@types/jsdom": "*",
     "@types/mini-css-extract-plugin": "*",
@@ -176,6 +178,7 @@
     "favicons-webpack-plugin": "*",
     "identity-obj-proxy": "*",
     "image-minimizer-webpack-plugin": "*",
+    "imagemin": "*",
     "jest": "*",
     "jsdoc": "*",
     "mini-css-extract-plugin": "*",
@@ -997,36 +1000,38 @@
           },
           "image": {
             "content": {
-              "minimizerOptions": {
-                "plugins": [
-                  [
-                    "gifsicle",
-                    {
-                      "colors": 256,
-                      "interlanced": false,
-                      "optimizationLevel": 3
-                    }
-                  ],
-                  [
-                    "jpegtran",
-                    {
-                      "arithmetic": true,
-                      "progressive": true
-                    }
-                  ],
-                  [
-                    "optipng",
-                    {
-                      "optimizationLevel": 7
-                    }
-                  ],
-                  [
-                    "svgo",
-                    {
-                      "plugins": []
-                    }
+              "minimizer": {
+                "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.`) || /.*/"
@@ -1034,11 +1039,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": {

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 {
@@ -450,6 +451,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

package/webpackConfigurator.js

@@ -64,9 +64,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
@@ -84,7 +84,8 @@ var pluginNameResourceMapping = {
   MiniCSSExtract: 'mini-css-extract-plugin',
   Favicon: 'favicons-webpack-plugin',
   ImageMinimizer: 'image-minimizer-webpack-plugin',
-  Offline: 'workbox-webpack-plugin'
+  Offline: 'workbox-webpack-plugin',
+  Terser: 'terser-webpack-plugin'
 };
 var plugins = {};
 
@@ -560,11 +561,6 @@ if (htmlAvailable) pluginInstances.push({
     });
   }
 }); // // endregion
-// // region add automatic image compression
-// NOTE: This plugin should be loaded at last to ensure that all emitted images
-// ran through.
-
-if (plugins.ImageMinimizer) pluginInstances.push(new plugins.ImageMinimizer(_module.optimizer.image.content)); // // endregion
 // // region context replacements
 
 var _iterator10 = _createForOfIteratorHelper(_module.replacements.context),
@@ -1181,6 +1177,7 @@ if (htmlAvailable && _configurator["default"].debug && _configurator["default"].
   }
 } // / endregion
 // endregion
+// region plugins
 
 
 var _iterator15 = _createForOfIteratorHelper(_configurator["default"].plugins),
@@ -1193,7 +1190,10 @@ try {
     var _plugin = (0, _clientnode.optionalRequire)(pluginConfiguration.name.module);
 
     if (_plugin) pluginInstances.push((0, _construct2["default"])(_plugin[pluginConfiguration.name.initializer], (0, _toConsumableArray2["default"])(pluginConfiguration.parameters)));else console.warn("Configured plugin module \"".concat(pluginConfiguration.name.module, "\" ") + 'could not be loaded.');
-  } // region configuration
+  } // endregion
+  // region minimizer and image compression
+  // NOTE: This plugin should be loaded at last to ensure that all emitted images
+  // ran through.
 
 } catch (err) {
   _iterator15.e(err);
@@ -1201,6 +1201,27 @@ try {
   _iterator15.f();
 }
 
+if (!_module.optimizer.minimizer) {
+  _module.optimizer.minimizer = [];
+  if (plugins.Terser)
+    /*
+        HTML-Templates shouldn't be transformed via terser to avoid html
+        webpack plugin throwing to not get markup as intermediate result.
+    */
+    _module.optimizer.minimizer.push(new plugins.Terser({
+      exclude: /\\.html(?:\\.js)?(?:\\?.*)?$/,
+      extractComments: false,
+      parallel: true
+    }));
+  if (plugins.ImageMinimizer) _module.optimizer.minimizer.push(new plugins.ImageMinimizer(_clientnode["default"].extend(true, {
+    minimizer: {
+      implementation: plugins.ImageMinimizer.imageminMinify
+    }
+  }, _module.optimizer.image.content)));
+} // endregion
+// region configuration
+
+
 var customConfiguration = {};
 if ((_configuration$path$c = _configurator["default"].path.configuration) !== null && _configuration$path$c !== void 0 && _configuration$path$c.json) try {
   require.resolve(_configurator["default"].path.configuration.json);