@eui/tools 6.10.3 → 6.10.4

package/.version.properties

@@ -1 +1 @@
-6.10.3
+6.10.4

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.10.4 (2023-04-15)
+
+##### Refactors
+
+* **other:**
+  * nodejs and resolution injection for local eUI version of project - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([597aaa41](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/597aaa412f4ecb2a3bf017acbd4b5236bf8a7f94))
+
+* * *
+* * *
 ## 6.10.3 (2023-03-28)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/init/global.js

@@ -12,42 +12,77 @@ const { registry } = tools.getArgs();
 
 
 const processResolutionsInjection = module.exports.processResolutionsInjection = (packageJsonPath, euiVersion) => {
-  tools.logInfo(`Processing resolutions replacement for eUI version found : ${euiVersion}`);
+  let euiResolutionsInjected = false;
+  let resolutionsJsonFile;
 
-  const packageJsonFile = path.join(packageJsonPath, 'package.json');
-  const packageJson = require(packageJsonFile);
-  const resolutionsJsonFile = path.join(__dirname, 'resources', euiVersion, 'resolutions.json');
+  if (!euiVersion || euiVersion === 'DEFAULT') {
+    tools.logInfo('Default eUI version found or empty...skipping');
+
+  } else {
+    tools.logInfo(`Processing resolutions replacement for eUI version found : ${euiVersion}`);
+    const packageJsonFile = path.join(packageJsonPath, 'package.json');
+    const packageJson = require(packageJsonFile);
+    resolutionsJsonFile = path.join(__dirname, 'resources', euiVersion, 'resolutions.json');
+
+    if (tools.isFileExists(resolutionsJsonFile)) {
+      const resolutionsJson = require(resolutionsJsonFile);
+
+      tools.logInfo('Injecting resolutions content');
+      console.log(resolutionsJson);
+      packageJson.resolutions = resolutionsJson;
+
+      tools.logInfo('Updating root package.json');
+      tools.writeJsonFileSync(packageJsonFile, packageJson);
+
+      euiResolutionsInjected = true;
+    }
+  }
+
+  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}`;
+  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);
-    packageJson.resolutions = resolutionsJson;
-
+    rootPackageJson.resolutions = resolutionsJson;
     tools.logInfo('Updating root package.json');
-    tools.writeJsonFileSync(packageJsonFile, packageJson);
+    tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
 
   } else {
-    tools.logInfo('Not found...skipping');
+    if (!euiResolutionsInjected) {
+      tools.logInfo('Resetting resolutions...');
+      tools.logInfo('Updating root package.json');
+      rootPackageJson.resolutions = {};
+      tools.writeJsonFileSync(rootPackageJsonFile, rootPackageJson);
+    }
   }
 }
 
 
-
-module.exports.processLocalEuiVersions = () => {
+module.exports.initRootFilesAndResolutions = () => {
  tools.logTitle('Processing injections for local installed eUI versions if needed');
 
   return Promise.resolve()
     .then(() => {
       const euiVersion = configUtils.global.getLocalEuiVersion();
 
+      processResolutionsInjection(process.cwd(), euiVersion);
+
       if (!euiVersion || euiVersion === 'DEFAULT') {
-        tools.logInfo('Default eUI version found or empty...skipping');
+        tools.logInfo('euiVersion not found skippint yarn.lock replacement');
 
       } else {
-        processResolutionsInjection(process.cwd(), euiVersion);
-
         tools.logInfo(`Processing .browserlistrc replacement for eUI version found : ${euiVersion}`);
 
         const blResourcesFile = path.join(__dirname, 'resources', euiVersion, 'browserslistrc');
@@ -62,8 +97,8 @@ module.exports.processLocalEuiVersions = () => {
         tools.logInfo(`Processing yarn.lock replacement for eUI version found : ${euiVersion}`);
 
         if (registry) {
-           tools.logInfo('Alternate registry found...skipping yarn.lock remplacement');
-           return;
+            tools.logInfo('Alternate registry found...skipping yarn.lock remplacement');
+            return;
         }
 
         const yResourcesFile = path.join(__dirname, 'resources', euiVersion, 'yarn.lock');
@@ -76,41 +111,7 @@ module.exports.processLocalEuiVersions = () => {
         }
       }
     })
-    .catch((e) => {
-      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.logInfo('Not found...skipping');
-      }
-    })
     .catch((e) => {
       throw e;
     })

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

@@ -36,12 +36,7 @@ module.exports.init = (finalResponse) => {
     // adapt and inject particular root data/config for eUI version detected on project
     // if multiple versions of eUI are detected on the same project, an exception is thrown
     .then(() => {
-      return initUtils.global.processLocalEuiVersions();
-    })
-
-    // specific resolution injection based on NodeJS (recent failure of nodejs10.x for MWP v7)
-    .then(() => {
-      return initUtils.global.processResolutionsForNodeVersion();
+      return initUtils.global.initRootFilesAndResolutions();
     })
 
     // Install deps based on current config generated => take last know snapshots

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

@@ -49,12 +49,7 @@ module.exports.init = (finalResponse) => {
     // adapt and inject particular root data/config for eUI version detected on project
     // if multiple versions of eUI are detected on the same project, an exception is thrown
     .then(() => {
-      return initUtils.global.processLocalEuiVersions();
-    })
-
-    // specific resolution injection based on NodeJS (recent failure of nodejs10.x for MWP v7)
-    .then(() => {
-      return initUtils.global.processResolutionsForNodeVersion();
+      return initUtils.global.initRootFilesAndResolutions();
     })
 
     // Install deps based on current config generated => take last know snapshots

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

@@ -63,10 +63,7 @@ module.exports.sync = () => {
     return initUtils.meta.init();
   })
   .then(() => {
-    return initUtils.global.processLocalEuiVersions();
-  })
-  .then(() => {
-    return initUtils.global.processResolutionsForNodeVersion();
+    return initUtils.global.initRootFilesAndResolutions();
   })
   .then(() => {
     if (!skipInstall) {

package/scripts/utils/notification/config.js

@@ -31,7 +31,7 @@ module.exports.getPackageConfig = (pkg) => {
         SLACK_HOOK: globalConfig.SLACK_HOOK,
         SLACK_CHANNEL: slackChannel
       }
-    } else if (globalConfig.NOTIFICATION_CLIENT === 'SLACK') {
+    } else if (globalConfig.NOTIFICATION_CLIENT === 'MSTEAMS') {
       return {
         CLIENT: globalConfig.NOTIFICATION_CLIENT,
         MSTEAMS_CHANNEL: msTeamsChannel,