@eui/tools 6.3.34 → 6.3.35

package/.version.properties

@@ -1 +1 @@
-6.3.34
+6.3.35

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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.35",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/sandbox.js

@@ -1157,14 +1157,19 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
 //   })
 
 
+// Promise.resolve()
+//   .then(() => {
+//     const remote = configUtils.remotes.getRemote('cc-task-centre-eui15-remote-el-ui');
+//     return buildPackageUtils.element.postBuild(remote, '1.0.0');
+//   })
+//   .then(() => {
+//     console.log('ok');
+//   })
 Promise.resolve()
   .then(() => {
-    const remote = configUtils.remotes.getRemote('cc-task-centre-eui15-remote-el-ui');
-    return buildPackageUtils.element.postBuild(remote, '1.0.0');
-  })
-  .then(() => {
-    console.log('ok');
+    const pkg = configUtils.packages.getPackage('mywp-eusearch-eui10-remote-el-ui');
+    const euiVersion = configUtils.packages.getPackageEuiVersion(pkg, true);
+    console.log(euiVersion);
   })
 
 
-

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/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);
     }