@eui/tools 4.18.3 → 4.18.4

package/.version.properties

@@ -1 +1 @@
-4.18.3
+4.18.4

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.18.4 (2021-12-15)
+
+##### Chores
+
+* **other:**
+  * fix dependencies resolution for support snapshot - enabled prevSnapshot deps fetch from metadata option - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([1e270e30](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1e270e305eacca555fce441366de86a9dc2fa722))
+
+* * *
+* * *
 ## 4.18.3 (2021-12-15)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -633,8 +633,8 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 
 return Promise.resolve()
   .then(() => {
-    const prjName = 'my-workplace';
+    const prjName = 'eui-showcase-ux';
     const prj = configUtils.projects.getCsdrProject(prjName);
 
-    return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'TRN', true);
+    return compositeUtils.getDeps(prj, 'TST');
   })

package/scripts/csdr/install/common.js

@@ -130,6 +130,9 @@ const getRemappedDeps = (pkgDeps, pkgDefaultDeps) => {
 const getResolvedCarretDeps = (deps) => {
   tools.logTitle('Resolving carret for next version packages');
 
+  tools.logInfo('processing dependencies : ');
+  console.log(deps);
+
   return Promise.resolve()
     .then(() => {
 
@@ -148,6 +151,7 @@ const getResolvedCarretDeps = (deps) => {
             const lastMajorVersion = metadataUtils.package.getLastMajorVersion(pkg, version.substr(1).split('.')[0]);
 
             if (lastMajorVersion) {
+              tools.logInfo(`--version found : ${lastMajorVersion}`);
               acc[k] = lastMajorVersion;
 
             } else {

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

@@ -1,6 +1,7 @@
 'use strict';
 
 const { deepStrictEqual } = require('assert');
+const { toInteger } = require('lodash');
 // global
 const path = require('path');
 
@@ -60,10 +61,10 @@ const getPackagesDepsByEnv = (prj, envTarget, compositeType) => {
     })
     .then((prjDeps) => {
       if (envTarget === 'DEV') {
-        return getDeps_DEV(prjDeps);
+        return getDeps_DEV(prj, prjDeps);
       }
       if (envTarget === 'TST') {
-        return getDeps_TST(prjDeps);
+        return getDeps_TST(prj, prjDeps);
       }
       if (envTarget === 'INT') {
         return getDeps_INT(prj, compositeType);
@@ -91,10 +92,16 @@ const getPackagesDepsByEnv = (prj, envTarget, compositeType) => {
  * For DEV target, we take the outermost known versions of the packages,
  * including : SNAPSHOTS & LATEST
  */
-const getDeps_DEV = (prjDeps) => {
+const getDeps_DEV = (prj, prjDeps) => {
   return Promise.resolve()
     .then(() => {
-      return metadataUtils.package.getPackagesDeps('packages');
+      if (prj.build && prj.build.prevSnapshotEnabled) {
+        tools.logInfo('project has prevSnapshot enabled, getting deps list from prevSnapshotsTag');
+        return metadataUtils.package.getPackagesDeps('packagesPrevSnapshotsTag');
+      } else {
+        tools.logInfo('getting project deps from snapshots metadata list');
+        return metadataUtils.package.getPackagesDeps('packages');
+      }
     })
 
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
@@ -105,18 +112,24 @@ const getDeps_DEV = (prjDeps) => {
     .catch((e) => {
       throw e;
     })
-}
+  }
 
 
-/**
- * For TST target, we take only the LATEST know versions of the packages,
- * including : LATEST
+  /**
+   * For TST target, we take only the LATEST know versions of the packages,
+   * including : LATEST
  */
-const getDeps_TST = (prjDeps) => {
+const getDeps_TST = (prj, prjDeps) => {
   return Promise.resolve()
-    .then(() => {
+  .then(() => {
+    if (prj.build && prj.build.prevSnapshotEnabled) {
+      tools.logInfo('project has prevSnapshot enabled, getting deps list from prevTag');
+      return metadataUtils.package.getPackagesDeps('packagesPrevTag');
+    } else {
+      tools.logInfo('getting project deps from packagesLatest metadata list');
       return metadataUtils.package.getPackagesDeps('packagesLatestTag');
-    })
+    }
+  })
 
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
     .then((pkgDeps) => {