@eui/tools 6.12.30 → 6.12.32

package/.version.properties

@@ -1 +1 @@
-6.12.30
+6.12.32

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.32 (2023-07-24)
+
+##### Chores
+
+* **other:**
+  * added mywp-shared audit checks for no sub-entry usage - bypass style audit with disabled feature - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([03bf262e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/03bf262e20662030ab31a5bbecaf5932b0f282f9))
+
+* * *
+* * *
+## 6.12.31 (2023-07-24)
+
+##### Chores
+
+* **other:**
+  * adapted routes replacement generation for workspaces refactoring - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([35c997f9](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/35c997f94958ce10d4064017f3cd0a9604a18351))
+
+* * *
+* * *
 ## 6.12.30 (2023-07-21)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/audit/styles.js

@@ -93,6 +93,7 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
     htmlFilesCount: 0,
     htmlLinesCount: 0,
     scssLinescount: 0,
+    stylesAuditDisabledCount: 0,
     tsOver500: {
       count: 0,
       files: [],
@@ -153,6 +154,10 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
       count: 0,
       indices: []
     },
+    mywpSharedAll: {
+      count: 0,
+      indices: []
+    },
     finalReport: {},
   };
 
@@ -175,6 +180,11 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
     const fileContent = tools.getFileContent(filePath).trim();
     const linesCount = fileContent.split('\n').length;
 
+    if (fileContent.indexOf('styles-audit-disabled') !== -1) {
+      report.stylesAuditDisabledCount++;
+      return;
+    }
+
     if (fileContent === '') {
       report.scssEmptyFiles++;
     }
@@ -255,6 +265,11 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
     const fileContent = tools.getFileContent(filePath);
     const linesCount = fileContent.split('\n').length;
 
+    if (fileContent.indexOf('styles-audit-disabled') !== -1) {
+      report.stylesAuditDisabledCount++;
+      return;
+    }
+
     report.htmlLinesCount += linesCount;
 
     let result,
@@ -286,6 +301,11 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
     const fileContent = tools.getFileContent(filePath);
     const linesCount = fileContent.split('\n').length;
 
+    if (fileContent.indexOf('styles-audit-disabled') !== -1) {
+      report.stylesAuditDisabledCount++;
+      return;
+    }
+
     if (linesCount > 500) {
       report.tsOver500.count++;
       report.tsOver500.files.push(file);
@@ -324,6 +344,14 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
     }
     report.allModules.count += allModulesIndices.length;
     report.allModules.indices = [...report.allModules.indices, ...generateIndicesContent(allModulesIndices, file, fileContent)];
+
+    let mywpSharedAllIndices = [];
+    regex = /\@mywp\/shared'|\@mywp\/shared"/gi;
+    while ((result = regex.exec(fileContent))) {
+      mywpSharedAllIndices.push(result.index);
+    }
+    report.mywpSharedAll.count += mywpSharedAllIndices.length;
+    report.mywpSharedAll.indices = [...report.mywpSharedAll.indices, ...generateIndicesContent(mywpSharedAllIndices, file, fileContent)];
   });
 
   // Analyzing 3rd party dependencies usage
@@ -403,6 +431,15 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
     };
   }
 
+  if (report.stylesAuditDisabledCount !==0) {
+    report.finalReport['stylesAuditDisabledCount'] = {
+      description: 'audit disabled count',
+      value: report.stylesAuditDisabledCount,
+      status: report.stylesAuditDisabledCount !== 0 ? 'IMPROVE': 'OK',
+      comment : report.stylesAuditDisabledCount !==0 ? 'If not done yet, files to be checked by eUI team': null,
+    }
+  }
+
   // BALANCED - styles content
 
   if (report.scssFilesCount !== 0) {
@@ -492,6 +529,12 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
       status: report.allModules.count !== 0 ? 'CRITICAL' : 'OK',
       comment: report.allModules.count !== 0 ? 'Use only tree-shakable eUI module imports (as of 15+)' : null,
     };
+    report.finalReport['mywpSharedAll'] = {
+      description: 'Usage of @mywp/shared import without sub-entry',
+      value: report.mywpSharedAll.count,
+      status: report.mywpSharedAll.count !== 0 ? 'CRITICAL' : 'OK',
+      comment: report.mywpSharedAll.count !== 0 ? 'use only import of @mywp/shared/SUB_ENTRY (as of 16+)' : null,
+    };
 
     // IMPROVE ONLY
 

package/scripts/utils/pre-build/routes-replacement/routes-replacement.js

