@eui/tools 6.3.28 → 6.3.29

package/.version.properties

@@ -1 +1 @@
-6.3.28
+6.3.29

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.3.29 (2023-02-12)
+
+##### Chores
+
+* **other:**
+  * adapted v15 resolutions for detected vulnerabilities check - adapted styles audit for css files - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([d61eeedd](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d61eeedd51e64306ad94495e6716cb7d221994c9))
+
+* * *
+* * *
 ## 6.3.28 (2023-02-10)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/audit/styles.js

@@ -128,7 +128,11 @@ const runStylesAudit = module.exports.runStylesAudit = (pkg, customPath) => {
     report.package = pkg.name;
   }
 
-  let files = glob.sync('**/*.scss', { cwd: srcPath, nodir: true, follow: true, dot: true });
+  let files;
+  const scssFiles = glob.sync('**/*.scss', { cwd: srcPath, nodir: true, follow: true, dot: true });
+  const cssFiles = glob.sync('**/*.css', { cwd: srcPath, nodir: true, follow: true, dot: true });
+
+  files = [...scssFiles, ...cssFiles];
 
   report.scssFilesCount += files.length;
 
@@ -272,20 +276,20 @@ const runStylesAudit = module.exports.runStylesAudit = (pkg, customPath) => {
  if (report.htmlFilesCount !== 0) {
    const scssHtmlRatio = Math.floor(100 * report.scssFilesCount / report.htmlFilesCount);
    report.finalReport['scssHtmlRatio'] = {
-     description: 'scss files VS html files',
+     description: 'scss/css files VS html files',
      value: `${report.scssFilesCount} out of ${report.htmlFilesCount} (${scssHtmlRatio}%)`,
      status: (scssHtmlRatio >= 25) ? 'CRITICAL' : (scssHtmlRatio >= 10 && scssHtmlRatio <= 25) ? 'IMPROVE' : 'OK',
      comment: null,
    }
    if (report.finalReport['scssHtmlRatio'].status === 'CRITICAL') {
-    report.finalReport['scssHtmlRatio'].comment = 'The percentage of html files having scss declaration is too high';
+    report.finalReport['scssHtmlRatio'].comment = 'The percentage of html files having styles declaration is too high';
    }
  }
 
  if (report.htmlLinesCount !== 0) {
    const scssHtmlLinesRatio = Math.floor(100 * report.scssLinescount / report.htmlLinesCount);
    report.finalReport['scssHtmlLinesRatio'] = {
-     description: 'scss lines count VS html lines count',
+     description: 'css lines count VS html lines count',
      value: `${report.scssLinescount} / ${report.htmlLinesCount} (${scssHtmlLinesRatio}%)`,
      status: (scssHtmlLinesRatio >= 25) ? 'CRITICAL' : (scssHtmlLinesRatio >= 10 && scssHtmlLinesRatio <= 25) ? 'IMPROVE' : 'OK',
      comment: null,
@@ -297,7 +301,7 @@ const runStylesAudit = module.exports.runStylesAudit = (pkg, customPath) => {
 
  if (report.scssFilesCount !== 0) {
    report.finalReport['scssEmptyFiles'] = {
-     description: 'scss empty files',
+     description: 'scss/css empty files',
      value: `${report.scssEmptyFiles} out of ${report.scssFilesCount} (${Math.floor(100 * report.scssEmptyFiles / report.scssFilesCount)}%)`,
      status: (report.scssEmptyFiles !== 0) ? 'IMPROVE' : 'OK',
      comment: (report.scssEmptyFiles !== 0) ? 'Scss files without content should be cleaned up' : null

package/scripts/csdr/audit/yarn.js

@@ -108,7 +108,7 @@ module.exports.audit = (pkg) => {
         }
 
       } else {
-        tools.logWarning(JSON.stringify(vulnerabilityReport));
+        tools.logWarning(JSON.stringify(vulnerabilityReport, null, 2));
 
         let message = '';
         Object.entries(vulnerabilityReport.auditSummary).forEach((v) => {

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

@@ -1,2 +1,3 @@
 {
+    "cacheable-request": ">=10.2.7"
 }