weboptimizer 2.0.1138 → 2.0.1141

package/configurator.js

@@ -142,7 +142,7 @@ var load = function load(context) {
     if ((0, _typeof2["default"])(configuration.library) === 'object') _clientnode["default"].extend(true, _clientnode["default"].modifyObject(libraryConfiguration, configuration.library), configuration.library);
     if (configuration.library && ((_specificConfiguratio3 = specificConfiguration) === null || _specificConfiguratio3 === void 0 ? void 0 : _specificConfiguratio3.library) !== false) configuration = _clientnode["default"].extend(true, _clientnode["default"].modifyObject(configuration, libraryConfiguration), libraryConfiguration); // endregion
     // region merging and evaluating task specific and dynamic configurations
-    // / region load additional dynamically given configuration
+    /// region load additional dynamically given configuration
 
     var count = 0;
     var filePath = null;
@@ -165,8 +165,8 @@ var load = function load(context) {
       (0, _fs.unlink)(filePath, function (error) {
         if (error) throw error;
       });
-    } // // region task specific configuration
-    // /// region apply task type specific configuration
+    } //// region task specific configuration
+    ///// region apply task type specific configuration
 
 
     if (runtimeInformation.givenCommandLineArguments.length > 2) {
@@ -186,8 +186,8 @@ var load = function load(context) {
       } finally {
         _iterator.f();
       }
-    } // /// endregion
-    // /// region clear task type specific configurations
+    } ///// endregion
+    ///// region clear task type specific configurations
 
 
     var _iterator2 = _createForOfIteratorHelper(_type4.SubConfigurationTypes),
@@ -201,9 +201,9 @@ var load = function load(context) {
           var _configurationTarget = _arr2[_i2];
           if (Object.prototype.hasOwnProperty.call(_configurationTarget, _type3) && (0, _typeof2["default"])(_configurationTarget[_type3]) === 'object') delete _configurationTarget[_type3];
         }
-      } // /// endregion
-      // // endregion
-      // / endregion
+      } ///// endregion
+      //// endregion
+      /// endregion
 
     } catch (err) {
       _iterator2.e(err);
@@ -242,7 +242,7 @@ var load = function load(context) {
 
 
     configuration = _clientnode["default"].removeKeyPrefixes(configuration); // endregion
-    // / region build absolute paths
+    /// region build absolute paths
 
     configuration.path.base = (0, _path.resolve)(configuration.path.context, configuration.path.base);
 
@@ -260,7 +260,7 @@ var load = function load(context) {
           }
         }
       }
-    } // / endregion
+    } /// endregion
     // region evaluate dynamic configuration structures
 
 
@@ -319,7 +319,7 @@ var load = function load(context) {
     };
     resolvedConfiguration.needed = {
       javaScript: configuration.debug && ['serve', 'test:browser'].includes(resolvedConfiguration.givenCommandLineArguments[2])
-    }; // / region determine which asset types are needed
+    }; /// 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)) {
@@ -350,7 +350,7 @@ var load = function load(context) {
           _iterator4.f();
         }
       }
-    } // / endregion
+    } /// endregion
     // endregion
     // region adding special aliases
 

package/ejsLoader.js

@@ -19,6 +19,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -34,7 +36,7 @@ var _core = require("@babel/core");
 
 var _babelPresetMinify = _interopRequireDefault(require("babel-preset-minify"));
 
-var _clientnode = _interopRequireDefault(require("clientnode"));
+var _clientnode = _interopRequireWildcard(require("clientnode"));
 
 var _ejs = _interopRequireDefault(require("ejs"));
 
