weboptimizer 4.0.58 → 4.0.59

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.58",
+  "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.1489",
+    "clientnode": "4.0.1490",
     "core-js": "^3.50.0",
     "ejs": "^6.0.1",
     "exports-loader": "^5.0.0",
@@ -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",
@@ -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;