weboptimizer 2.0.1155 → 2.0.1158

package/configurator.js

@@ -26,13 +26,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.loadedConfiguration = exports.load = exports.get = exports["default"] = void 0;
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _clientnode = _interopRequireWildcard(require("clientnode"));
 
 var _fs = _interopRequireWildcard(require("fs"));
 
-var _path = _interopRequireWildcard(require("path"));
+var _path2 = _interopRequireWildcard(require("path"));
 
 var _helper = _interopRequireDefault(require("./helper"));
 
@@ -85,11 +87,11 @@ var load = function load(context) {
       _package.configuration["default"].path.context = webOptimizerPath;
 
       while (true) {
-        _package.configuration["default"].path.context = (0, _path.resolve)(_package.configuration["default"].path.context, '../../');
-        if ((0, _path.basename)((0, _path.dirname)(_package.configuration["default"].path.context)) !== 'node_modules') break;
+        _package.configuration["default"].path.context = (0, _path2.resolve)(_package.configuration["default"].path.context, '../../');
+        if ((0, _path2.basename)((0, _path2.dirname)(_package.configuration["default"].path.context)) !== 'node_modules') break;
       }
 
-      if ((0, _path.basename)((0, _path.dirname)(currentWorkingDirectory)) === 'node_modules' || (0, _path.basename)((0, _path.dirname)(currentWorkingDirectory)) === '.staging' && (0, _path.basename)((0, _path.dirname)((0, _path.dirname)(currentWorkingDirectory))) === 'node_modules') {
+      if ((0, _path2.basename)((0, _path2.dirname)(currentWorkingDirectory)) === 'node_modules' || (0, _path2.basename)((0, _path2.dirname)(currentWorkingDirectory)) === '.staging' && (0, _path2.basename)((0, _path2.dirname)((0, _path2.dirname)(currentWorkingDirectory))) === 'node_modules') {
         /*
             NOTE: If we are dealing was a dependency project use current
             directory as context.
@@ -104,7 +106,7 @@ var load = function load(context) {
             hierarchy.
         */
         try {
-          if ((0, _fs.lstatSync)((0, _path.join)(currentWorkingDirectory, 'node_modules')).isSymbolicLink()) _package.configuration["default"].path.context = currentWorkingDirectory;
+          if ((0, _fs.lstatSync)((0, _path2.join)(currentWorkingDirectory, 'node_modules')).isSymbolicLink()) _package.configuration["default"].path.context = currentWorkingDirectory;
         } catch (error) {// Continue regardless of error.
         }
     } // endregion
@@ -113,7 +115,7 @@ var load = function load(context) {
     var specificConfiguration = {};
 
     try {
-      specificConfiguration = (0, _clientnode.currentRequire)((0, _path.join)(_package.configuration["default"].path.context, 'package'));
+      specificConfiguration = (0, _clientnode.currentRequire)((0, _path2.join)(_package.configuration["default"].path.context, 'package'));
     } catch (error) {
       _package.configuration["default"].path.context = currentWorkingDirectory;
     } // endregion
@@ -197,8 +199,8 @@ var load = function load(context) {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var _type3 = _step2.value;
 
-        for (var _i2 = 0, _arr2 = [configuration, specificConfiguration]; _i2 < _arr2.length; _i2++) {
-          var _configurationTarget = _arr2[_i2];
+        for (var _i7 = 0, _arr2 = [configuration, specificConfiguration]; _i7 < _arr2.length; _i7++) {
+          var _configurationTarget = _arr2[_i7];
           if (Object.prototype.hasOwnProperty.call(_configurationTarget, _type3) && (0, _typeof2["default"])(_configurationTarget[_type3]) === 'object') delete _configurationTarget[_type3];
         }
       } ///// endregion
@@ -244,18 +246,30 @@ var load = function load(context) {
     configuration = _clientnode["default"].removeKeyPrefixes(configuration); // endregion
     /// region build absolute paths
 
-    configuration.path.base = (0, _path.resolve)(configuration.path.context, configuration.path.base);
+    configuration.path.base = (0, _path2.resolve)(configuration.path.context, configuration.path.base);
+
+    for (var _i2 = 0, _Object$entries = Object.entries(configuration.path); _i2 < _Object$entries.length; _i2++) {
+      var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i2], 2),
+          key = _Object$entries$_i[0],
+          _path = _Object$entries$_i[1];
+
+      if (!['base', 'configuration'].includes(key)) if (typeof _path === 'string') configuration.path[key] = (0, _path2.resolve)(configuration.path.base, _path) + '/';else if (_clientnode["default"].isPlainObject(_path)) {
+        if (Object.prototype.hasOwnProperty.call(_path, 'base')) configuration.path[key].base = (0, _path2.resolve)(configuration.path.base, _path.base);
+
+        for (var _i3 = 0, _Object$entries2 = Object.entries(_path); _i3 < _Object$entries2.length; _i3++) {
+          var _Object$entries2$_i = (0, _slicedToArray2["default"])(_Object$entries2[_i3], 2),
+              subKey = _Object$entries2$_i[0],
+              subPath = _Object$entries2$_i[1];
 
-    for (var key in configuration.path) {
-      if (Object.prototype.hasOwnProperty.call(configuration.path, key) && !['base', 'configuration'].includes(key)) if (typeof configuration.path[key] === 'string') configuration.path[key] = (0, _path.resolve)(configuration.path.base, configuration.path[key]) + '/';else if (_clientnode["default"].isPlainObject(configuration.path[key])) {
-        if (Object.prototype.hasOwnProperty.call(configuration.path[key], 'base')) configuration.path[key].base = (0, _path.resolve)(configuration.path.base, configuration.path[key].base);
+          if (!['base', 'public'].includes(subKey) && typeof subPath === 'string') _path[subKey] = (0, _path2.resolve)(_path.base, subPath) + '/';else if (subKey !== 'options' && _clientnode["default"].isPlainObject(subPath)) {
+            subPath.base = (0, _path2.resolve)(_path.base, subPath.base);
 
-        for (var subKey in configuration.path[key]) {
-          if (Object.prototype.hasOwnProperty.call(configuration.path[key], subKey) && !['base', 'public'].includes(subKey) && typeof configuration.path[key][subKey] === 'string') configuration.path[key][subKey] = (0, _path.resolve)(configuration.path[key].base, configuration.path[key][subKey]) + '/';else if (subKey !== 'options' && _clientnode["default"].isPlainObject(configuration.path[key][subKey])) {
-            configuration.path[key][subKey].base = (0, _path.resolve)(configuration.path[key].base, configuration.path[key][subKey].base);
+            for (var _i4 = 0, _Object$entries3 = Object.entries(subPath); _i4 < _Object$entries3.length; _i4++) {
+              var _Object$entries3$_i = (0, _slicedToArray2["default"])(_Object$entries3[_i4], 2),
+                  subSubKey = _Object$entries3$_i[0],
+                  subSubPath = _Object$entries3$_i[1];
 
-            for (var subSubKey in configuration.path[key][subKey]) {
-              if (Object.prototype.hasOwnProperty.call(configuration.path[key][subKey], subSubKey) && subSubKey !== 'base' && typeof configuration.path[key][subKey][subSubKey] === 'string') configuration.path[key][subKey][subSubKey] = (0, _path.resolve)(configuration.path[key][subKey].base, configuration.path[key][subKey][subSubKey]) + '/';
+              if (subSubKey !== 'base' && typeof subSubPath === 'string') subPath[subSubKey] = (0, _path2.resolve)(subPath.base, subSubPath) + '/';
             }
           }
         }
@@ -275,7 +289,7 @@ var load = function load(context) {
       fileSystem: _fs["default"],
       Helper: _helper["default"],
       optionalRequire: _clientnode.optionalRequire,
-      path: _path["default"],
+      path: _path2["default"],
       require: _clientnode.currentRequire,
       Tools: _clientnode["default"],
       webOptimizerPath: webOptimizerPath,
@@ -290,10 +304,14 @@ var load = function load(context) {
     var defaultConfiguration = resolvedConfiguration.buildContext.types["default"];
     delete resolvedConfiguration.buildContext.types["default"];
 
-    for (var _type in resolvedConfiguration.buildContext.types) {
-      if (Object.prototype.hasOwnProperty.call(resolvedConfiguration.buildContext.types, _type)) resolvedConfiguration.buildContext.types[_type] = _clientnode["default"].extend(true, _clientnode["default"].copy(defaultConfiguration), _clientnode["default"].extend(true, {
+    for (var _i5 = 0, _Object$entries4 = Object.entries(resolvedConfiguration.buildContext.types); _i5 < _Object$entries4.length; _i5++) {
+      var _Object$entries4$_i = (0, _slicedToArray2["default"])(_Object$entries4[_i5], 2),
+          _type = _Object$entries4$_i[0],
+          _context = _Object$entries4$_i[1];
+
+      resolvedConfiguration.buildContext.types[_type] = _clientnode["default"].extend(true, _clientnode["default"].copy(defaultConfiguration), _clientnode["default"].extend(true, {
         extension: _type
-      }, resolvedConfiguration.buildContext.types[_type], {
+      }, _context, {
         type: _type
       }));
     } // endregion
@@ -304,7 +322,7 @@ var load = function load(context) {
       file: resolvedConfiguration.extensions.file.internal
     }, resolvedConfiguration.path.context, resolvedConfiguration.path.source.asset.base);
     resolvedConfiguration.injection = _helper["default"].resolveAutoInjection(resolvedConfiguration.injection, _helper["default"].resolveBuildConfigurationFilePaths(resolvedConfiguration.buildContext.types, resolvedConfiguration.path.source.asset.base, _helper["default"].normalizePaths(resolvedConfiguration.path.ignore.concat(resolvedConfiguration.module.directoryNames, resolvedConfiguration.loader.directoryNames).map(function (filePath) {
-      return (0, _path.resolve)(resolvedConfiguration.path.context, filePath);
+      return (0, _path2.resolve)(resolvedConfiguration.path.context, filePath);
     }).filter(function (filePath) {
       return !resolvedConfiguration.path.context.startsWith(filePath);
     })), resolvedConfiguration["package"].main.fileNames), resolvedConfiguration.module.aliases, resolvedConfiguration.module.replacements.normal, resolvedConfiguration.extensions, resolvedConfiguration.path.context, resolvedConfiguration.path.source.asset.base, resolvedConfiguration.path.ignore);
@@ -312,7 +330,7 @@ var load = function load(context) {
     resolvedConfiguration.injection.entry = {
       given: givenInjection,
       normalized: _helper["default"].resolveModulesInFolders(_helper["default"].normalizeGivenInjection(givenInjection), resolvedConfiguration.module.aliases, resolvedConfiguration.module.replacements.normal, resolvedConfiguration.path.context, resolvedConfiguration.path.source.asset.base, resolvedConfiguration.path.ignore.concat(resolvedConfiguration.module.directoryNames, resolvedConfiguration.loader.directoryNames).map(function (filePath) {
-        return (0, _path.resolve)(resolvedConfiguration.path.context, filePath);
+        return (0, _path2.resolve)(resolvedConfiguration.path.context, filePath);
       }).filter(function (filePath) {
         return !resolvedConfiguration.path.context.startsWith(filePath);
       }))
@@ -321,34 +339,34 @@ var load = function load(context) {
       javaScript: configuration.debug && ['serve', 'test:browser'].includes(resolvedConfiguration.givenCommandLineArguments[2])
     }; /// region determine which asset types are needed
 
-    for (var chunkName in resolvedConfiguration.injection.entry.normalized) {
-      if (Object.prototype.hasOwnProperty.call(resolvedConfiguration.injection.entry.normalized, chunkName)) {
-        var _iterator4 = _createForOfIteratorHelper(resolvedConfiguration.injection.entry.normalized[chunkName]),
-            _step4;
+    for (var _i6 = 0, _Object$values = Object.values(resolvedConfiguration.injection.entry.normalized); _i6 < _Object$values.length; _i6++) {
+      var chunk = _Object$values[_i6];
 
-        try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var moduleID = _step4.value;
-
-            var _filePath = _helper["default"].determineModuleFilePath(moduleID, resolvedConfiguration.module.aliases, resolvedConfiguration.module.replacements.normal, {
-              file: resolvedConfiguration.extensions.file.internal
-            }, resolvedConfiguration.path.context,
-            /*
-                NOTE: We doesn't use
-                "resolvedConfiguration.path.source.asset.base" because
-                we already have resolved all module ids.
-            */
-            './', resolvedConfiguration.path.ignore, resolvedConfiguration.module.directoryNames, resolvedConfiguration["package"].main.fileNames, resolvedConfiguration["package"].main.propertyNames, resolvedConfiguration["package"].aliasPropertyNames, resolvedConfiguration.encoding);
-
-            var _type2 = null;
-            if (_filePath) _type2 = _helper["default"].determineAssetType(_filePath, resolvedConfiguration.buildContext.types, resolvedConfiguration.path);else throw new Error("Given request \"".concat(moduleID, "\" couldn't be resolved."));
-            if (_type2) resolvedConfiguration.needed[_type2] = true;
-          }
-        } catch (err) {
-          _iterator4.e(err);
-        } finally {
-          _iterator4.f();
+      var _iterator4 = _createForOfIteratorHelper(chunk),
+          _step4;
+
+      try {
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          var moduleID = _step4.value;
+
+          var _filePath = _helper["default"].determineModuleFilePath(moduleID, resolvedConfiguration.module.aliases, resolvedConfiguration.module.replacements.normal, {
+            file: resolvedConfiguration.extensions.file.internal
+          }, resolvedConfiguration.path.context,
+          /*
+              NOTE: We doesn't use
+              "resolvedConfiguration.path.source.asset.base" because
+              we already have resolved all module ids.
+          */
+          './', resolvedConfiguration.path.ignore, resolvedConfiguration.module.directoryNames, resolvedConfiguration["package"].main.fileNames, resolvedConfiguration["package"].main.propertyNames, resolvedConfiguration["package"].aliasPropertyNames, resolvedConfiguration.encoding);
+
+          var _type2 = null;
+          if (_filePath) _type2 = _helper["default"].determineAssetType(_filePath, resolvedConfiguration.buildContext.types, resolvedConfiguration.path);else throw new Error("Given request \"".concat(moduleID, "\" couldn't be resolved."));
+          if (_type2) resolvedConfiguration.needed[_type2] = true;
         }
+      } catch (err) {
+        _iterator4.e(err);
+      } finally {
+        _iterator4.f();
       }
     } /// endregion
     // endregion

package/helper.js

@@ -162,8 +162,12 @@ var Helper = /*#__PURE__*/function () {
       }, scope);
       var filePath = template;
 
-      for (var placeholderName in scope) {
-        if (Object.prototype.hasOwnProperty.call(scope, placeholderName)) filePath = filePath.replace(new RegExp(_clientnode["default"].stringEscapeRegularExpressions(placeholderName), 'g'), "".concat(scope[placeholderName]));
+      for (var _i = 0, _Object$entries = Object.entries(scope); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
+            placeholderName = _Object$entries$_i[0],
+            value = _Object$entries$_i[1];
+
+        filePath = filePath.replace(new RegExp(_clientnode["default"].stringEscapeRegularExpressions(placeholderName), 'g'), "".concat(value));
       }
 
       return filePath;
@@ -316,23 +320,23 @@ var Helper = /*#__PURE__*/function () {
 
       if (!(filePath || inPlaceNormalLibrary) || _clientnode["default"].isAnyMatching(resolvedRequest, includePattern)) return Helper.applyContext(resolvedRequest, requestContext, referencePath, aliases, moduleReplacements, relativeModuleLocations) || null;
 
-      for (var chunkName in normalizedGivenInjection) {
-        if (Object.prototype.hasOwnProperty.call(normalizedGivenInjection, chunkName)) {
-          var _iterator3 = _createForOfIteratorHelper(normalizedGivenInjection[chunkName]),
-              _step3;
+      for (var _i2 = 0, _Object$values = Object.values(normalizedGivenInjection); _i2 < _Object$values.length; _i2++) {
+        var chunk = _Object$values[_i2];
 
-          try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var moduleID = _step3.value;
-              if (Helper.determineModuleFilePath(moduleID, aliases, moduleReplacements, {
-                file: extensions.file.internal
-              }, context, requestContext, pathsToIgnore, relativeModuleLocations, packageEntryFileNames, packageMainPropertyNames, packageAliasPropertyNames, encoding) === filePath) return null;
-            }
-          } catch (err) {
-            _iterator3.e(err);
-          } finally {
-            _iterator3.f();
+        var _iterator3 = _createForOfIteratorHelper(chunk),
+            _step3;
+
+        try {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var moduleID = _step3.value;
+            if (Helper.determineModuleFilePath(moduleID, aliases, moduleReplacements, {
+              file: extensions.file.internal
+            }, context, requestContext, pathsToIgnore, relativeModuleLocations, packageEntryFileNames, packageMainPropertyNames, packageAliasPropertyNames, encoding) === filePath) return null;
           }
+        } catch (err) {
+          _iterator3.e(err);
+        } finally {
+          _iterator3.f();
         }
       }
 
@@ -391,11 +395,15 @@ var Helper = /*#__PURE__*/function () {
         }
       }
 
-      if (!result) for (var _i = 0, _arr = [paths.source, paths.target]; _i < _arr.length; _i++) {
-        var _type = _arr[_i];
+      if (!result) for (var _i3 = 0, _arr = [paths.source, paths.target]; _i3 < _arr.length; _i3++) {
+        var _type = _arr[_i3];
 
-        for (var assetType in _type.asset) {
-          if (Object.prototype.hasOwnProperty.call(_type.asset, assetType) && assetType !== 'base' && _type.asset[assetType] && filePath.startsWith(_type.asset[assetType])) return assetType;
+        for (var _i4 = 0, _Object$entries2 = Object.entries(_type.asset); _i4 < _Object$entries2.length; _i4++) {
+          var _Object$entries2$_i = (0, _slicedToArray2["default"])(_Object$entries2[_i4], 2),
+              assetType = _Object$entries2$_i[0],
+              assetConfiguration = _Object$entries2$_i[1];
+
+          if (assetType !== 'base' && assetConfiguration && filePath.startsWith(assetConfiguration)) return assetType;
         }
       }
       return result;
@@ -422,39 +430,39 @@ var Helper = /*#__PURE__*/function () {
       var mainFileBasenames = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ['index', 'main'];
       var buildConfiguration = [];
 
-      for (var type in configuration) {
-        if (Object.prototype.hasOwnProperty.call(configuration, type)) {
-          var newItem = _clientnode["default"].extend(true, {
-            filePaths: []
-          }, configuration[type]);
+      for (var _i5 = 0, _Object$values2 = Object.values(configuration); _i5 < _Object$values2.length; _i5++) {
+        var value = _Object$values2[_i5];
 
-          var _iterator5 = _createForOfIteratorHelper(_clientnode["default"].walkDirectoryRecursivelySync(entryPath, function (file) {
-            if (Helper.isFilePathInLocation(file.path, pathsToIgnore)) return false;
-          })),
-              _step5;
+        var newItem = _clientnode["default"].extend(true, {
+          filePaths: []
+        }, value);
 
-          try {
-            for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-              var _file$stats;
+        var _iterator5 = _createForOfIteratorHelper(_clientnode["default"].walkDirectoryRecursivelySync(entryPath, function (file) {
+          if (Helper.isFilePathInLocation(file.path, pathsToIgnore)) return false;
+        })),
+            _step5;
 
-              var file = _step5.value;
-              if ((_file$stats = file.stats) !== null && _file$stats !== void 0 && _file$stats.isFile() && file.path.endsWith(".".concat(newItem.extension)) && !(newItem.ignoredExtension && file.path.endsWith(".".concat(newItem.ignoredExtension))) && !new RegExp(newItem.filePathPattern).test(file.path)) newItem.filePaths.push(file.path);
-            }
-          } catch (err) {
-            _iterator5.e(err);
-          } finally {
-            _iterator5.f();
+        try {
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var _file$stats;
+
+            var file = _step5.value;
+            if ((_file$stats = file.stats) !== null && _file$stats !== void 0 && _file$stats.isFile() && file.path.endsWith(".".concat(newItem.extension)) && !(newItem.ignoredExtension && file.path.endsWith(".".concat(newItem.ignoredExtension))) && !new RegExp(newItem.filePathPattern).test(file.path)) newItem.filePaths.push(file.path);
           }
+        } catch (err) {
+          _iterator5.e(err);
+        } finally {
+          _iterator5.f();
+        }
 
-          newItem.filePaths.sort(function (firstFilePath, secondFilePath) {
-            if (mainFileBasenames.includes((0, _path.basename)(firstFilePath, (0, _path.extname)(firstFilePath)))) {
-              if (mainFileBasenames.includes((0, _path.basename)(secondFilePath, (0, _path.extname)(secondFilePath)))) return 0;
-            } else if (mainFileBasenames.includes((0, _path.basename)(secondFilePath, (0, _path.extname)(secondFilePath)))) return 1;
+        newItem.filePaths.sort(function (firstFilePath, secondFilePath) {
+          if (mainFileBasenames.includes((0, _path.basename)(firstFilePath, (0, _path.extname)(firstFilePath)))) {
+            if (mainFileBasenames.includes((0, _path.basename)(secondFilePath, (0, _path.extname)(secondFilePath)))) return 0;
+          } else if (mainFileBasenames.includes((0, _path.basename)(secondFilePath, (0, _path.extname)(secondFilePath)))) return 1;
 
-            return 0;
-          });
-          buildConfiguration.push(newItem);
-        }
+          return 0;
+        });
+        buildConfiguration.push(newItem);
       }
 
       return buildConfiguration.sort(function (first, second) {
@@ -517,27 +525,27 @@ var Helper = /*#__PURE__*/function () {
       var directoryPaths = [];
       var normalizedGivenInjection = Helper.resolveModulesInFolders(Helper.normalizeGivenInjection(givenInjection), aliases, moduleReplacements, context, referencePath, pathsToIgnore);
 
-      for (var chunkName in normalizedGivenInjection) {
-        if (Object.prototype.hasOwnProperty.call(normalizedGivenInjection, chunkName)) {
-          var _iterator6 = _createForOfIteratorHelper(normalizedGivenInjection[chunkName]),
-              _step6;
+      for (var _i6 = 0, _Object$values3 = Object.values(normalizedGivenInjection); _i6 < _Object$values3.length; _i6++) {
+        var chunk = _Object$values3[_i6];
 
-          try {
-            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-              var moduleID = _step6.value;
-              var filePath = Helper.determineModuleFilePath(moduleID, aliases, moduleReplacements, extensions, context, referencePath, pathsToIgnore, relativeModuleLocations, packageEntryFileNames, packageMainPropertyNames, packageAliasPropertyNames, encoding);
-
-              if (filePath) {
-                filePaths.push(filePath);
-                var directoryPath = (0, _path.dirname)(filePath);
-                if (!directoryPaths.includes(directoryPath)) directoryPaths.push(directoryPath);
-              }
+        var _iterator6 = _createForOfIteratorHelper(chunk),
+            _step6;
+
+        try {
+          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+            var moduleID = _step6.value;
+            var filePath = Helper.determineModuleFilePath(moduleID, aliases, moduleReplacements, extensions, context, referencePath, pathsToIgnore, relativeModuleLocations, packageEntryFileNames, packageMainPropertyNames, packageAliasPropertyNames, encoding);
+
+            if (filePath) {
+              filePaths.push(filePath);
+              var directoryPath = (0, _path.dirname)(filePath);
+              if (!directoryPaths.includes(directoryPath)) directoryPaths.push(directoryPath);
             }
-          } catch (err) {
-            _iterator6.e(err);
-          } finally {
-            _iterator6.f();
           }
+        } catch (err) {
+          _iterator6.e(err);
+        } finally {
+          _iterator6.f();
         }
       }
 
@@ -572,54 +580,53 @@ var Helper = /*#__PURE__*/function () {
       var pathsToIgnore = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : ['.git'];
       if (referencePath.startsWith('/')) referencePath = (0, _path.relative)(context, referencePath);
 
-      for (var chunkName in normalizedGivenInjection) {
-        if (Object.prototype.hasOwnProperty.call(normalizedGivenInjection, chunkName)) {
-          var index = 0;
+      for (var _i7 = 0, _Object$values4 = Object.values(normalizedGivenInjection); _i7 < _Object$values4.length; _i7++) {
+        var chunk = _Object$values4[_i7];
+        var index = 0;
 
-          var _iterator7 = _createForOfIteratorHelper(normalizedGivenInjection[chunkName]),
-              _step7;
+        var _iterator7 = _createForOfIteratorHelper(chunk),
+            _step7;
 
-          try {
-            for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-              var moduleID = _step7.value;
-              var resolvedModuleID = Helper.applyModuleReplacements(Helper.applyAliases(Helper.stripLoader(moduleID), aliases), moduleReplacements);
+        try {
+          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+            var moduleID = _step7.value;
+            var resolvedModuleID = Helper.applyModuleReplacements(Helper.applyAliases(Helper.stripLoader(moduleID), aliases), moduleReplacements);
 
-              if (resolvedModuleID === false) {
-                normalizedGivenInjection[chunkName].splice(index, 1);
-                continue;
-              }
+            if (resolvedModuleID === false) {
+              chunk.splice(index, 1);
+              continue;
+            }
 
-              var resolvedPath = (0, _path.resolve)(referencePath, resolvedModuleID);
+            var resolvedPath = (0, _path.resolve)(referencePath, resolvedModuleID);
 
-              if (_clientnode["default"].isDirectorySync(resolvedPath)) {
-                normalizedGivenInjection[chunkName].splice(index, 1);
+            if (_clientnode["default"].isDirectorySync(resolvedPath)) {
+              chunk.splice(index, 1);
 
-                var _iterator8 = _createForOfIteratorHelper(_clientnode["default"].walkDirectoryRecursivelySync(resolvedPath, function (file) {
-                  if (Helper.isFilePathInLocation(file.path, pathsToIgnore)) return false;
-                })),
-                    _step8;
+              var _iterator8 = _createForOfIteratorHelper(_clientnode["default"].walkDirectoryRecursivelySync(resolvedPath, function (file) {
+                if (Helper.isFilePathInLocation(file.path, pathsToIgnore)) return false;
+              })),
+                  _step8;
 
-                try {
-                  for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-                    var _file$stats2;
+              try {
+                for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+                  var _file$stats2;
 
-                    var file = _step8.value;
-                    if ((_file$stats2 = file.stats) !== null && _file$stats2 !== void 0 && _file$stats2.isFile()) normalizedGivenInjection[chunkName].push('./' + (0, _path.relative)(referencePath, (0, _path.resolve)(resolvedPath, file.path)));
-                  }
-                } catch (err) {
-                  _iterator8.e(err);
-                } finally {
-                  _iterator8.f();
+                  var file = _step8.value;
+                  if ((_file$stats2 = file.stats) !== null && _file$stats2 !== void 0 && _file$stats2.isFile()) chunk.push('./' + (0, _path.relative)(referencePath, (0, _path.resolve)(resolvedPath, file.path)));
                 }
-              } else if (resolvedModuleID.startsWith('./') && !resolvedModuleID.startsWith("./".concat((0, _path.relative)(context, referencePath)))) normalizedGivenInjection[chunkName][index] = "./".concat((0, _path.relative)(context, resolvedPath));
+              } catch (err) {
+                _iterator8.e(err);
+              } finally {
+                _iterator8.f();
+              }
+            } else if (resolvedModuleID.startsWith('./') && !resolvedModuleID.startsWith("./".concat((0, _path.relative)(context, referencePath)))) chunk[index] = "./".concat((0, _path.relative)(context, resolvedPath));
 
-              index += 1;
-            }
-          } catch (err) {
-            _iterator7.e(err);
-          } finally {
-            _iterator7.f();
+            index += 1;
           }
+        } catch (err) {
+          _iterator7.e(err);
+        } finally {
+          _iterator7.f();
         }
       }
 
@@ -647,15 +654,19 @@ var Helper = /*#__PURE__*/function () {
         var hasContent = false;
         var chunkNamesToDelete = [];
 
-        for (var chunkName in givenInjection) {
-          if (Object.prototype.hasOwnProperty.call(givenInjection, chunkName)) if (Array.isArray(givenInjection[chunkName])) {
-            if (givenInjection[chunkName].length > 0) {
+        for (var _i8 = 0, _Object$entries3 = Object.entries(givenInjection); _i8 < _Object$entries3.length; _i8++) {
+          var _Object$entries3$_i = (0, _slicedToArray2["default"])(_Object$entries3[_i8], 2),
+              chunkName = _Object$entries3$_i[0],
+              chunk = _Object$entries3$_i[1];
+
+          if (Array.isArray(chunk)) {
+            if (chunk.length > 0) {
               hasContent = true;
-              result[chunkName] = givenInjection[chunkName];
+              result[chunkName] = chunk;
             } else chunkNamesToDelete.push(chunkName);
           } else {
             hasContent = true;
-            result[chunkName] = [givenInjection[chunkName]];
+            result[chunkName] = [chunk];
           }
         }
 
@@ -732,17 +743,18 @@ var Helper = /*#__PURE__*/function () {
           /* eslint-disable curly */
 
           if (_clientnode["default"].isPlainObject(injectionType)) {
-            for (var _i2 = 0, _Object$entries = Object.entries(injectionType); _i2 < _Object$entries.length; _i2++) {
-              var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i2], 2),
-                  chunkName = _Object$entries$_i[0],
-                  chunk = _Object$entries$_i[1];
+            for (var _i9 = 0, _Object$entries4 = Object.entries(injectionType); _i9 < _Object$entries4.length; _i9++) {
+              var _Object$entries4$_i = (0, _slicedToArray2["default"])(_Object$entries4[_i9], 2),
+                  chunkName = _Object$entries4$_i[0],
+                  chunk = _Object$entries4$_i[1];
 
               if (chunk === '__auto__') {
                 chunk = injectionType[chunkName] = [];
                 var modules = Helper.getAutoInjection(buildConfigurations, moduleFilePathsToExclude, referencePath);
 
-                for (var subChunkName in modules) {
-                  if (Object.prototype.hasOwnProperty.call(modules, subChunkName)) chunk.push(modules[subChunkName]);
+                for (var _i10 = 0, _Object$values5 = Object.values(modules); _i10 < _Object$values5.length; _i10++) {
+                  var subChunk = _Object$values5[_i10];
+                  chunk.push(subChunk);
                 }
                 /*
                     Reverse array to let javaScript and main files be
@@ -1060,10 +1072,14 @@ var Helper = /*#__PURE__*/function () {
   }, {
     key: "applyAliases",
     value: function applyAliases(moduleID, aliases) {
-      for (var alias in aliases) {
-        if (Object.prototype.hasOwnProperty.call(aliases, alias)) if (alias.endsWith('$')) {
-          if (moduleID === alias.substring(0, alias.length - 1)) moduleID = aliases[alias];
-        } else if (typeof moduleID === 'string') moduleID = moduleID.replace(alias, aliases[alias]);
+      for (var _i11 = 0, _Object$entries5 = Object.entries(aliases); _i11 < _Object$entries5.length; _i11++) {
+        var _Object$entries5$_i = (0, _slicedToArray2["default"])(_Object$entries5[_i11], 2),
+            name = _Object$entries5$_i[0],
+            alias = _Object$entries5$_i[1];
+
+        if (name.endsWith('$')) {
+          if (moduleID === name.substring(0, name.length - 1)) moduleID = alias;
+        } else if (typeof moduleID === 'string') moduleID = moduleID.replace(name, alias);
       }
 
       return moduleID;
@@ -1083,8 +1099,12 @@ var Helper = /*#__PURE__*/function () {
     value: function applyModuleReplacements(moduleID, replacements) {
       if (moduleID === false) return moduleID;
 
-      for (var replacement in replacements) {
-        if (Object.prototype.hasOwnProperty.call(replacements, replacement)) moduleID = moduleID.replace(new RegExp(replacement), replacements[replacement]);
+      for (var _i12 = 0, _Object$entries6 = Object.entries(replacements); _i12 < _Object$entries6.length; _i12++) {
+        var _Object$entries6$_i = (0, _slicedToArray2["default"])(_Object$entries6[_i12], 2),
+            search = _Object$entries6$_i[0],
+            replacement = _Object$entries6$_i[1];
+
+        moduleID = moduleID.replace(new RegExp(search), replacement);
       }
 
       return moduleID;

package/index.js

@@ -30,6 +30,8 @@ exports["default"] = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -408,44 +410,46 @@ var main = /*#__PURE__*/function () {
                                     if (tidiedUp) return;
                                     tidiedUp = true;
 
-                                    for (var chunkName in configuration.injection.entry.normalized) {
-                                      if (Object.prototype.hasOwnProperty.call(configuration.injection.entry.normalized, chunkName)) {
-                                        var _iterator4 = _createForOfIteratorHelper(configuration.injection.entry.normalized[chunkName]),
-                                            _step4;
+                                    for (var _i = 0, _Object$entries = Object.entries(configuration.injection.entry.normalized); _i < _Object$entries.length; _i++) {
+                                      var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
+                                          chunkName = _Object$entries$_i[0],
+                                          chunk = _Object$entries$_i[1];
 
-                                        try {
-                                          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                                            var moduleID = _step4.value;
+                                      var _iterator4 = _createForOfIteratorHelper(chunk),
+                                          _step4;
 
-                                            var _filePath2 = _helper["default"].determineModuleFilePath(moduleID, configuration.module.aliases, configuration.module.replacements.normal, {
-                                              file: configuration.extensions.file.internal
-                                            }, configuration.path.context, configuration.path.source.asset.base, configuration.path.ignore, configuration.module.directoryNames, configuration["package"].main.fileNames, configuration["package"].main.propertyNames, configuration["package"].aliasPropertyNames, configuration.encoding);
+                                      try {
+                                        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                                          var moduleID = _step4.value;
 
-                                            var type = null;
-                                            if (_filePath2) type = _helper["default"].determineAssetType(_filePath2, configuration.buildContext.types, configuration.path);
+                                          var _filePath2 = _helper["default"].determineModuleFilePath(moduleID, configuration.module.aliases, configuration.module.replacements.normal, {
+                                            file: configuration.extensions.file.internal
+                                          }, configuration.path.context, configuration.path.source.asset.base, configuration.path.ignore, configuration.module.directoryNames, configuration["package"].main.fileNames, configuration["package"].main.propertyNames, configuration["package"].aliasPropertyNames, configuration.encoding);
 
-                                            if (typeof type === 'string' && configuration.buildContext.types[type]) {
-                                              var _filePath3 = _helper["default"].renderFilePathTemplate(_helper["default"].stripLoader(configuration.files.compose.javaScript), {
-                                                '[name]': chunkName
-                                              });
-                                              /*
-                                                  NOTE: Close handler have to be
-                                                  synchronous.
-                                              */
+                                          var type = null;
+                                          if (_filePath2) type = _helper["default"].determineAssetType(_filePath2, configuration.buildContext.types, configuration.path);
 
+                                          if (typeof type === 'string' && configuration.buildContext.types[type]) {
+                                            var _filePath3 = _helper["default"].renderFilePathTemplate(_helper["default"].stripLoader(configuration.files.compose.javaScript), {
+                                              '[name]': chunkName
+                                            });
+                                            /*
+                                                NOTE: Close handler have to be
+                                                synchronous.
+                                            */
 
-                                              /*
-                                                  NOTE: Close handler have to be
-                                                  synchronous.
-                                              */
-                                              if (configuration.buildContext.types[type].outputExtension === 'js' && _clientnode["default"].isFileSync(_filePath3)) (0, _fs.chmodSync)(_filePath3, '755');
-                                            }
+
+                                            /*
+                                                NOTE: Close handler have to be
+                                                synchronous.
+                                            */
+                                            if (configuration.buildContext.types[type].outputExtension === 'js' && _clientnode["default"].isFileSync(_filePath3)) (0, _fs.chmodSync)(_filePath3, '755');
                                           }
-                                        } catch (err) {
-                                          _iterator4.e(err);
-                                        } finally {
-                                          _iterator4.f();
                                         }
+                                      } catch (err) {
+                                        _iterator4.e(err);
+                                      } finally {
+                                        _iterator4.f();
                                       }
                                     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1155",
+  "version": "2.0.1158",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -77,7 +77,7 @@
     "test:watch": "yarn test --watch",
     "test:watch:all": "yarn test --watchAll",
     "update": "yarn version --patch && yarn publish",
-    "update:documentation": "documentationWebsite --log-level info"
+    "update:documentation": "documentation-website"
   },
   "dependencies": {
     "@babel/core": "*",

package/webpackConfigurator.js

@@ -89,11 +89,13 @@ var pluginNameResourceMapping = {
 };
 var plugins = {};
 
-for (var name in pluginNameResourceMapping) {
-  if (Object.prototype.hasOwnProperty.call(pluginNameResourceMapping, name)) {
-    var plugin = (0, _clientnode.optionalRequire)(pluginNameResourceMapping[name]);
-    if (plugin) plugins[name] = plugin;else console.debug("Optional webpack plugin \"".concat(name, "\" not available."));
-  }
+for (var _i = 0, _Object$entries = Object.entries(pluginNameResourceMapping); _i < _Object$entries.length; _i++) {
+  var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
+      name = _Object$entries$_i[0],
+      alias = _Object$entries$_i[1];
+
+  var plugin = (0, _clientnode.optionalRequire)(alias);
+  if (plugin) plugins[name] = plugin;else console.debug("Optional webpack plugin \"".concat(name, "\" not available."));
 }
 
 if (plugins.Offline) {
@@ -133,17 +135,19 @@ try {
   _iterator.f();
 }
 
-var _loop = function _loop(source) {
-  if (Object.prototype.hasOwnProperty.call(_module.replacements.normal, source)) {
-    var search = new RegExp(source);
-    pluginInstances.push(new _webpack.NormalModuleReplacementPlugin(search, function (resource) {
-      resource.request = resource.request.replace(search, _module.replacements.normal[source]);
-    }));
-  }
+var _loop = function _loop() {
+  var _Object$entries2$_i = (0, _slicedToArray2["default"])(_Object$entries2[_i2], 2),
+      source = _Object$entries2$_i[0],
+      replacement = _Object$entries2$_i[1];
+
+  var search = new RegExp(source);
+  pluginInstances.push(new _webpack.NormalModuleReplacementPlugin(search, function (resource) {
+    resource.request = resource.request.replace(search, replacement);
+  }));
 };
 
-for (var source in _module.replacements.normal) {
-  _loop(source);
+for (var _i2 = 0, _Object$entries2 = Object.entries(_module.replacements.normal); _i2 < _Object$entries2.length; _i2++) {
+  _loop();
 } //// endregion
 //// region generate html file
 
@@ -176,13 +180,13 @@ if (htmlAvailable && configuration.favicon && plugins.Favicon && _clientnode["de
 //// region provide offline functionality
 
 if (htmlAvailable && configuration.offline && plugins.Offline) {
-  if (!['serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2])) for (var _i = 0, _Object$entries = Object.entries({
+  if (!['serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2])) for (var _i3 = 0, _Object$entries3 = Object.entries({
     cascadingStyleSheet: 'css',
     javaScript: 'js'
-  }); _i < _Object$entries.length; _i++) {
-    var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
-        _name = _Object$entries$_i[0],
-        extension = _Object$entries$_i[1];
+  }); _i3 < _Object$entries3.length; _i3++) {
+    var _Object$entries3$_i = (0, _slicedToArray2["default"])(_Object$entries3[_i3], 2),
+        _name = _Object$entries3$_i[0],
+        extension = _Object$entries3$_i[1];
 
     var type = _name;
 
@@ -190,8 +194,8 @@ if (htmlAvailable && configuration.offline && plugins.Offline) {
       var matches = Object.keys(configuration.inPlace[type]);
       if (!Array.isArray(configuration.offline.common.excludeChunks)) configuration.offline.common.excludeChunks = [];
 
-      for (var _i2 = 0, _matches = matches; _i2 < _matches.length; _i2++) {
-        var _name2 = _matches[_i2];
+      for (var _i4 = 0, _matches = matches; _i4 < _matches.length; _i4++) {
+        var _name2 = _matches[_i4];
         configuration.offline.common.excludeChunks.push((0, _path.relative)(configuration.path.target.base, configuration.path.target.asset[type]) + "".concat(_name2, ".").concat(extension, "?").concat(configuration.hashAlgorithm, "=*"));
       }
     }
@@ -210,17 +214,18 @@ if (_module.provide) pluginInstances.push(new _webpack.ProvidePlugin(_module.pro
 pluginInstances.push({
   apply: function apply(compiler) {
     compiler.hooks.emit.tap('applyModulePattern', function (compilation) {
-      for (var request in compilation.assets) {
-        if (Object.prototype.hasOwnProperty.call(compilation.assets, request)) {
-          var filePath = request.replace(/\?[^?]+$/, '');
+      for (var _i5 = 0, _Object$entries4 = Object.entries(compilation.assets); _i5 < _Object$entries4.length; _i5++) {
+        var _Object$entries4$_i = (0, _slicedToArray2["default"])(_Object$entries4[_i5], 2),
+            request = _Object$entries4$_i[0],
+            asset = _Object$entries4$_i[1];
 
-          var _type2 = _helper["default"].determineAssetType(filePath, configuration.buildContext.types, configuration.path);
+        var filePath = request.replace(/\?[^?]+$/, '');
 
-          if (_type2 && configuration.assetPattern[_type2] && new RegExp(configuration.assetPattern[_type2].includeFilePathRegularExpression).test(filePath) && !new RegExp(configuration.assetPattern[_type2].excludeFilePathRegularExpression).test(filePath)) {
-            var _source = compilation.assets[request].source();
+        var _type2 = _helper["default"].determineAssetType(filePath, configuration.buildContext.types, configuration.path);
 
-            if (typeof _source === 'string') compilation.assets[request] = new _webpackSources.RawSource(configuration.assetPattern[_type2].pattern.replace(/\{1\}/g, _source.replace(/\$/g, '$$$')));
-          }
+        if (_type2 && configuration.assetPattern[_type2] && new RegExp(configuration.assetPattern[_type2].includeFilePathRegularExpression).test(filePath) && !new RegExp(configuration.assetPattern[_type2].excludeFilePathRegularExpression).test(filePath)) {
+          var source = asset.source();
+          if (typeof source === 'string') compilation.assets[request] = new _webpackSources.RawSource(configuration.assetPattern[_type2].pattern.replace(/\{1\}/g, source.replace(/\$/g, '$$$')));
         }
       }
     });
@@ -364,10 +369,10 @@ if (configuration.injection.external.modules === '__implicit__')
       file: configuration.extensions.file.external
     }, configuration.path.context, context, configuration.path.ignore, _module.directoryNames, configuration["package"].main.fileNames, configuration["package"].main.propertyNames, configuration["package"].aliasPropertyNames, configuration.encoding);
 
-    if (filePath) for (var _i3 = 0, _Object$entries2 = Object.entries(configuration.injection.external.aliases); _i3 < _Object$entries2.length; _i3++) {
-      var _Object$entries2$_i = (0, _slicedToArray2["default"])(_Object$entries2[_i3], 2),
-          pattern = _Object$entries2$_i[0],
-          targetConfiguration = _Object$entries2$_i[1];
+    if (filePath) for (var _i6 = 0, _Object$entries5 = Object.entries(configuration.injection.external.aliases); _i6 < _Object$entries5.length; _i6++) {
+      var _Object$entries5$_i = (0, _slicedToArray2["default"])(_Object$entries5[_i6], 2),
+          pattern = _Object$entries5$_i[0],
+          targetConfiguration = _Object$entries5$_i[1];
 
       if (pattern.startsWith('^')) {
         var regularExpression = new RegExp(pattern);
@@ -499,16 +504,20 @@ if (htmlAvailable) pluginInstances.push({
           script: 'src'
         };
 
-        for (var tagName in linkables) {
-          if (Object.prototype.hasOwnProperty.call(linkables, tagName)) for (var _i4 = 0, _Array$from = Array.from(dom.window.document.querySelectorAll("".concat(tagName, "[").concat(linkables[tagName], "*=\"?") + "".concat(configuration.hashAlgorithm, "=\"]"))); _i4 < _Array$from.length; _i4++) {
-            var domNode = _Array$from[_i4];
+        for (var _i7 = 0, _Object$entries6 = Object.entries(linkables); _i7 < _Object$entries6.length; _i7++) {
+          var _Object$entries6$_i = (0, _slicedToArray2["default"])(_Object$entries6[_i7], 2),
+              tagName = _Object$entries6$_i[0],
+              attributeName = _Object$entries6$_i[1];
+
+          for (var _i8 = 0, _Array$from = Array.from(dom.window.document.querySelectorAll("".concat(tagName, "[").concat(attributeName, "*=\"?") + "".concat(configuration.hashAlgorithm, "=\"]"))); _i8 < _Array$from.length; _i8++) {
+            var domNode = _Array$from[_i8];
 
             /*
                 NOTE: Removing symbols after a "&" in hash
                 string is necessary to match the generated
                 request strings in offline plugin.
             */
-            domNode.setAttribute(linkables[tagName], domNode.getAttribute(linkables[tagName]).replace(new RegExp('(\\?' + "".concat(configuration.hashAlgorithm, "=") + '[^&]+).*$'), '$1'));
+            domNode.setAttribute(attributeName, domNode.getAttribute(attributeName).replace(new RegExp('(\\?' + "".concat(configuration.hashAlgorithm, "=") + '[^&]+).*$'), '$1'));
           }
         }
         /*
@@ -1308,8 +1317,8 @@ var webpackConfiguration = _clientnode["default"].extend(true, {
       cacheGroups: {
         defaultVendors: {
           chunks: function chunks(chunk) {
-            if ((0, _typeof2["default"])(configuration.inPlace.javaScript) === 'object' && configuration.inPlace.javaScript !== null) for (var _i5 = 0, _Object$keys = Object.keys(configuration.inPlace.javaScript); _i5 < _Object$keys.length; _i5++) {
-              var _name4 = _Object$keys[_i5];
+            if ((0, _typeof2["default"])(configuration.inPlace.javaScript) === 'object' && configuration.inPlace.javaScript !== null) for (var _i9 = 0, _Object$keys = Object.keys(configuration.inPlace.javaScript); _i9 < _Object$keys.length; _i9++) {
+              var _name4 = _Object$keys[_i9];
               if (_name4 === '*' || _name4 === chunk.name) return false;
             }
             return true;