@eui/tools 6.21.48 → 6.21.50

package/.version.properties

@@ -1 +1 @@
-6.21.48
+6.21.50

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.21.50 (2025-03-18)
+
+##### Chores
+
+* **other:**
+  * host build relies in same eUI version in upper envs - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([82b714b3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/82b714b3aaa81e1a1dd90f836b117eedc49a00c7))
+
+* * *
+* * *
+## 6.21.49 (2025-03-07)
+
+##### Bug Fixes
+
+* **other:**
+  * workspace config generation issue - MWP-11274 [MWP-11274](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11274)  ([d97553b8](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d97553b8a7354da6b793833effc84a330cea938f))
+
+* * *
+* * *
 ## 6.21.48 (2025-03-07)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -1511,14 +1511,26 @@ const publishUtils = require('./scripts/utils/publish/publish-utils');
 //     console.log(isSonarEnabled);
 //   })
 
-Promise.resolve()
-  .then(() => {
-    const pkg = configUtils.packages.getPackage('eui-mobile-core', true);
-    console.log(pkg);
+// Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.packages.getPackage('eui-mobile-core', true);
+//     console.log(pkg);
+
+//     const pkgVersions = metadataUtils.packageUtils.getPackageVersions(pkg);
+//     console.log(pkgVersions);
+
+//     const versions = metadataUtils.packageUtils.getLastMajorVersion(pkg, '17', false, true);
+//     console.log(versions);
+//   })
 
-    const pkgVersions = metadataUtils.packageUtils.getPackageVersions(pkg);
-    console.log(pkgVersions);
 
-    const versions = metadataUtils.packageUtils.getLastMajorVersion(pkg, '17', false, true);
-    console.log(versions);
+Promise.resolve()
+  .then(() => {
+    const prj = configUtils.projects.getCsdrProject('my-workplace-host');
+    const envTarget = 'INT';
+    return installUtils.projects.getDeps(prj, envTarget);
   })
+
+  .then((compositeDeps) => {
+    console.log(compositeDeps);
+  })

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

@@ -49,23 +49,37 @@ const getDeps_TST = (compositeDeps, standalone = false) => {
 
 
 
-const getCompositeDepsByEnv = (compositePath, envTarget, envsMetadata, prevEnv, currentEnv) => {
+const getCompositeDepsByEnv = (compositePath, envTarget, envsMetadata, prevEnv, currentEnv, euiVersion, versionsMetadata) => {
 
   let prevEnvDeps = {}, currentEnvDeps = {};
 
-  if (envsMetadata[prevEnv]) {
-    prevEnvDeps = envsMetadata[prevEnv].dependencies;
+  if (euiVersion && versionsMetadata) {
+    let prevEnvVersions = [];
+    prevEnvVersions = versionsMetadata.versions.filter(v => v.envTarget === prevEnv && parseInt(v.packages['@eui/deps-base']) === parseInt(euiVersion));
+    
+    if (prevEnvVersions.length > 0) {
+      prevEnvDeps = prevEnvVersions[prevEnvVersions.length - 1].packages;
+    } else {
+      throw new Error(`
+        ${prevEnv} dependencies not found for ${currentEnv} and euiVersion ${euiVersion} dependencies fetch, ensure that the project/remote has been delivered to a previous environment first
+      `);
+    }
+      
   } else {
-    throw new Error(`
-      ${prevEnv} dependencies not found for ${currentEnv} dependencies fetch, ensure that the project/remote has been delivered to a previous environment first
-    `);
+    if (envsMetadata[prevEnv]) {
+      prevEnvDeps = envsMetadata[prevEnv].dependencies;
+    } else {
+      throw new Error(`
+        ${prevEnv} dependencies not found for ${currentEnv} dependencies fetch, ensure that the project/remote has been delivered to a previous environment first
+      `);
+    }
   }
 
+
   if (envsMetadata[currentEnv]) {
     currentEnvDeps = envsMetadata[currentEnv].dependencies;
   }
 
-
   // if default composite type then we iterate over all detected composite files by env
   let depsToResolve = false;
 
@@ -129,9 +143,10 @@ module.exports.getCompositeDeps = (
   envsMetadata,
   envTarget = 'DEV',
   standalone = false,
-  hasPreprod = true
+  hasPreprod = true,
+  euiVersion,
+  versionsMetadata
 ) => {
-
   tools.logInfo('install.compositeCore.getCompositeDeps');
   tools.logInfo(`Processing installation at : ${compositePath} for env: ${envTarget}`);
 
@@ -179,7 +194,9 @@ module.exports.getCompositeDeps = (
           compositePath,
           envTarget,
           envsMetadata,
-          'TST', 'INT'
+          'TST', 'INT',
+          euiVersion,
+          versionsMetadata
         );
       }
 
@@ -194,7 +211,9 @@ module.exports.getCompositeDeps = (
           compositePath,
           envTarget,
           envsMetadata,
-          'INT', 'ACC'
+          'INT', 'ACC',
+          euiVersion,
+          versionsMetadata
         );
       }
 
@@ -209,14 +228,18 @@ module.exports.getCompositeDeps = (
             compositePath,
             envTarget,
             envsMetadata,
-            'PPD', 'PROD'
+            'PPD', 'PROD',
+            euiVersion,
+            versionsMetadata
           );
         } else {
           return getCompositeDepsByEnv(
             compositePath,
             envTarget,
             envsMetadata,
-            'TRN', 'PROD'
+            'TRN', 'PROD',
+            euiVersion,
+            versionsMetadata
           );
         }
       }
@@ -233,14 +256,18 @@ module.exports.getCompositeDeps = (
             compositePath,
             envTarget,
             envsMetadata,
-            'PROD', 'TRN'
+            'PROD', 'TRN',
+            euiVersion,
+            versionsMetadata
           );
         } else {
           return getCompositeDepsByEnv(
             compositePath,
             envTarget,
             envsMetadata,
-            'ACC', 'TRN'
+            'ACC', 'TRN',
+            euiVersion,
+            versionsMetadata
           );
         }
       }
@@ -255,7 +282,9 @@ module.exports.getCompositeDeps = (
           compositePath,
           envTarget,
           envsMetadata,
-          'ACC', 'PPD'
+          'ACC', 'PPD',
+          euiVersion,
+          versionsMetadata
         );
       }
 
