@eui/tools 5.2.2 → 5.2.5

package/.version.properties

@@ -1 +1 @@
-5.2.2
+5.2.5

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.2.5 (2022-05-12)
+
+##### Bug Fixes
+
+* **eui-tools:**
+  * sub-package build issue - EUI-5961 [EUI-5961](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5961)  ([8dcb702b](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/8dcb702b8f59ccee550c10177bdd3cab6f50b5a9))
+
+* * *
+* * *
+## 5.2.4 (2022-05-05)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong dependencies resolutions when not dependencies parent in composite of project - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([3c4e8300](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3c4e8300d893cbdadc50a28b2bb019617288ca2c))
+
+* * *
+* * *
+## 5.2.3 (2022-05-03)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong tag set for envTarget based packages/remotes - EUI-5632 [EUI-5632](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-5632)  ([6f9a69d2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6f9a69d2e73067902592575a6c97d7c0e5633d40))
+
+* * *
+* * *
 ## 5.2.2 (2022-05-03)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/config/angular.js

@@ -1340,7 +1340,7 @@ module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath) =>
 
   let projectDef = JSON.stringify(angularPackageSubEntryDef);
 
-  let replacePath = tools.replaceAll(projectDef, '@subEntry.path@', subEntryPath)
+  let replacePath = tools.replaceAll(projectDef, '@subEntry.path@', subEntryName)
   replacePath = tools.replaceAll(replacePath, '@subEntry.package.name@', 'ng-package.json');
 
   jsonFile['projects'][subEntryName] = JSON.parse(replacePath);

package/scripts/csdr/install/common.js

@@ -303,8 +303,14 @@ const getLocalProjectDeps = (prj) => {
 
   // check dependencies composite file - default
   const prjCompJsonFile = path.join(process.cwd(), prj.folder, 'dependencies-composite.json');
-  const prjCompDeps = tools.getJsonFileContent(prjCompJsonFile).dependencies || {};
 
+  const depsJson = tools.getJsonFileContent(prjCompJsonFile);
+  let prjCompDeps;
+  if (depsJson.dependencies) {
+    prjCompDeps = depsJson.dependencies || {};
+  } else {
+    prjCompDeps = depsJson || {}
+  }
   return { ...prjDeps, ...prjCompDeps };
 }
 

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

@@ -24,18 +24,14 @@ const writePackageJsonCore = (newVersion, folder, isSnapshot, isNextBranch, isSu
 
       let tag;
 
-      if (envTarget && envTarget === 'DEV') {
+      if (isSnapshot) {
         tag = 'snapshot';
+      } else if (isNextBranch) {
+        tag = 'next';
+      } else if (isSupportBranch) {
+        tag = 'prev';
       } else {
-        if (isSnapshot) {
-          tag = 'snapshot';
-        } else if (isNextBranch) {
-          tag = 'next';
-        } else if (isSupportBranch) {
-          tag = 'prev';
-        } else {
-          tag = 'latest';
-        }
+        tag = 'latest';
       }
 
       pkgJson.version = newVersion;

package/scripts/utils/tools.js

@@ -412,7 +412,7 @@ function getFiles(parentPath) {
 
 function getFilesGlob(from, fileGlob) {
   return new Promise((resolve, reject) => {
-    glob(fileGlob, { cwd: from, nodir: true, follow: true, dot: true }, (err, files) => {
+    glob(fileGlob, { ignore: ['dist/**'], cwd: from, nodir: true, follow: true, dot: true }, (err, files) => {
         if (err) {
           logError(err);
           reject(err);