weboptimizer 4.0.20 → 4.0.21

package/browser.js

@@ -17,7 +17,6 @@
 */
 // region imports
 import { CONSOLE_METHODS, Logger, timeout } from 'clientnode';
-import webOptimizerDefaultTemplate from 'webOptimizerDefaultTemplateFilePath';
 // endregion
 // region declaration
 
@@ -100,17 +99,17 @@ if (typeof TARGET_TECHNOLOGY === 'undefined' || TARGET_TECHNOLOGY === 'node')
           NOTE: We load dependencies now to avoid having file imports
           after test runner has finished to isolate the environment.
       */
-      const ejsLoader = (await import('./ejsLoader')).default;
+      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) => {
+        async: () => (error, result) => {
           if (error) throw error;else evaluatedContent = result;
         }
       })(content);
-    } else evaluatedContent = webOptimizerDefaultTemplate;
+    } else evaluatedContent = (await import('webOptimizerDefaultTemplateFilePath')).default;
     render(evaluatedContent);
     // endregion
   })().catch(error => {

package/configurator.d.ts

@@ -1,7 +1,5 @@
 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;
 /**

package/configurator.js

@@ -16,63 +16,6 @@
     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 { 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';
@@ -81,14 +24,6 @@ import { determineAssetType, determineModuleFilePath, determineModuleLocations,
 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;
@@ -184,7 +119,16 @@ environment = eval('process.env')) => {
   if (debug) configuration = extend(true, modifyObject(metaConfiguration.default, metaConfiguration.debug), metaConfiguration.debug);else configuration = metaConfiguration.default;
   configuration.debug = debug;
   if (typeof configuration.library === 'object') extend(true, modifyObject(libraryConfiguration, configuration.library), configuration.library);
-  if (configuration.library && specificConfiguration.library !== false) configuration = extend(true, modifyObject(configuration, libraryConfiguration), libraryConfiguration);
+  if (configuration.library && specificConfiguration.library !== false) {
+    const modifiedConfiguration = modifyObject(configuration, libraryConfiguration);
+    configuration = extend(true,
+    /*
+        NOTE: We have to copy both objects otherwise the
+        substucture under "path" is not extended as expected.
+    */
+    copy(modifiedConfiguration), copy(libraryConfiguration));
+  }
+
   // endregion
   // region merging and evaluating task specific and dynamic configurations
   /// region load additional dynamically given configuration

package/ejsLoader.js

@@ -29,7 +29,6 @@ import { determineModuleFilePath } from "./helper.js";
 // region types
 
 // endregion
-const configuration = await getConfiguration();
 export const log = new Logger({
   name: 'weboptimizer.ejs-loader'
 });
