@eui/tools 6.2.50 → 6.3.1

package/.version.properties

@@ -1 +1 @@
-6.2.50
+6.3.1

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.1 (2023-01-25)
+
+##### Chores
+
+* **other:**
+  * force downgrade of node-fetch node10 resolutions - EUI-7035 [EUI-7035](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7035)  ([b77659ac](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b77659ac4032ea0335c92f3147a020546fdcd6ed))
+
+* * *
+* * *
+## 6.3.0 (2023-01-25)
+
+##### New Features
+
+* **other:**
+  * adapted dependencies resolution - revert json-server update - EUI-7035 [EUI-7035](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7035)  ([4b1a4c94](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4b1a4c9453b621c4ba0df8aefa6f21b67f22ca1f))
+
+* * *
+* * *
 ## 6.2.50 (2023-01-23)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.2.50",
+    "version": "6.3.1",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -27,7 +27,7 @@
         "figures": "3.2.0",
         "xml2js": "0.4.23",
         "https-proxy-agent": "2.2.3",
-        "json-server": "0.17.1",
+        "json-server": "0.16.3",
         "faker": "5.5.3",
         "nodemon": "2.0.20",
         "lowdb": "1.0.0",

package/scripts/csdr/init/resources/nodejs-10.x/resolutions.json

@@ -8,5 +8,6 @@
     "glob": ">=7.0.0 <8.0.0",
     "nopt": ">=5.0.0 <6.0.0",
     "svg-sprite": "1.5.4",
-    "winston": "2.4.6"
+    "winston": "2.4.6",
+    "node-fetch": "2.6.7"
 }

package/scripts/csdr/install/common.js

@@ -91,66 +91,8 @@ module.exports.executeInstallPackage = (cwdPath, npmPkg) => {
 }
 
 
