@eui/tools 4.18.2 → 4.18.6

package/.version.properties

@@ -1 +1 @@
-4.18.2
+4.18.6

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## 4.18.6 (2021-12-15)
+
+##### Bug Fixes
+
+* **other:**
+  * release app script wrong condition on branch - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([f3745bc1](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/f3745bc13749503726bfbdd11832e90401f59ba6))
+
+* * *
+* * *
+## 4.18.5 (2021-12-15)
+
+##### Bug Fixes
+
+* **other:**
+  * adapted release-app script taking care of support snapshot builds - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d4ac56bd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d4ac56bdf236fab1e4601d6963df668002d31607))
+
+* * *
+* * *
+## 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
+
+* **other:**
+  * added support/develop flow for snapshot on support branches - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([d40e9718](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d40e9718a0ba194f7a2ce746032b0ffdce6dd106))
+
+* * *
+* * *
 ## 4.18.2 (2021-12-13)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.18.2",
+    "version": "4.18.6",
     "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,5 @@
 'use strict';
 
-const { deepStrictEqual } = require('assert');
 // global
 const path = require('path');
 
@@ -60,10 +59,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 +90,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 +110,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) => {

package/scripts/csdr/release/app/release-app.js

@@ -37,11 +37,13 @@ module.exports.run = () => {
   }
 
   // Getting branch flags
+  var isSupportSnapshotBranch;
   var isSupportBranch;
   var isSnapshot;
 
   if (branch) {
-    isSupportBranch = (branch !== 'master' && branch.indexOf('support/') > -1);
+    isSupportSnapshotBranch = (branch !== 'master' && branch.indexOf('support/develop') > -1);
+    isSupportBranch = (branch !== 'master' && !isSupportSnapshotBranch && branch.indexOf('support/') > -1);
     isSnapshot = (branch !== 'master' && !isSupportBranch);
   }
 
@@ -56,7 +58,7 @@ module.exports.run = () => {
 
     // for traditional app build using develop / master branch
   } else {
-    if (isSnapshot) {
+    if (isSnapshot || isSupportSnapshotBranch) {
       envTargetGen = 'DEV';
     } else {
       envTargetGen = 'TST';
@@ -145,7 +147,7 @@ module.exports.run = () => {
     .then(() => {
       utils.tools.logTitle('Getting app new version...');
 
-      return versionUtils.app.getNewVersion(project, isSnapshot, isSupportBranch, envTarget);
+      return versionUtils.app.getNewVersion(project, (isSnapshot || isSupportSnapshotBranch), isSupportBranch, envTarget);
     })
     .then((version) => {
       // set the new version found for later use
@@ -199,7 +201,7 @@ module.exports.run = () => {
     // *****************************************************************
     .then(() => {
       // process v1 - diff report is generated on MASTER / TST release
-      if (!isSnapshot && !envTarget) {
+      if (!isSnapshot && !isSupportSnapshotBranch && !envTarget) {
         return metadataUtils.appHistory.generateDiffReport(project, newVersion, isSupportBranch);
       }
 
@@ -256,7 +258,7 @@ module.exports.run = () => {
     // BUILD ANGULAR APPLICATION
     // *****************************************************************
     .then(() => {
-      return utils.buildApp.angular(envTarget, isSnapshot, newVersion);
+      return utils.buildApp.angular(envTarget, (isSnapshot || isSupportSnapshotBranch), newVersion);
     })
 
 
@@ -285,7 +287,7 @@ module.exports.run = () => {
       if (project.build && project.build.distribution) {
         return Promise.resolve()
           .then(() => {
-            return utils.buildApp.generateProjectDistributionFile(project, isSnapshot);
+            return utils.buildApp.generateProjectDistributionFile(project, (isSnapshot || isSupportSnapshotBranch));
           })
           .catch((e) => {
             throw e;
@@ -338,7 +340,7 @@ module.exports.run = () => {
     .then(() => {
       // for env-target based builds, no need to merge anything back as it only contains a master branch for sources
       if (!envTarget) {
-        if (!isSnapshot && !isSupportBranch) {
+        if (!isSnapshot && !isSupportBranch && !isSupportSnapshotBranch) {
           return utils.git.mergeMasterToDevelop(project, project.folder);
         }
       }

package/scripts/csdr/release/package/common.js

@@ -19,9 +19,9 @@ module.exports.getBranches = () => {
 
   const isSnapshot =  (branch === 'develop');
   const isMaster =  (branch === 'master');
-  const isSupport = (!isMaster && !isSnapshot && branch.indexOf('support/') > -1);
+  const isSupportSnapshot = (!isMaster && !isSnapshot && branch.indexOf('support/develop') > -1);
+  const isSupport = (!isMaster && !isSnapshot && !isSupportSnapshot && branch.indexOf('support/') > -1);
   const isNext = (!isMaster && !isSnapshot && !isSupport && branch.indexOf('next/') > -1);
-  const isSupportSnapshot = (!isMaster && !isSnapshot && !isSupport && !isNext);
 
   return {
     isSupport: isSupport,
@@ -178,7 +178,7 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
 
   // GET NEW VERSION from VALID commits found in metadata
   .then(() => {
-    return versionUtils.package.getNewVersion(pkg, pkgMetadata.commits, branches.isSnapshot, branches.isNext, branches.isSupport);
+    return versionUtils.package.getNewVersion(pkg, pkgMetadata.commits, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport);
   })
 
 
@@ -187,7 +187,7 @@ module.exports.updateVersion = (pkg, pkgMetadata) => {
     newVersion = version;
 
     if (!dryRun) {
-      return versionUtils.package.updateVersion(pkg, version, branches.isSnapshot, branches.isNext, branches.isSupport);
+      return versionUtils.package.updateVersion(pkg, version, (branches.isSnapshot || branches.isSupportSnapshot), branches.isNext, branches.isSupport);
     }
   })
 
@@ -288,7 +288,7 @@ module.exports.runGitOperations = (pkg, version) => {
 
   // TAG THE NEW RELEASE (MASTER) for MASTER and SUPPORT
   .then(() => {
-    if (!branches.isSnapshot) {
+    if (!branches.isSnapshot && !branches.isSupportSnapshot) {
       return utils.git.tagVersion(
         version, branches.branch,
         `chore(release): tagging ${version} - from CI server`,