@eui/tools 5.3.2 → 5.3.5

package/.version.properties

@@ -1 +1 @@
-5.3.2
+5.3.5

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.3.5 (2022-06-01)
+
+##### Bug Fixes
+
+* **other:**
+  * env config injection when no configEnvTarget pass from pipeline take default - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([fc6b7585](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/fc6b75850d3f96774ecda373954c77700d426f5e))
+
+* * *
+* * *
+## 5.3.4 (2022-05-31)
+
+##### Bug Fixes
+
+* **other:**
+  * adapted openid injection to standalone installation path - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([8ba4de88](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/8ba4de880bf8d8881c3d21db0d409218b4be85f5))
+
+* * *
+* * *
+## 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

package/package.json

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

package/sandbox.js

@@ -879,4 +879,13 @@ Promise.resolve()
   .then(() => {
     const prj = configUtils.projects.getProject('rsp-starter-kit');
     console.log(prj);
+
+    var { branch, dryRun, envTarget, compositeType, configEnvTarget } = tools.getArgs();
+    console.log(configEnvTarget);
+
+    if (configEnvTarget && typeof (configEnvTarget) === 'boolean') {
+      configEnvTarget = null;
+    }
+
+    console.log(configEnvTarget);
   })

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/build/app/build-app-utils.js

@@ -43,6 +43,11 @@ module.exports.angular = (envTarget, isSnapshot, version, configEnvTargetIn) =>
   // as this angular build method can be called in stand-alone (outside of CSDR pipeline flow)
   if (configEnvTargetIn) {
     configEnvTarget = configEnvTargetIn;
+
+  } else {
+    if (configEnvTarget && typeof (configEnvTarget) === 'boolean') {
+      configEnvTarget = null;
+    }
   }
 
   // getting param from project config

package/scripts/utils/pre-build/projects.js

@@ -89,32 +89,32 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
       if ((project.build && project.build.openid) || openid) {
         tools.logInfo('Executing scripts files replacement for openId Connect');
 
+        const nodeModulesPath = project.paths.nodeModulesPath;
         let rootTargetFolder = 'src';
-        tools.logInfo(`Copying node_modules/oidc-client/dist/oidc-client.min.js to ${rootTargetFolder}/assets/oidc-client.min.js`);
+
+        tools.logInfo(`Copying ${nodeModulesPath}/oidc-client/dist/oidc-client.min.js to ${rootTargetFolder}/assets/oidc-client.min.js`);
         tools.copy(
-          path.join(process.cwd(), 'node_modules/oidc-client/dist/oidc-client.min.js'),
+          path.join(nodeModulesPath, '/oidc-client/dist/oidc-client.min.js'),
           path.join(project.paths.angularPath, `${rootTargetFolder}/assets/oidc-client.min.js`)
         );
         tools.logSuccess();
 
-        tools.logInfo(`Copying node_modules/jsrsasign/lib/jsrsasign-all-min.js to ${rootTargetFolder}/assets/jsrsasign-all-min.js`);
+        tools.logInfo(`Copying ${nodeModulesPath}/jsrsasign/lib/jsrsasign-all-min.js to ${rootTargetFolder}/assets/jsrsasign-all-min.js`);
         tools.copy(
-          path.join(process.cwd(), 'node_modules/jsrsasign/lib/jsrsasign-all-min.js'),
+          path.join(nodeModulesPath, '/jsrsasign/lib/jsrsasign-all-min.js'),
           path.join(project.paths.angularPath, `${rootTargetFolder}/assets/jsrsasign-all-min.js`)
         );
         tools.logSuccess();
 
-        tools.logInfo(`Copying node_modules/@eui/base/assets/openid/openid-login.js to ${rootTargetFolder}/assets/openid-login.js`);
+        tools.logInfo(`Copying ${nodeModulesPath}/@eui/base/assets/openid/openid-login.js to ${rootTargetFolder}/assets/openid-login.js`);
         tools.copy(
-          path.join(process.cwd(), 'node_modules/@eui/base/assets/openid/openid-login.js'),
+          path.join(nodeModulesPath, '/@eui/base/assets/openid/openid-login.js'),
           path.join(project.paths.angularPath, `${rootTargetFolder}/assets/openid-login.js`)
         );
         tools.logSuccess();
       }
 
-      if (configEnvTarget) {
-        return this.injectAppConfig(project, configEnvTarget);
-      }
+      return this.injectAppConfig(project, configEnvTarget);
     })
 
     .catch((e) => {
@@ -129,7 +129,12 @@ module.exports.injectAppConfig = (project, configEnvTarget) => {
     .then(() => {
       tools.logInfo(`Executing configuration replacement for : ${configEnvTarget} environment`);
 
-      const envFilePath = path.join(project.paths.angularPath, 'src/assets/config', `env-json-config-${configEnvTarget}.json`);
+      // set default if not envTarget provided
+      let envFilePath = path.join(project.paths.angularPath, 'src/assets/config', `env-json-config.json`);;
+
+      if (configEnvTarget) {
+        envFilePath = path.join(project.paths.angularPath, 'src/assets/config', `env-json-config-${configEnvTarget}.json`);
+      }
 
       if (!tools.isFileExists(envFilePath)) {
         tools.logError(`Cannot find environment config to inject : `);