weboptimizer 4.0.12 → 4.0.14

package/ejsLoader.js

@@ -39,6 +39,7 @@ export const log = new Logger({
  * @returns Transformed string.
  */
 export const loader = async function (source) {
+  console.log('AA', this.async, this.async());
   const callback = this.async();
   const givenOptions = convertSubstringInPlainObject(extend(true, {
     compiler: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.12",
+  "version": "4.0.14",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -564,7 +564,7 @@
             }
           ],
           "watchFiles": {
-            "__evaluate__": "self.webpack.watchOptions ? {options: self.webpack.watchOptions} : {}"
+            "__evaluate__": "{paths: [], options: {cwd: self.path.target.base, ...(self.webpack.watchOptions ?? {})}}"
           }
         },
         "tool": false
@@ -586,7 +586,9 @@
         "globalObject": {
           "__evaluate__": "2 < self.givenCommandLineArguments.length && self.givenCommandLineArguments[2] === 'serve' ? 'window' : 'this'"
         },
-        "self": "modern-module"
+        "self": {
+          "__evaluate__": "2 < self.givenCommandLineArguments.length && ['document', 'serve'].includes(self.givenCommandLineArguments[2]) ? 'var' : 'modern-module'"
+        }
       },
       "extensions": {
         "file": {
@@ -1651,9 +1653,6 @@
             ]
           }
         },
-        "exportFormat": {
-          "self": "var"
-        },
         "generic": {
           "isWeb": false
         },

package/plugins/HTMLTransformation.js

@@ -76,7 +76,7 @@ export class HTMLTransformation {
       for (const loaderConfiguration of [].concat(htmlFileSpecification.template.use)) if (loaderConfiguration.options?.compileSteps && typeof loaderConfiguration.options.compileSteps === 'number') data.html = await new Promise((resolve, reject) => {
         void ejsLoader.bind({
           query: extend(true, Object.prototype.hasOwnProperty.call(loaderConfiguration, 'options') ? copy(loaderConfiguration.options) : {}, htmlFileSpecification.template.postCompileOptions),
-          async: (error, result) => {
+          async: () => (error, result) => {
             if (error) reject(error);else resolve(result);
           }
         })(data.html);

package/webpackConfigurator.js

@@ -849,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 (module.skipParseRegularExpressions && !Array.isArray(module.skipParseRegularExpressions) || module.skipParseRegularExpressions.length) if (typeof webpackConfiguration.module === 'object') webpackConfiguration.module.noParse = module.skipParseRegularExpressions;else webpackConfiguration.module = {
+if (Array.isArray(module.skipParseRegularExpressions) ? module.skipParseRegularExpressions.length : module.skipParseRegularExpressions) if (typeof webpackConfiguration.module === 'object') webpackConfiguration.module.noParse = module.skipParseRegularExpressions;else webpackConfiguration.module = {
   noParse: module.skipParseRegularExpressions
 };
 if (configuration.path.configuration.javaScript) try {