@eui/tools 6.21.75 → 6.21.76

package/.version.properties

@@ -1 +1 @@
-6.21.75
+6.21.76

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.21.76 (2025-05-16)
+
+##### Chores
+
+* **other:**
+  * scan eUI core project version from dependencies-base with composite - EUI-10199 [EUI-10199](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-10199)  ([5adc4131](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5adc4131ba88b61c5e0815c2b1e6ac90989655ce))
+
+* * *
+* * *
 ## 6.21.75 (2025-05-15)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/config/projects.js

@@ -283,13 +283,18 @@ const getEuiVersionCore = (project) => {
 
   tools.logInfo(`Checking project dependencies in : ${project.folder}`);
   const depsCompositeFile = path.join(project.folder, 'dependencies-composite.json');
+  const depsBaseFile = path.join(project.folder, 'dependencies-base.json');
 
-  if (!tools.isFileExists(depsCompositeFile)) {
+  if (!tools.isFileExists(depsCompositeFile) || !tools.isFileExists(depsBaseFile)) {
     tools.logWarning('Unable to find project version / dependencies-composite.json does not exist in project');
   } else {
-    tools.logInfo(`parsing ${depsCompositeFile}`);
-    const jsonFileContnet = JSON.parse(tools.getFileContent(depsCompositeFile));
-    const deps = jsonFileContnet.dependencies;
+    tools.logInfo(`parsing ${depsCompositeFile} and ${depsBaseFile}`);
+    const jsonFileContent = JSON.parse(tools.getFileContent(depsCompositeFile));
+    const jsonFileContentBase = JSON.parse(tools.getFileContent(depsBaseFile));
+    const depsComposite = jsonFileContent.dependencies;
+    const depsBase = jsonFileContentBase;
+
+    const deps = {...depsComposite, ...depsBase};
 
     if (!deps) {
       version = 'DEFAULT';