@@ -269,7 +298,9 @@ module.exports.getCompositeDeps = (
           compositePath,
           envTarget,
           envsMetadata,
-          'ACC', 'DLT'
+          'ACC', 'DLT',
+          euiVersion,
+          versionsMetadata
         );
       }
     })

package/scripts/csdr/install/projects.js

@@ -18,11 +18,26 @@ const { remotesImport } = tools.getArgs();
 const getDeps = (module.exports.getDeps = (prj, envTarget) => {
   tools.logInfo('install.projects.getDeps');
 
+  const { euiVersion } = tools.getArgs();
+
+  let envsMetadata, versionsMetadata;
+
   return Promise.resolve()
     .then(() => {
       return metadataUtils.appEnvs.getMetadata(prj);
     })
-    .then((envsMetadata) => {
+    .then((outEnvsMetadata) => {
+      envsMetadata = outEnvsMetadata;
+    })
+
+    .then(() => {
+      return metadataUtils.app.getMetadata(prj);
+    })
+    .then((outVersionsMetadata) => {
+      versionsMetadata = outVersionsMetadata;
+    })
+
+    .then(() => {
       let hasPreprod = true;
 
       if (prj.hostName && prj.hostName === 'sedia') {
@@ -34,7 +49,9 @@ const getDeps = (module.exports.getDeps = (prj, envTarget) => {
         envsMetadata,
         envTarget,
         prj.standalone,
-        hasPreprod
+        hasPreprod,
+        euiVersion,
+        versionsMetadata
       );
     })
 

package/scripts/utils/pre-build/routes-replacement/routes-replacement.js

@@ -562,6 +562,7 @@ const generateLinks = (project, routes, envTargetFinal) => {
   if (tools.isFileExists(path.join(project.paths.assetsPath, workspaceDefsBaseFilename))) {
     tools.logInfo('==> existing...processing');  
     workspaceDefsBaseJSON = require(path.join(project.paths.assetsPath, workspaceDefsBaseFilename));
+    tools.writeJsonFileSync(path.join(project.paths.assetsPath, 'workspace-defs-base.json'), workspaceDefsBaseJSON);
   } else {
     tools.logWarning('==> not existing...skipping');  
   }