@eui/tools 4.19.7 → 4.19.8

package/.version.properties

@@ -1 +1 @@
-4.19.7
+4.19.8

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.19.8 (2022-02-16)
+
+##### Bug Fixes
+
+* **other:**
+  * routes replacement for local-dev not taken into account - MWP-7941 [MWP-7941](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7941)  ([18a42cee](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/18a42ceeeb32aacf72fb2d441059ec91b6cef055))
+
+* * *
+* * *
 ## 4.19.7 (2022-02-13)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -649,5 +649,5 @@ return Promise.resolve()
   // })
   .then(() => {
     // return injectionUtils.externals.remapRoutesByEnvConfig(prj, 'DEV', true);
-    return injectionUtils.routesReplacement.buildRoutes(prj, 'DEV', false);
+    return injectionUtils.routesReplacement.buildRoutes(prj, 'DEV', true);
   })

package/scripts/utils/pre-build/injection/routes-replacement.js

@@ -7,6 +7,29 @@ const tools = require('../../tools');
 const configUtils = require('../../../csdr/config/config-utils');
 
 
+const getEnvTarget = (envTarget, build) => {
+  let envTargetFinal = envTarget.toLowerCase();
+
+  if (build) {
+    // dirty fix as openid files do not respect envTarget names
+    if (envTargetFinal === 'tst') {
+      envTargetFinal = 'test';
+    }
+
+  // serve configuration based
+  } else {
+    if (envTarget.indexOf('local') > -1) {
+      envTargetFinal = envTarget.replace('-openid', '');
+    } else {
+      envTargetFinal = 'local-' + envTargetFinal;
+    }
+  }
+
+  return envTargetFinal;
+}
+
+
+
 const getEnvConfig = (project, envTarget, build) => {
   tools.logInfo(`Getting config file for env : ${envTarget}`);
 
@@ -14,25 +37,8 @@ const getEnvConfig = (project, envTarget, build) => {
     .then(() => {
       // getting config file
       const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
-      let configFile;
-
-      // build - envTarget based
-      if (build) {
-        let envTargetFinal = envTarget.toLowerCase();
-        // dirty fix as openid files do not respect envTarget names
-        if (envTargetFinal === 'tst') {
-          envTargetFinal = 'test';
-        }
-        configFile = path.join(projectAssetsPath, 'openid-login-config.' + envTargetFinal + '.json');
-
-      // serve configuration based
-      } else {
-        if (envTarget.indexOf('local') > -1) {
-          configFile = path.join(projectAssetsPath, 'openid-login-config.' + envTarget.replace('-openid', '') + '.json');
-        } else {
-          configFile = path.join(projectAssetsPath, 'openid-login-config.local-' + envTarget + '.json');
-        }
-      }
+      const envTargetFinal = getEnvTarget(envTarget, build);
+      const configFile = path.join(projectAssetsPath, 'openid-login-config.' + envTargetFinal + '.json');
 
       tools.logInfo(`checking ${configFile}`);
       if (!tools.isFileExists(configFile)) {
@@ -178,15 +184,15 @@ const replaceRoutes = (project, envTarget, build, routesFileContent) => {
 
       // getting env route defs content if build mode (not serve)
       let envRouteDefsPath, envRouteDefsJSON = [];
-      if (build) {
-        envRouteDefsPath = path.join(projectAssetsPath, 'route-defs.' + envTarget.toLowerCase() + '.json');
+      const envTargetFinal = getEnvTarget(envTarget, build);
 
-        if (!tools.isFileExists(envRouteDefsPath)) {
-          tools.logError(`${envRouteDefsPath} File NOT FOUND`);
-          throw 'ENV_ROUTE_DEFS_FILE_NOT_FOUND';
-        }
-        envRouteDefsJSON = require(envRouteDefsPath);
+      envRouteDefsPath = path.join(projectAssetsPath, 'route-defs.' + envTargetFinal + '.json');
+
+      if (!tools.isFileExists(envRouteDefsPath)) {
+        tools.logError(`${envRouteDefsPath} File NOT FOUND`);
+        throw 'ENV_ROUTE_DEFS_FILE_NOT_FOUND';
       }
+      envRouteDefsJSON = require(envRouteDefsPath);
 
       // merging content of base + env
       tools.logInfo(`Merging ${baseRouteDefsPath} with ${envRouteDefsPath}`);