@eui/tools 6.13.5 → 6.13.7

package/.version.properties

@@ -1 +1 @@
-6.13.5
+6.13.7

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.13.7 (2023-11-06)
+
+##### Chores
+
+* **other:**
+  * updated to forced deps for MWP releases v16 and v10 on multi-environments - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([04de9b3e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/04de9b3eadaaf712368cb15459e3d34337d23034))
+
+* * *
+* * *
+## 6.13.6 (2023-10-26)
+
+##### Chores
+
+* **other:**
+  * added resolutions for v14 v15 v16 v17 for crypto-js 4.2.0 up forced usage - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([173f7e9a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/173f7e9a326bf88fde4da4cbf56a1d0257e140ef))
+
+* * *
+* * *
 ## 6.13.5 (2023-10-23)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.13.5",
+    "version": "6.13.7",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -1344,12 +1344,23 @@ const publishUtils = require('./scripts/utils/publish/publish-utils');
 //     console.log(e);
 //   })
 
+// Promise.resolve()
+//   .then(() => {
+//     const util = require('./scripts/csdr/release/package/common');
+//     const branches = util.getBranches();
+//     console.log(branches);
+//   })
+//   .catch((e) => {
+//     console.log(e);
+//   })
+
 Promise.resolve()
   .then(() => {
-    const util = require('./scripts/csdr/release/package/common');
-    const branches = util.getBranches();
-    console.log(branches);
+    const prj = configUtils.projects.getCsdrProject('my-workplace-host');
+    const envTarget = 'INT';
+    return installUtils.projects.getDeps(prj, envTarget);
   })
-  .catch((e) => {
-    console.log(e);
+
+  .then((compositeDeps) => {
+    console.log(compositeDeps);
   })

package/scripts/csdr/init/resources/14.x/resolutions.json

@@ -4,5 +4,6 @@
     "mem": ">=4.3.0 <=8.1.1",
     "zone.js": ">=0.11.5",
     "nth-check": ">=2.0.1",
-    "fast-xml-parser": ">=4.2.4"
+    "fast-xml-parser": ">=4.2.4",
+    "crypto-js": ">=4.2.0"
 }

package/scripts/csdr/init/resources/15.x/resolutions.json

@@ -2,5 +2,6 @@
     "cacheable-request": ">=10.2.7",
     "fast-xml-parser": ">=4.2.4",
     "get-stream": "6.0.1",
-    "socket.io": ">=4.7.2"
+    "socket.io": ">=4.7.2",
+    "crypto-js": ">=4.2.0"
 }

package/scripts/csdr/init/resources/16.x/resolutions.json

@@ -2,5 +2,6 @@
     "fast-xml-parser": ">=4.2.4",
     "socket.io-parser": ">=4.2.3",
     "semver": ">=6.3.1",
+    "crypto-js": ">=4.2.0",
     "@babel/traverse": ">=7.23.2"
 }

package/scripts/csdr/init/resources/17.x/resolutions.json

@@ -1,5 +1,7 @@
 {
     "fast-xml-parser": ">=4.2.4",
     "socket.io-parser": ">=4.2.3",
-    "semver": ">=6.3.1"
+    "semver": ">=6.3.1",
+    "crypto-js": ">=4.2.0",
+    "@babel/traverse": ">=7.23.2"
 }

package/scripts/csdr/install/composite-core.js

@@ -60,6 +60,8 @@ const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMeta
 
   // if default composite type then we iterate over all detected composite files by env
   if (compositeType === 'DEFAULT') {
+    let depsToResolve = false;
+
     return Promise.resolve()
     .then(() => {
       tools.logTitle('Processing accumulated composites for ALL composite types');
@@ -69,13 +71,27 @@ const getCompositeDepsByEnv = (compositePath, envTarget, compositeType, envsMeta
       filesByEnv.forEach((f) => {
         tools.logInfo(`Parsing : ${f}`);
         const compositeFile = path.join(process.cwd(), compositePath, f);
-        const fileDeps = tools.getJsonFileContent(compositeFile).lockedDependencies || {};
-        console.log(JSON.stringify(fileDeps, null, 2));
-        returnedDeps = { ...returnedDeps, ...fileDeps};
+        const fileDeps = tools.getJsonFileContent(compositeFile);
+        const deps = fileDeps.lockedDependencies || fileDeps.forcedCarretDependencies || {};
+        console.log(JSON.stringify(deps, null, 2));
+        returnedDeps = { ...returnedDeps, ...deps};
+        if (fileDeps.forcedCarretDependencies) {
+          depsToResolve = true;
+        }
       });
 
       return { ...prevEnvDeps, ...returnedDeps };
     })
+
+    .then((deps) => {
+      if (depsToResolve) {
+        tools.logInfo('Resolving forced dependencies for env');
+        return innerCommon.getResolvedCarretDeps(deps, true, false);
+      } else {
+        return deps;
+      }
+    })
+
     .then((deps) => {
       tools.logInfo('Scanning resulting deps for RC detection (do avoid RC spreading up to non DEV envs)');
       const depsToScan = Object.keys(deps);