@eui/tools 5.1.2 → 5.1.5

package/.version.properties

@@ -1 +1 @@
-5.1.2
+5.1.5

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.1.5 (2022-04-28)
+
+##### Bug Fixes
+
+* **other:**
+  * old remote delivery issues on version upgrade - adapted metadata version for app delivery - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([0499f9f0](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0499f9f0ba9b4df56c39773922a3f721476e9a82))
+
+* * *
+* * *
+## 5.1.4 (2022-04-28)
+
+##### Bug Fixes
+
+* **other:**
+  * ensure backward compatibility for alternate dep composite declaration outside of MWP - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([523c2fb2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/523c2fb23b41594d53e87d7747889889a6c5a3b4))
+
+* * *
+* * *
+## 5.1.3 (2022-04-28)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong function call - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([2eb3bddd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2eb3bdddf2de7c0f44b936ce8cb443fcb9817e5e))
+
+* * *
+* * *
 ## 5.1.2 (2022-04-28)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -813,14 +813,30 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 
 
-const pkg = configUtils.packages.getPackage('mywp-dummy-eui10-remote-el-ui');
+// const pkg = configUtils.packages.getPackage('mywp-dummy-eui10-remote-el-ui');
+
+// Promise.resolve()
+//   .then(() => {
+//     return metadataUtils.packageHistory.generateDiffReport(pkg);
+//   })
+//   .then((metadata) => {
+//     console.log(metadata);
+//   })
 
 Promise.resolve()
-  .then(() => {
-    return metadataUtils.packageHistory.generateDiffReport(pkg);
-  })
-  .then((metadata) => {
-    console.log(metadata);
-  })
+// getting root composite - dependencies-composite.json content
+.then(() => {
+  const compositeJsonFile = path.join(process.cwd(), 'apps/eui-showcase-dev-guide', 'dependencies-composite.json');
+  var compositeDeps = tools.getJsonFileContent(compositeJsonFile) || {};
+
+  if (compositeDeps.dependencies) {
+    return compositeDeps.dependencies;
+  } else {
+    return compositeDeps;
+  }
+})
+.then((deps) => {
+  console.log(deps);
+})
 
 

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

@@ -138,7 +138,13 @@ module.exports.getCompositeDeps = (
     // getting root composite - dependencies-composite.json content
     .then(() => {
       const compositeJsonFile = path.join(process.cwd(), compositePath, 'dependencies-composite.json');
-      return tools.getJsonFileContent(compositeJsonFile) || {};
+      var compositeDeps = tools.getJsonFileContent(compositeJsonFile) || {};
+
+      if (compositeDeps.dependencies) {
+        return compositeDeps.dependencies;
+      } else {
+        return compositeDeps;
+      }
     })
 
     // getting env specific composite with compositeType if provided

package/scripts/csdr/install/projects.js

@@ -24,7 +24,7 @@ const getDeps = module.exports.getDeps = (prj, envTarget, compositeType) => {
       return metadataUtils.appEnvs.getMetadata(prj);
     })
     .then((envsMetadata) => {
-      return innerCompositeCore.getDeps(
+      return innerCompositeCore.getCompositeDeps(
         prj.folder,
         envTarget,
         compositeType,

package/scripts/csdr/metadata/app-versions.js

@@ -54,7 +54,7 @@ module.exports.storeMetadata = (project, newVersion, envTarget) => {
       }
 
       versions.push({
-        name: newVersion,
+        version: newVersion,
         releaseDate: appReleaseDate,
         envTarget: envTarget
       });

package/scripts/csdr/version/package-default.js

@@ -98,36 +98,47 @@ module.exports.getNewVersion = (
 
       tools.logInfo(`Current version found : ${currentVersion}`);
 
-      const release = getReleaseType(commits);
-      tools.logInfo('release info found : ' + JSON.stringify(release));
-
       let newVersion = '1.0.0';
 
-      if (isNextBranch) {
-        newVersion = semver.inc(currentVersion, 'prerelease');
-      } else {
-        newVersion = semver.valid(release.releaseType) || semver.inc(currentVersion, release.releaseType)
-      }
+      if (commits) {
+        const release = getReleaseType(commits);
+        tools.logInfo('release info found : ' + JSON.stringify(release));
+
+        if (isNextBranch) {
+          newVersion = semver.inc(currentVersion, 'prerelease');
+        } else {
+          newVersion = semver.valid(release.releaseType) || semver.inc(currentVersion, release.releaseType)
+        }
 
-      tools.logInfo('probable new version : ' + newVersion);
+        tools.logInfo('probable new version : ' + newVersion);
 
-      if (isSnapshot) {
-        if (pkg.backend) {
-          if (pkg.build && pkg.build.nodejs) {
-            newVersion += '-snapshot-' + Date.now();
+        if (isSnapshot) {
+          if (pkg.backend) {
+            if (pkg.build && pkg.build.nodejs) {
+              newVersion += '-snapshot-' + Date.now();
+            } else {
+              newVersion += '-SNAPSHOT';
+            }
           } else {
-            newVersion += '-SNAPSHOT';
+            newVersion += '-snapshot-' + Date.now();
           }
-        } else {
-          newVersion += '-snapshot-' + Date.now();
+
+        } else if (isSupportBranch) {
+          if (pkg.backend) {
+            newVersion = semver.inc(currentVersion, 'prerelease');
+          }
+        } else if (isHotfixBranch) {
+          newVersion = semver.inc(currentVersion, 'prerelease');
         }
 
-      } else if (isSupportBranch) {
-        if (pkg.backend) {
+      } else {
+        tools.logInfo('No commits found for version processing...applying minor version upgrade');
+
+        if (isNextBranch) {
           newVersion = semver.inc(currentVersion, 'prerelease');
+        } else {
+          newVersion = semver.inc(currentVersion, 'minor');
         }
-      } else if (isHotfixBranch) {
-        newVersion = semver.inc(currentVersion, 'prerelease');
       }
 
       tools.logSuccess('new version generated : ' + newVersion);