weboptimizer 4.0.13 → 4.0.15

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.13",
+  "version": "4.0.15",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -123,7 +123,7 @@
     "@types/html-minifier": "^4.0.6",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/imagemin": "^9.0.1",
-    "@types/node": "^26.1.0",
+    "@types/node": "^26.1.1",
     "@types/postcss-import": "^14.0.3",
     "@types/postcss-url": "^10.0.4",
     "@types/webpack-env": "^1.18.8",
@@ -356,7 +356,7 @@
             "__evaluate__": "self.debug"
           },
           "EXTERNAL_EXPORT_FORMAT": {
-            "__evaluate__": "`'${self.exportFormat.external}'`"
+            "__evaluate__": "`'${self.exportFormat.external ?? self.exportFormat.self}'`"
           },
           "NAME": {
             "__evaluate__": "`'${self.name}'`"
@@ -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]) ? 'window' : '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

@@ -244,7 +244,9 @@ if (configuration.injection.external.modules === '__implicit__')
       }
       if (typeof result !== 'string' && Object.prototype.hasOwnProperty.call(result, 'root') && Array.isArray(result.root)) result.root = [].concat(result.root).map(name => convertToValidVariableName(name));
       const exportFormat = Object.prototype.hasOwnProperty.call(configuration.exportFormat, 'external') ? configuration.exportFormat.external : configuration.exportFormat.self;
-      callback(undefined, exportFormat === 'umd' || typeof result === 'string' ? result : result[exportFormat], exportFormat);
+      let reference = exportFormat === 'umd' || typeof result === 'string' ? result : result[exportFormat];
+      if (typeof reference === 'string' && ['window', 'var'].includes(exportFormat)) reference = convertToValidVariableName(reference);
+      callback(undefined, reference, exportFormat);
       return;
     }
     callback();