@eui/tools 6.12.5 → 6.12.7

package/.version.properties

@@ -1 +1 @@
-6.12.5
+6.12.7

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.7 (2023-06-19)
+
+##### Bug Fixes
+
+* **other:**
+  * audit-styles for indices count - adapted injection of yarn.lock for remote build - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([9b4bb063](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/9b4bb06339e34a671af1526d258f58fffde1f87d))
+
+* * *
+* * *
+## 6.12.6 (2023-06-19)
+
+##### Bug Fixes
+
+* **audit:**
+  * mark known allowed material entries as excluded from audit - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([e9e4d8e4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/e9e4d8e449e0c414030c0c0eff709535f8e7f369))
+
+* * *
+* * *
 ## 6.12.5 (2023-06-19)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/audit/styles.js

@@ -13,7 +13,7 @@ const metadataUtils = require('../metadata/metadata-utils');
 
 const runStylesAudit = module.exports.runStylesAudit = (pkg, customPath) => {
 
-  const generateIndicesContent = (indices, file, fileContent) => {
+  const generateIndicesContent = (indices, file, fileContent, exclusions = []) => {
     let content = [];
 
     indices.forEach((i) => {
@@ -28,16 +28,39 @@ const runStylesAudit = module.exports.runStylesAudit = (pkg, customPath) => {
 
       const lineNumber = fileContent.substring(0, i).split('\n').length;
 
-      content.push({
-        file: file,
-        lineNumber: lineNumber,
-        content: indiceContent,
+      let excluded = false;
+      exclusions.forEach((exclusion) => {
+        if (indiceContent.indexOf(exclusion) > -1) {
+          excluded = true;
+        }
       })
+
+      if (!excluded) {
+        content.push({
+          file: file,
+          lineNumber: lineNumber,
+          content: indiceContent,
+        })
+      }
     })
 
     return content;
   }
 
+  const recalculateIndicesCount = (indicesContent) => {
+    let count = 0;
+
+    if (indicesContent && indicesContent.length !== 0) {
+      indicesContent.forEach((ic) => {
+        ic.forEach((icd) => {
+          count++;
+        });
+      });
+    }
+
+    return count;
+  }
+
   const getStatus = (count) => {
     return (count > 5) ? 'CRITICAL' : (count > 0 && count <= 5) ? 'IMPROVE' : 'OK';
   }
@@ -285,8 +308,16 @@ const runStylesAudit = module.exports.runStylesAudit = (pkg, customPath) => {
    while ( (result = regex.exec(fileContent)) ) {
      materialIndices.push(result.index);
    }
-   report.material.count += materialIndices.length;
-   report.material.indices = [...report.material.indices, ...generateIndicesContent(materialIndices, file, fileContent)];
+   const indicesContent = generateIndicesContent(
+    materialIndices, file, fileContent,
+    [
+      '@angular/material/core',
+      '@angular/material-moment-adapter'
+    ]
+   );
+
+   report.material.count += recalculateIndicesCount(indicesContent);
+   report.material.indices = [...report.material.indices, indicesContent];
 
    let allModulesIndices = [];
    regex = /EuiAllModule/gi;

package/scripts/csdr/init/global.js

@@ -116,3 +116,43 @@ module.exports.initRootFilesAndResolutions = () => {
       throw e;
     })
 }
+
+
+module.exports.initRemoteFilesAndResolutions = (packageJsonPath, euiVersion) => {
+  tools.logTitle('Processing remote injections for local installed eUI versions if needed');
+
+  processResolutionsInjection(packageJsonPath, euiVersion);
+
+  if (!euiVersion || euiVersion === 'DEFAULT') {
+    tools.logInfo('euiVersion not found skippint yarn.lock replacement');
+
+  } else {
+    tools.logInfo(`Processing .browserlistrc replacement for eUI version found : ${euiVersion}`);
+
+    const blResourcesFile = path.join(__dirname, 'resources', euiVersion, 'browserslistrc');
+    const blDestFile = path.join(packageJsonPath, '.browserslistrc');
+
+    if (tools.isFileExists(blResourcesFile)) {
+      tools.copy(blResourcesFile, blDestFile);
+    } else {
+      tools.logInfo('Not found...skipping');
+    }
+
+    tools.logInfo(`Processing yarn.lock replacement for eUI version found : ${euiVersion}`);
+
+    if (registry) {
+        tools.logInfo('Alternate registry found...skipping yarn.lock remplacement');
+        return;
+    }
+
+    const yResourcesFile = path.join(__dirname, 'resources', euiVersion, 'yarn.lock');
+    const yDestFile = path.join(packageJsonPath, 'yarn.lock');
+
+    if (tools.isFileExists(yResourcesFile)) {
+      tools.copy(yResourcesFile, yDestFile);
+    } else {
+      tools.logInfo('Not found...skipping');
+    }
+  }
+ }
+

package/scripts/csdr/install/remotes.js

@@ -88,7 +88,7 @@ const pkgInstall = (pkg, envTarget, compositeType) => {
       const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
 
       // checking for resolution updates according to eUI version used
-      initUtils.global.processResolutionsInjection(pkg.paths.root, euiVersion);
+      initUtils.global.initRemoteFilesAndResolutions(pkg.paths.root, euiVersion);
 
 
       if (dryRun) {