@eui/tools 6.11.6 → 6.11.8

package/.version.properties

@@ -1 +1 @@
-6.11.6
+6.11.8

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.11.8 (2023-04-18)
+
+##### Chores
+
+* **other:**
+  * reverted node-fetch to 2.x version - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([1a33f810](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/1a33f8100d9e19e05fad8d0d8299c6df0aa90795))
+
+* * *
+* * *
+## 6.11.7 (2023-04-18)
+
+##### Bug Fixes
+
+* **other:**
+  * routes replacement not overriding local config if provided - MWP-9533 [MWP-9533](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9533)  ([931623c5](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/931623c5ce06279ab3325255bc719ea7f5074aaa))
+
+* * *
+* * *
 ## 6.11.6 (2023-04-18)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.11.6",
+    "version": "6.11.8",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -41,7 +41,7 @@
         "mocha": "10.2.0",
         "chai": "4.3.7",
         "nyc": "15.1.0",
-        "node-fetch": "3.3.1",
+        "node-fetch": "2.6.9",
         "svg-sprite": "2.0.2",
         "imagemin": "7.0.1",
         "imagemin-svgo": "9.0.0",

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

@@ -13,7 +13,7 @@ module.exports.run = () => {
 
   // TESTING a release pipeline in DRY-RUN mode :
   // virtual remotes
-  // npm run pkg:release mywp-dashboard-eui15-remote-el-ui -- --dryRun --branch master --envTarget DEV --skipInstall
+  // npm run pkg:release mywp-dashboard-eui15-remote-el-ui -- --dryRun --branch master --envTarget DEV --skipInstall --debug --build
 
   // normal UI package / old style remote
   // npm run pkg:release eui-tools -- --dryRun --branch develop --skipLint --skipInstall --skipTest --skipDoc --skipClone --debug --build

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

@@ -275,6 +275,8 @@ const processRoutesConfig = (project, envTarget, build, routesFile, routesFileCo
       const euiVersionNumber = euiVersion.split('.')[0];
       const envTargetFinal = getEnvTarget(envTarget, build);
 
+      tools.logInfo(`Processing for envTarget : ${envTargetFinal}`);
+
       // getting the input file definitions of routes for replacements
       // from tokenized template in config -- allowing to control playground vs normal env (when using the MWP HOST for release)
       // format :
@@ -287,6 +289,7 @@ const processRoutesConfig = (project, envTarget, build, routesFile, routesFileCo
         throw 'ROUTES_CONFIG_V2_TEMPLATE_NOT_FOUND';
       }
 
+
       routeDefsInputFilename = project.externalRoutesSources.routesFilenameTemplate.replace('@eui.version@', euiVersionNumber);
       routeDefsInputFilename = routeDefsInputFilename.replace('@env.target@', envTargetFinal);
 
@@ -303,13 +306,40 @@ const processRoutesConfig = (project, envTarget, build, routesFile, routesFileCo
 
       const routeDefsInputJSON = require(path.join(routeDefsInputPath));
 
+      // Merging content with "local" route file defs if existing
+
+      let mergedRoutes = [];
+
+      if (envTargetFinal.indexOf('local') > -1) {
+        const localRouteDefsInputFilename = `route-defs.${envTargetFinal}.json`;
+        const localRouteDefsInputPath = path.join(projectAssetsPath, localRouteDefsInputFilename);
+
+        if (tools.isFileExists(localRouteDefsInputPath)) {
+          tools.logInfo(`Merging local configuration found : ${localRouteDefsInputFilename}`);
+          const localRouteDefsInputJSON = require(path.join(localRouteDefsInputPath));
+
+          routeDefsInputJSON.forEach((route) => {
+            const matchedRoute = localRouteDefsInputJSON.filter(newRoute => newRoute.path === route.path)[0];
+            if (matchedRoute) {
+              tools.logInfo(`-- replacing ${route.path} route entry with overriden local config`);
+              tools.logInfo(`-----> ${JSON.stringify(matchedRoute)}`);
+              mergedRoutes.push(matchedRoute);
+            } else {
+              mergedRoutes.push(route);
+            }
+          });
+        }
+      } else {
+        mergedRoutes = routeDefsInputJSON;
+      }
+
       const appRoutes = [],
         appFeatureLibs = [],
         finalRemotesDefs = [];
 
       // processing each routes found in the routeDefs entry
 
-      routeDefsInputJSON.forEach((route) => {
+      mergedRoutes.forEach((route) => {
         tools.logInfo(`Processing route : ${route.path}`);
 
         const defRoute = routeDefsBaseJSON.filter((r) => r.path === route.path)[0];