weboptimizer 2.0.1321 → 2.0.1323

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1321",
+  "version": "2.0.1323",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -1188,7 +1188,7 @@
               ],
               "presets": {
                 "#": "NOTE: We have to disable module export/import transformation to allow tree shaking by the final (minimizer).",
-                "__evaluate__": "[['@babel/preset-env', {loose: true, modules: false, targets: self.generic.isWeb ? {browsers: self.generic.supportedBrowsers, node: packageConfiguration.engines.node} : {node: packageConfiguration.engines.node}}], '@babel/preset-typescript'].concat((self.debug || !self.module.optimizer.babelMinify.module || 2 < self.givenCommandLineArguments.length && self.givenCommandLineArguments[2] === 'document') ? [] : [['minify', self.module.optimizer.babelMinify.module]])"
+                "__evaluate__": "[['@babel/preset-env', {loose: true, modules: false, targets: self.generic.isWeb ? {browsers: self.generic.supportedBrowsers, node: packageConfiguration.engines.node.replace(/>?=?([0-9]+)/, '$1')} : {node: packageConfiguration.engines.node.replace(/>?=?([0-9]+)/, '$1')}}], '@babel/preset-typescript'].concat((self.debug || !self.module.optimizer.babelMinify.module || 2 < self.givenCommandLineArguments.length && self.givenCommandLineArguments[2] === 'document') ? [] : [['minify', self.module.optimizer.babelMinify.module]])"
               }
             },
             "regularExpression": "\\.[jt]sx?(?:\\?.*)?$"

package/webpackConfigurator.js

@@ -746,7 +746,9 @@ var evaluateAdditionalLoaderConfiguration = function evaluateAdditionalLoaderCon
     use: evaluate(loaderConfiguration.use)
   };
 };
-var includingPaths = _helper["default"].normalizePaths([configuration.path.source.asset.javaScript].concat(_module.locations.directoryPaths));
+var getIncludingPaths = function getIncludingPaths(path) {
+  return _helper["default"].normalizePaths([path].concat(_module.locations.directoryPaths));
+};
 var cssUse = _module.preprocessor.cascadingStyleSheet.additional.pre.map(evaluateMapper).concat({
   loader: _module.style.loader,
   options: _module.style.options || {}
@@ -822,7 +824,7 @@ var genericLoader = {
         return htmlConfiguration.template.filePath;
       })).includes(filePath) || _module.preprocessor.ejs.exclude === null ? false : Boolean(evaluate(_module.preprocessor.ejs.exclude, filePath));
     },
-    include: includingPaths,
+    include: getIncludingPaths(configuration.path.source.asset.template),
     test: /^(?!.+\.html\.ejs$).+\.ejs$/i,
     use: _module.preprocessor.ejs.additional.pre.map(evaluateMapper).concat({
       loader: 'file?name=[path][name]' + ((_clientnode["default"].isPlainObject(_module.preprocessor.ejs.options) ? _module.preprocessor.ejs.options : {
@@ -844,7 +846,7 @@ var genericLoader = {
     include: function include(filePath) {
       var result = evaluate(_module.preprocessor.javaScript.include, filePath);
       if ([null, undefined].includes(result)) {
-        var _iterator12 = _createForOfIteratorHelper(includingPaths),
+        var _iterator12 = _createForOfIteratorHelper(getIncludingPaths(configuration.path.source.asset.javaScript)),
           _step12;
         try {
           for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
@@ -926,7 +928,7 @@ var genericLoader = {
     include: function include(filePath) {
       var result = evaluate(_module.cascadingStyleSheet.include, filePath);
       if ([null, undefined].includes(result)) {
-        var _iterator13 = _createForOfIteratorHelper(includingPaths),
+        var _iterator13 = _createForOfIteratorHelper(getIncludingPaths(configuration.path.source.asset.cascadingStyleSheet)),
           _step13;
         try {
           for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {