@eui/tools 6.3.34 → 6.3.36

package/.version.properties

@@ -1 +1 @@
-6.3.34
+6.3.36

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.36 (2023-02-15)
+
+##### Bug Fixes
+
+* **other:**
+  * remotes initialisation issues - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([bac59a6c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/bac59a6c5e1b9329d01373b5cee1be1c8b613d3b))
+
+* * *
+* * *
+## 6.3.35 (2023-02-15)
+
+##### Bug Fixes
+
+* **other:**
+  * euiVersion fetch for packages and remotes - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([4873c6e4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4873c6e40f9822eaeb519a7e8e8236f050e347df))
+
+* * *
+* * *
 ## 6.3.34 (2023-02-14)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -1134,37 +1134,50 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //     console.log(e);
 //   })
 
-// const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
 
 // Promise.resolve()
 //   .then(() => {
+//     const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
 //     return installUtils.projects.getLocalProjectRemoteDeps(prj);
 //   })
 //   .then((deps) => {
-//     return installUtils.projects.importLocalProjectRemotes(prj, deps);
-//   })
-//   .then(() => {
+//     console.log(deps);
 //   })
 
 
 // Promise.resolve()
 //   .then(() => {
-//     const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
-//     return installUtils.projects.getLocalProjectRemoteDeps(prj);
+//     const remote = configUtils.remotes.getRemote('cc-task-centre-eui15-remote-el-ui');
+//     return buildPackageUtils.element.postBuild(remote, '1.0.0');
 //   })
-//   .then((deps) => {
-//     console.log(deps);
+//   .then(() => {
+//     console.log('ok');
 //   })
+// Promise.resolve()
+//   .then(() => {
+//     const pkg = configUtils.packages.getPackage('mywp-eusearch-eui10-remote-el-ui');
+//     const euiVersion = configUtils.packages.getPackageEuiVersion(pkg, true);
+//     console.log(euiVersion);
+//   })
+// Promise.resolve()
+//   .then(() => {
+//     // const packages = configUtils.packages.getCsdrPackages();
+//     // console.log(packages);
+//     const remotes = configUtils.remotes.getCsdrRemotes();
+//     console.log(remotes);
+//   })
+
+const prj = configUtils.projects.getCsdrProject('my-workplace-host-playground');
 
 
 Promise.resolve()
   .then(() => {
-    const remote = configUtils.remotes.getRemote('cc-task-centre-eui15-remote-el-ui');
-    return buildPackageUtils.element.postBuild(remote, '1.0.0');
+    return installUtils.projects.getLocalProjectRemoteDeps(prj);
+  })
+  .then((deps) => {
+    return installUtils.projects.importLocalProjectRemotes(prj, deps);
   })
   .then(() => {
-    console.log('ok');
   })
 
 
-

package/scripts/csdr/config/global.js

@@ -165,6 +165,8 @@ module.exports.getConfig = () => {
 
 
 module.exports.updateConfig = (args = { project, packages, remotes, reset}) => {
+  tools.logInfo('Updating euirc config');
+  console.log(args);
 
   const configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
 
@@ -194,11 +196,11 @@ module.exports.updateConfig = (args = { project, packages, remotes, reset}) => {
     }
 
     if (args.packages) {
-      newConfig.packages = tools.removeArrayDuplicates([...newConfig.packages, ...args.packages]);
+      newConfig.packages = tools.removeArrayDuplicates([...newConfig.packages || [], ...args.packages]);
     }
 
     if (args.remotes) {
-      newConfig.remotes = tools.removeArrayDuplicates([...newConfig.remotes, ...args.remotes]);
+      newConfig.remotes = tools.removeArrayDuplicates([...newConfig.remotes || [], ...args.remotes]);
     }
   }
 

package/scripts/csdr/config/init.js

@@ -27,7 +27,7 @@ module.exports.run = (args) => {
       }
 
       if (args.remote) {
-        const remote = innerRemotes.getRemote(args.remote);
+        const remote = innerRemotes.getCsdrRemotes()[args.remote];
         if (remote) {
           remotes.push(args.remote);
         }

package/scripts/csdr/config/packages.js

@@ -276,11 +276,15 @@ const getPackageEuiVersion = module.exports.getPackageEuiVersion = (pkg, log = f
 
     if (pkg.build && pkg.build.euiVersion) {
       version = pkg.build.euiVersion;
+    }
 
-    } else if (pkg.euiVersion) {
-      version = pkg.euiVersion;
+    if (!version) {
+      if (pkg.euiVersion) {
+        version = pkg.euiVersion;
+      }
+    }
 
-    } else if (!pkg.remote) {
+    if (!version) {
       version = getEuiVersionCore(pkg);
     }
 

package/scripts/csdr/config/remotes.js

@@ -91,24 +91,35 @@ module.exports.getCsdrRemotes = (hostName, euiVersion) => {
   }
 
   const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
-  const remotesArray = Object.keys(remotesConfig).map((r) => {
+  let remotesArray = Object.keys(remotesConfig).map((r) => {
     const remote = remotesConfig[r];
     remote.name = r;
     return remote;
   });
 
-  let outRemotes = remotesArray;
-
   if (hostName) {
-    outRemotes = outRemotes.filter(r => hostNameFilterFn(r));
+    remotesArray = remotesArray.filter(r => hostNameFilterFn(r));
   }
   if (euiVersion) {
-    outRemotes = outRemotes.filter(r => r.euiVersion === euiVersion);
+    remotesArray = remotesArray.filter(r => r.euiVersion === euiVersion);
   }
 
+  const outRemotes = {};
+  remotesArray.forEach((r) => {
+    outRemotes[r.name] = r;
+  })
+
   return outRemotes;
 }
 
+module.exports.getCsdrRemotesArray = (hostName, euiVersion) => {
+  const remotes = this.getCsdrRemotes(hostName, euiVersion);
+
+  return Object.keys(remotes).map((r) => {
+    return remotes[r];
+  })
+}
+
 
 module.exports.getRemotes = () => {
   const remotes = innerGlobal.getConfig().remotes;
@@ -125,7 +136,7 @@ module.exports.getRemoteByNpmPkg = (npmPkg, fromCsdrConfig) => {
   let remotes;
 
   if (fromCsdrConfig) {
-    remotes = this.getCsdrRemotes();
+    remotes = this.getCsdrRemotesArray();
 
   } else {
     remotes = this.getRemotes();

package/scripts/csdr/install/projects.js

@@ -194,7 +194,7 @@ const getLocalProjectRemoteDeps = module.exports.getLocalProjectRemoteDeps = (pr
     tools.logTitle(`Detecting remotes deps for project : ${prj.name}`);
 
     const euiVersion = configUtils.global.getLocalEuiVersion();
-    const remotes = configUtils.remotes.getCsdrRemotes(prj.hostName, euiVersion);
+    const remotes = configUtils.remotes.getCsdrRemotesArray(prj.hostName, euiVersion);
 
     let remoteDeps = {};
     remotes