weboptimizer 4.0.3 → 4.0.5

package/browser.d.ts

@@ -1,5 +1,5 @@
-import { Logger } from 'clientnode';
 import { Browser, InitializedBrowser } from './type';
+import { Logger } from 'clientnode';
 export declare const browser: Browser;
 export declare const log: Logger;
 /**

package/browser.js

@@ -17,11 +17,11 @@
 */
 // region imports
 import "core-js/modules/es.array.push.js";
-import { CONSOLE_METHODS, Logger, ProcedureFunction, timeout } from 'clientnode';
+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";
-import { Browser, InitializedBrowser } from "./type.js";
 // endregion
 // region declaration
 
@@ -98,7 +98,7 @@ if (typeof TARGET_TECHNOLOGY === 'undefined' || TARGET_TECHNOLOGY === 'node')
       });
     };
     if (typeof NAME === 'undefined' || NAME === 'webOptimizer') {
-      const filePath = path.join(__dirname, 'index.html.ejs');
+      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.

package/configurator.d.ts

@@ -1,7 +1,9 @@
 import type { ResolvedConfiguration } from './type';
-import clientnode from 'clientnode';
+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: clientnode.Logger;
+export declare const log: Logger;
 /**
  * Main entry point to determine current configuration.
  * @param context - Location from where to build current application.
@@ -12,10 +14,10 @@ export declare const log: clientnode.Logger;
  * @param environment - Environment variables to take into account.
  * @returns Nothing.
  */
-export declare const load: (context?: string, currentWorkingDirectory?: string, commandLineArguments?: Array<string>, webOptimizerPath?: string, environment?: NodeJS.ProcessEnv) => ResolvedConfiguration;
+export declare const load: (context?: string, currentWorkingDirectory?: string, commandLineArguments?: Array<string>, webOptimizerPath?: string, environment?: NodeJS.ProcessEnv) => Promise<ResolvedConfiguration>;
 /**
  * Get cached or determined configuration object.
  * @returns Nothing.
  */
-export declare const get: () => ResolvedConfiguration;
+export declare const get: () => Promise<ResolvedConfiguration>;
 export default get;

package/configurator.js

@@ -16,36 +16,84 @@
     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/configurator.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/configurator.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.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 "core-js/modules/es.json.parse.js";
-import clientnode from 'clientnode';
-const {
-  convertCircularObjectToJSON,
-  copy,
-  currentRequire,
-  evaluateDynamicData,
-  extend,
-  getUTCTimestamp,
-  isFileSync,
-  isObject,
-  isolatedRequire,
-  isPlainObject,
-  Logger,
-  MAXIMAL_NUMBER_OF_ITERATIONS,
-  modifyObject,
-  optionalRequire,
-  parseEncodedObject,
-  removeKeyPrefixes,
-  UTILITY_SCOPE
-} = clientnode;
+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 fileSystem, { lstatSync, readFileSync, unlinkSync } from 'fs';
+import { createRequire } from 'node:module';
 import path, { basename, dirname, join, resolve } from 'path';
 import { determineAssetType, determineModuleFilePath, determineModuleLocations, resolveAutoInjection, resolveBuildConfigurationFilePaths, resolveModulesInFolders, normalizeGivenInjection, normalizePaths } from "./helper.js";
 import packageConfiguration from './package.json' with { type: 'json' };
 import { SubConfigurationTypes } from "./type.js";
 // endregion
+export const require = createRequire(import.meta.url);
+export const optionalRequire = id => {
+  try {
+    return require(_rewrite(id, _rewrite_options));
+  } catch {
+    return null;
+  }
+};
 const {
   configuration: metaConfiguration
 } = packageConfiguration;
@@ -53,6 +101,10 @@ export let loadedConfiguration = null;
 export const log = new Logger({
   name: 'weboptimizer.configurator'
 });
+
+// Wait until optional filesystem modules have been loaded.
+await importsPromise;
+
 /**
  * Main entry point to determine current configuration.
  * @param context - Location from where to build current application.
@@ -63,7 +115,7 @@ export const log = new Logger({
  * @param environment - Environment variables to take into account.
  * @returns Nothing.
  */
-export const load = (context, currentWorkingDirectory = process.cwd(), commandLineArguments = process.argv, webOptimizerPath = __dirname,
+export const load = async (context, currentWorkingDirectory = process.cwd(), commandLineArguments = process.argv, webOptimizerPath = import.meta.dirname,
 /*
     NOTE: We have to avoid that some pre-processor removes this
     assignment.
@@ -107,8 +159,11 @@ environment = eval('process.env')) => {
   // region load application specific configuration
   let specificConfiguration = {};
   try {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    specificConfiguration = currentRequire(join(metaConfiguration.default.path.context, 'package'));
+    specificConfiguration = (await optionalImport(join(metaConfiguration.default.path.context, 'package.json'), {
+      with: {
+        type: 'json'
+      }
+    })).default;
   } catch {
     metaConfiguration.default.path.context = currentWorkingDirectory;
   }
@@ -196,16 +251,18 @@ environment = eval('process.env')) => {
       transformed in place in the following lines of code.
   */
   const resolvedConfiguration = evaluateDynamicData(configuration, {
-    ...UTILITY_SCOPE,
-    currentPath: currentWorkingDirectory,
-    fs: fileSystem,
-    packageConfiguration,
-    optionalRequire,
-    path,
-    require: isolatedRequire,
-    webOptimizerPath,
-    now,
-    nowUTCTimestamp: getUTCTimestamp(now)
+    scope: {
+      ...UTILITY_SCOPE,
+      currentPath: currentWorkingDirectory,
+      fs: fileSystem,
+      optionalRequire,
+      packageConfiguration,
+      path,
+      require: isolatedRequire,
+      webOptimizerPath,
+      now,
+      nowUTCTimestamp: getUTCTimestamp(now)
+    }
   });
   // endregion
   // region consolidate file specific build configuration
@@ -239,7 +296,7 @@ environment = eval('process.env')) => {
       file: resolvedConfiguration.extensions.file.internal
     }, resolvedConfiguration.path.context,
     /*
-        NOTE: We doesn't use
+        NOTE: We don't use
         "resolvedConfiguration.path.source.asset.base" because we
         already have resolved all module ids.
     */
@@ -263,7 +320,7 @@ environment = eval('process.env')) => {
   }
   resolvedConfiguration.module.aliases.webOptimizerDefaultTemplateFilePath = resolvedConfiguration.files.defaultHTML.template.filePath;
   // endregion
-  // region apply html webpack plugin workarounds
+  // region apply HTML webpack plugin workarounds
   /*
       NOTE: Provides a workaround to handle a bug with chained loader
       configurations.
@@ -284,9 +341,8 @@ environment = eval('process.env')) => {
  * Get cached or determined configuration object.
  * @returns Nothing.
  */
-export const get = () => {
-  if (loadedConfiguration) return loadedConfiguration;
-  loadedConfiguration = load();
+export const get = async () => {
+  if (!loadedConfiguration) loadedConfiguration = await load();
   return loadedConfiguration;
 };
 export default get;

package/ejsLoader.d.ts

@@ -1,7 +1,8 @@
-import { Encoding, Logger, Mapping } from 'clientnode';
-import { Options, TemplateFunction as EJSTemplateFunction } from 'ejs';
-import { LoaderContext } from 'webpack';
-import { Extensions, Replacements } from './type';
+import type { Encoding, Mapping } from 'clientnode';
+import type { Options, TemplateFunction as EJSTemplateFunction } from 'ejs';
+import type { LoaderContext } from 'webpack';
+import type { Extensions, Replacements } from './type';
+import { Logger } from 'clientnode';
 export type TemplateFunction = EJSTemplateFunction;
 export type CompilerOptions = Options & {
     encoding: Encoding;

package/ejsLoader.js

@@ -15,23 +15,21 @@
     See https://creativecommons.org/licenses/by/3.0/deed.de
     endregion
 */
-// region imports
-import { FileResult, transformSync as babelTransformSync } from '@babel/core';
+// region
+import { transformSync as babelTransformSync } from '@babel/core';
 import babelMinifyPreset from 'babel-preset-minify';
-import { convertSubstringInPlainObject, copy, currentRequire, evaluate, EvaluationResult, Encoding, extend, Logger, Mapping, RecursivePartial, UTILITY_SCOPE } from 'clientnode';
-import ejs, { Options, TemplateFunction as EJSTemplateFunction } from 'ejs';
+import { convertSubstringInPlainObject, copy, currentRequire, evaluate, extend, Logger, UTILITY_SCOPE } from 'clientnode';
+import ejs from 'ejs';
 import { readFileSync } from 'fs';
 import { minify as minifyHTML } from 'html-minifier';
 import { extname } from 'path';
-import { LoaderContext } from 'webpack';
 import getConfiguration from "./configurator.js";
 import { determineModuleFilePath } from "./helper.js";
-import { Extensions, Replacements, ResolvedConfiguration } from "./type.js";
 // endregion
 // region types
 
 // endregion
-const configuration = getConfiguration();
+const configuration = await getConfiguration();
 export const log = new Logger({
   name: 'weboptimizer.ejs-loader'
 });

package/helper.d.ts

@@ -1,8 +1,8 @@
 import type { Encoding, Mapping } from 'clientnode';
 import type { BuildConfiguration, Extensions, GivenInjection, GivenInjectionConfiguration, NormalizedGivenInjection, PathConfiguration, PackageDescriptor, Replacements, ResolvedBuildConfiguration, SpecificExtensions } from './type';
-import clientnode from 'clientnode';
+import { Logger } from 'clientnode';
 export declare const KNOWN_FILE_EXTENSIONS: Array<string>;
-export declare const log: clientnode.Logger;
+export declare const log: Logger;
 /**
  * Determines whether given file path is within given list of file locations.
  * @param filePath - Path to file to check.

package/helper.js

@@ -27,20 +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 clientnode from 'clientnode';
-const {
-  copy,
-  currentRequire,
-  escapeRegularExpressions,
-  extend,
-  isAnyMatching,
-  isDirectorySync,
-  isFileSync,
-  isPlainObject,
-  Logger,
-  represent,
-  walkDirectoryRecursivelySync
-} = clientnode;
+import { copy, currentRequire, 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

package/index.d.ts

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

package/index.js

@@ -24,28 +24,10 @@ import "core-js/modules/es.iterator.filter.js";
 import "core-js/modules/es.iterator.map.js";
 import "core-js/modules/es.json.stringify.js";
 import { exec as execChildProcess, spawn as spawnChildProcess } from 'child_process';
-import clientnode from 'clientnode';
-const {
-  CLOSE_EVENT_NAMES,
-  copyDirectoryRecursiveSync,
-  copyFileSync,
-  evaluate,
-  getProcessCloseHandler,
-  handleChildProcess,
-  isDirectory,
-  isDirectorySync,
-  isFile,
-  isFileSync,
-  isPlainObject,
-  Logger,
-  MAXIMAL_NUMBER_OF_ITERATIONS,
-  NOOP,
-  parseEncodedObject,
-  walkDirectoryRecursively
-} = clientnode;
+import { CLOSE_EVENT_NAMES, copyDirectoryRecursiveSync, copyFileSync, evaluate, getProcessCloseHandler, handleChildProcess, importsPromise, isDirectory, isDirectorySync, isFile, isFileSync, isPlainObject, Logger, MAXIMAL_NUMBER_OF_ITERATIONS, NOOP, parseEncodedObject, walkDirectoryRecursively } from 'clientnode';
 import { chmodSync, unlinkSync } from 'fs';
 import { writeFile, unlink } from 'fs/promises';
-import globAll from 'glob-all';
+import { sync as globAllSync } from 'glob-all';
 import path, { join, resolve } from 'path';
 import { rimraf as removeDirectoryRecursively, sync as removeDirectoryRecursivelySync } from 'rimraf';
 import { load as loadConfiguration } from "./configurator.js";
@@ -59,6 +41,10 @@ Logger.configureAllInstances({
 });
 // NOTE: Environment variables can only be strings.
 process.env.UV_THREADPOOL_SIZE = '128';
+
+// Wait until optional filesystem modules have been loaded.
+await importsPromise;
+
 /**
  * Main entry point.
  * @param context - Location from where to build current application.
@@ -69,14 +55,14 @@ process.env.UV_THREADPOOL_SIZE = '128';
  * @param environment - Environment variables to take into account.
  * @returns Nothing.
  */
-const main = async (context, currentWorkingDirectory = process.cwd(), commandLineArguments = process.argv, webOptimizerPath = __dirname,
+const main = async (context, currentWorkingDirectory = process.cwd(), commandLineArguments = process.argv, webOptimizerPath = import.meta.dirname,
 /*
     NOTE: We have to avoid that some pre-processor removes this
     assignment.
 */
 environment = eval('process.env')) => {
   if (environment.PATH && !environment.PATH.includes(':node_modules/.bin')) environment.PATH += ':node_modules/.bin';else environment.PATH = 'node_modules/.bin';
-  const configuration = loadConfiguration(context, currentWorkingDirectory, commandLineArguments, webOptimizerPath, environment);
+  const configuration = await loadConfiguration(context, currentWorkingDirectory, commandLineArguments, webOptimizerPath, environment);
   let clear = NOOP();
   try {
     // region controller
@@ -119,7 +105,7 @@ environment = eval('process.env')) => {
       // endregion
       // region handle clear
       /*
-          NOTE: Some tasks could depend on previously created artefacts
+          NOTE: Some tasks could depend on previously created artifacts
           packages so a preceding clear should not be performed in that
           cases.
           NOTE: If we have a dependency cycle we need to preserve files
@@ -127,7 +113,7 @@ environment = eval('process.env')) => {
       */
       if (possibleArguments.includes(configuration.givenCommandLineArguments[2]) && (!['build', 'build:types', 'lint', 'preinstall', 'test', 'test:browser', 'test:coverage', 'test:coverage:report', 'serve', 'watch'].includes(configuration.givenCommandLineArguments[2]) ||
       /*
-          NOTE: If target artefacts are located next to their
+          NOTE: If target artifacts are located next to their
           source files, we need to clear them first when running
           dev mode (watching source files and reloading build
           automatically).
@@ -152,7 +138,7 @@ environment = eval('process.env')) => {
         for (const filePath of configuration.path.tidyUpOnClear) if (filePath) if (isFileSync(filePath))
           // NOTE: Close handler have to be synchronous.
           unlinkSync(filePath);else if (isDirectorySync(filePath)) removeDirectoryRecursivelySync(filePath);
-        removeDirectoryRecursivelySync(globAll.sync(configuration.path.tidyUpOnClearGlobs));
+        removeDirectoryRecursivelySync(globAllSync(configuration.path.tidyUpOnClearGlobs));
       }
       // endregion
       // region handle build
@@ -186,7 +172,7 @@ environment = eval('process.env')) => {
           for (const filePath of configuration.path.tidyUp) if (filePath) if (isFileSync(filePath))
             // NOTE: Close handler have to be synchronous.
             unlinkSync(filePath);else if (isDirectorySync(filePath)) removeDirectoryRecursivelySync(filePath);
-          removeDirectoryRecursivelySync(globAll.sync(configuration.path.tidyUpGlobs));
+          removeDirectoryRecursivelySync(globAllSync(configuration.path.tidyUpGlobs));
         };
         closeEventHandlers.push(tidyUp);
 
@@ -293,7 +279,7 @@ environment = eval('process.env')) => {
       finished = true;
     };
     for (const closeEventName of CLOSE_EVENT_NAMES) process.on(closeEventName, closeHandler);
-    if (require.main === module && (configuration.givenCommandLineArguments.length < 3 || !possibleArguments.includes(configuration.givenCommandLineArguments[2]))) log.info(`Give one of "${possibleArguments.join('", "')}" as command`, 'line argument. You can provide a json string as second', 'parameter to dynamically overwrite some configurations.\n');
+    if (import.meta.main && (configuration.givenCommandLineArguments.length < 3 || !possibleArguments.includes(configuration.givenCommandLineArguments[2]))) log.info(`Give one of "${possibleArguments.join('", "')}" as command`, 'line argument. You can provide a json string as second', 'parameter to dynamically overwrite some configurations.\n');
     // endregion
     // region forward nested return codes
     try {
@@ -308,5 +294,5 @@ environment = eval('process.env')) => {
   }
   return clear;
 };
-if (require.main === module) void main();
+if (import.meta.main) void main();
 export default main;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "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.1428",
+    "clientnode": "4.0.1432",
     "core-js": "^3.49.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",
@@ -109,7 +109,7 @@
     "rimraf": "^6.1.3",
     "script-loader": "^0.7.2",
     "typescript": "^6.0.3",
-    "webpack": "^5.108.1",
+    "webpack": "^5.108.3",
     "webpack-cli": "^7.1.0",
     "webpack-sources": "^3.5.0"
   },
@@ -123,17 +123,17 @@
     "@types/html-minifier": "^4.0.6",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/imagemin": "^9.0.1",
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.1.0",
     "@types/postcss-import": "^14.0.3",
     "@types/postcss-url": "^10.0.4",
     "@types/webpack-env": "^1.18.8",
     "@types/webpack-sources": "^3.2.3",
-    "@typescript-eslint/parser": "^8.62.0",
+    "@typescript-eslint/parser": "^8.62.1",
     "css-loader": "^7.1.4",
     "cssnano": "^8.0.2",
-    "eslint": "^10.5.0",
+    "eslint": "^10.6.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jsdoc": "^63.0.9",
+    "eslint-plugin-jsdoc": "^63.0.10",
     "favicons": "^7.3.0",
     "favicons-webpack-plugin": "^6.0.1",
     "globals": "^17.7.0",
@@ -143,11 +143,11 @@
     "mini-css-extract-plugin": "^2.10.2",
     "mkdirp": "^3.0.1",
     "node-fetch": "^3.3.2",
-    "postcss": "^8.5.15",
+    "postcss": "^8.5.16",
     "postcss-fontpath": "^1.0.0",
     "postcss-import": "^16.1.1",
     "postcss-loader": "^8.2.1",
-    "postcss-preset-env": "^11.3.1",
+    "postcss-preset-env": "^11.3.2",
     "postcss-sprites": "^4.2.1",
     "postcss-url": "^10.1.4",
     "shx": "^0.4.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.0",
+    "typescript-eslint": "^8.62.1",
     "typescript-plugin-css-modules": "^5.2.0",
     "web-documentation": "^1.0.42",
     "workbox-webpack-plugin": "^7.4.1"
@@ -1190,24 +1190,11 @@
                   }
                 ],
                 [
-                  "@babel/plugin-transform-private-methods",
+                  "babel-plugin-polyfill-corejs3",
                   {
-                    "loose": true
+                    "method": "usage-global"
                   }
-                ],
-                [
-                  "@babel/plugin-transform-class-properties"
-                ],
-                [
-                  "transform-modern-regexp",
-                  {
-                    "features": [
-                      "dotAll",
-                      "namedCapturingGroups"
-                    ]
-                  }
-                ],
-                "babel-plugin-polyfill-corejs3"
+                ]
               ],
               "presets": {
                 "#": "NOTE: We have to disable module export/import transformation to allow tree shaking by the final (minimizer).",

package/plugins/HTMLTransformation.d.ts

@@ -1,5 +1,5 @@
-import { Compiler } from 'webpack';
-import { HTMLTransformationOptions } from '../type';
+import type { Compiler } from 'webpack';
+import type { HTMLTransformationOptions } from '../type';
 export declare class HTMLTransformation {
     private defaultOptions;
     private options;

package/plugins/HTMLTransformation.js

@@ -20,12 +20,10 @@ import "core-js/modules/es.array.push.js";
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { copy, extend, Mapping } from 'clientnode';
+import { copy, extend } from 'clientnode';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { JSDOM as DOM } from 'jsdom';
-import { Compilation, Compiler, LoaderContext } from 'webpack';
-import ejsLoader, { LoaderConfiguration as EJSLoaderConfiguration } from "../ejsLoader.js";
-import { HTMLTransformationOptions, HTMLWebpackPluginBeforeEmitData, WebpackLoader } from "../type.js";
+import ejsLoader from "../ejsLoader.js";
 // endregion
 
 export class HTMLTransformation {

package/plugins/InPlaceAssetsIntoHTML.d.ts

@@ -1,5 +1,5 @@
-import { Compiler } from 'webpack';
-import { InPlaceAssetsIntoHTMLOptions } from '../type';
+import type { Compiler } from 'webpack';
+import type { InPlaceAssetsIntoHTMLOptions } from '../type';
 export declare class InPlaceAssetsIntoHTML {
     private defaultOptions;
     private options;

package/plugins/InPlaceAssetsIntoHTML.js

@@ -23,9 +23,7 @@ import "core-js/modules/es.iterator.some.js";
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { Compilation, Compiler } from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import { InPlaceAssetConfiguration, InPlaceAssetsIntoHTMLOptions, WebpackAssets, WebpackBaseAssets } from "../type.js";
 // endregion
 
 export class InPlaceAssetsIntoHTML {

package/stylelintConfigurator.js

@@ -19,6 +19,6 @@
 import getConfiguration from "./configurator.js";
 import { ResolvedConfiguration } from "./type.js";
 // endregion
-const configuration = getConfiguration();
+const configuration = await getConfiguration();
 module.exports = configuration.stylelint;
 export default module.exports;

package/webpackConfigurator.d.ts

@@ -1,6 +1,5 @@
+import type { WebpackConfiguration } from './type';
 import { Logger } from 'clientnode';
-import { WebpackConfiguration } from './type';
 export declare const log: Logger;
-export declare const optionalRequire: <T = unknown>(id: string) => null | T;
 export declare let webpackConfiguration: WebpackConfiguration;
 export default webpackConfiguration;

package/webpackConfigurator.js

@@ -78,49 +78,45 @@ 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, EvaluationResult, escapeRegularExpressions, extend, isFileSync, isObject, isPlainObject, Logger, Mapping, mask, PlainObject, PositiveEvaluationResult, RecursivePartial, represent, Unpacked } from 'clientnode';
-import { PluginOptions as ImageMinimizerOptions } from 'image-minimizer-webpack-plugin';
+import { convertToValidVariableName, evaluate, escapeRegularExpressions, extend, importsPromise, isFileSync, isObject, isPlainObject, Logger, mask, optionalImport, represent } from 'clientnode';
 import { extname, join, relative, resolve } from 'path';
-import { Transformer as PostcssTransformer } from 'postcss';
-import PostcssNode from 'postcss/lib/node';
 import util from 'util';
-import { Chunk, Compiler, Compilation, ContextReplacementPlugin, DefinePlugin, HotModuleReplacementPlugin, IgnorePlugin, NormalModuleReplacementPlugin, ProvidePlugin, RuleSetRule } from 'webpack';
-import { RawSource as WebpackRawSource } from 'webpack-sources';
-import { InjectManifestOptions as WorkboxInjectManifestOptions } from 'workbox-build';
-import getConfiguration from "./configurator.js";
-import { LoaderConfiguration as EJSLoaderConfiguration } from "./ejsLoader.js";
+import webpack from 'webpack';
+const {
+  Compilation,
+  ContextReplacementPlugin,
+  DefinePlugin,
+  HotModuleReplacementPlugin,
+  IgnorePlugin,
+  NormalModuleReplacementPlugin,
+  ProvidePlugin
+} = webpack;
+import webpackSources from 'webpack-sources';
+const {
+  RawSource: WebpackRawSource
+} = webpackSources;
+import getConfiguration, { require } 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";
-import { AdditionalLoaderConfiguration, AssetPathConfiguration, EvaluationScope, GenericLoader, HTMLConfiguration, IgnorePattern, InPlaceConfiguration, Loader, PackageDescriptor, RedundantRequest, ResolvedConfiguration, RuleSet, WebpackConfiguration, WebpackExtendedResolveData, WebpackLoader, WebpackLoaderConfiguration, WebpackLoaderIndicator, WebpackPlugin, WebpackPlugins, WebpackResolveData } from "./type.js";
+
+// Wait until optional filesystem modules have been loaded.
+await importsPromise;
+
+/// region optional imports
+const postcssCSSnano = await optionalImport('cssnano');
+const postcssFontpath = await optionalImport('postcss-fontpath');
+const postcssImport = await optionalImport('postcss-import');
+const postcssSprites = await optionalImport('postcss-sprites');
+const updateRule = (await optionalImport('postcss-sprites/lib/core'))?.updateRule;
+const postcssURL = await optionalImport('postcss-url');
+/// endregion
 export const log = new Logger({
   name: 'weboptimizer.webpack-configurator'
 });
 Logger.configureAllInstances({
   level: ['debug', 'development'].includes(process.env.NODE_ENV ?? '') ? 'debug' : 'warn'
 });
-/// region optional imports
-// NOTE: Has to be defined here to ensure to resolve from here.
-const currentRequire =
-/*
-    typeof __non_webpack_require__ === 'function' ?
-        __non_webpack_require__ :
-*/
-eval(`typeof require === 'undefined' ? null : require`);
-export const optionalRequire = id => {
-  try {
-    return currentRequire ? currentRequire(id) : null;
-  } catch {
-    return null;
-  }
-};
-const postcssCSSnano = optionalRequire('cssnano');
-const postcssFontpath = optionalRequire('postcss-fontpath');
-const postcssImport = optionalRequire('postcss-import');
-const postcssSprites = optionalRequire('postcss-sprites');
-const updateRule = optionalRequire('postcss-sprites/lib/core')?.updateRule;
-const postcssURL = optionalRequire('postcss-url');
-/// endregion
 const pluginNameResourceMapping = {
   Favicon: 'favicons-webpack-plugin',
   ImageMinimizer: 'image-minimizer-webpack-plugin',
@@ -131,11 +127,13 @@ const pluginNameResourceMapping = {
 };
 const plugins = {};
 for (const [name, alias] of Object.entries(pluginNameResourceMapping)) {
-  const plugin = optionalRequire(alias);
-  if (plugin) plugins[name] = plugin;else log.debug(`Optional webpack plugin "${name}" not available.`);
+  const plugin = await optionalImport(alias);
+  if (plugin) {
+    if ('default' in plugin) plugins[name] = plugin.default;else plugins[name] = plugin;
+  } else log.debug(`Optional webpack plugin "${name}" not available.`);
 }
 // endregion
-const configuration = getConfiguration();
+const configuration = await getConfiguration();
 Logger.configureAllInstances({
   level: configuration.debug ? 'debug' : 'warn'
 });
@@ -226,14 +224,14 @@ pluginInstances.push({
   }
 });
 ///// endregion
-///// region in-place configured assets in the main html file
+///// region in-place configured assets in the main HTML file
 if (plugins.HTML && htmlAvailable && !['serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2]) && configuration.inPlace.cascadingStyleSheet && Object.keys(configuration.inPlace.cascadingStyleSheet).length || configuration.inPlace.javaScript && Object.keys(configuration.inPlace.javaScript).length) pluginInstances.push(new InPlaceAssetsIntoHTML({
   cascadingStyleSheet: configuration.inPlace.cascadingStyleSheet,
   javaScript: configuration.inPlace.javaScript,
   htmlPlugin: plugins.HTML
 }));
 ///// endregion
-///// region mark empty javaScript modules as dummy
+///// region mark empty JavaScript modules as dummy
 if (!(configuration.needed.javaScript || configuration.needed.javaScriptExtension || configuration.needed.typeScript || configuration.needed.typeScriptExtension)) configuration.files.compose.javaScript = resolve(configuration.path.target.asset.javaScript, '.__dummy__.compiled.js');
 ///// endregion
 ///// region extract cascading style sheets
@@ -248,7 +246,7 @@ if (configuration.injection.external.modules === '__implicit__')
       We only want to process modules from local context in library mode,
       since a concrete project using this library should combine all assets
       (and de-duplicate them) for optimal bundling results.
-      NOTE: Only native javascript and json modules will be marked as
+      NOTE: Only native JavaScript and json modules will be marked as
       external dependency.
   */
   configuration.injection.external.modules = ({
@@ -314,7 +312,7 @@ if (configuration.injection.external.modules === '__implicit__')
   };
 ///// endregion
 //// endregion
-//// region apply final html modifications/fixes
+//// region apply final HTML modifications/fixes
 if (htmlAvailable && plugins.HTML) pluginInstances.push(new HTMLTransformation({
   hashAlgorithm: configuration.hashAlgorithm,
   htmlPlugin: plugins.HTML,
@@ -325,8 +323,7 @@ if (htmlAvailable && plugins.HTML) pluginInstances.push(new HTMLTransformation({
 for (const contextReplacement of module.replacements.context) pluginInstances.push(new ContextReplacementPlugin(...contextReplacement.map(value => {
   const evaluated = evaluate(value, {
     configuration,
-    __dirname,
-    __filename
+    metaImport: import.meta
   });
   if (evaluated.error) throw new Error('Error occurred during processing given context ' + `replacement: ${evaluated.error}`);
   return evaluated.result;
@@ -336,7 +333,7 @@ for (const contextReplacement of module.replacements.context) pluginInstances.pu
 /*
     NOTE: Redundancies usually occur when symlinks aren't converted to their
     real paths since real paths can be de-duplicated by webpack but if two
-    linked modules share the same transitive dependency webpack wont recognize
+    linked modules share the same transitive dependency webpack won't recognize
     them as same dependency.
 */
 if (module.enforceDeduplication) {
@@ -501,7 +498,7 @@ const scope = {
   configuration,
   isFilePathInDependencies,
   loader,
-  require: currentRequire ?? require
+  require
 };
 const evaluateAnThrow = (object, givenOptions = {}) => {
   const options = {
@@ -543,7 +540,7 @@ const cssUse = module.preprocessor.cascadingStyleSheet.additional.pre.map(create
   options: module.cascadingStyleSheet.options || {}
 }, module.preprocessor.cascadingStyleSheet.loader ? {
   loader: module.preprocessor.cascadingStyleSheet.loader,
-  options: extend(true, optionalRequire('postcss') ? {
+  options: extend(true, (await optionalImport('postcss')) ? {
     postcssOptions: {
       /*
           NOTE: Some plugins like "postcss-import" are
@@ -640,7 +637,7 @@ const genericLoader = {
     }, module.preprocessor.javaScript.additional.post.map(createEvaluateMapper('script')))
   },
   // endregion
-  // region html template
+  // region HTML template
   html: {
     // NOTE: This is only for the main entry template.
     main: {
@@ -835,7 +832,7 @@ const genericLoader = {
 extend(loader, genericLoader);
 if (configuration.files.compose.cascadingStyleSheet && plugins.MiniCSSExtract) {
   /*
-      NOTE: We have to remove the client side javascript hmr style loader
+      NOTE: We have to remove the client side JavaScript hmr style loader
       first.
   */
   loader.style.use.shift();
@@ -862,7 +859,7 @@ if (htmlAvailable && configuration.debug && configuration.development.server.liv
 // endregion
 // region plugins
 for (const pluginConfiguration of configuration.plugins) {
-  const plugin = optionalRequire(pluginConfiguration.name.module);
+  const plugin = await optionalImport(pluginConfiguration.name.module);
   if (plugin) pluginInstances.push(new plugin[pluginConfiguration.name.initializer](...pluginConfiguration.parameters));else log.warn(`Configured plugin module "${pluginConfiguration.name.module}"`, 'could not be loaded.');
 }
 // endregion
@@ -887,7 +884,7 @@ let customConfiguration = {};
 if (configuration.path.configuration.json) try {
   require.resolve(_rewrite(configuration.path.configuration.json, _rewrite_options));
   try {
-    customConfiguration = currentRequire(configuration.path.configuration.json);
+    customConfiguration = require(_rewrite(configuration.path.configuration.json, _rewrite_options));
   } catch (error) {
     log.debug('Importing provided json webpack configuration file path', `under "${configuration.path.configuration.json}" failed:`, represent(error));
   }
@@ -999,7 +996,7 @@ if (!Array.isArray(module.skipParseRegularExpressions) || module.skipParseRegula
 };
 if (configuration.path.configuration.javaScript) try {
   require.resolve(_rewrite(configuration.path.configuration.javaScript, _rewrite_options));
-  const result = optionalRequire(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);
   } else log.debug('Failed to load given JavaScript configuration file path', `"${configuration.path.configuration.javaScript}".`);