@eui/tools 5.3.25 → 5.3.26

package/.version.properties

@@ -1 +1 @@
-5.3.25
+5.3.26

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.3.26 (2022-06-23)
+
+##### Chores
+
+* **other:**
+  * adapted for MWP v14 setup and migration - MWP-8474 [MWP-8474](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8474)  ([4fc90eca](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4fc90eca36fe64366397bded27818675f17485f4))
+
+* * *
+* * *
 ## 5.3.25 (2022-06-22)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/config/angular.js

@@ -6,6 +6,7 @@ const path = require('path');
 // LOCAL
 const tools = require('../../utils/tools');
 
+const innerPackages = require('./packages');
 
 
 const angularConfigDef = {
@@ -1307,12 +1308,21 @@ module.exports.registerAngularPackage = (pkg, isReset) => {
     pathBase = 'packages/' + pkg.parentPkg + '/packages';
   }
 
+  let packageEuiVersion;
+
+  if (pkg.build && pkg.build.euiVersion) {
+    packageEuiVersion = pkg.build.euiVersion;
+
+  } else {
+    packageEuiVersion = innerPackages.getPackageEuiVerison(pkg);
+  }
+
   let projectDef = JSON.stringify(angularPackageDef);
 
-  if (pkg.build && pkg.build.euiVersion === '13.x') {
+  if (packageEuiVersion === '13.x') {
     projectDef = JSON.stringify(angularPackageDefV13);
   }
-  if (pkg.build && pkg.build.euiVersion === '14.x') {
+  if (packageEuiVersion === '14.x') {
     projectDef = JSON.stringify(angularPackageDefV14);
   }
 

package/scripts/csdr/config/packages.js

@@ -243,52 +243,63 @@ module.exports.getDepGraph = () => {
 }
 
 
-module.exports.getLocalPackagesEuiVersion = () => {
-  tools.logTitle('getting local packages installed eUI version...');
-
-  const pkgs = getPackages();
-  let versionsFound = [];
-
-  pkgs.forEach((p) => {
-    if (p.parent !== true && p.tsPackage !== false) {
-      tools.logInfo(`checking ${p.name}`);
+const getPackageEuiVersion = module.exports.getPackageEuiVerison = (pkg) => {
+  if (pkg.parent !== true && pkg.tsPackage !== false) {
+    tools.logInfo(`checking ${pkg.name}`);
 
-      let version;
+    let version;
 
-      if (p.build && p.build.euiVersion) {
-        version = p.build.euiVersion;
+    if (pkg.build && pkg.build.euiVersion) {
+      version = pkg.build.euiVersion;
 
-      } else if (!p.remote) {
-        const depsCompositeFile = path.join(p.paths.pkgRootDirectory, 'dependencies-composite.json');
-        tools.logInfo(`Try fetching version from ${depsCompositeFile}`);
+    } else if (!pkg.remote) {
+      const depsCompositeFile = path.join(pkg.paths.pkgRootDirectory, 'dependencies-composite.json');
+      tools.logInfo(`Try fetching version from ${depsCompositeFile}`);
 
-        if (!tools.isFileExists(depsCompositeFile)) {
-          tools.logInfo('---- no dependencies-composite.json file found');
-        } else {
-          const deps = tools.getJsonFileContent(depsCompositeFile);
-          const euiDepsBase = deps['@eui/deps-base'];
+      if (!tools.isFileExists(depsCompositeFile)) {
+        tools.logInfo('---- no dependencies-composite.json file found');
+      } else {
+        const deps = tools.getJsonFileContent(depsCompositeFile);
+        const euiDepsBase = deps['@eui/deps-base'];
 
-          if (euiDepsBase) {
-            let euiVersion = euiDepsBase.split('.')[0];
+        if (euiDepsBase) {
+          let euiVersion = euiDepsBase.split('.')[0];
 
-            if (euiVersion.substr(0,1) === '^') {
-              euiVersion = euiVersion.substr(1);
-            }
-            version = `${euiVersion}.x`;
+          if (euiVersion.substr(0,1) === '^') {
+            euiVersion = euiVersion.substr(1);
+          }
+          version = `${euiVersion}.x`;
 
-            if (version === '7.x') {
-              version = 'DEFAULT';
-            }
+          if (version === '7.x') {
+            version = 'DEFAULT';
           }
         }
       }
+    }
 
-      if (version) {
-        tools.logInfo(`---- version found : ${version}\n`);
-        versionsFound.push(version);
-      } else {
-        tools.logInfo('---- version detection skipped');
-      }
+    if (version) {
+      tools.logInfo(`---- version found : ${version}\n`);
+    } else {
+      tools.logInfo('---- version detection skipped');
+    }
+
+    return version;
+  }
+}
+
+
+
+module.exports.getLocalPackagesEuiVersion = () => {
+  tools.logTitle('getting local packages installed eUI version...');
+
+  const pkgs = getPackages();
+  let versionsFound = [];
+
+  pkgs.forEach((p) => {
+    const version = getPackageEuiVersion(p);
+
+    if (version) {
+      versionsFound.push(version);
     }
   })
 

package/scripts/csdr/install/common.js

@@ -10,7 +10,7 @@ const configUtils = require('../config/config-utils');
 const metadataUtils = require('../metadata/metadata-utils');
 
 // FETCH ARGS
-const { dryRun, skipInstall, registry, remotesImport } = tools.getArgs();
+const { dryRun, skipInstall, registry, remotesImport, skipLocalPackagesDeps } = tools.getArgs();
 
 
 
@@ -227,17 +227,24 @@ const getLocalPackagesDeps = () => {
 const getLocalPackageCompositeDeps = (pkg) => {
   let pkgJsonFile;
 
-  if (pkg.child) {
-    pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-composite.json');
+  if (!skipLocalPackagesDeps) {
+    if (pkg.child) {
+      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-composite.json');
+    } else {
+      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-composite.json');
+    }
+
+    if (tools.isFileExists(pkgJsonFile)) {
+      tools.logInfo(`found ${pkgJsonFile}, parsing...`);
+    }
+
+    return tools.getJsonFileContent(pkgJsonFile) || {};
+
   } else {
-    pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-composite.json');
-  }
+    tools.logInfo('Skipping gathering local packages composite deps');
 
-  if (tools.isFileExists(pkgJsonFile)) {
-    tools.logInfo(`found ${pkgJsonFile}, parsing...`);
+    return {};
   }
-
-  return tools.getJsonFileContent(pkgJsonFile) || {};
 }