@@ -48,6 +50,10 @@ var _configurator = _interopRequireDefault(require("./configurator"));
 
 var _helper = _interopRequireDefault(require("./helper"));
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(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); 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 = 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; }
@@ -201,7 +207,7 @@ var loader = function loader(source) {
 
         if (typeof result === 'string') {
           var filePath = isString ? options.filename : result;
-          if (filePath && (0, _path.extname)(filePath) === '.js') result = eval('require')(filePath);else {
+          if (filePath && (0, _path.extname)(filePath) === '.js') result = (0, _clientnode.currentRequire)(filePath);else {
             if (!isString) {
               var encoding = configuration.encoding;
               if (typeof options.encoding === 'string') encoding = options.encoding;

package/helper.js

@@ -19,6 +19,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -32,12 +34,16 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _clientnode = _interopRequireDefault(require("clientnode"));
+var _clientnode = _interopRequireWildcard(require("clientnode"));
 
 var _fs = require("fs");
 
 var _path = require("path");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(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); 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 = 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; }
@@ -1133,7 +1139,7 @@ var Helper = /*#__PURE__*/function () {
       var fileName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'package.json';
       var filePath = Helper.findPackageDescriptorFilePath(modulePath, fileName);
       if (!filePath) return null;
-      var configuration = eval('require')(filePath);
+      var configuration = (0, _clientnode.currentRequire)(filePath);
       /*
           If the package.json does not have a name property, try again from
           one level higher.

package/index.js

@@ -166,16 +166,16 @@ var main = /*#__PURE__*/function () {
                                 return (0, _promises.writeFile)(filePath, JSON.stringify(dynamicConfiguration));
 
                               case 22:
-                                additionalArguments = commandLineArguments.splice(3); // / region register exit handler to tidy up
+                                additionalArguments = commandLineArguments.splice(3); /// region register exit handler to tidy up
 
-                                // / region register exit handler to tidy up
+                                /// region register exit handler to tidy up
                                 clear = function clear(error) {
                                   // NOTE: Close handler have to be synchronous.
                                   if (_clientnode["default"].isFileSync(filePath)) (0, _fs.unlinkSync)(filePath);
                                   if (error) throw error;
                                 };
 
-                                closeEventHandlers.push(clear); // / endregion
+                                closeEventHandlers.push(clear); /// endregion
                                 // endregion
                                 // region handle clear
 
@@ -666,7 +666,7 @@ var main = /*#__PURE__*/function () {
                                   } finally {
                                     _iterator11.f();
                                   }
-                                }; // / region a-/synchronous
+                                }; /// region a-/synchronous
 
 
                                 if (!['document', 'test', 'test:coverage', 'test:coverage:report'].includes(configuration.givenCommandLineArguments[2])) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1138",
+  "version": "2.0.1141",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -1823,14 +1823,6 @@
         10
       ],
       "no-invalid-this": 0,
-      "no-this-assignment": [
-        true,
-        {
-          "allowed-names": [
-            "^self$"
-          ]
-        }
-      ],
       "no-unused-vars": [
         "error",
         {
@@ -1879,7 +1871,12 @@
             "exceptions": [
               "/usr/bin/env node"
             ]
-          }
+          },
+          "markers": [
+            "/",
+            "//",
+            "///"
+          ]
         }
       ],
       "space-infix-ops": 0,

package/type.js

@@ -23,18 +23,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.TaskTypes = exports.SubConfigurationTypes = void 0;
 // endregion
 // region exports
-// / region generic
-// / endregion
-// / region injection
-// / endregion
-// / region configuration
-// // region path
-// // endregion
-// // region build
+/// region generic
+/// endregion
+/// region injection
+/// endregion
+/// region configuration
+//// region path
+//// endregion
+//// region build
 var SubConfigurationTypes = ['debug', 'document', 'test', 'test:browser'];
 exports.SubConfigurationTypes = SubConfigurationTypes;
-var TaskTypes = ['build', 'serve'].concat(SubConfigurationTypes); // // endregion
-// // region loader
+var TaskTypes = ['build', 'serve'].concat(SubConfigurationTypes); //// endregion
+//// region loader
 // endregion
 // region vim modline
 // vim: set tabstop=4 shiftwidth=4 expandtab:

package/webpackConfigurator.js

@@ -104,16 +104,16 @@ if (plugins.Offline) {
 
 var configuration = (0, _configurator["default"])();
 var _module = configuration.module; // region initialisation
-// / region determine library name
+/// region determine library name
 
 var libraryName;
 if (configuration.libraryName) libraryName = configuration.libraryName;else if (Object.keys(configuration.injection.entry.normalized).length > 1) libraryName = '[name]';else {
   libraryName = configuration.name;
   if (['assign', 'global', 'this', 'var', 'window'].includes(configuration.exportFormat.self)) libraryName = _clientnode["default"].stringConvertToValidVariableName(libraryName);
-} // / endregion
-// / region plugins
+} /// endregion
+/// region plugins
 
-var pluginInstances = []; // // region define modules to ignore
+var pluginInstances = []; //// region define modules to ignore
 
 var _iterator = _createForOfIteratorHelper([].concat(configuration.injection.ignorePattern)),
     _step;
@@ -124,8 +124,8 @@ try {
     if (typeof pattern.contextRegExp === 'string') pattern.contextRegExp = new RegExp(pattern.contextRegExp);
     if (typeof pattern.resourceRegExp === 'string') pattern.resourceRegExp = new RegExp(pattern.resourceRegExp);
     pluginInstances.push(new _webpack.IgnorePlugin(pattern));
-  } // // endregion
-  // // region define modules to replace
+  } //// endregion
+  //// region define modules to replace
 
 } catch (err) {
   _iterator.e(err);
@@ -144,8 +144,8 @@ var _loop = function _loop(source) {
 
 for (var source in _module.replacements.normal) {
   _loop(source);
-} // // endregion
-// // region generate html file
+} //// endregion
+//// region generate html file
 
 
 var htmlAvailable = false;
@@ -163,8 +163,8 @@ try {
       })));
       htmlAvailable = true;
     }
