weboptimizer 4.0.10 → 4.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.10",
+  "version": "4.0.12",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -1236,9 +1236,7 @@
       "nodeENV": null,
       "nodeEnvironment": {
         "#": "Indicates which node environment variables should be included in built artefacts.",
-        "global": true,
-        "__filename": "mock",
-        "__dirname": "mock"
+        "global": true
       },
       "offline": {
         "common": {

package/webpackConfigurator.js

@@ -78,12 +78,13 @@ Logger.configureAllInstances({
 const module = configuration.module;
 // region initialization
 /// region determine library name
+const exportFormatsNeedingAValidVariableName = ['assign', 'global', 'this', 'var', 'window'];
 let 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 = convertToValidVariableName(libraryName);
+  if (exportFormatsNeedingAValidVariableName.includes(configuration.exportFormat.self)) libraryName = convertToValidVariableName(libraryName);
 }
-if (libraryName === '*') libraryName = ['assign', 'global', 'this', 'var', 'window'].includes(configuration.exportFormat.self) ? Object.keys(configuration.injection.entry.normalized).map(name => convertToValidVariableName(name)) : undefined;
+if (libraryName === '*') libraryName = exportFormatsNeedingAValidVariableName.includes(configuration.exportFormat.self) ? Object.keys(configuration.injection.entry.normalized).map(name => convertToValidVariableName(name)) : undefined;
 /// endregion
 /// region plugins
 const pluginInstances = [];
@@ -704,7 +705,7 @@ if (configuration.files.compose.cascadingStyleSheet && plugins.MiniCSSExtract) {
     So we inject live reload and hot module replacement manually.
 */
 if (htmlAvailable && configuration.debug && configuration.development.server.liveReload && !Object.prototype.hasOwnProperty.call(configuration.injection.entry.normalized, 'developmentHandler') && (configuration.development.includeClient || typeof configuration.development.includeClient !== 'boolean' && ['serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2]))) {
-  configuration.injection.entry.normalized.developmentHandler = ['webpack-dev-server/client/index.js?' + 'live-reload=true' + `&hot=${configuration.development.server.hot ? 'true' : 'false'}` + `&http${configuration.development.server.https ? 's' : ''}://` + `${configuration.development.server.host}: ` + String(configuration.development.server.port)];
+  configuration.injection.entry.normalized.developmentHandler = ['webpack-dev-server/client/index.js?' + 'live-reload=true' + `&hot=${configuration.development.server.hot ? 'true' : 'false'}` + `&http${configuration.development.server.https ? 's' : ''}://` + `${configuration.development.server.host}:` + String(configuration.development.server.port)];
   if (configuration.development.server.hot) {
     configuration.injection.entry.normalized.developmentHandler.push('webpack/hot/dev-server.js');
     configuration.development.server.hot = false;
@@ -848,7 +849,7 @@ export let webpackConfiguration = extend(true, {
 if (configuration.nodeENV !== null) if (typeof webpackConfiguration.optimization === 'object') webpackConfiguration.optimization.nodeEnv = configuration.nodeENV;else webpackConfiguration.optimization = {
   nodeEnv: configuration.nodeENV
 };
-if (!Array.isArray(module.skipParseRegularExpressions) || module.skipParseRegularExpressions.length) if (typeof webpackConfiguration.module === 'object') webpackConfiguration.module.noParse = module.skipParseRegularExpressions;else webpackConfiguration.module = {
+if (module.skipParseRegularExpressions && !Array.isArray(module.skipParseRegularExpressions) || module.skipParseRegularExpressions.length) if (typeof webpackConfiguration.module === 'object') webpackConfiguration.module.noParse = module.skipParseRegularExpressions;else webpackConfiguration.module = {
   noParse: module.skipParseRegularExpressions
 };
 if (configuration.path.configuration.javaScript) try {