@@ -40,6 +39,7 @@ export const log = new Logger({
  */
 export const loader = async function (source) {
   const callback = this.async();
+  const configuration = await getConfiguration();
   const givenOptions = convertSubstringInPlainObject(extend(true, {
     compiler: {
       async: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.20",
+  "version": "4.0.21",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -77,7 +77,7 @@
     "lint:base": "eslint --no-warn-ignored *.ts */*.ts test/*/*.ts",
     "prepare": "yarn build",
     "prettify": "yarn lint:base --fix || true",
-    "test": "yarn build:test && jest --config ./weboptimizerJest.json --noStackTrace --root-dir './' --test-regex '/test/.+\\\\.js$' test/browser.js test/configurator.js test/helper.js test/ejsLoader.js test/stylelintConfigurator.js test/index.js test/webpackConfigurator.js",
+    "test": "yarn build:test && node --experimental-vm-modules node_modules/.bin/jest --config ./weboptimizerJest.json --noStackTrace --root-dir './' --test-regex '/test/.+\\\\.js$' test/browser.js test/configurator.js test/helper.js test/ejsLoader.js test/stylelintConfigurator.js test/index.js test/webpackConfigurator.js",
     "test:coverage": "yarn test --ci --coverage --coverageReporters=text --coverageReporters=text-summary --silent --testLocationInResults",
     "test:coverage:report": "yarn test:coverage --coverageDirectory=.coverage --coverageReporters=lcov --outputFile=lcov.info",
     "test:watch": "yarn test --watch",
@@ -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.1444",
+    "clientnode": "4.0.1451",
     "core-js": "^3.49.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",
@@ -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.63.0",
+    "@typescript-eslint/parser": "^8.64.0",
     "css-loader": "^7.1.4",
     "cssnano": "^8.0.2",
-    "eslint": "^10.6.0",
+    "eslint": "^10.7.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jsdoc": "^63.0.12",
+    "eslint-plugin-jsdoc": "^63.0.13",
     "favicons": "^7.3.0",
     "favicons-webpack-plugin": "^6.0.1",
     "globals": "^17.7.0",
@@ -143,7 +143,7 @@
     "mini-css-extract-plugin": "^2.10.2",
     "mkdirp": "^3.0.1",
     "node-fetch": "^3.3.2",
-    "postcss": "^8.5.16",
+    "postcss": "^8.5.19",
     "postcss-fontpath": "^1.0.0",
     "postcss-import": "^16.1.1",
     "postcss-loader": "^8.2.1",
@@ -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.63.0",
+    "typescript-eslint": "^8.64.0",
     "typescript-plugin-css-modules": "^5.2.0",
     "web-documentation": "^1.0.42",
     "workbox-webpack-plugin": "^7.4.1"
@@ -950,7 +950,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": [
               {
-                "__await_evaluate__": "module.optionalImport('cssnano-preset-default')"
+                "__await_evaluate__": "module.optionalImport('cssnano-preset-default').then((module) => module?.default)"
               },
               {
                 "autoprefixer": false,

package/stylelintConfigurator.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("clientnode").PlainObject;
 export default _default;

package/stylelintConfigurator.js

@@ -15,10 +15,6 @@
     See https://creativecommons.org/licenses/by/3.0/deed.de
     endregion
 */
-// region imports
 import getConfiguration from "./configurator.js";
-import { ResolvedConfiguration } from "./type.js";
-// endregion
 const configuration = await getConfiguration();
-module.exports = configuration.stylelint;
-export default module.exports;
+export default configuration.stylelint;

package/webpackConfigurator.js

@@ -42,12 +42,12 @@ import HTMLTransformation from "./plugins/HTMLTransformation.js";
 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');
+const postcssCSSnano = (await optionalImport('cssnano'))?.default;
+const postcssFontpath = (await optionalImport('postcss-fontpath'))?.default;
+const postcssImport = (await optionalImport('postcss-import'))?.default;
+const postcssSprites = (await optionalImport('postcss-sprites'))?.default;
+const updateRule = (await optionalImport('postcss-sprites/lib/core'))?.default.updateRule;
+const postcssURL = (await optionalImport('postcss-url'))?.default;
 /// endregion
 export const log = new Logger({
   name: 'weboptimizer.webpack-configurator'
@@ -70,12 +70,15 @@ for (const [name, alias] of Object.entries(pluginNameResourceMapping)) {
     if ('default' in plugin) plugins[name] = plugin.default;else plugins[name] = plugin;
   } else log.debug(`Optional webpack plugin "${name}" not available.`);
 }
+
 // endregion
 const configuration = await getConfiguration();
 Logger.configureAllInstances({
   level: configuration.debug ? 'debug' : 'warn'
 });
-const module = configuration.module;
+const {
+  module
+} = configuration;
 // region initialization
 /// region determine library name
 const exportFormatsNeedingAValidVariableName = ['assign', 'global', 'this', 'var', 'window'];
@@ -720,8 +723,11 @@ if (htmlAvailable && configuration.debug && configuration.development.server.liv
 // endregion
 // region plugins
 for (const pluginConfiguration of configuration.plugins) {
-  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.');
+  let plugin = await optionalImport(pluginConfiguration.name.module);
+  if (plugin) {
+    if ('default' in plugin) plugin = plugin.default;
+    pluginInstances.push(new plugin[pluginConfiguration.name.initializer](...pluginConfiguration.parameters));
+  } else log.warn(`Configured plugin module "${pluginConfiguration.name.module}"`, 'could not be loaded.');
 }
 // endregion
 // region minimizer and image compression
@@ -858,9 +864,10 @@ if (Array.isArray(module.skipParseRegularExpressions) ? module.skipParseRegularE
 };
 if (configuration.path.configuration.javaScript) try {
   import.meta.resolve(configuration.path.configuration.javaScript);
-  const result = await optionalImport(configuration.path.configuration.javaScript);
+  let 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);
+    if ('default' in result) result = result.default;
+    if ('replaceWebOptimizer' in result) webpackConfiguration = result.replaceWebOptimizer;else extend(true, webpackConfiguration, result);
   } else log.debug('Failed to load given JavaScript configuration file path', `"${configuration.path.configuration.javaScript}".`);
 } catch {
   log.debug('Optional configuration file script', `"${configuration.path.configuration.javaScript}" not available.`);