weboptimizer 4.0.73 → 4.0.74

package/browser.js

@@ -37,84 +37,77 @@ export const log = new Logger({
 });
 // endregion
 // region ensure presence of common browser environment
-if (typeof TARGET_TECHNOLOGY === 'undefined' || TARGET_TECHNOLOGY === 'node')
-  /*
-      NOTE: We use an asynchronous wrapper method to initialize
-      "browser.initialized" at module loading time.
-  */
-  (async () => {
-    // region mock browser environment
-    const [{
-      JSDOM,
-      VirtualConsole: VirtualConsoleImplementation
-    }, path] = await Promise.all([import('jsdom'), import('path')]);
-    const virtualConsole = new VirtualConsoleImplementation();
-    for (const name of CONSOLE_METHODS) virtualConsole.on(name, console[name].bind(console));
-    virtualConsole.on('error', error => {
-      if (!browser.debug && ['XMLHttpRequest', 'resource loading'].includes(error.type)) log.warn(`Loading resource failed: ${error.toString()}.`);else log.error(error.stack, error.detail);
-    });
-    const render = template => {
-      browser.DOM = JSDOM;
-      browser.initialized = true;
-      browser.instance = new browser.DOM(template, {
-        beforeParse: window => {
-          // We want to use it in a polymorphic way.
+if (typeof TARGET_TECHNOLOGY === 'undefined' || TARGET_TECHNOLOGY === 'node') {
+  // region mock browser environment
+  const [{
+    JSDOM,
+    VirtualConsole: VirtualConsoleImplementation
+  }, path] = await Promise.all([import('jsdom'), import('path')]);
+  const virtualConsole = new VirtualConsoleImplementation();
+  for (const name of CONSOLE_METHODS) virtualConsole.on(name, console[name].bind(console));
+  virtualConsole.on('error', error => {
+    if (!browser.debug && ['XMLHttpRequest', 'resource loading'].includes(error.type)) log.warn(`Loading resource failed: ${error.toString()}.`);else log.error(error.stack, error.detail);
+  });
+  const render = template => {
+    browser.DOM = JSDOM;
+    browser.initialized = true;
+    browser.instance = new browser.DOM(template, {
+      beforeParse: window => {
+        // We want to use it in a polymorphic way.
+        /*
+            eslint-disable
+            @typescript-eslint/no-unnecessary-type-assertion
+        */
+        browser.window = global.window ?? window;
+        /*
+            eslint-enable
+            @typescript-eslint/no-unnecessary-type-assertion
+        */
+
+        window.document.addEventListener('DOMContentLoaded', () => {
           /*
-              eslint-disable
-              @typescript-eslint/no-unnecessary-type-assertion
+              Move template results into global
+              pre-defined dom.
           */
-          browser.window = global.window ?? window;
+          if (global.window) for (const type of ['head', 'body']) global.window.document[type].innerHTML = window.document[type].innerHTML;
+          browser.domContentLoaded = true;
+        });
+        window.addEventListener('load', () => {
           /*
-              eslint-enable
-              @typescript-eslint/no-unnecessary-type-assertion
+              NOTE: Maybe we have miss the "DOMContentLoaded"
+              event caused by a race condition.
           */
-
-          window.document.addEventListener('DOMContentLoaded', () => {
-            /*
-                Move template results into global
-                pre-defined dom.
-            */
-            if (global.window) for (const type of ['head', 'body']) global.window.document[type].innerHTML = window.document[type].innerHTML;
-            browser.domContentLoaded = true;
-          });
-          window.addEventListener('load', () => {
-            /*
-                NOTE: Maybe we have miss the "DOMContentLoaded"
-                event caused by a race condition.
-            */
-            browser.domContentLoaded = browser.windowLoaded = true;
-          });
-          for (const callback of onCreatedListener) void callback();
-        },
-        resources: 'usable',
-        runScripts: 'dangerously',
-        url: 'http://localhost',
-        virtualConsole
-      });
-    };
-    let evaluatedContent = '';
-    if (typeof NAME === 'undefined' || NAME === 'webOptimizer') {
-      const filePath = path.join(import.meta.dirname, 'index.html.ejs');
-      /*
-          NOTE: We load dependencies now to avoid having file imports
-          after test runner has finished to isolate the environment.
-      */
-      const ejsLoader = (await import('./ejsLoader.js')).default;
-      const content = await (await import('fs')).promises.readFile(filePath, {
-        encoding: 'utf-8'
-      });
-      await ejsLoader.bind({
-        resourcePath: filePath,
-        async: () => (error, result) => {
-          if (error) throw error;else evaluatedContent = result;
-        }
-      })(content);
-    } else evaluatedContent = (await import('webOptimizerDefaultTemplateFilePath')).default;
-    render(evaluatedContent);
-    // endregion
-  })().catch(error => {
-    log.error(error);
-  });else {
+          browser.domContentLoaded = browser.windowLoaded = true;
+        });
+        for (const callback of onCreatedListener) void callback();
+      },
+      resources: 'usable',
+      runScripts: 'dangerously',
+      url: 'http://localhost',
+      virtualConsole
+    });
+  };
+  let evaluatedContent = '';
+  if (typeof NAME === 'undefined' || NAME === 'webOptimizer') {
+    const filePath = path.join(import.meta.dirname, 'index.html.ejs');
+    /*
+        NOTE: We load dependencies now to avoid having file imports
+        after test runner has finished to isolate the environment.
+    */
+    const ejsLoader = (await import('./ejsLoader.js')).default;
+    const content = await (await import('fs')).promises.readFile(filePath, {
+      encoding: 'utf-8'
+    });
+    await ejsLoader.bind({
+      resourcePath: filePath,
+      async: () => (error, result) => {
+        if (error) throw error;else evaluatedContent = result;
+      }
+    })(content);
+  } else evaluatedContent = (await import('webOptimizerDefaultTemplateFilePath')).default;
+  render(evaluatedContent);
+  // endregion
+} else {
   browser.initialized = true;
   browser.window = window;
   window.document.addEventListener('DOMContentLoaded', () => {

package/configurator.js

@@ -16,7 +16,7 @@
     endregion
 */
 // region imports
-import { convertCircularObjectToJSON, copy, evaluateAsyncDynamicData, evaluateDynamicData, extend, getUTCTimestamp, importFilesystemAPI, isFileSync, isObject, isPlainObject, Logger, MAXIMAL_NUMBER_OF_ITERATIONS, modifyObject, optionalImport, parseEncodedObject, removeKeyPrefixes, UTILITY_SCOPE } from 'clientnode';
+import { convertCircularObjectToJSON, copy, evaluateAsyncDynamicData, evaluateDynamicData, extend, getUTCTimestamp, importFilesystemAPI, isFile, isObject, isPlainObject, Logger, MAXIMAL_NUMBER_OF_ITERATIONS, modifyObject, optionalImport, parseEncodedObject, removeKeyPrefixes, UTILITY_SCOPE } from 'clientnode';
 import fileSystemSynchronous from 'fs';
 import fileSystem, { lstat, readFile, unlink } from 'fs/promises';
 import path, { basename, dirname, join, resolve } from 'path';
@@ -136,7 +136,7 @@ environment = eval('process.env')) => {
   let filePath = null;
   for (let iteration = 0; iteration < MAXIMAL_NUMBER_OF_ITERATIONS.value; iteration++) {
     const newFilePath = `${configuration.path.context}.dynamicConfiguration-` + `${String(count)}.json`;
-    if (!isFileSync(newFilePath)) break;
+    if (!(await isFile(newFilePath))) break;
     filePath = newFilePath;
     count += 1;
   }
@@ -166,7 +166,7 @@ environment = eval('process.env')) => {
     if (Object.prototype.hasOwnProperty.call(result, '__reference__')) {
       const referenceNames = [].concat(result.__reference__);
       delete result.__reference__;
-      for (const name of referenceNames) if (Object.prototype.hasOwnProperty.call(configuration, name)) extend(true, result, configuration[name]);else if (isFileSync(name)) extend(true, result, JSON.parse(await readFile(name, configuration.encoding)));else log.warn(`Given dynamic referenced configuration "${name}"`, 'could not be resolved.');
+      for (const name of referenceNames) if (Object.prototype.hasOwnProperty.call(configuration, name)) extend(true, result, configuration[name]);else if (await isFile(name)) extend(true, result, JSON.parse(await readFile(name, configuration.encoding)));else log.warn(`Given dynamic referenced configuration "${name}"`, 'could not be resolved.');
     }
     extend(true, modifyObject(configuration, result), result);
   }

package/ejsLoader.js

@@ -248,7 +248,7 @@ export const loader = async function (source) {
           minified: givenOptions.compress?.javaScript,
           presets: [],
           sourceMaps: false,
-          sourceType: 'script'
+          sourceType: 'module'
         }, (error, file) => {
           if (error) reject(error);else resolve(file);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.73",
+  "version": "4.0.74",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",