-module.exports.getRemappedDeps = (pkgDeps, pkgDefaultDeps, isMaster) => {
-  tools.logTitle('Remapping major version carret declared dependencies');
 
-  return Promise.resolve()
-    .then(() => {
-      const dependencies = Object.keys(pkgDefaultDeps)
-        .reduce((acc, k) => {
-
-          // if the package is being part of CSDR
-          if (pkgDeps[k] && typeof(pkgDeps[k]) !== 'function') {
-
-            const latestTagMajor = pkgDeps[k].split('.')[0];
-
-            var currentMajor;
-            // in case of carret defined, in dependencies-composite, check if the current major matches
-            // the latest tag major on the devops metadata deps
-            if (pkgDefaultDeps[k].substr(0, 1) === '^') {
-              currentMajor = pkgDefaultDeps[k].substr(1).split('.')[0];
-
-              // if it matches, then we take the one from devops-metadata
-              if (latestTagMajor === currentMajor) {
-                acc[k] = pkgDeps[k];
-
-              // if not real version is taken as set, for hotfix deps f.e.
-              } else {
-                acc[k] = pkgDefaultDeps[k];
-              }
-
-            // if no carret we take the real version set
-            } else {
-              acc[k] = pkgDefaultDeps[k];
-            }
-
-          // if the package is not on CSDR (3rd party libs), then we just take the version set
-          } else {
-            acc[k] = pkgDefaultDeps[k];
-          }
-          return acc;
-        }, {});
-
-      tools.logSuccess();
-
-      return dependencies;
-    })
-
-    .then((remappedDeps) => {
-      return getResolvedCarretDeps(remappedDeps, isMaster);
-    })
-
-
-    .catch((e) => {
-      throw e;
-    })
-}
-
-
-
-
-
-const getResolvedCarretDeps = module.exports.getResolvedCarretDeps = (deps, isMaster) => {
+module.exports.getResolvedCarretDeps = (deps, isMaster) => {
   tools.logTitle('Resolving carret versions for prev or next version packages');
 
   tools.logInfo('processing dependencies : ');

package/scripts/csdr/install/composite-core.js

@@ -16,18 +16,7 @@ const innerCommon = require('./common');
 const getDeps_DEV = (compositeDeps, prevSnapshotEnabled) => {
   return Promise.resolve()
     .then(() => {
-      if (prevSnapshotEnabled) {
-        tools.logInfo('project has prevSnapshot enabled, getting deps list from prevSnapshotsTag');
-        return metadataUtils.package.getPackagesDeps('packagesPrevSnapshotsTag');
-      } else {
-        tools.logInfo('getting project deps from snapshots metadata list');
-        return metadataUtils.package.getPackagesDeps('packages');
-      }
-    })
-
-    // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
-    .then((metadataDeps) => {
-      return innerCommon.getRemappedDeps(metadataDeps, compositeDeps);
+      return innerCommon.getResolvedCarretDeps(compositeDeps, false);
     })
 
     .catch((e) => {
@@ -39,19 +28,9 @@ const getDeps_DEV = (compositeDeps, prevSnapshotEnabled) => {
 
 const getDeps_TST = (compositeDeps, prevSnapshotEnabled) => {
   return Promise.resolve()
-    .then(() => {
-      if (prevSnapshotEnabled) {
-        tools.logInfo('project has prevSnapshot enabled, getting deps list from prevTag');
-        return metadataUtils.package.getPackagesDeps('packagesPrevTag');
-      } else {
-        tools.logInfo('getting project deps from packagesLatest metadata list');
-        return metadataUtils.package.getPackagesDeps('packagesLatestTag');
-      }
-    })
-
     // Re-mapping the dependencies found against their max "carret" versions found in the base dependencies defs in the project
     .then((metadataDeps) => {
-      return innerCommon.getRemappedDeps(metadataDeps, compositeDeps, true);
+      return innerCommon.getResolvedCarretDeps(compositeDeps, true);
     })
 
     .catch((e) => {

package/scripts/csdr/install/local-dev.js

@@ -104,23 +104,13 @@ module.exports.install = () => {
 
 
 
-    // Get last known working build dependencies from DEVOPS metadata, including snapshot releases
-    .then(() => {
-      return metadataUtils.package.getPackagesDeps('packages');
-    })
-
-
     // Parse dependencies against carrets ones for projects
-    .then((depsMetadata) => {
-
+    .then(() => {
       const fixedDeps = configUtils.global.getConfig().npm.fixedDependencies;
 
       const configDeps = { ...resolvedDeps, ...fixedDeps };
 
-      tools.logInfo('Accumulated dependencies found : ');
-      console.log(configDeps);
-
-      return innerCommon.getRemappedDeps(depsMetadata, configDeps, false);
+      return innerCommon.getResolvedCarretDeps(configDeps, false);
     })
 
 

package/scripts/csdr/install/packages.js

@@ -171,13 +171,9 @@ const getLocalPackagesBaseDeps = module.exports.getLocalPackagesBaseDeps = () =>
 module.exports.getLocalPackagesCompositeDepsRemapped = () => {
   return Promise.resolve()
     .then(() => {
-      return metadataUtils.package.getPackagesDeps('packages');
-    })
-
-    .then((depsMetadata) => {
       const compositeDeps = getLocalPackagesCompositeDeps();
 
-      return innerCommon.getRemappedDeps(depsMetadata, compositeDeps, false);
+      return innerCommon.getResolvedCarretDeps(compositeDeps, false);
     })
 
     .then((remappedDeps) => {
@@ -232,17 +228,13 @@ module.exports.installDeps = (prj, pkg, isMaster) => {
       // fetching local package composite
       return getLocalPackagesCompositeDeps();
     })
-
-    // Get last known working build dependencies from DEVOPS metadata, including snapshot releases
     .then((localPkgCompositeDepsIn) => {
       // storing
       localPkgCompositeDeps = localPkgCompositeDepsIn;
-
-      return metadataUtils.package.getPackagesDeps('packages');
     })
 
-    .then((depsMetadata) => {
-      return innerCommon.getRemappedDeps(depsMetadata, localPkgCompositeDeps, isMaster);
+    .then(() => {
+      return innerCommon.getResolvedCarretDeps(localPkgCompositeDeps, isMaster);
     })
 
     .then((remappedDepsIn) => {