@eui/tools 6.12.31 → 6.12.33

package/.version.properties

@@ -1 +1 @@
-6.12.31
+6.12.33

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.33 (2023-07-26)
+
+##### Chores
+
+* **other:**
+  * integrate workspaces links generation on pre-build route replacement - MWP-9751 [MWP-9751](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9751)  ([6ee4edc3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6ee4edc307230443351043877d1d529bb1e199c5))
+
+* * *
+* * *
+## 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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.12.31",
+    "version": "6.12.33",
     "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

@@ -106,6 +106,11 @@ const injectRoutesConfig = (project) => {
 
   tools.logInfo(`${routesConfigPath} - injecting in ${project.paths.assetsPath}`);
   tools.copydir(routesConfigPath, project.paths.assetsPath);
+
+  const workspacesConfigPath = path.join(pkgAssetsPath, project.externalRoutesSources.workspacesConfigAssetsPath);
+  tools.logInfo(`${workspacesConfigPath} - injecting in ${project.paths.assetsPath}`);
+  tools.copydir(workspacesConfigPath, project.paths.assetsPath);
+
 };
 
 
@@ -418,6 +423,8 @@ const generateLinks = (project, routes, envTargetFinal) => {
   const routeDefsBaseLinksJSON = require(path.join(project.paths.assetsPath, routeDefsBaseLinksFileName));
   const routeDefsBaseFilename = 'route-defs-base.json';
   const routeDefsBaseJSON = require(path.join(project.paths.assetsPath, routeDefsBaseFilename));
+  const workspaceDefsBaseFilename = 'workspace-defs-base.json';
+  const workspaceDefsBaseJSON = require(path.join(project.paths.assetsPath, workspaceDefsBaseFilename));
 
   const getRouteMenuDef = (link) => {
     let routeDef = null;
@@ -476,11 +483,36 @@ const generateLinks = (project, routes, envTargetFinal) => {
     }
   };
 
+  // global links combining routes links and workspaces links
+  let workspaceLinks = [];
+
+  // Combining workspaces definitions with base links definitions
+
+  workspaceDefsBaseJSON.forEach((wp) => {
+    if (wp.baseLinkDefs) {
+      wp.baseLinkDefs.forEach((wpLink) => {
+        workspaceLinks.push({
+          ...wpLink,
+          workspace: wp.id
+        });
+      });
+    }
+  });
+
+  tools.logInfo('Workspaces links generated :');
+  console.log(workspaceLinks);
+
+  const globalLinks = [
+    ...routeDefsBaseLinksJSON,
+    ...workspaceLinks,
+  ];
+
+
   // processing each link and matching route from routes base data definitions
 
   const linksGenerated = [];
 
-  routeDefsBaseLinksJSON.forEach((link) => {
+  globalLinks.forEach((link) => {
     let newLink = null;
 
     if (link.parentId) {