@eui/tools 5.3.0 → 5.3.3

package/.version.properties

@@ -1 +1 @@
-5.3.0
+5.3.3

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.3.3 (2022-05-31)
+
+##### Bug Fixes
+
+* **other:**
+  * app with masterBranchOnly build - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([d66e3076](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d66e3076fc4f90adc11fc59b3d8068995537c237))
+
+* * *
+* * *
+## 5.3.2 (2022-05-31)
+
+##### Bug Fixes
+
+* **other:**
+  * typo in standalone build part - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([180bce21](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/180bce21a29deb9cae6687aa74e1f821e80e6533))
+
+* * *
+* * *
+## 5.3.1 (2022-05-31)
+
+##### Bug Fixes
+
+* **other:**
+  * console log wrong declaration - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([beb3c4f3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/beb3c4f35325569e42630dcd8e5b483d40254d0f))
+
+* * *
+* * *
 ## 5.3.0 (2022-05-31)
 
 ##### New Features

package/package.json

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

package/scripts/csdr/install/build-app.js

@@ -11,7 +11,7 @@ module.exports.install = (prj, envTarget, compositeType) => {
   return Promise.resolve()
     // checking remotes
     .then(() => {
-      if (prj.standAlone) {
+      if (prj.standalone) {
         return innerProjects.installDepsStandalone(prj);
       } else {
         return innerProjects.installDeps(prj, envTarget, compositeType);

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

@@ -344,7 +344,9 @@ module.exports.run = () => {
       // 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 && !isSupportSnapshotBranch) {
-          return utils.git.mergeMasterToDevelop(project, project.folder);
+          if (project.build && !project.build.masterBranchOnly) {
+            return utils.git.mergeMasterToDevelop(project, project.folder);
+          }
         }
       }
     })

package/scripts/utils/tools.js

@@ -127,11 +127,9 @@ function relativeCopyEol(fileGlob, from, to) {
 function copydir(from, to, overwrite = true, globPattern = '**/*') {
   logInfo('----->copydir from : ' + from + ' ====> to : ' + to );
   var files = glob.sync(globPattern, { cwd: from, nodir: true, follow: true, dot: true });
-  console.log(files);
   files.forEach(file => {
       const origin = path.join(from, file);
       const dest = path.join(to, file);
-      console.logt(origin, dest);
       _recursiveMkDir(path.dirname(dest));
       fse.copySync(origin, dest, { overwrite: overwrite });
   });