-  } // // endregion
-  // // region generate favicons
+  } //// endregion
+  //// region generate favicons
 
 } catch (err) {
   _iterator2.e(err);
@@ -172,8 +172,8 @@ try {
   _iterator2.f();
 }
 
-if (htmlAvailable && configuration.favicon && plugins.Favicon && _clientnode["default"].isFileSync(configuration.favicon.logo)) pluginInstances.push(new plugins.Favicon(configuration.favicon)); // // endregion
-// // region provide offline functionality
+if (htmlAvailable && configuration.favicon && plugins.Favicon && _clientnode["default"].isFileSync(configuration.favicon.logo)) pluginInstances.push(new plugins.Favicon(configuration.favicon)); //// endregion
+//// 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({
@@ -198,14 +198,14 @@ if (htmlAvailable && configuration.offline && plugins.Offline) {
   }
   if ([].concat(configuration.offline.use).includes('injectionManifest')) pluginInstances.push(new plugins.InjectManifest(_clientnode["default"].extend(true, configuration.offline.common, configuration.offline.injectionManifest)));
   if ([].concat(configuration.offline.use).includes('generateServiceWorker')) pluginInstances.push(new plugins.GenerateServiceWorker(_clientnode["default"].extend(true, configuration.offline.common, configuration.offline.serviceWorker)));
-} // // endregion
-// // region provide build environment
+} //// endregion
+//// region provide build environment
 
 
 if (configuration.buildContext.definitions) pluginInstances.push(new _webpack.DefinePlugin(configuration.buildContext.definitions));
