@eui/tools 5.3.19 → 5.3.22

package/.version.properties

@@ -1 +1 @@
-5.3.19
+5.3.22

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.3.22 (2022-06-21)
+
+##### Chores
+
+* **other:**
+  * adapted routes replacement for local csdr app build - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([cd35684e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/cd35684e3489edc411c52caf4d874fc660710274))
+
+* * *
+* * *
+## 5.3.21 (2022-06-21)
+
+##### Bug Fixes
+
+* **other:**
+  * missing args declaration - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([6aab71fb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6aab71fbfa0c2f3aaeff5ce055f2612394d1695c))
+
+* * *
+* * *
+## 5.3.20 (2022-06-21)
+
+##### Chores
+
+* **other:**
+  * adapted pre-build to execute local project pre-build script if present - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([31675fd0](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/31675fd08502b56e6222d374a2c9d48973305df2))
+
+* * *
+* * *
 ## 5.3.19 (2022-06-21)
 
 ##### Bug Fixes

package/package.json

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

package/sandbox.js

@@ -877,15 +877,6 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 
 Promise.resolve()
   .then(() => {
-    const prj = configUtils.projects.getProject('rsp-starter-kit');
+    const prj = configUtils.projects.getProject('my-workplace-host-playground');
     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/utils/pre-build/injection/routes-replacement.js

@@ -7,12 +7,20 @@ const tools = require('../../tools');
 const configUtils = require('../../../csdr/config/config-utils');
 
 
-const getEnvTarget = (envTarget, build) => {
-  if (!envTarget) {
-    throw 'ENV_TARGET_NOT_FOUND';
+const getEnvTarget = (envTargetIn, build) => {
+  if (!envTargetIn) {
+
+    // check if envTarget has been provided as cli args for stand-alone local build of CSDR apps
+    const { envTarget } = tools.getArgs();
+
+    if (!envTarget) {
+      throw 'ENV_TARGET_NOT_FOUND';
+    } else {
+      envTargetIn = envTarget;
+    }
   }
 
-  let envTargetFinal = envTarget.toLowerCase();
+  let envTargetFinal = envTargetIn.toLowerCase();
 
   if (build) {
     // dirty fix as openid files do not respect envTarget names
@@ -22,8 +30,8 @@ const getEnvTarget = (envTarget, build) => {
 
   // serve configuration based
   } else {
-    if (envTarget.indexOf('local') > -1) {
-      envTargetFinal = envTarget.replace('-openid', '');
+    if (envTargetIn.indexOf('local') > -1) {
+      envTargetFinal = envTargetIn.replace('-openid', '');
     } else {
       envTargetFinal = 'local-' + envTargetFinal;
     }

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

@@ -10,7 +10,7 @@ const translationUtils = require('./translations/translation-utils');
 
 const configUtils = require('../../csdr/config/config-utils');
 
-let { openid } = tools.getArgs();
+let { openid, dryRun } = tools.getArgs();
 
 
 module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
@@ -128,6 +128,19 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
       return this.injectAppConfig(project, configEnvTarget);
     })
 
+    .then(() => {
+      const prebuildScript = path.join(project.paths.rootPath, 'pre-build.js');
+
+      if (!dryRun && tools.isFileExists(prebuildScript)) {
+        tools.logInfo('Executing pre-build script');
+
+        return tools.runScript(`node ${prebuildScript}`);
+
+      } else {
+        tools.logInfo('DRY-RUN or pre-build script not found in project folder --- skipping');
+      }
+    })
+
     .catch((e) => {
       throw e;
     })