@eui/tools 6.12.45 → 6.12.46

package/.version.properties

@@ -1 +1 @@
-6.12.45
+6.12.46

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.12.46 (2023-08-17)
+
+##### Chores
+
+* **other:**
+  * csdr-remotes-config defs from global config for MFE generic portal seperated config - EUI-7680 [EUI-7680](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7680)  ([7b186e72](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7b186e729197b618721a8991532f261b239b8838))
+
+* * *
+* * *
 ## 6.12.45 (2023-08-17)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/cli/package-build-frontend.js

@@ -55,7 +55,9 @@ const generateRemote = (args = constants.DEFAULT_CONFIG) => {
   tools.logInfo('In target path');
   console.log(targetPath);
 
-  const remoteConfigTargetPath = path.join(process.cwd(), 'packages', 'csdr-remotes-config', 'assets', args.fullName);
+  const configOptions = configUtils.global.getConfigOptions();
+
+  const remoteConfigTargetPath = path.join(configOptions.CSDR_REMOTES_CONFIG_PATH , 'assets', args.fullName);
 
   return Promise.resolve()
     // INIT and cleanup
@@ -88,7 +90,7 @@ const generateRemote = (args = constants.DEFAULT_CONFIG) => {
 
     // CLEANING REMOTES CONFIG ENTRY
     .then(() => {
-      tools.logInfo('Cleaning csdr-remotes-config target entry');
+      tools.logInfo('Cleaning remotes-config target entry');
       return tools.rimraf(remoteConfigTargetPath + '/**/*');
     })
 
@@ -99,7 +101,7 @@ const generateRemote = (args = constants.DEFAULT_CONFIG) => {
         remoteConfigTargetPath
       );
 
-      tools.logInfo('Replace sources content in csdr-remotes-config target entry');
+      tools.logInfo('Replace sources content in remotes-config target entry');
       replaceContent(remoteConfigTargetPath, args.pkgName, args.pkgScope, args.fullName);
     })
 

package/scripts/csdr/config/global.js

@@ -229,6 +229,8 @@ module.exports.getConfigOptions = () => {
     DEVOPS_METADATA_PATH: null,
     DEVOPS_METADATA_LOCKS_PATH: null,
     DEVOPS_CONFIG_JSON: '.devops-config.json',
+    CSDR_REMOTES_CONFIG_REPOSITORY: null,
+    CSDR_REMOTES_CONFIG_PATH: null,
     ISSUES_MANAGER_HOST: null,
     NPM_REGISTRY_DEFAULT: null,
     NPM_REGISTRY_DEFAULT_2: null,
@@ -268,6 +270,19 @@ module.exports.getConfigOptions = () => {
     }
   }
 
+  // csdr remotes config options
+  const csdrRemotesConfig = config && config.csdrRemotesConfig;
+
+  if (csdrRemotesConfig) {
+    if (csdrRemotesConfig.repository) {
+      configOptions.CSDR_REMOTES_CONFIG_REPOSITORY = csdrRemotesConfig.repository;
+    }
+
+    if (csdrRemotesConfig.folder) {
+      configOptions.CSDR_REMOTES_CONFIG_PATH = path.join(process.cwd(), csdrRemotesConfig.folder);
+    }
+  }
+
   // getting issues manager options
   const issuesManager = config && config.issuesManager;
 

package/scripts/csdr/config/remotes.js

@@ -5,13 +5,13 @@ const path = require('path');
 
 // LOCAL
 const tools = require('../../utils/tools');
+const configUtils = require('../config/config-utils');
 
 // INNER
 const innerGlobal = require('./global');
 const innerPackages = require('./packages');
 
 
-
 module.exports.getRemote = (remoteName) => {
   // if not provided as param, we fetch them from the command line (local operations)
   if (!remoteName) {
@@ -21,10 +21,12 @@ module.exports.getRemote = (remoteName) => {
   const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
   const remoteConfig = remotesConfig[remoteName];
 
-  const remotePath = path.join(process.cwd(), 'packages', 'csdr-remotes-config', 'assets', remoteName);
+  const configOptions = configUtils.global.getConfigOptions();
+
+  const remotePath = path.join(configOptions.CSDR_REMOTES_CONFIG_PATH , 'assets', remoteName);
 
   if (!tools.isDirExists(remotePath)) {
-    throw new Error(`Remote ${remoteName} cannot be found in the remotes global config - check packages/csdr-remotes-config for available remotes`);
+    throw new Error(`Remote ${remoteName} cannot be found in the remotes global config - check ${configOptions.CSDR_REMOTES_CONFIG_PATH} for available remotes`);
   }
 
   const remoteRootPath = path.join(process.cwd(), 'remotes', remoteName);