weboptimizer 4.0.6 → 4.0.8

package/browser.d.ts

@@ -1,7 +1,6 @@
-import { Browser, InitializedBrowser } from './type';
-import { Logger } from 'clientnode';
+import type { Browser, InitializedBrowser } from './type';
 export declare const browser: Browser;
-export declare const log: Logger;
+export declare const log: any;
 /**
  * Provides a generic browser api in node or web contexts.
  * @param replaceWindow - Indicates whether a potential existing window object

package/browser.js

@@ -17,11 +17,7 @@
 */
 // region imports
 import "core-js/modules/es.array.push.js";
-import { Browser, InitializedBrowser } from "./type.js";
 import { CONSOLE_METHODS, Logger, timeout } from 'clientnode';
-import { DOMWindow, VirtualConsole } from 'jsdom';
-import { LoaderContext } from 'webpack';
-import { LoaderConfiguration } from "./ejsLoader.js";
 // endregion
 // region declaration
 
@@ -107,9 +103,14 @@ if (typeof TARGET_TECHNOLOGY === 'undefined' || TARGET_TECHNOLOGY === 'node')
       const content = await (await import('fs')).promises.readFile(filePath, {
         encoding: 'utf-8'
       });
-      render(ejsLoader.bind({
-        resourcePath: filePath
-      })(content));
+      let evaluatedContent = '';
+      await ejsLoader.bind({
+        resourcePath: filePath,
+        async: (error, result) => {
+          if (error) throw error;else evaluatedContent = result;
+        }
+      })(content);
+      render(evaluatedContent);
     } else render(await import('webOptimizerDefaultTemplateFilePath'));
     // endregion
   })().catch(error => {

package/configurator.d.ts

@@ -1,9 +1,8 @@
 import type { ResolvedConfiguration } from './type';
-import { Logger } from 'clientnode';
 export declare const require: NodeJS.Require;
 export declare const optionalRequire: <T = unknown>(id: string) => null | T;
 export declare let loadedConfiguration: null | ResolvedConfiguration;
-export declare const log: Logger;
+export declare const log: any;
 /**
  * Main entry point to determine current configuration.
  * @param context - Location from where to build current application.

package/configurator.js

@@ -78,7 +78,7 @@ import "core-js/modules/es.iterator.filter.js";
 import "core-js/modules/es.iterator.map.js";
 import "core-js/modules/es.iterator.some.js";
 import "core-js/modules/es.json.parse.js";
-import { convertCircularObjectToJSON, copy, evaluateDynamicData, extend, getUTCTimestamp, importsPromise, isFileSync, isObject, isolatedRequire, isPlainObject, Logger, MAXIMAL_NUMBER_OF_ITERATIONS, modifyObject, optionalImport, parseEncodedObject, removeKeyPrefixes, UTILITY_SCOPE } from 'clientnode';
+import { convertCircularObjectToJSON, copy, evaluateAsyncDynamicData, evaluateDynamicData, extend, getUTCTimestamp, importsPromise, isFileSync, isObject, isPlainObject, Logger, MAXIMAL_NUMBER_OF_ITERATIONS, modifyObject, optionalImport, parseEncodedObject, removeKeyPrefixes, UTILITY_SCOPE } from 'clientnode';
 import fileSystem, { lstatSync, readFileSync, unlinkSync } from 'fs';
 import { createRequire } from 'node:module';
 import path, { basename, dirname, join, resolve } from 'path';
@@ -250,20 +250,19 @@ environment = eval('process.env')) => {
       NOTE: The configuration is not yet fully resolved but will be
       transformed in place in the following lines of code.
   */
-  const resolvedConfiguration = evaluateDynamicData(configuration, {
+  const evaluationOptions = {
     scope: {
       ...UTILITY_SCOPE,
       currentPath: currentWorkingDirectory,
       fs: fileSystem,
-      optionalRequire,
       packageConfiguration,
       path,
-      require: isolatedRequire,
       webOptimizerPath,
       now,
       nowUTCTimestamp: getUTCTimestamp(now)
     }
-  });
+  };
+  const resolvedConfiguration = await evaluateAsyncDynamicData(evaluateDynamicData(configuration, evaluationOptions), evaluationOptions);
   // endregion
   // region consolidate file specific build configuration
   // Apply default file level build configurations to all file type specific

package/ejsLoader.d.ts

@@ -1,9 +1,8 @@
 import type { Encoding, Mapping } from 'clientnode';
-import type { Options, TemplateFunction as EJSTemplateFunction } from 'ejs';
+import type { Options, AsyncTemplateFunction as EJSAsyncTemplateFunction } from 'ejs';
 import type { LoaderContext } from 'webpack';
 import type { Extensions, Replacements } from './type';
-import { Logger } from 'clientnode';
-export type TemplateFunction = EJSTemplateFunction;
+export type TemplateFunction = EJSAsyncTemplateFunction;
 export type CompilerOptions = Options & {
     encoding: Encoding;
     isString?: boolean;
@@ -25,11 +24,13 @@ export type LoaderConfiguration = Mapping<unknown> & {
         replacements: Replacements;
     };
 };
-export declare const log: Logger;
+export declare const log: any;
 /**
  * Main transformation function.
  * @param source - Input string to transform.
  * @returns Transformed string.
  */
-export declare const loader: (this: Partial<LoaderContext<LoaderConfiguration>>, source: string) => string;
+export declare const loader: (this: (Partial<LoaderContext<LoaderConfiguration>> & {
+    async: (result: unknown) => void;
+}), source: string) => Promise<void>;
 export default loader;

package/ejsLoader.js

@@ -16,11 +16,11 @@
     endregion
 */
 // region
-import { transformSync as babelTransformSync } from '@babel/core';
+import { transform as babelTransform } from '@babel/core';
 import babelMinifyPreset from 'babel-preset-minify';
-import { convertSubstringInPlainObject, copy, currentRequire, evaluate, extend, Logger, UTILITY_SCOPE } from 'clientnode';
+import { convertSubstringInPlainObject, copy, evaluate, extend, Logger, UTILITY_SCOPE } from 'clientnode';
 import ejs from 'ejs';
-import { readFileSync } from 'fs';
+import { readFile } from 'fs/promises';
 import { minify as minifyHTML } from 'html-minifier';
 import { extname } from 'path';
 import getConfiguration from "./configurator.js";
@@ -38,9 +38,11 @@ export const log = new Logger({
  * @param source - Input string to transform.
  * @returns Transformed string.
  */
-export const loader = function (source) {
+export const loader = async function (source) {
+  const callback = this.async();
   const givenOptions = convertSubstringInPlainObject(extend(true, {
     compiler: {
+      async: true,
       localsName: '_'
     },
     compileSteps: 2,
@@ -61,13 +63,13 @@ export const loader = function (source) {
       replacements: {}
     }
   }, this.getOptions ? this.getOptions() : this.query ?? {}), /#%%%#/g, '!');
-  const compile = (template, options = givenOptions.compiler, compileSteps = 2) => (locals = {}) => {
-    options = {
+  const compile = (template, nestedGivenOptions = givenOptions.compiler, compileSteps = 2) => async (locals = {}) => {
+    const options = {
       filename: template,
-      ...options
+      ...(nestedGivenOptions || {})
     };
     const givenLocals = [].concat(locals);
-    const require = (request, nestedLocals = {}) => {
+    const importFile = async (request, nestedLocals = {}) => {
       const template = request.replace(/^(.+)\?[^?]+$/, '$1');
       const queryMatch = /^[^?]+\?(.+)$/.exec(request);
       if (queryMatch) {
@@ -84,8 +86,8 @@ export const loader = function (source) {
       delete nestedOptions.client;
       nestedOptions = extend(true, {
         encoding: configuration.encoding
-      }, nestedOptions, nestedLocals.options || {}, options ?? {});
-      if (nestedOptions.isString) return compile(template, nestedOptions)(nestedLocals);
+      }, nestedOptions, nestedLocals.options || {}, options);
+      if (nestedOptions.isString) return await compile(template, nestedOptions)(nestedLocals);
       const templateFilePath = determineModuleFilePath(template, givenOptions.module?.aliases, givenOptions.module?.replacements, {
         file: givenOptions.extensions?.file.internal || []
       }, givenOptions.context, configuration.path.source.asset.base, configuration.path.ignore, configuration.module.directoryNames, configuration.package.main.fileNames, configuration.package.main.propertyNames, configuration.package.aliasPropertyNames, configuration.encoding);
@@ -96,8 +98,8 @@ export const loader = function (source) {
             file doesn't seem to be an ejs template we simply load
             included file content.
         */
-        if (queryMatch || templateFilePath.endsWith('.ejs')) return compile(templateFilePath, nestedOptions)(nestedLocals);
-        return readFileSync(templateFilePath, {
+        if (queryMatch || templateFilePath.endsWith('.ejs')) return await compile(templateFilePath, nestedOptions)(nestedLocals);
+        return await readFile(templateFilePath, {
           encoding: nestedOptions.encoding
         });
       }
@@ -143,19 +145,18 @@ export const loader = function (source) {
         if (step < 3 && 1 < compileSteps) scope = {
           ...UTILITY_SCOPE,
           configuration,
-          include: require,
-          require,
+          include: importFile,
           ...(Array.isArray(stepLocals) ? {} : stepLocals)
         };else if (!Array.isArray(stepLocals)) scope = stepLocals;
         // endregion
       }
       if (typeof result === 'string') {
         const filePath = isString ? options.filename : result;
-        if (filePath && extname(filePath) === '.js' && currentRequire) result = currentRequire(filePath);else {
+        if (filePath && extname(filePath) === '.js') result = await import(filePath);else {
           if (!isString) {
             let encoding = configuration.encoding;
             if (typeof options.encoding === 'string') encoding = options.encoding;
-            result = readFileSync(result, {
+            result = await readFile(result, {
               encoding
             });
           }
@@ -232,21 +233,25 @@ export const loader = function (source) {
           } else result = ejs.compile(result, options);
         }
       } else {
-        result = result(scope);
+        result = await result(scope);
         if (givenOptions.compress?.html) result = compressHTML(result);
       }
     }
     if (compileSteps % 2) {
-      const processed = babelTransformSync(result, {
-        ast: false,
-        babelrc: false,
-        comments: !givenOptions.compress?.javaScript,
-        compact: Boolean(givenOptions.compress?.javaScript),
-        filename: options.filename || 'unknown',
-        minified: Boolean(givenOptions.compress?.javaScript),
-        presets: givenOptions.compress?.javaScript ? [[babelMinifyPreset, givenOptions.compress.javaScript]] : [],
-        sourceMaps: false,
-        sourceType: 'script'
+      const processed = await new Promise((resolve, reject) => {
+        babelTransform(result, {
+          ast: false,
+          babelrc: false,
+          comments: !givenOptions.compress?.javaScript,
+          compact: Boolean(givenOptions.compress?.javaScript),
+          filename: options.filename || 'unknown',
+          minified: Boolean(givenOptions.compress?.javaScript),
+          presets: givenOptions.compress?.javaScript ? [[babelMinifyPreset, givenOptions.compress.javaScript]] : [],
+          sourceMaps: false,
+          sourceType: 'script'
+        }, (error, file) => {
+          if (error) reject(error);else resolve(file);
+        });
       });
       if (typeof processed?.code === 'string') result = processed.code;
       return `${options.strict ? `'use strict';\n` : ''}${result}`;
@@ -257,13 +262,17 @@ export const loader = function (source) {
     }
     return '';
   };
-  return compile(source, {
-    ...givenOptions.compiler,
-    client: Boolean((givenOptions.compileSteps ?? 2) % 2),
-    compileDebug: givenOptions.debug,
-    debug: givenOptions.debug,
-    filename: this.resourcePath || 'unknown',
-    isString: true
-  }, givenOptions.compileSteps)(givenOptions.locals || {});
+  try {
+    callback(null, await compile(source, {
+      ...givenOptions.compiler,
+      client: Boolean((givenOptions.compileSteps ?? 2) % 2),
+      compileDebug: givenOptions.debug,
+      debug: givenOptions.debug,
+      filename: this.resourcePath || 'unknown',
+      isString: true
+    }, givenOptions.compileSteps)(givenOptions.locals || {}));
+  } catch (error) {
+    callback(error);
+  }
 };
 export default loader;

package/helper.d.ts

@@ -1,8 +1,7 @@
 import type { Encoding, Mapping } from 'clientnode';
 import type { BuildConfiguration, Extensions, GivenInjection, GivenInjectionConfiguration, NormalizedGivenInjection, PathConfiguration, PackageDescriptor, Replacements, ResolvedBuildConfiguration, SpecificExtensions } from './type';
-import { Logger } from 'clientnode';
 export declare const KNOWN_FILE_EXTENSIONS: Array<string>;
-export declare const log: Logger;
+export declare const log: any;
 /**
  * Determines whether given file path is within given list of file locations.
  * @param filePath - Path to file to check.
@@ -246,4 +245,4 @@ export declare const findPackageDescriptorFilePath: (start: Array<string> | stri
  * @returns A object containing found parsed configuration an their
  * corresponding file path.
  */
-export declare const getClosestPackageDescriptor: (modulePath: string, fileName?: string) => null | PackageDescriptor;
+export declare const getClosestPackageDescriptor: (modulePath: string, fileName?: string) => Promise<null | PackageDescriptor>;

package/helper.js

@@ -27,7 +27,7 @@ import "core-js/modules/es.set.is-subset-of.v2.js";
 import "core-js/modules/es.set.is-superset-of.v2.js";
 import "core-js/modules/es.set.symmetric-difference.v2.js";
 import "core-js/modules/es.set.union.v2.js";
-import { copy, currentRequire, escapeRegularExpressions, extend, isAnyMatching, isDirectorySync, isFileSync, isPlainObject, Logger, represent, walkDirectoryRecursivelySync } from 'clientnode';
+import { copy, escapeRegularExpressions, extend, isAnyMatching, isDirectorySync, isFileSync, isPlainObject, Logger, represent, walkDirectoryRecursivelySync } from 'clientnode';
 import { existsSync, readFileSync } from 'fs';
 import { basename, dirname, extname, join, normalize, resolve, sep, relative } from 'path';
 // endregion
@@ -599,15 +599,15 @@ export const findPackageDescriptorFilePath = (start, fileName = 'package.json')
  * @returns A object containing found parsed configuration an their
  * corresponding file path.
  */
-export const getClosestPackageDescriptor = (modulePath, fileName = 'package.json') => {
+export const getClosestPackageDescriptor = async (modulePath, fileName = 'package.json') => {
   const filePath = findPackageDescriptorFilePath(modulePath, fileName);
-  if (!(filePath && currentRequire)) return null;
-  const configuration = currentRequire(filePath);
+  if (!filePath) return null;
+  const configuration = await import(filePath);
   /*
       If the package.json does not have a name property, try again from
       one level higher.
   */
-  if (!configuration.name) return getClosestPackageDescriptor(resolve(dirname(filePath), '..'), fileName);
+  if (!configuration.name) return await getClosestPackageDescriptor(resolve(dirname(filePath), '..'), fileName);
   if (!configuration.version) configuration.version = 'not set';
   return {
     configuration,

package/index.d.ts

@@ -1,6 +1,5 @@
 #!/usr/bin/env babel-node
-import { Logger } from 'clientnode';
-export declare const log: Logger;
+export declare const log: any;
 /**
  * Main entry point.
  * @param context - Location from where to build current application.

package/jestSetup.js

@@ -15,15 +15,8 @@
     See https://creativecommons.org/licenses/by/3.0/deed.de
     endregion
 */
-// region imports
-import { globalContext } from 'clientnode';
-import { TextEncoder, TextDecoder } from 'util'
-// endregion
-;
+import { globalContext, optionalImport } from 'clientnode';
+import { TextEncoder, TextDecoder } from 'util';
 globalContext.TextEncoder = TextEncoder;
 globalContext.TextDecoder = TextDecoder;
-try {
-  if (eval('require')('jest-canvas-mock')) console.info('Canvas mocking module loaded.');
-} catch {
-  // Do nothing.
-}
+if (await optionalImport('jest-canvas-mock')) console.info('Canvas mocking module loaded.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -95,7 +95,7 @@
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "babel-plugin-transform-rewrite-imports": "^1.5.4",
     "babel-preset-minify": "^0.5.2",
-    "clientnode": "4.0.1432",
+    "clientnode": "4.0.1437",
     "core-js": "^3.49.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",
@@ -109,9 +109,9 @@
     "rimraf": "^6.1.3",
     "script-loader": "^0.7.2",
     "typescript": "^6.0.3",
-    "webpack": "^5.108.3",
-    "webpack-cli": "^7.1.0",
-    "webpack-sources": "^3.5.0"
+    "webpack": "^5.108.4",
+    "webpack-cli": "^7.2.1",
+    "webpack-sources": "^3.5.1"
   },
   "devDependencies": {
     "@babel/cli": "^8.0.1",
@@ -128,12 +128,12 @@
     "@types/postcss-url": "^10.0.4",
     "@types/webpack-env": "^1.18.8",
     "@types/webpack-sources": "^3.2.3",
-    "@typescript-eslint/parser": "^8.62.1",
+    "@typescript-eslint/parser": "^8.63.0",
     "css-loader": "^7.1.4",
     "cssnano": "^8.0.2",
     "eslint": "^10.6.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jsdoc": "^63.0.10",
+    "eslint-plugin-jsdoc": "^63.0.12",
     "favicons": "^7.3.0",
     "favicons-webpack-plugin": "^6.0.1",
     "globals": "^17.7.0",
@@ -156,7 +156,7 @@
     "stylelint-config-standard": "^40.0.0",
     "stylelint-config-standard-scss": "^17.0.0",
     "terser-webpack-plugin": "^5.6.1",
-    "typescript-eslint": "^8.62.1",
+    "typescript-eslint": "^8.63.0",
     "typescript-plugin-css-modules": "^5.2.0",
     "web-documentation": "^1.0.42",
     "workbox-webpack-plugin": "^7.4.1"
@@ -342,7 +342,7 @@
           },
           "includeFilePathRegularExpression": "^.*$",
           "pattern": {
-            "__evaluate__": "`${self.generic.assetPattern.javaScript.pattern}if(typeof window==='undefined'||window===null)var window=(typeof global==='undefined'||global===null)?{}:global;{1}`"
+            "__evaluate__": "`if(typeof window==='undefined'||window===null)var window=(typeof global==='undefined'||global===null)?{}:global;{1}`"
           }
         }
       },
@@ -582,11 +582,10 @@
       },
       "encoding": "utf-8",
       "exportFormat": {
-        "external": "umd",
         "globalObject": {
           "__evaluate__": "2 < self.givenCommandLineArguments.length && self.givenCommandLineArguments[2] === 'serve' ? 'window' : 'this'"
         },
-        "self": "umd"
+        "self": "modern-module"
       },
       "extensions": {
         "file": {
@@ -728,12 +727,6 @@
         ]
       },
       "generic": {
-        "assetPattern": {
-          "javaScript": {
-            "#": "We have to ensure, that the highest resolvable dependency inside this project will be used in node environments to ensure one instance of each dependent artefact for linked projects. We have to wrap \"require\" into an eval call to avoid other pre-processing scripts to replace this statement here.",
-            "pattern": "'use strict';if(typeof module!=='undefined'&&module!==null&&eval('typeof require')!=='undefined'&&eval('require')!==null&&'main'in eval('require')&&eval('typeof require.main')!=='undefined'&&eval('require.main')!==null){var ORIGINAL_MAIN_MODULE=module;if(module!==eval('require.main')&&'paths'in module&&'paths'in eval('require.main')&&typeof __dirname!=='undefined'&&__dirname!==null)module.paths=eval('require.main.paths').concat(module.paths.filter(function(path){return eval('require.main.paths').includes(path)}))};"
-          }
-        },
         "cascadingStyleSheetFileExtension": "css",
         "isWeb": true,
         "supportedBrowsers": [
@@ -946,7 +939,7 @@
             "#": "The autoprefixer has to be disabled in this context since it would remove all needed vendor prefixes from the preceding processing (every prefix should be needed here).",
             "preset": [
               {
-                "__evaluate__": "optionalRequire('cssnano-preset-default')"
+                "__await_evaluate__": "module.optionalImport('cssnano-preset-default')"
               },
               {
                 "autoprefixer": false,
@@ -1084,7 +1077,7 @@
               "pre": []
             },
             "loader": {
-              "__evaluate__": "optionalRequire('postcss-loader') ? 'postcss-loader' : null"
+              "__await_evaluate__": "module.optionalImport('postcss-loader').then((result) => result ? 'postcss-loader' : null)"
             },
             "options": {}
           },
@@ -1457,14 +1450,10 @@
           "javaScript": {
             "pattern": {
               "#": "This is how we can make our test artefact executable.",
-              "__evaluate__": "`#!/usr/bin/env node\n// -*- coding: utf-8 -*-\n${self.generic.assetPattern.javaScript.pattern}{1}`"
+              "__evaluate__": "`#!/usr/bin/env node\n// -*- coding: utf-8 -*-\n{1}`"
             }
           }
         },
-        "exportFormat": {
-          "external": "commonjs2",
-          "self": "commonjs2"
-        },
         "files": {
           "defaultHTML": {
             "filename": "test.html",

package/plugins/HTMLTransformation.js

@@ -35,7 +35,7 @@ export class HTMLTransformation {
       ...options
     };
   }
-  process(data) {
+  async process(data) {
     /*
         NOTE: We have to prevent creating native "style" dom nodes to
         prevent jsdom from parsing the entire cascading style sheet. Which
@@ -74,9 +74,14 @@ export class HTMLTransformation {
     data.html = dom.serialize().replace(/##\+#\+#\+##/g, '<%').replace(/##-#-#-##/g, '%>').replace(/(<style[^>]*>)[\s\S]*?(<\/style[^>]*>)/gi, (match, startTag, endTag) => `${startTag}${styleContents.shift()}${endTag}`);
     // region post compilation
     for (const htmlFileSpecification of this.options.files) if (htmlFileSpecification.filename === data.plugin.options.filename) {
-      for (const loaderConfiguration of [].concat(htmlFileSpecification.template.use)) if (loaderConfiguration.options?.compileSteps && typeof loaderConfiguration.options.compileSteps === 'number') data.html = ejsLoader.bind({
-        query: extend(true, Object.prototype.hasOwnProperty.call(loaderConfiguration, 'options') ? copy(loaderConfiguration.options) : {}, htmlFileSpecification.template.postCompileOptions)
-      })(data.html);
+      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) => {
+            if (error) reject(error);else resolve(result);
+          }
+        })(data.html);
+      });
       break;
     }
     // endregion
@@ -84,7 +89,7 @@ export class HTMLTransformation {
   }
   apply(compiler) {
     compiler.hooks.compilation.tap('WebOptimizer', compilation => {
-      this.options.htmlPlugin.getHooks(compilation).beforeEmit.tap('WebOptimizerPostProcessHTML', this.process.bind(this));
+      this.options.htmlPlugin.getHooks(compilation).beforeEmit.tapPromise('WebOptimizerPostProcessHTML', this.process.bind(this));
     });
   }
 }

package/type.d.ts

@@ -1,4 +1,4 @@
-import type { AnyFunction, Encoding, Mapping, PlainObject, SecondParameter } from 'clientnode';
+import type { AnyFunction, Encoding, Mapping, PlainObject, SecondParameter, UTILITY_SCOPE } from 'clientnode';
 import type FaviconWebpackPlugin from 'favicons-webpack-plugin';
 import type { FaviconWebpackPlugionOptions as FaviconWebpackPluginOptions } from 'favicons-webpack-plugin/src/options';
 import type HtmlWebpackPlugin from 'html-webpack-plugin';
@@ -432,12 +432,12 @@ export interface GenericLoader {
     data: RuleSetRule;
 }
 export type Loader = GenericLoader & Mapping<WebpackRuleSetRule>;
-export interface EvaluationScope {
+export type EvaluationScope = (typeof UTILITY_SCOPE) & {
     configuration: ResolvedConfiguration;
     isFilePathInDependencies: (filePath: string) => boolean;
     loader: Loader;
     require: typeof require;
-}
+};
 export interface WebpackBaseAssets {
     outputName: string;
     plugin: HtmlWebpackPlugin;

package/webpackConfigurator.d.ts

@@ -1,5 +1,4 @@
 import type { WebpackConfiguration } from './type';
-import { Logger } from 'clientnode';
-export declare const log: Logger;
+export declare const log: any;
 export declare let webpackConfiguration: WebpackConfiguration;
 export default webpackConfiguration;

package/webpackConfigurator.js

@@ -16,69 +16,11 @@
     endregion
 */
 // region imports
-const _rewrite = (specifier, options) => {
-    if (typeof specifier !== 'string') {
-      throw new TypeError(`rewrite error: expected specifier of type string, not ${typeof specifier}`);
-    }
-    let replacementMap;
-    if (options.replaceExtensions) {
-      Object.entries(options.replaceExtensions).some(([target, replacement]) => {
-        if (target.startsWith('^') || target.endsWith('$')) {
-          const targetRegExp = new RegExp(target);
-          const capturingGroups = Array.from(specifier.match(targetRegExp) || []);
-          if (capturingGroups.length) {
-            replacementMap = [targetRegExp, replacement, capturingGroups];
-            return true;
-          }
-        } else if (specifier.endsWith(target)) {
-          replacementMap = [target, replacement, []];
-          return true;
-        }
-      });
-    }
-    let finalImportPath = specifier;
-    if (replacementMap) {
-      const [target, replacement, capturingGroups] = replacementMap;
-      finalImportPath = finalImportPath.replace(target, typeof replacement === 'string' ? replacement : replacement({
-        specifier,
-        capturingGroups,
-        filepath: '/__w/weboptimizer/weboptimizer/webpackConfigurator.ts'
-      }));
-    }
-    const isRelative = finalImportPath.startsWith('./') || finalImportPath.startsWith('.\\') || finalImportPath.startsWith('../') || finalImportPath.startsWith('..\\') || finalImportPath === '.' || finalImportPath === '..';
-    if (options.appendExtension && isRelative) {
-      const endsWithSlash = /(\/|\\)$/.test(finalImportPath);
-      const basenameIsDots = /(^\.?\.(\/|\\)?$)|((\/|\\)\.?\.(\/|\\)?$)/.test(finalImportPath);
-      const extensionToAppend = typeof options.appendExtension === 'string' ? options.appendExtension : options.appendExtension({
-        specifier,
-        capturingGroups: [],
-        filepath: '/__w/weboptimizer/weboptimizer/webpackConfigurator.ts'
-      });
-      if (extensionToAppend !== undefined) {
-        if (basenameIsDots) {
-          finalImportPath += `${endsWithSlash ? '' : '/'}index${extensionToAppend}`;
-        } else {
-          const hasRecognizedExtension = !endsWithSlash && options.recognizedExtensions.some(extension => {
-            return finalImportPath.endsWith(extension);
-          });
-          if (!hasRecognizedExtension) {
-            finalImportPath = endsWithSlash ? finalImportPath + `index${extensionToAppend}` : finalImportPath + extensionToAppend;
-          }
-        }
-      }
-    }
-    return finalImportPath;
-  },
-  _rewrite_options = {
-    "appendExtension": ".js",
-    "recognizedExtensions": [".js", ".jsx", ".d.ts", ".ts", ".tsx", ".json"]
-  };
 import "core-js/modules/es.array.push.js";
 import "core-js/modules/es.iterator.constructor.js";
 import "core-js/modules/es.iterator.filter.js";
 import "core-js/modules/es.iterator.map.js";
-import "core-js/modules/es.iterator.some.js";
-import { convertToValidVariableName, evaluate, escapeRegularExpressions, extend, importsPromise, isFileSync, isObject, isPlainObject, Logger, mask, optionalImport, represent } from 'clientnode';
+import { convertToValidVariableName, evaluate, escapeRegularExpressions, extend, importsPromise, isFileSync, isObject, isPlainObject, Logger, mask, optionalImport, represent, UTILITY_SCOPE } from 'clientnode';
 import { extname, join, relative, resolve } from 'path';
 import util from 'util';
 import webpack from 'webpack';
@@ -95,7 +37,7 @@ import webpackSources from 'webpack-sources';
 const {
   RawSource: WebpackRawSource
 } = webpackSources;
-import getConfiguration, { require } from "./configurator.js";
+import getConfiguration from "./configurator.js";
 import { determineAssetType, determineExternalRequest, determineModuleFilePath, getClosestPackageDescriptor, isFilePathInLocation, normalizePaths, stripLoader } from "./helper.js";
 import InPlaceAssetsIntoHTML from "./plugins/InPlaceAssetsIntoHTML.js";
 import HTMLTransformation from "./plugins/HTMLTransformation.js";
@@ -338,10 +280,10 @@ for (const contextReplacement of module.replacements.context) pluginInstances.pu
 */
 if (module.enforceDeduplication) {
   const absoluteContextPath = resolve(configuration.path.context);
-  const consolidator = result => {
+  const consolidator = async result => {
     const targetPath = result.createData.resource;
     if (targetPath && /((?: ^|\/)node_modules\/.+)/.test(targetPath) && (!targetPath.startsWith(absoluteContextPath) || /((?: ^|\/)node_modules\/.+){2}/.test(targetPath)) && isFileSync(targetPath)) {
-      const packageDescriptor = getClosestPackageDescriptor(targetPath);
+      const packageDescriptor = await getClosestPackageDescriptor(targetPath);
       if (packageDescriptor) {
         let pathPrefixes;
         let pathSuffix;
@@ -371,7 +313,7 @@ if (module.enforceDeduplication) {
         for (const pathPrefix of pathPrefixes) {
           const alternateTargetPath = resolve(pathPrefix, pathSuffix);
           if (isFileSync(alternateTargetPath)) {
-            const otherPackageDescriptor = getClosestPackageDescriptor(alternateTargetPath);
+            const otherPackageDescriptor = await getClosestPackageDescriptor(alternateTargetPath);
             if (otherPackageDescriptor) {
               if (packageDescriptor.configuration.version === otherPackageDescriptor.configuration.version) {
                 log.info('\nConsolidate module request', `"${targetPath}" to`, `"${alternateTargetPath}".`);
@@ -399,93 +341,11 @@ if (module.enforceDeduplication) {
   pluginInstances.push({
     apply: compiler => {
       compiler.hooks.normalModuleFactory.tap('WebOptimizerModuleConsolidation', nmf => {
-        nmf.hooks.afterResolve.tap('WebOptimizerModuleConsolidation', consolidator);
+        nmf.hooks.afterResolve.tapPromise('WebOptimizerModuleConsolidation', consolidator);
       });
     }
   });
 }
-/*
-new NormalModuleReplacementPlugin(
-    /.+/,
-    (result: {
-        context: string
-        createData: {resource: string}
-        request: string
-    }): void => {
-        const isResource: boolean = Boolean(result.createData.resource)
-        const targetPath: string = isResource ?
-            result.createData.resource :
-            resolve(result.context, result.request)
-        if (
-            targetPath &&
-            /((?: ^|\/)node_modules\/.+){2}/.test(targetPath) &&
-            isFileSync(targetPath)
-        ) {
-            const packageDescriptor: null | PackageDescriptor =
-                Helper.getClosestPackageDescriptor(targetPath)
-            if (packageDescriptor) {
-                const pathPrefixes: null | RegExpMatchArray = targetPath.match(
-                    /((?: ^|.*?\/)node_modules\/)/g
-                )
-                if (pathPrefixes === null)
-                    return
-                // Avoid finding the same artefact.
-                pathPrefixes.pop()
-                let index: number = 0
-                for (const pathPrefix of pathPrefixes) {
-                    if (index > 0)
-                        pathPrefixes[index] =
-                            resolve(pathPrefixes[index - 1], pathPrefix)
-                    index += 1
-                }
-                const pathSuffix: string =
-                    targetPath.replace(/(?: ^|.*\/)node_modules\/(.+$)/, '$1')
-                let redundantRequest: null | PlainObject = null
-                for (const pathPrefix of pathPrefixes) {
-                    const alternateTargetPath: string =
-                        resolve(pathPrefix, pathSuffix)
-                    if (isFileSync(alternateTargetPath)) {
-                        const otherPackageDescriptor: null | PackageDescriptor =
-                            Helper.getClosestPackageDescriptor(
-                                alternateTargetPath
-                            )
-                        if (otherPackageDescriptor) {
-                            if (
-                                packageDescriptor.configuration.version ===
-                                otherPackageDescriptor.configuration.version
-                            ) {
-                                log.info(
-                                    '\nConsolidate module request',
-                                    `"${targetPath}" to`,
-                                    `"${alternateTargetPath}".`
-                                )
-                                result.createData.resource =
-                                    alternateTargetPath
-                                result.request = alternateTargetPath
-                                return
-                            }
-                            redundantRequest = {
-                                path: alternateTargetPath,
-                                version:
-                                    otherPackageDescriptor.configuration
-                                        .version
-                            }
-                        }
-                    }
-                }
-                if (redundantRequest)
-                    log.warn(
-                        '\nIncluding different versions of same package',
-                        `"${packageDescriptor.configuration.name}". Module`,
-                        `"${targetPath}" (version`,
-                        `${packageDescriptor.configuration.version}) has`,
-                        `redundancies with "${redundantRequest.path}"`,
-                        `(version ${redundantRequest.version}).`
-                    )
-            }
-        }
-    }
-))*/
 //// endregion
 /// endregion
 /// region loader helper
@@ -495,12 +355,13 @@ const isFilePathInDependencies = filePath => {
 };
 const loader = {};
 const scope = {
+  ...UTILITY_SCOPE,
   configuration,
   isFilePathInDependencies,
   loader,
   require
 };
-const evaluateAnThrow = (object, givenOptions = {}) => {
+const evaluateAndThrow = (object, givenOptions = {}) => {
   const options = {
     filePath: configuration.path.context,
     ...givenOptions
@@ -516,16 +377,16 @@ const evaluateAnThrow = (object, givenOptions = {}) => {
   }
   return object;
 };
-const createEvaluateMapper = type => value => evaluateAnThrow(value, {
+const createEvaluateMapper = type => value => evaluateAndThrow(value, {
   type
 });
 const evaluateAdditionalLoaderConfiguration = loaderConfiguration => ({
-  exclude: filePath => evaluateAnThrow(loaderConfiguration.exclude, {
+  exclude: filePath => evaluateAndThrow(loaderConfiguration.exclude, {
     filePath
   }),
-  include: loaderConfiguration.include && evaluateAnThrow(loaderConfiguration.include) || configuration.path.source.base,
-  test: new RegExp(evaluateAnThrow(loaderConfiguration.test)),
-  use: evaluateAnThrow(loaderConfiguration.use)
+  include: loaderConfiguration.include && evaluateAndThrow(loaderConfiguration.include) || configuration.path.source.base,
+  test: new RegExp(evaluateAndThrow(loaderConfiguration.test)),
+  use: evaluateAndThrow(loaderConfiguration.use)
 });
 const getIncludingPaths = path => normalizePaths([path].concat(module.locations.directoryPaths));
 const postCSSResolver = (name, _context) => {
@@ -598,7 +459,7 @@ const genericLoader = {
   // Convert to compatible native web types.
   // region generic template
   ejs: {
-    exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || module.preprocessor.ejs.exclude === null ? false : evaluateAnThrow(module.preprocessor.ejs.exclude, {
+    exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || module.preprocessor.ejs.exclude === null ? false : evaluateAndThrow(module.preprocessor.ejs.exclude, {
       filePath
     }),
     include: getIncludingPaths(configuration.path.source.asset.template),
@@ -615,12 +476,12 @@ const genericLoader = {
   // endregion
   // region script
   script: {
-    exclude: filePath => evaluateAnThrow(module.preprocessor.javaScript.exclude, {
+    exclude: filePath => evaluateAndThrow(module.preprocessor.javaScript.exclude, {
       filePath,
       type: 'script'
     }),
     include: filePath => {
-      const result = evaluateAnThrow(module.preprocessor.javaScript.include, {
+      const result = evaluateAndThrow(module.preprocessor.javaScript.include, {
         filePath,
         type: 'script'
       });
@@ -645,7 +506,7 @@ const genericLoader = {
       use: configuration.files.defaultHTML.template.use
     },
     ejs: {
-      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.preprocessor.html.exclude === null ? false : evaluateAnThrow(module.preprocessor.html.exclude, {
+      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.preprocessor.html.exclude === null ? false : evaluateAndThrow(module.preprocessor.html.exclude, {
         filePath,
         type: 'html.ejs'
       })),
@@ -671,7 +532,7 @@ const genericLoader = {
       }, module.preprocessor.html.additional.post.map(createEvaluateMapper('html.ejs')))
     },
     html: {
-      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.html.exclude === null ? true : evaluateAnThrow(module.html.exclude, {
+      exclude: filePath => normalizePaths(configuration.files.html.concat(configuration.files.defaultHTML).map(htmlConfiguration => htmlConfiguration.template.filePath)).includes(filePath) || (module.html.exclude === null ? true : evaluateAndThrow(module.html.exclude, {
         filePath,
         type: 'html'
       })),
@@ -691,12 +552,12 @@ const genericLoader = {
   // Load dependencies.
   // region style
   style: {
-    exclude: filePath => module.cascadingStyleSheet.exclude === null ? isFilePathInDependencies(filePath) : evaluateAnThrow(module.cascadingStyleSheet.exclude, {
+    exclude: filePath => module.cascadingStyleSheet.exclude === null ? isFilePathInDependencies(filePath) : evaluateAndThrow(module.cascadingStyleSheet.exclude, {
       filePath,
       type: 'style'
     }),
     include: filePath => {
-      const result = evaluateAnThrow(module.cascadingStyleSheet.include, {
+      const result = evaluateAndThrow(module.cascadingStyleSheet.include, {
         filePath,
         type: 'style'
       });
@@ -714,7 +575,7 @@ const genericLoader = {
   // region font
   font: {
     eot: {
-      exclude: filePath => module.optimizer.font.eot.exclude === null ? false : evaluateAnThrow(module.optimizer.font.eot.exclude, {
+      exclude: filePath => module.optimizer.font.eot.exclude === null ? false : evaluateAndThrow(module.optimizer.font.eot.exclude, {
         filePath,
         type: 'font.eot'
       }),
@@ -731,7 +592,7 @@ const genericLoader = {
       use: module.optimizer.font.eot.loader.map(createEvaluateMapper('font.eot'))
     },
     svg: {
-      exclude: filePath => module.optimizer.font.svg.exclude === null ? false : evaluateAnThrow(module.optimizer.font.svg.exclude, {
+      exclude: filePath => module.optimizer.font.svg.exclude === null ? false : evaluateAndThrow(module.optimizer.font.svg.exclude, {
         filePath,
         type: 'svg'
       }),
@@ -750,7 +611,7 @@ const genericLoader = {
       use: module.optimizer.font.svg.loader.map(createEvaluateMapper('font.svg'))
     },
     ttf: {
-      exclude: filePath => module.optimizer.font.ttf.exclude === null ? false : evaluateAnThrow(module.optimizer.font.ttf.exclude, {
+      exclude: filePath => module.optimizer.font.ttf.exclude === null ? false : evaluateAndThrow(module.optimizer.font.ttf.exclude, {
         filePath,
         type: 'ttf'
       }),
@@ -768,7 +629,7 @@ const genericLoader = {
       use: module.optimizer.font.ttf.loader.map(createEvaluateMapper('font.ttf'))
     },
     woff: {
-      exclude: filePath => module.optimizer.font.woff.exclude === null ? false : evaluateAnThrow(module.optimizer.font.woff.exclude, {
+      exclude: filePath => module.optimizer.font.woff.exclude === null ? false : evaluateAndThrow(module.optimizer.font.woff.exclude, {
         filePath,
         type: 'woff'
       }),
@@ -788,7 +649,7 @@ const genericLoader = {
   // endregion
   // region image
   image: {
-    exclude: filePath => module.optimizer.image.exclude === null ? isFilePathInDependencies(filePath) : evaluateAnThrow(module.optimizer.image.exclude, {
+    exclude: filePath => module.optimizer.image.exclude === null ? isFilePathInDependencies(filePath) : evaluateAndThrow(module.optimizer.image.exclude, {
       filePath,
       type: 'image'
     }),
@@ -810,7 +671,7 @@ const genericLoader = {
   data: {
     exclude: filePath => {
       if (typeof filePath !== 'string') return false;
-      return configuration.extensions.file.internal.includes(extname(stripLoader(filePath))) || (module.optimizer.data.exclude === null ? isFilePathInDependencies(filePath) : evaluateAnThrow(module.optimizer.data.exclude, {
+      return configuration.extensions.file.internal.includes(extname(stripLoader(filePath))) || (module.optimizer.data.exclude === null ? isFilePathInDependencies(filePath) : evaluateAndThrow(module.optimizer.data.exclude, {
         filePath,
         type: 'data'
       }));
@@ -882,9 +743,9 @@ if (!module.optimizer.minimizer) {
 // region configuration
 let customConfiguration = {};
 if (configuration.path.configuration.json) try {
-  require.resolve(_rewrite(configuration.path.configuration.json, _rewrite_options));
+  import.meta.resolve(configuration.path.configuration.json);
   try {
-    customConfiguration = require(_rewrite(configuration.path.configuration.json, _rewrite_options));
+    customConfiguration = await import(configuration.path.configuration.json);
   } catch (error) {
     log.debug('Importing provided json webpack configuration file path', `under "${configuration.path.configuration.json}" failed:`, represent(error));
   }
@@ -897,7 +758,8 @@ export let webpackConfiguration = extend(true, {
   devtool: configuration.development.tool,
   devServer: configuration.development.server,
   experiments: {
-    topLevelAwait: true
+    futureDefaults: true,
+    outputModule: true
   },
   // region input
   entry: configuration.injection.entry.normalized,
@@ -995,7 +857,7 @@ if (!Array.isArray(module.skipParseRegularExpressions) || module.skipParseRegula
   noParse: module.skipParseRegularExpressions
 };
 if (configuration.path.configuration.javaScript) try {
-  require.resolve(_rewrite(configuration.path.configuration.javaScript, _rewrite_options));
+  import.meta.resolve(configuration.path.configuration.javaScript);
   const result = await optionalImport(configuration.path.configuration.javaScript);
   if (isPlainObject(result)) {
     if (Object.prototype.hasOwnProperty.call(result, 'replaceWebOptimizer')) webpackConfiguration = result.replaceWebOptimizer;else extend(true, webpackConfiguration, result);