@eui/tools 6.11.26 → 6.11.27

package/.version.properties

@@ -1 +1 @@
-6.11.26
+6.11.27

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.11.27 (2023-06-05)
+
+##### Bug Fixes
+
+* **other:**
+  * fetch remotes config prior to remotes metadata extraction - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([311a71af](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/311a71affb35768e8cff04c3edd7ec97cd2d58fa))
+
+* * *
+* * *
 ## 6.11.26 (2023-06-05)
 
 ##### Chores

package/package.json

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

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

@@ -5,6 +5,7 @@ const _ = require('lodash');
 
 const tools = require('../../tools');
 const configUtils = require('../../../csdr/config/config-utils');
+const initUtils = require('../../../csdr/init/init-utils');
 
 const { debug } = tools.getArgs();
 
@@ -629,48 +630,59 @@ const injectRoutesConfig = (project, npmPkg) => {
 module.exports.extractRemotesMetadata = (project) => {
   tools.logTitle('Extracting remotes-metadata.json for known participant remotes');
 
-  const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
+  return Promise.resolve()
+    .then(() => {
+      return initUtils.remotes.cloneRemotesConfig();
+    })
 
-  const finalRemotesDefsFile = path.join(projectAssetsPath, 'remotes-metadata.json');
-  const openidConfigFile = path.join(projectAssetsPath, 'openid-login-config.json');
+    .then(() => {
+      const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
 
-  let remoteMetadataJSON = tools.getJsonFileContent(finalRemotesDefsFile);
-  const openidConfigJSON = tools.getJsonFileContent(openidConfigFile);
+      const finalRemotesDefsFile = path.join(projectAssetsPath, 'remotes-metadata.json');
+      const openidConfigFile = path.join(projectAssetsPath, 'openid-login-config.json');
 
-  remoteMetadataJSON.forEach((r) => {
-    tools.logInfo(`Fetching remote info for : ${r}`);
+      let remoteMetadataJSON = tools.getJsonFileContent(finalRemotesDefsFile);
+      const openidConfigJSON = tools.getJsonFileContent(openidConfigFile);
 
-    let remote;
-    if (configUtils.remotes.isVirtualRemote(r)) {
-      remote = configUtils.remotes.getRemote(r);
-    } else {
-      remote = configUtils.packages.getPackage(r, true);
-    }
+      remoteMetadataJSON.forEach((r) => {
+        tools.logInfo(`Fetching remote info for : ${r}`);
 
-    if (remote.build && remote.build.hasParticipants) {
-      let participantsList;
-      if (remote.euiVersion === '15.x') {
-        participantsList = openidConfigJSON.modules[remote.build.configModuleName].participants_v15
-      } else {
-        participantsList = openidConfigJSON.modules[remote.build.configModuleName].participants
-      }
-      if (participantsList) {
-        let participantRemotes = [];
-        Object.keys(participantsList).forEach((p) => {
-          participantRemotes.push(participantsList[p].moduleId);
-        });
-        tools.logInfo('Found participant remotes : ');
-        console.log(participantRemotes);
-
-        remoteMetadataJSON = [...remoteMetadataJSON, ...participantRemotes];
-      }
-    }
-  })
+        let remote;
+        if (configUtils.remotes.isVirtualRemote(r)) {
+          remote = configUtils.remotes.getRemote(r);
+        } else {
+          remote = configUtils.packages.getPackage(r, true);
+        }
+
+        if (remote.build && remote.build.hasParticipants) {
+          let participantsList;
+          if (remote.euiVersion === '15.x') {
+            participantsList = openidConfigJSON.modules[remote.build.configModuleName].participants_v15
+          } else {
+            participantsList = openidConfigJSON.modules[remote.build.configModuleName].participants
+          }
+          if (participantsList) {
+            let participantRemotes = [];
+            Object.keys(participantsList).forEach((p) => {
+              participantRemotes.push(participantsList[p].moduleId);
+            });
+            tools.logInfo('Found participant remotes : ');
+            console.log(participantRemotes);
+
+            remoteMetadataJSON = [...remoteMetadataJSON, ...participantRemotes];
+          }
+        }
+      })
+
+      remoteMetadataJSON = tools.removeArrayDuplicates(remoteMetadataJSON);
 
-  remoteMetadataJSON = tools.removeArrayDuplicates(remoteMetadataJSON);
+      tools.logInfo('Final remotes metadata list found :');
+      console.log(remoteMetadataJSON);
 
-  tools.logInfo('Final remotes metadata list found :');
-  console.log(remoteMetadataJSON);
+      return tools.writeJsonFileSync(finalRemotesDefsFile, remoteMetadataJSON);
+  })
 
-  tools.writeJsonFileSync(finalRemotesDefsFile, remoteMetadataJSON);
+  .catch((e) => {
+    throw e;
+  });
 }