@eui/tools 4.21.11 → 4.21.14

package/.version.properties

@@ -1 +1 @@
-4.21.11
+4.21.14

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 4.21.14 (2022-04-08)
+
+##### Chores
+
+* **other:**
+  * adapted nodejs 10.x resolution force update-notifier 4.1.3 to avoid lru-cache - semver upgrade - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([b39c05b4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b39c05b47e1f71429f749ccdef2d03ec36de1de2))
+
+* * *
+* * *
+## 4.21.13 (2022-04-08)
+
+##### Bug Fixes
+
+* **other:**
+  * remove jest dependency - upgraded semver to 7.3.4 for avoiding lru-cache dependency on root tools install - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([a7442c2a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a7442c2a6b0cf6cc5dd5577436b8ad8467613184))
+
+* * *
+* * *
+## 4.21.12 (2022-04-08)
+
+##### Chores
+
+* **other:**
+  * adapted resolutions based on nodejs version detected as v7 is stuck building packages - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106)  ([a3e55041](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a3e550416b16d543cebd09e96d18be1834d317d4))
+
+* * *
+* * *
 ## 4.21.11 (2022-04-07)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "4.21.11",
+    "version": "4.21.14",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -16,7 +16,7 @@
         "chalk": "4.1.2",
         "fs-extra": "9.0.0",
         "replace-in-file": "4.1.3",
-        "semver": "6.0.0",
+        "semver": "7.3.4",
         "cross-spawn": "6.0.5",
         "eol": "0.9.1",
         "rimraf": "3.0.2",
@@ -27,8 +27,6 @@
         "figures": "3.2.0",
         "xml2js": "0.4.23",
         "https-proxy-agent": "2.2.3",
-        "jest": "26.6.3",
-        "supertest": "4.0.2",
         "memfs": "3.2.4",
         "json-server": "0.16.3",
         "faker": "5.5.3",
@@ -40,6 +38,7 @@
         "autoprefixer": "9.6.1",
         "sass": "1.39.0",
         "postcss": "7.0.36",
-        "cssnano": "4.1.11"
+        "cssnano": "4.1.11",
+        "extend": "3.0.2"
     }
 }

package/sandbox.js

@@ -694,10 +694,9 @@ const translationUtils = require('./scripts/utils/pre-build/translations/transla
 //     console.log(configOptions);
 //   })
 
-return Promise.resolve()
+Promise.resolve()
   .then(() => {
-    const versions = configUtils.packages.getLocalPackagesEuiVersion();
-    console.log(versions);
+     return initUtils.processResolutionsForNodeVersion();
   })
 
 // return Promise.resolve()

package/scripts/csdr/init/init-utils.js

@@ -243,3 +243,39 @@ module.exports.processLocalEuiVersions = () => {
       throw e;
     })
 }
+
+
+module.exports.processResolutionsForNodeVersion = () => {
+  return Promise.resolve()
+    .then(() => {
+      tools.logTitle('Processing injections for detected nodeJS version');
+
+      let nodeVersion = process.versions.node;
+      nodeVersion = `${nodeVersion.split('.')[0]}.x`;
+
+      const rootPackageJsonFile = path.join(process.cwd(), 'package.json');
+      const rootPackageJson = require(rootPackageJsonFile);
+
+      const nodeVersionResource = `nodejs-${nodeVersion}`;
+
+      const resolutionsJsonFile = path.join(__dirname, 'resources', nodeVersionResource, 'resolutions.json');
+
+      tools.logInfo(`Checking nodejsResolution resource for path: ${resolutionsJsonFile}`);
+
+      if (tools.isFileExists(resolutionsJsonFile)) {
+        const resolutionsJson = require(resolutionsJsonFile);
+
+        tools.logInfo('Injecting resolutions content');
+        console.log(resolutionsJson);
+        rootPackageJson.resolutions = resolutionsJson;
+
+        tools.logInfo('Updating root package.json');
+        tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
+      } else {
+        tools.logWarning('Not found...skipping');
+      }
+    })
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/csdr/init/init.js

@@ -83,6 +83,11 @@ module.exports.init = () => {
       return initUtils.processLocalEuiVersions();
     })
 
+    // specific resolution injection based on NodeJS (recent failure of nodejs10.x for MWP v7)
+    .then(() => {
+      return initUtils.processResolutionsForNodeVersion();
+    })
+
     // Install deps based on current config generated => take last know snapshots
     .then(() => {
       // this is only executed for local dev installation,

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

@@ -0,0 +1,8 @@
+{
+    "sockjs-client":"1.5.2",
+    "https-proxy-agent": ">=2.2.3",
+    "@types/node": "14.14.10",
+    "mem": ">=4.3.0 <=8.1.1",
+    "lru-cache": "5.1.1",
+    "update-notifier": "4.1.3"
+}

package/scripts/csdr/sync/sync-utils.js

@@ -56,6 +56,9 @@ module.exports.sync = () => {
   .then(() => {
     return initUtils.processLocalEuiVersions();
   })
+  .then(() => {
+    return initUtils.processResolutionsForNodeVersion();
+  })
   .catch((e) => {
     throw e;
   })

package/scripts/utils/build/package/nodeJs.js

@@ -21,11 +21,11 @@ module.exports.build = (pkg, isMaster) => {
   }
 
   return Promise.resolve()
-    .then(() => {
-      if (!skipTest) {
-        return testUtils.runJest(pkg);
-      }
-    })
+    // .then(() => {
+    //   if (!skipTest) {
+    //     return testUtils.runJest(pkg);
+    //   }
+    // })
 
     .then(() => {
       return notificationUtils.package.sendPackageMessage({

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

@@ -1,6 +0,0 @@
-{
-    "sockjs-client": "1.5.2",
-    "https-proxy-agent": ">=2.2.3",
-    "@types/node": "14.14.10",
-    "mem": ">=4.3.0 <=8.1.1"
-}