weboptimizer 4.0.57 → 4.0.59

package/configurator.js

@@ -17,7 +17,7 @@
 */
 // region imports
 import { convertCircularObjectToJSON, copy, evaluateAsyncDynamicData, evaluateDynamicData, extend, getUTCTimestamp, importFilesystemAPI, isFileSync, isObject, isPlainObject, Logger, MAXIMAL_NUMBER_OF_ITERATIONS, modifyObject, optionalImport, parseEncodedObject, removeKeyPrefixes, UTILITY_SCOPE } from 'clientnode';
-import fileSystem, { lstatSync, readFileSync, unlinkSync } from 'fs';
+import fileSystem, { lstat, readFile, unlink } from 'fs/promises';
 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' };
@@ -79,7 +79,7 @@ environment = eval('process.env')) => {
           hierarchy.
       */
       try {
-        if (lstatSync(join(currentWorkingDirectory, 'node_modules')).isSymbolicLink()) metaConfiguration.default.path.context = currentWorkingDirectory;
+        if ((await lstat(join(currentWorkingDirectory, 'node_modules'))).isSymbolicLink()) metaConfiguration.default.path.context = currentWorkingDirectory;
       } catch {
         // Continue regardless of error.
       }
@@ -143,11 +143,11 @@ environment = eval('process.env')) => {
     givenCommandLineArguments: commandLineArguments
   };
   if (filePath) {
-    const fileContent = readFileSync(filePath, {
+    const fileContent = await readFile(filePath, {
       encoding: configuration.encoding
     });
     runtimeInformation = JSON.parse(fileContent);
-    unlinkSync(filePath);
+    await unlink(filePath);
   }
   //// region task specific configuration
   ///// region apply task type specific configuration
@@ -165,7 +165,7 @@ environment = eval('process.env')) => {
     if (Object.prototype.hasOwnProperty.call(result, '__reference__')) {
       const referenceNames = [].concat(result.__reference__);
       delete result.__reference__;
-      for (const name of referenceNames) if (Object.prototype.hasOwnProperty.call(configuration, name)) extend(true, result, configuration[name]);else if (isFileSync(name)) extend(true, result, JSON.parse(readFileSync(name, configuration.encoding)));else log.warn(`Given dynamic referenced configuration "${name}"`, 'could not be resolved.');
+      for (const name of referenceNames) if (Object.prototype.hasOwnProperty.call(configuration, name)) extend(true, result, configuration[name]);else if (isFileSync(name)) extend(true, result, JSON.parse(await readFile(name, configuration.encoding)));else log.warn(`Given dynamic referenced configuration "${name}"`, 'could not be resolved.');
     }
     extend(true, modifyObject(configuration, result), result);
   }

package/ejsLoader.js

@@ -77,11 +77,13 @@ export const loader = async function (source) {
       const queryMatch = /^[^?]+\?(.+)$/.exec(request);
       if (queryMatch) {
         const evaluated = evaluate(queryMatch[1], {
-          compile,
-          locals,
-          request,
-          source,
-          template
+          scope: {
+            compile,
+            locals,
+            request,
+            source,
+            template
+          }
         });
         if (evaluated.error) log.warn('Error occurred during processing given query:', evaluated.error);else if (evaluated.result) extend(true, nestedLocals, evaluated.result);
       }

package/index.js

@@ -220,12 +220,14 @@ environment = eval('process.env')) => {
           const expression = buildConfiguration[configuration.givenCommandLineArguments[2]].trim();
           for (const filePath of buildConfiguration.filePaths) if (!testModuleFilePaths.includes(filePath)) {
             const evaluated = evaluate(`\`${expression}\``, {
-              global,
-              self: configuration,
-              buildConfiguration,
-              path,
-              additionalArguments,
-              filePath
+              scope: {
+                global,
+                self: configuration,
+                buildConfiguration,
+                path,
+                additionalArguments,
+                filePath
+              }
             });
             if (evaluated.error) throw new Error('Error occurred during processing given ' + `command: ${evaluated.error}`);
             log.info(`Running "${evaluated.result}"`);
@@ -247,9 +249,11 @@ environment = eval('process.env')) => {
         const tasks = Array.isArray(configuration.commandLine[type]) ? configuration.commandLine[type] : [configuration.commandLine[type]];
         for (const task of tasks) {
           const evaluated = evaluate(Object.prototype.hasOwnProperty.call(task, 'indicator') ? task.indicator : 'true', {
-            global,
-            self: configuration,
-            path
+            scope: {
+              global,
+              self: configuration,
+              path
+            }
           });
           if (evaluated.error) throw new Error('Error occurred during processing given task: ' + evaluated.error);
           if (evaluated.result) processPromises.push(new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.57",
+  "version": "4.0.59",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -102,7 +102,7 @@
     "babel-loader": "^10.1.1",
     "babel-plugin-polyfill-corejs3": "^1.0.0",
     "babel-plugin-transform-rewrite-imports": "^1.5.4",
-    "clientnode": "4.0.1488",
+    "clientnode": "4.0.1490",
     "core-js": "^3.50.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",
@@ -130,15 +130,15 @@
     "@types/html-minifier": "^4.0.6",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/imagemin": "^9.0.1",
-    "@types/node": "^26.2.0",
+    "@types/node": "^26.3.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.67.0",
+    "@typescript-eslint/parser": "^8.68.0",
     "css-loader": "^7.1.4",
     "cssnano": "^8.0.8",
-    "eslint": "^10.9.0",
+    "eslint": "^10.9.1",
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-jsdoc": "^64.2.1",
     "favicons": "^7.3.1",
@@ -154,7 +154,7 @@
     "postcss-fontpath": "^1.0.0",
     "postcss-import": "^17.0.0",
     "postcss-loader": "^8.2.1",
-    "postcss-preset-env": "^11.4.0",
+    "postcss-preset-env": "^11.5.0",
     "postcss-sprites": "^4.2.1",
     "postcss-url": "^10.1.4",
     "shx": "^0.4.0",
@@ -163,7 +163,7 @@
     "stylelint-config-standard": "^40.0.0",
     "stylelint-config-standard-scss": "^17.0.0",
     "terser-webpack-plugin": "^5.6.1",
-    "typescript-eslint": "^8.67.0",
+    "typescript-eslint": "^8.68.0",
     "typescript-plugin-css-modules": "^5.2.0",
     "web-documentation": "^1.0.49",
     "workbox-webpack-plugin": "^7.4.1"
@@ -989,7 +989,7 @@
           "cssnano": {
             "preset": [
               {
-                "__await_evaluate__": "module.optionalImport('cssnano-preset-default').then((module) => module?.default)"
+                "__await_evaluate__": "(await module.optionalImport('cssnano-preset-default'))?.default"
               },
               "#: 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).",
               {
@@ -1140,7 +1140,7 @@
               "pre": []
             },
             "loader": {
-              "__await_evaluate__": "module.optionalImport('postcss-loader').then((result) => result ? 'postcss-loader' : null)"
+              "__await_evaluate__": "(await module.optionalImport('postcss-loader')) ? 'postcss-loader' : null"
             },
             "options": {}
           },

package/webpackConfigurator.js

@@ -272,8 +272,10 @@ if (htmlAvailable && plugins.HTML) pluginInstances.push(new HTMLTransformation({
 //// region context replacements
 for (const contextReplacement of module.replacements.context) pluginInstances.push(new ContextReplacementPlugin(...contextReplacement.map(value => {
   const evaluated = evaluate(value, {
-    configuration,
-    metaImport: import.meta
+    scope: {
+      configuration,
+      metaImport: import.meta
+    }
   });
   if (evaluated.error) throw new Error('Error occurred during processing given context ' + `replacement: ${evaluated.error}`);
   return evaluated.result;
@@ -375,9 +377,11 @@ const evaluateOrThrowOnError = (object, givenOptions = {}) => {
   };
   if (typeof object === 'string') {
     const evaluated = evaluate(object, {
-      filePath: options.filePath,
-      ...scope,
-      type: options.type
+      scope: {
+        filePath: options.filePath,
+        ...scope,
+        type: options.type
+      }
     });
     if (evaluated.error) throw new Error('Error occurred during processing given expression: ' + evaluated.error);
     return evaluated.result;