weboptimizer 2.0.1562 → 2.0.1563

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1562",
+  "version": "2.0.1563",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -148,7 +148,7 @@
     "mini-css-extract-plugin": "^2.9.2",
     "mkdirp": "^3.0.1",
     "node-fetch": "^3.3.2",
-    "postcss": "^8.5.2",
+    "postcss": "^8.5.3",
     "postcss-fontpath": "^1.0.0",
     "postcss-import": "^16.1.0",
     "postcss-loader": "^8.1.1",
@@ -1099,7 +1099,7 @@
               },
               "compress": {
                 "html": {
-                  "__evaluate__": "self.module.optimizer.htmlMinifier"
+                  "__evaluate__": "type && type.includes('html') && self.module.optimizer.htmlMinifier"
                 },
                 "javaScript": {
                   "__evaluate__": "self.module.optimizer.babelMinify.module"

package/webpackConfigurator.js

@@ -593,23 +593,34 @@ var scope = {
   require: currentRequire !== null && currentRequire !== void 0 ? currentRequire : require
 };
 var evaluateAnThrow = function evaluateAnThrow(object) {
-  var filePath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : configuration.path.context;
+  var givenOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var options = _objectSpread({
+    filePath: configuration.path.context
+  }, givenOptions);
   if (typeof object === 'string') {
-    var evaluated = (0, _clientnode.evaluate)(object, _objectSpread({
-      filePath: filePath
-    }, scope));
+    var evaluated = (0, _clientnode.evaluate)(object, _objectSpread(_objectSpread({
+      filePath: options.filePath
+    }, scope), {}, {
+      type: options.type
+    }));
     if (evaluated.error) throw new Error('Error occurred during processing given expression: ' + evaluated.error);
     return evaluated.result;
   }
   return object;
 };
-var evaluateMapper = function evaluateMapper(value) {
-  return evaluateAnThrow(value);
+var createEvaluateMapper = function createEvaluateMapper(type) {
+  return function (value) {
+    return evaluateAnThrow(value, {
+      type: type
+    });
+  };
 };
 var evaluateAdditionalLoaderConfiguration = function evaluateAdditionalLoaderConfiguration(loaderConfiguration) {
   return {
     exclude: function exclude(filePath) {
-      return evaluateAnThrow(loaderConfiguration.exclude, filePath);
+      return evaluateAnThrow(loaderConfiguration.exclude, {
+        filePath: filePath
+      });
     },
     include: loaderConfiguration.include && evaluateAnThrow(loaderConfiguration.include) || configuration.path.source.base,
     test: new RegExp(evaluateAnThrow(loaderConfiguration.test)),
@@ -619,7 +630,7 @@ var evaluateAdditionalLoaderConfiguration = function evaluateAdditionalLoaderCon
 var getIncludingPaths = function getIncludingPaths(path) {
   return (0, _helper.normalizePaths)([path].concat(_module.locations.directoryPaths));
 };
-var cssUse = _module.preprocessor.cascadingStyleSheet.additional.pre.map(evaluateMapper).concat({
+var cssUse = _module.preprocessor.cascadingStyleSheet.additional.pre.map(createEvaluateMapper('css')).concat({
   loader: _module.style.loader,
   options: _module.style.options || {}
 }, {
@@ -636,7 +647,7 @@ var cssUse = _module.preprocessor.cascadingStyleSheet.additional.pre.map(evaluat
       */
       plugins: [].concat(postcssImport ? postcssImport({
         root: configuration.path.context
-      }) : [], _module.preprocessor.cascadingStyleSheet.additional.plugins.pre.map(evaluateMapper),
+      }) : [], _module.preprocessor.cascadingStyleSheet.additional.plugins.pre.map(createEvaluateMapper('css.postcss')),
       /*
           NOTE: Checking path doesn't work if fonts
           are referenced in libraries provided in
@@ -681,10 +692,10 @@ var cssUse = _module.preprocessor.cascadingStyleSheet.additional.pre.map(evaluat
         },
         stylesheetPath: configuration.path.source.asset.cascadingStyleSheet,
         spritePath: configuration.path.source.asset.image
-      }) : [], _module.preprocessor.cascadingStyleSheet.additional.plugins.post.map(evaluateMapper), _module.optimizer.cssnano && postcssCSSnano ? postcssCSSnano(_module.optimizer.cssnano) : [])
+      }) : [], _module.preprocessor.cascadingStyleSheet.additional.plugins.post.map(createEvaluateMapper('css.postcss')), _module.optimizer.cssnano && postcssCSSnano ? postcssCSSnano(_module.optimizer.cssnano) : [])
     }
   } : {}, _module.preprocessor.cascadingStyleSheet.options || {})
-} : [], _module.preprocessor.cascadingStyleSheet.additional.post.map(evaluateMapper));
+} : [], _module.preprocessor.cascadingStyleSheet.additional.post.map(createEvaluateMapper('css')));
 var genericLoader = {
   // Convert to compatible native web types.
   // region generic template
@@ -692,23 +703,31 @@ var genericLoader = {
     exclude: function exclude(filePath) {
       return (0, _helper.normalizePaths)(configuration.files.html.concat(configuration.files.defaultHTML).map(function (htmlConfiguration) {
         return htmlConfiguration.template.filePath;
-      })).includes(filePath) || _module.preprocessor.ejs.exclude === null ? false : evaluateAnThrow(_module.preprocessor.ejs.exclude, filePath);
+      })).includes(filePath) || _module.preprocessor.ejs.exclude === null ? false : evaluateAnThrow(_module.preprocessor.ejs.exclude, {
+        filePath: filePath
+      });
     },
     include: getIncludingPaths(configuration.path.source.asset.template),
     test: /^(?!.+\.html\.ejs$).+\.ejs$/i,
-    use: _module.preprocessor.ejs.additional.pre.map(evaluateMapper).concat({
+    use: _module.preprocessor.ejs.additional.pre.map(createEvaluateMapper('ejs')).concat({
       loader: _module.preprocessor.ejs.loader,
       options: _module.preprocessor.ejs.options || {}
-    }, _module.preprocessor.ejs.additional.post.map(evaluateMapper))
+    }, _module.preprocessor.ejs.additional.post.map(createEvaluateMapper('ejs')))
   },
   // endregion
   // region script
   script: {
     exclude: function exclude(filePath) {
-      return evaluateAnThrow(_module.preprocessor.javaScript.exclude, filePath);
+      return evaluateAnThrow(_module.preprocessor.javaScript.exclude, {
+        filePath: filePath,
+        type: 'script'
+      });
     },
     include: function include(filePath) {
-      var result = evaluateAnThrow(_module.preprocessor.javaScript.include, filePath);
+      var result = evaluateAnThrow(_module.preprocessor.javaScript.include, {
+        filePath: filePath,
+        type: 'script'
+      });
       if ([null, undefined].includes(result)) {
         var _iterator10 = _createForOfIteratorHelper(getIncludingPaths(configuration.path.source.asset.javaScript)),
           _step10;
@@ -727,10 +746,10 @@ var genericLoader = {
       return Boolean(result);
     },
     test: new RegExp(_module.preprocessor.javaScript.regularExpression, 'i'),
-    use: _module.preprocessor.javaScript.additional.pre.map(evaluateMapper).concat({
+    use: _module.preprocessor.javaScript.additional.pre.map(createEvaluateMapper('script')).concat({
       loader: _module.preprocessor.javaScript.loader,
       options: _module.preprocessor.javaScript.options || {}
-    }, _module.preprocessor.javaScript.additional.post.map(evaluateMapper))
+    }, _module.preprocessor.javaScript.additional.post.map(createEvaluateMapper('script')))
   },
   // endregion
   // region html template
@@ -744,11 +763,14 @@ var genericLoader = {
       exclude: function exclude(filePath) {
         return (0, _helper.normalizePaths)(configuration.files.html.concat(configuration.files.defaultHTML).map(function (htmlConfiguration) {
           return htmlConfiguration.template.filePath;
-        })).includes(filePath) || (_module.preprocessor.html.exclude === null ? false : evaluateAnThrow(_module.preprocessor.html.exclude, filePath));
+        })).includes(filePath) || (_module.preprocessor.html.exclude === null ? false : evaluateAnThrow(_module.preprocessor.html.exclude, {
+          filePath: filePath,
+          type: 'html.ejs'
+        }));
       },
       include: configuration.path.source.asset.template,
       test: /\.html\.ejs(?: \?.*)?$/i,
-      use: _module.preprocessor.html.additional.pre.map(evaluateMapper).concat(
+      use: _module.preprocessor.html.additional.pre.map(createEvaluateMapper('html.ejs')).concat(
       /*
           We might need to evaluate ejs before we are able to
           parse html beforhand. If not we parse it as html
@@ -765,24 +787,27 @@ var genericLoader = {
       }], {
         loader: _module.preprocessor.html.loader,
         options: _module.preprocessor.html.options || {}
-      }, _module.preprocessor.html.additional.post.map(evaluateMapper))
+      }, _module.preprocessor.html.additional.post.map(createEvaluateMapper('html.ejs')))
     },
     html: {
       exclude: function exclude(filePath) {
         return (0, _helper.normalizePaths)(configuration.files.html.concat(configuration.files.defaultHTML).map(function (htmlConfiguration) {
           return htmlConfiguration.template.filePath;
-        })).includes(filePath) || (_module.html.exclude === null ? true : evaluateAnThrow(_module.html.exclude, filePath));
+        })).includes(filePath) || (_module.html.exclude === null ? true : evaluateAnThrow(_module.html.exclude, {
+          filePath: filePath,
+          type: 'html'
+        }));
       },
       include: configuration.path.source.asset.template,
       test: /\.html(?: \?.*)?$/i,
-      use: _module.html.additional.pre.map(evaluateMapper).concat({
+      use: _module.html.additional.pre.map(createEvaluateMapper('html')).concat({
         loader: 'file?name=' + (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.template), "[name][ext]?".concat(configuration.hashAlgorithm, "=") + '[contenthash]')
       }, {
         loader: 'extract'
       }, {
         loader: _module.html.loader,
         options: _module.html.options || {}
-      }, _module.html.additional.post.map(evaluateMapper))
+      }, _module.html.additional.post.map(createEvaluateMapper('html')))
     }
   },
   // endregion
@@ -790,10 +815,16 @@ var genericLoader = {
   // region style
   style: {
     exclude: function exclude(filePath) {
-      return _module.cascadingStyleSheet.exclude === null ? isFilePathInDependencies(filePath) : evaluateAnThrow(_module.cascadingStyleSheet.exclude, filePath);
+      return _module.cascadingStyleSheet.exclude === null ? isFilePathInDependencies(filePath) : evaluateAnThrow(_module.cascadingStyleSheet.exclude, {
+        filePath: filePath,
+        type: 'style'
+      });
     },
     include: function include(filePath) {
-      var result = evaluateAnThrow(_module.cascadingStyleSheet.include, filePath);
+      var result = evaluateAnThrow(_module.cascadingStyleSheet.include, {
+        filePath: filePath,
+        type: 'style'
+      });
       if ([null, undefined].includes(result)) {
         var _iterator11 = _createForOfIteratorHelper(getIncludingPaths(configuration.path.source.asset.cascadingStyleSheet)),
           _step11;
@@ -820,7 +851,10 @@ var genericLoader = {
   font: {
     eot: {
       exclude: function exclude(filePath) {
-        return _module.optimizer.font.eot.exclude === null ? false : evaluateAnThrow(_module.optimizer.font.eot.exclude, filePath);
+        return _module.optimizer.font.eot.exclude === null ? false : evaluateAnThrow(_module.optimizer.font.eot.exclude, {
+          filePath: filePath,
+          type: 'font.eot'
+        });
       },
       generator: {
         filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
@@ -832,11 +866,14 @@ var genericLoader = {
           maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
         }
       },
-      use: _module.optimizer.font.eot.loader.map(evaluateMapper)
+      use: _module.optimizer.font.eot.loader.map(createEvaluateMapper('font.eot'))
     },
     svg: {
       exclude: function exclude(filePath) {
-        return _module.optimizer.font.svg.exclude === null ? false : evaluateAnThrow(_module.optimizer.font.svg.exclude, filePath);
+        return _module.optimizer.font.svg.exclude === null ? false : evaluateAnThrow(_module.optimizer.font.svg.exclude, {
+          filePath: filePath,
+          type: 'svg'
+        });
       },
       include: configuration.path.source.asset.font,
       generator: {
@@ -850,11 +887,14 @@ var genericLoader = {
       },
       test: /\.svg(?: \?.*)?$/i,
       type: 'asset/resource',
-      use: _module.optimizer.font.svg.loader.map(evaluateMapper)
+      use: _module.optimizer.font.svg.loader.map(createEvaluateMapper('font.svg'))
     },
     ttf: {
       exclude: function exclude(filePath) {
-        return _module.optimizer.font.ttf.exclude === null ? false : evaluateAnThrow(_module.optimizer.font.ttf.exclude, filePath);
+        return _module.optimizer.font.ttf.exclude === null ? false : evaluateAnThrow(_module.optimizer.font.ttf.exclude, {
+          filePath: filePath,
+          type: 'ttf'
+        });
       },
       generator: {
         filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
@@ -867,11 +907,14 @@ var genericLoader = {
           maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
         }
       },
-      use: _module.optimizer.font.ttf.loader.map(evaluateMapper)
+      use: _module.optimizer.font.ttf.loader.map(createEvaluateMapper('font.ttf'))
     },
     woff: {
       exclude: function exclude(filePath) {
-        return _module.optimizer.font.woff.exclude === null ? false : evaluateAnThrow(_module.optimizer.font.woff.exclude, filePath);
+        return _module.optimizer.font.woff.exclude === null ? false : evaluateAnThrow(_module.optimizer.font.woff.exclude, {
+          filePath: filePath,
+          type: 'woff'
+        });
       },
       generator: {
         filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.font), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
@@ -883,14 +926,17 @@ var genericLoader = {
           maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
         }
       },
-      use: _module.optimizer.font.woff.loader.map(evaluateMapper)
+      use: _module.optimizer.font.woff.loader.map(createEvaluateMapper('font.woff'))
     }
   },
   // endregion
   // region image
   image: {
     exclude: function exclude(filePath) {
-      return _module.optimizer.image.exclude === null ? isFilePathInDependencies(filePath) : evaluateAnThrow(_module.optimizer.image.exclude, filePath);
+      return _module.optimizer.image.exclude === null ? isFilePathInDependencies(filePath) : evaluateAnThrow(_module.optimizer.image.exclude, {
+        filePath: filePath,
+        type: 'image'
+      });
     },
     generator: {
       filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.image), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
@@ -903,14 +949,17 @@ var genericLoader = {
         maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
       }
     },
-    use: _module.optimizer.image.loader.map(evaluateMapper)
+    use: _module.optimizer.image.loader.map(createEvaluateMapper('image'))
   },
   // endregion
   // region data
   data: {
     exclude: function exclude(filePath) {
       if (typeof filePath !== 'string') return false;
-      return configuration.extensions.file.internal.includes((0, _path.extname)((0, _helper.stripLoader)(filePath))) || (_module.optimizer.data.exclude === null ? isFilePathInDependencies(filePath) : evaluateAnThrow(_module.optimizer.data.exclude, filePath));
+      return configuration.extensions.file.internal.includes((0, _path.extname)((0, _helper.stripLoader)(filePath))) || (_module.optimizer.data.exclude === null ? isFilePathInDependencies(filePath) : evaluateAnThrow(_module.optimizer.data.exclude, {
+        filePath: filePath,
+        type: 'data'
+      }));
     },
     generator: {
       filename: (0, _path.join)((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset.data), '[name][ext]') + "?".concat(configuration.hashAlgorithm, "=[contenthash]")
@@ -922,7 +971,7 @@ var genericLoader = {
         maxSize: configuration.inPlace.otherMaximumFileSizeLimitInByte
       }
     },
-    use: _module.optimizer.data.loader.map(evaluateMapper)
+    use: _module.optimizer.data.loader.map(createEvaluateMapper('data'))
   }
   // endregion
 };