-if (_module.provide) pluginInstances.push(new _webpack.ProvidePlugin(_module.provide)); // // endregion
-// // region modules/assets
-// /// region apply module pattern
+if (_module.provide) pluginInstances.push(new _webpack.ProvidePlugin(_module.provide)); //// endregion
+//// region modules/assets
+///// region apply module pattern
 
 pluginInstances.push({
   apply: function apply(compiler) {
@@ -225,8 +225,8 @@ pluginInstances.push({
       }
     });
   }
-}); // /// endregion
-// /// region in-place configured assets in the main html file
+}); ///// endregion
+///// region in-place configured assets in the main html file
 
 /*
     TODO
@@ -313,17 +313,17 @@ if (htmlAvailable && !['serve', 'test:browser'].includes(configuration.givenComm
       });
     });
   }
-}); // /// endregion
-// /// region mark empty javaScript modules as dummy
+}); ///// endregion
+///// region mark empty javaScript modules as dummy
 
-if (!(configuration.needed.javaScript || configuration.needed.javaScriptExtension || configuration.needed.typeScript || configuration.needed.typeScriptExtension)) configuration.files.compose.javaScript = (0, _path.resolve)(configuration.path.target.asset.javaScript, '.__dummy__.compiled.js'); // /// endregion
-// /// region extract cascading style sheets
+if (!(configuration.needed.javaScript || configuration.needed.javaScriptExtension || configuration.needed.typeScript || configuration.needed.typeScriptExtension)) configuration.files.compose.javaScript = (0, _path.resolve)(configuration.path.target.asset.javaScript, '.__dummy__.compiled.js'); ///// endregion
+///// region extract cascading style sheets
 
 var cssOutputPath = configuration.files.compose.cascadingStyleSheet;
 if (cssOutputPath && plugins.MiniCSSExtract) pluginInstances.push(new plugins.MiniCSSExtract({
   filename: typeof cssOutputPath === 'string' ? (0, _path.relative)(configuration.path.target.base, cssOutputPath) : cssOutputPath
-})); // /// endregion
-// /// region performs implicit external logic
+})); ///// endregion
+///// region performs implicit external logic
 
 if (configuration.injection.external.modules === '__implicit__')
   /*
@@ -463,9 +463,9 @@ if (configuration.injection.external.modules === '__implicit__')
     }
 
     return callback();
-  }; // /// endregion
-// // endregion
-// // region apply final cascadingStyleSheet/dom/javaScript modifications/fixes
+  }; ///// endregion
+//// endregion
+//// region apply final cascadingStyleSheet/dom/javaScript modifications/fixes
 
 if (htmlAvailable) pluginInstances.push({
   apply: function apply(compiler) {
@@ -561,8 +561,8 @@ if (htmlAvailable) pluginInstances.push({
       });
     });
   }
-}); // // endregion
-// // region context replacements
+}); //// endregion
+//// region context replacements
 
 var _iterator10 = _createForOfIteratorHelper(_module.replacements.context),
     _step10;
@@ -580,8 +580,8 @@ try {
       if (evaluated.error) throw new Error('Error occurred during processing given context ' + "replacement: ".concat(evaluated.error));
       return evaluated.result;
     }))));
-  } // // endregion
-  // // region consolidate duplicated module requests
+  } //// endregion
+  //// region consolidate duplicated module requests
 
   /*
       NOTE: Redundancies usually occur when symlinks aren't converted to their
@@ -786,9 +786,9 @@ new NormalModuleReplacementPlugin(
         }
     }
 ))*/
-// // endregion
-// / endregion
-// / region loader helper
+//// endregion
+/// endregion
+/// region loader helper
 
 
 var isFilePathInDependencies = function isFilePathInDependencies(filePath) {
@@ -805,7 +805,7 @@ var scope = {
   configuration: configuration,
   isFilePathInDependencies: isFilePathInDependencies,
   loader: loader,
-  require: eval('require')
+  require: _clientnode.currentRequire
 };
 
 var evaluate = function evaluate(object) {
@@ -1157,8 +1157,8 @@ if (configuration.files.compose.cascadingStyleSheet && plugins.MiniCSSExtract) {
   loader.style.use.unshift({
     loader: plugins.MiniCSSExtract.loader
   });
-} // / endregion
-// / region apply runtime dev helper
+} /// endregion
+/// region apply runtime dev helper
 
 /*
     NOTE: Disable automatic injection to avoid injection in all chunks and as
@@ -1175,7 +1175,7 @@ if (htmlAvailable && configuration.debug && configuration.development.server.liv
     configuration.development.server.hot = false;
     pluginInstances.push(new _webpack.HotModuleReplacementPlugin());
   }
-} // / endregion
+} /// endregion
 // endregion
 // region plugins