@@ -428,6 +428,7 @@ const generateLinks = (project, routes, envTargetFinal) => {
           r.menuLinkDefs.forEach((md) => {
             if (md.url === link.url) {
               routeDef = md;
+              routeDef.path = r.path;
               if (link.id) {
                 routeDef.id = link.id;
               }
@@ -440,26 +441,11 @@ const generateLinks = (project, routes, envTargetFinal) => {
               if (link.dashboardWidgetDisabled) {
                 routeDef.dashboardWidgetDisabled = link.dashboardWidgetDisabled;
               }
-              return;
-            }
-          });
-        }
-      });
-    }
-
-    return routeDef;
-  };
-
-  const getRouteDefFromMenuLink = (link) => {
-    let routeDef = null;
+              if (link.alwaysDisplayed) {
+                routeDef.alwaysDisplayed = link.alwaysDisplayed;
+              }
 
-    if (link.url) {
-      routeDefsBaseJSON.forEach((r) => {
-        if (r.menuLinkDefs && r.menuLinkDefs.length > 0) {
-          r.menuLinkDefs.forEach((md) => {
-            if (md.url === link.url) {
-              routeDef = r;
-              return;
+             return;
             }
           });
         }
@@ -495,7 +481,7 @@ const generateLinks = (project, routes, envTargetFinal) => {
   const linksGenerated = [];
 
   routeDefsBaseLinksJSON.forEach((link) => {
-    let newLink;
+    let newLink = null;
 
     if (link.parentId) {
       if (isLinkAllowed(link)) {
@@ -507,6 +493,16 @@ const generateLinks = (project, routes, envTargetFinal) => {
             const defRoute = getRouteMenuDef(subLink);
 
             if (defRoute) {
+              if (project.externalRoutesSources.routesFilenameTemplate.indexOf('playground') > 0) {
+                const routePathInInputRoutes = routes.filter(r => r.angularRouteDef.path === defRoute.path)[0];
+
+                if (!routePathInInputRoutes) {
+                  defRoute.disabled = true;
+
+                } else {
+                  tools.logInfo(`[${defRoute.url}] --> route found in input routes - enabled`);
+                }
+              }
               newLink.children.push(defRoute);
             }
           }
@@ -517,13 +513,18 @@ const generateLinks = (project, routes, envTargetFinal) => {
         const defRoute = getRouteMenuDef(link);
 
         if (defRoute) {
-          newLink = defRoute;
-        } else {
-          newLink = link;
-        }
+          if (project.externalRoutesSources.routesFilenameTemplate.indexOf('playground') > 0) {
+            const routePathInInputRoutes = routes.filter(r => r.angularRouteDef.path === defRoute.path)[0];
 
-        if (link.alwaysDisplayed) {
-          newLink.alwaysDisplayed = true;
+            if (!routePathInInputRoutes) {
+              defRoute.disabled = true;
+            } else {
+              tools.logInfo(`[${defRoute.url}] --> route found in input routes - enabled`);
+            }
+          }
+          newLink = {...defRoute};
+        } else {
+          newLink = {...link};
         }
       }
     }
@@ -531,71 +532,16 @@ const generateLinks = (project, routes, envTargetFinal) => {
     if (newLink) {
       linksGenerated.push(newLink);
     }
-
-    if (debug) {
-      console.log('Links generated');
-      console.log(JSON.stringify(linksGenerated));
-    }
   });
 
-  tools.logInfo(`Links generated : ${linksGenerated.length} found`);
-
-  // checking if in playground route mode (local dev), in this case we mark the non-existing routes
-  // as disabled locally
-  let finalLinksGenerated = [];
-  if (project.externalRoutesSources.routesFilenameTemplate.indexOf('playground') > 0) {
-    tools.logInfo('Disabling non-active routes for playground');
-
-    linksGenerated.forEach((link) => {
-      let newLink = link;
-
-      if (link.parentId) {
-        let newLinkChildren = [];
-
-        link.children.forEach((subLink) => {
-          const defRoute = getRouteDefFromMenuLink(subLink);
-
-          if (defRoute) {
-            const routePathInInputRoutes = routes.filter(r => r.angularRouteDef.path === defRoute.path)[0];
-
-            if (!routePathInInputRoutes) {
-              subLink.disabled = true;
-
-            } else {
-              tools.logInfo(`[${subLink.url}] --> route found in input routes - enabled`);
-            }
-          }
-          newLinkChildren.push(subLink);
-        });
-        newLink.children = newLinkChildren;
-
-        const enabledChildren = newLink.children.filter(c => !c.disabled);
-        if (enabledChildren.length === 0) {
-          newLink.disabled = true;
-        }
-
-      } else {
-        const defRoute = getRouteDefFromMenuLink(link);
-
-        if (defRoute) {
-          const routePathInInputRoutes = routes.filter(r => r.angularRouteDef.path === defRoute.path)[0];
+  // if (debug) {
+    // console.log('Links generated');
+    // console.log(linksGenerated);
+  // }
 
-          if (!routePathInInputRoutes) {
-            newLink.disabled = true;
-          } else {
-            tools.logInfo(`[${link.url}] --> route found in input routes - enabled`);
-          }
-        }
-      }
-
-      finalLinksGenerated.push(newLink);
-    });
-
-  } else {
-    finalLinksGenerated = linksGenerated;
-  }
+  tools.logInfo(`Links generated : ${linksGenerated.length} found`);
 
-  tools.writeJsonFileSync(path.join(project.paths.assetsPath, 'route-defs-links.json'), finalLinksGenerated);
+  tools.writeJsonFileSync(path.join(project.paths.assetsPath, 'route-defs-links.json'), linksGenerated);
 }