@eui/tools 4.15.11 → 4.16.0

package/scripts/csdr/metadata/app-envs.js

@@ -3,7 +3,7 @@
 // GLOBAL
 const path = require('path');
 const moment = require('moment');
-const sanitizeHtml = require('sanitize-html');
+// const sanitizeHtml = require('sanitize-html');
 
 // LOCAL
 const tools = require('../../utils/tools');
@@ -73,45 +73,46 @@ const storeMetadata = (project, newVersion, metadata, envTarget) => {
 
 
 
-const envsMetadataToTable = (metadata) => {
-  return Promise.resolve()
-    .then(() => {
-      let content = '';
-      content += '<h3>Environment status</h3>';
-      content += '<table><thead><tr>';
-      content += '<th>ENV</th>';
-      content += '<th>VERSION</th>';
-      content += '<th>Release date</th>';
-      content += '</tr></thead>';
-      content += '<tbody>';
-
-      Object.entries(metadata).forEach((env) => {
-        content += '<tr>';
-        content += `<td>${env[0]}</td>`
-        content += `<td>${env[1].version}</td>`
-        content += `<td>${env[1].releaseDate}</td>`
-        content += '</tr>';
-
-        console.log(`ENVS status : ${env[0]} - ${env[1].version} --> ${env[1].releaseDate}`);
-      });
-
-      content += '</tbody>';
-      content += '</table>';
+// const envsMetadataToTable = (metadata) => {
+//   return Promise.resolve()
+//     .then(() => {
+//       let content = '';
+//       content += '<h3>Environment status</h3>';
+//       content += '<table><thead><tr>';
+//       content += '<th>ENV</th>';
+//       content += '<th>VERSION</th>';
+//       content += '<th>Release date</th>';
+//       content += '</tr></thead>';
+//       content += '<tbody>';
 
-      tools.logSuccess();
+//       Object.entries(metadata).forEach((env) => {
+//         content += '<tr>';
+//         content += `<td>${env[0]}</td>`
+//         content += `<td>${env[1].version}</td>`
+//         content += `<td>${env[1].releaseDate}</td>`
+//         content += '</tr>';
 
-      return sanitizeHtml(content);
-    })
+//         console.log(`ENVS status : ${env[0]} - ${env[1].version} --> ${env[1].releaseDate}`);
+//       });
 
-    .catch((e) => {
-      throw e;
-    })
-}
+//       content += '</tbody>';
+//       content += '</table>';
+
+//       tools.logSuccess();
+
+//       // return sanitizeHtml(content);
+//       return content;
+//     })
+
+//     .catch((e) => {
+//       throw e;
+//     })
+// }
 
 
 
 module.exports = {
   getMetadata,
   storeMetadata,
-  envsMetadataToTable,
+  // envsMetadataToTable,
 }

package/scripts/csdr/metadata/app-history.js

@@ -3,7 +3,7 @@
 // GLOBAL
 const path = require('path');
 const execa = require('execa');
-const sanitizeHtml = require('sanitize-html');
+// const sanitizeHtml = require('sanitize-html');
 const moment = require('moment');
 const semver = require('semver');
 
@@ -338,65 +338,66 @@ const generateDiffReport = (project, newVersion, isSupportBranch, envTarget, fro
 
 
 
-const historyMetadataToTable = (metadata) => {
-  tools.logTitle('Generating table from metadata...');
-
-  const iSSUES_MANAGER_HOST = configUtils.global.getConfigOptions().iSSUES_MANAGER_HOST;
-
-  var content;
-
-  if (!metadata.versions) {
-    tools.logWarning('WARNING: no content found');
-    return content;
-  }
-
-  content = '';
-  content += '<h3>MyWorkplace MAJOR versions history</h3>';
-  content += '<table><thead><tr>';
-  content += '<th>ENV</th>';
-  content += '<th>VERSION</th>';
-  content += '<th>CONTENT</th>';
-  content += '</tr></thead>';
-  content += '<tbody>';
-
-  metadata.versions.reverse().forEach((item) => {
-    content += '<tr>';
-    content += `<td><strong>${item.envTarget}</strong></td>`
-    content += `<td><strong>${item.name}</strong></td>`
-    content += '<td>';
-    if (!item.diffs || item.diffs.length === 0) {
-      content += 'N/A';
-    } else {
-      item.diffs.forEach((diffItem) => {
-        content += `<strong>${diffItem.name}</strong> : from ${diffItem.old} to ${diffItem.new}`
-        content += `<hr />`
-        if (diffItem.gitMetadata.length === 0) {
-          content += 'N/A';
-        } else {
-          diffItem.gitMetadata.forEach((gitCommits) => {
-            gitCommits.forEach((gitCommit) => {
-              if (gitCommit.issue === '') {
-                content += `N/A - ${gitCommit.subject}`;
-              } else {
-                content += `<a href="${iSSUES_MANAGER_HOST}${gitCommit.issue}">${gitCommit.issue}</a> - ${gitCommit.subject}`;
-              }
-              content += `<br />`;
-            })
-          })
-        }
-        content += `<br />`;
-      })
-    }
-    content += '</td>';
-    content += '</tr>';
-  })
-  content += '</tbody>';
-  content += '</table>';
-
-  tools.logSuccess();
-
-  return sanitizeHtml(content);
-}
+// const historyMetadataToTable = (metadata) => {
+//   tools.logTitle('Generating table from metadata...');
+
+//   const iSSUES_MANAGER_HOST = configUtils.global.getConfigOptions().iSSUES_MANAGER_HOST;
+
+//   var content;
+
+//   if (!metadata.versions) {
+//     tools.logWarning('WARNING: no content found');
+//     return content;
+//   }
+
+//   content = '';
+//   content += '<h3>MyWorkplace MAJOR versions history</h3>';
+//   content += '<table><thead><tr>';
+//   content += '<th>ENV</th>';
+//   content += '<th>VERSION</th>';
+//   content += '<th>CONTENT</th>';
+//   content += '</tr></thead>';
+//   content += '<tbody>';
+
+//   metadata.versions.reverse().forEach((item) => {
+//     content += '<tr>';
+//     content += `<td><strong>${item.envTarget}</strong></td>`
+//     content += `<td><strong>${item.name}</strong></td>`
+//     content += '<td>';
+//     if (!item.diffs || item.diffs.length === 0) {
+//       content += 'N/A';
+//     } else {
+//       item.diffs.forEach((diffItem) => {
+//         content += `<strong>${diffItem.name}</strong> : from ${diffItem.old} to ${diffItem.new}`
+//         content += `<hr />`
+//         if (diffItem.gitMetadata.length === 0) {
+//           content += 'N/A';
+//         } else {
+//           diffItem.gitMetadata.forEach((gitCommits) => {
+//             gitCommits.forEach((gitCommit) => {
+//               if (gitCommit.issue === '') {
+//                 content += `N/A - ${gitCommit.subject}`;
+//               } else {
+//                 content += `<a href="${iSSUES_MANAGER_HOST}${gitCommit.issue}">${gitCommit.issue}</a> - ${gitCommit.subject}`;
+//               }
+//               content += `<br />`;
+//             })
+//           })
+//         }
+//         content += `<br />`;
+//       })
+//     }
+//     content += '</td>';
+//     content += '</tr>';
+//   })
+//   content += '</tbody>';
+//   content += '</table>';
+
+//   tools.logSuccess();
+
+//   // return sanitizeHtml(content);
+//   return content;
+// }
 
 
 
@@ -436,7 +437,7 @@ module.exports.getMetadata = getMetadata;
 module.exports.storeMetadata = storeMetadata;
 module.exports.getDiffBetweenMajors = getDiffBetweenMajors;
 module.exports.generateDiffReport = generateDiffReport;
-module.exports.historyMetadataToTable = historyMetadataToTable;
+// module.exports.historyMetadataToTable = historyMetadataToTable;
 module.exports.flattenDiffMetadata = flattenDiffMetadata;
 module.exports.flatDiffMetadataToMessage = flatDiffMetadataToMessage;
 module.exports.getDiffBetweenBuildVersions = getDiffBetweenBuildVersions;

package/scripts/csdr/metadata/app.js

@@ -98,7 +98,7 @@ const storeMetadataAssets = (project, newVersion, packagesDeps, historyMetadata,
 
       const metadataFile = path.join(project.folder, 'src', 'assets', 'app-metadata.json');
 
-      console.log(`Creating ${metadataFile}`);
+      tools.logInfo(`Creating ${metadataFile}`);
       console.log(appMetadata);
 
       if (!dryRun) {
@@ -112,7 +112,7 @@ const storeMetadataAssets = (project, newVersion, packagesDeps, historyMetadata,
 
       const metadataFile = path.join(project.folder, 'src', 'assets', 'app-metadata-history.json');
 
-      console.log(`Creating ${metadataFile}`);
+      tools.logInfo(`Creating ${metadataFile}`);
 
       if (!dryRun && envTarget && envTarget !== 'DEV') {
         return tools.writeJsonFileSync(metadataFile, historyMetadata);
@@ -160,7 +160,7 @@ const storeMetadataAssetsStandAlone = () => {
 
       const metadataFile = path.join(prj.folder, 'src', 'assets', 'app-metadata.json');
 
-      console.log(`Creating ${metadataFile}`);
+      tools.logInfo(`Creating ${metadataFile}`);
       console.log(appMetadata);
 
       if (!dryRun) {

package/scripts/csdr/metadata/common.js

@@ -7,7 +7,7 @@ const path = require('path');
 const tools = require('../../utils/tools');
 const gitUtils = require('../../utils/git-utils');
 const configUtils = require('../config/config-utils');
-const confluenceUtils = require('../../utils/confluence-utils');
+// const confluenceUtils = require('../../utils/confluence-utils');
 
 // fetching command parameters
 const { dryRun, skipClone } = tools.getArgs();
@@ -146,7 +146,7 @@ module.exports.isSonarEnabled = () => {
 
 module.exports.publishMetadata = (project) => {
 
-  tools.logInfo(`publishMetadata...skipping`); 
+  tools.logInfo(`publishMetadata...skipping`);
 
   // var envsTableContent;
   // var historyTableContent;

package/scripts/csdr/metadata/package-history.js

@@ -3,7 +3,6 @@
 // GLOBAL
 const path = require('path');
 const execa = require('execa');
-const sanitizeHtml = require('sanitize-html');
 const moment = require('moment');
 const semver = require('semver');
 

package/scripts/csdr/release/app/release-app.js

@@ -78,6 +78,9 @@ module.exports.run = () => {
 
   // Starting the release process
   return Promise.resolve()
+    .then(() => {
+      utils.tools.logVersion();
+    })
 
     // *****************************************************************
     // RELEASE PACKAGE START

package/scripts/csdr/release/package/backend.js

@@ -0,0 +1,26 @@
+'use strict';
+
+// GLOBAL
+const path = require('path');
+
+// LOCAL
+const installUtils = require('../../install/install-utils');
+const configUtils = require('../../config/config-utils');
+
+module.exports.install = (pkg, isMaster) => {
+  return Promise.resolve()
+
+  // FETCHING CURRENT PACKAGES & INSTALL
+  .then(() => {
+    // fetch related project if passed as arguments
+    const prj = configUtils.projects.getProject();
+
+    // install the dependencies for current package build
+    return installUtils.buildPackage.install(prj, pkg, isMaster);
+  })
+
+  .catch((e) => {
+    throw e;
+  })
+}
+

package/scripts/csdr/release/package/common.js

@@ -381,7 +381,7 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
 
 
 module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
-  console.log(pkgMetadata);
+  // console.log(pkgMetadata);
 
   return Promise.resolve()
   .then(() => {

package/scripts/csdr/release/package/release-package.js

@@ -14,6 +14,7 @@ const metadataUtils = require('../../metadata/metadata-utils');
 const innerCommon = require('./common');
 const innerUi = require('./ui');
 const innerRemote = require('./remote');
+const innerBackend = require('./backend');
 
 
 module.exports.run = () => {
@@ -36,6 +37,10 @@ module.exports.run = () => {
 
 
     return Promise.resolve()
+      .then(() => {
+        utils.tools.logVersion();
+      })
+
 
       // RELEASE PACKAGE START
       .then(() => {
@@ -76,6 +81,9 @@ module.exports.run = () => {
         if (pkg.remote) {
           return innerRemote.install(pkg, branches.isMaster);
 
+        } else if (pkg.backend) {
+          return innerBackend.install(pkg, branches.isMaster);
+
         } else {
           return innerUi.install(pkg, branches.isMaster);
         }

package/scripts/csdr/release/package/ui.js

@@ -7,6 +7,8 @@ const path = require('path');
 const installUtils = require('../../install/install-utils');
 const configUtils = require('../../config/config-utils');
 const auditUtils = require('../../audit/audit-utils');
+const notificationUtils = require('../../../utils/notification/notification-utils');
+const tools = require('../../../utils/tools');
 
 
 module.exports.install = (pkg, isMaster) => {
@@ -24,7 +26,7 @@ module.exports.install = (pkg, isMaster) => {
 
   // CHECK INTERNAL DEPENDENCIES
   .then(() => {
-    return installUtils.buildPackage.checkDeps(pkg);
+    return checkDeps(pkg);
   })
 
 
@@ -38,3 +40,83 @@ module.exports.install = (pkg, isMaster) => {
     throw e;
   })
 }
+
+
+const checkDeps = (pkg) => {
+  tools.logTitle('Checking package internal dependencies');
+
+  return Promise.resolve()
+   .then(() => {
+     var depsFound = [];
+     var files = glob.sync('**/*.ts', { cwd: pkg.paths.pkgLibFolder, nodir: true, follow: true, dot: true });
+     files.forEach(file => {
+       const filePath = path.join(pkg.paths.pkgLibFolder, file);
+       const fileContent = tools.getFileContent(filePath);
+       var regex = /@cc\/|@mywp\/|@opsys\/|@sfc\//gi, result, indices = [];
+       while ( (result = regex.exec(fileContent)) ) {
+           indices.push(result.index);
+       }
+       if (indices.length !== 0) {
+         // tools.logInfo(`Number of occurences found : ${indices.length}`);
+         indices.forEach((i) => {
+           const endPos = fileContent.substr(i, 40).indexOf("'");
+           const dep = fileContent.substr(i, endPos);
+           if (endPos > -1) {
+             // tools.logInfo(`dep found on : ${dep}`);
+             depsFound.push(dep);
+
+           } else {
+             tools.logInfo(`Potential wrong import detected on file : ${file}`);
+             const subContent = fileContent.substr(i, 40);
+             const detectMultiSlashes = subContent.match(/\//g);
+             if (detectMultiSlashes.length > 0) {
+               tools.logError('Multislashes on import : ');
+               console.log(subContent);
+             }
+           }
+         })
+       }
+     });
+     depsFound = tools.removeArrayDuplicates(depsFound);
+     tools.logWarning(`Dependencies found : ${depsFound.length}`);
+     console.log(depsFound);
+
+     return depsFound;
+   })
+
+   .then((depsFound) => {
+     var depsLevel;
+
+     switch(true) {
+         case (depsFound.length === 1):
+           depsLevel = 'LOW (1)';
+           break;
+         case (depsFound.length > 1 && depsFound.length <= 3):
+           depsLevel = 'MEDIUM (between 1 and 3)';
+           break;
+         case (depsFound.length > 3 && depsFound.length <= 5):
+           depsLevel = 'HIGH (between 3 and 5)';
+           break;
+         case (depsFound.length > 5):
+           depsLevel = 'VERY HIGH (>5)';
+           break;
+         default:
+           depsLevel = 'NONE';
+     }
+
+     var message = `Internal dependencies detected : ${depsFound.length} - deps level: ${depsLevel}\n`;
+     message += depsFound.join('\n');
+
+
+     return notificationUtils.package.sendPackageMessage({
+      package: pkg,
+      text: message
+     });
+   })
+
+   .catch((e) => {
+     console.log(e);
+   })
+
+ }
+

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

@@ -8,22 +8,26 @@ const configUtils = require('../config/config-utils');
 
 const tools = require('../../utils/tools');
 
+const { skipPull } = tools.getArgs();
+
 module.exports.sync = () => {
   return Promise.resolve()
   .then(() => {
     tools.logInfo('Resetting package.json');
     return tools.copy(path.join(process.cwd(), '.csdr', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
   })
-  .then(() => {
-    tools.logInfo('Removing yarn.lock');
-    return tools.remove(path.join(process.cwd(), 'yarn.lock'));
-  })
+  // .then(() => {
+  //   tools.logInfo('Removing yarn.lock');
+  //   return tools.remove(path.join(process.cwd(), 'yarn.lock'));
+  // })
   .then(() => {
     tools.logSuccess();
   })
   .then(() => {
-    tools.logInfo(`Pulling root folder ...`);
-    return execa.shellSync(`git pull`, { cwd: path.join(process.cwd()), stdio: 'inherit' });
+    if (!skipPull) {
+      tools.logInfo(`Pulling root folder ...`);
+      return execa.shellSync(`git pull`, { cwd: path.join(process.cwd()), stdio: 'inherit' });
+    }
   })
   .then(() => {
     tools.logSuccess();
@@ -49,6 +53,9 @@ module.exports.sync = () => {
   .then(() => {
     return initUtils.meta.init();
   })
+  .then(() => {
+    return initUtils.processLocalEuiVersions();
+  })
   .catch((e) => {
     throw e;
   })

package/scripts/csdr/version/package.js

@@ -37,8 +37,9 @@ const getCurrentVersion = (pkg) => {
           // by default maven java backend is taken into account
         } else {
           tools.logInfo('Backend => extracting pom.xml');
-
           const xmlContent = tools.getXMLJsContent(path.join(pkg.paths.pkgDirectory, 'pom.xml'));
+
+          tools.logInfo('Content found:');
           console.log(xmlContent);
 
           currentVersion = xmlContent.project.version.toString();

package/scripts/utils/build/app/build-app-utils.js

@@ -120,7 +120,7 @@ module.exports.angular = (envTarget, isSnapshot, version) => {
 
         tools.logInfo(`ng test : watching = ${watch || false}`);
 
-        console.log(`running Angular TEST with args: ${args} on`);
+        tools.logInfo(`running Angular TEST with args: ${args} on :`);
         console.log(currentProject.paths.angularPath);
 
         if (!dryRun) {
@@ -204,7 +204,7 @@ module.exports.angular = (envTarget, isSnapshot, version) => {
 
       tools.logInfo(`ng build for configuration : ${configuration || 'production'}`);
 
-      console.log(`running Angular BUILD with args: ${args} on`);
+      tools.logInfo(`running Angular BUILD with args: ${args} on :`);
       console.log(currentProject.paths.angularPath);
 
       if (!dryRun && !skipCompile) {

package/scripts/utils/build/package/angular.js

@@ -65,11 +65,11 @@ module.exports.build = (pkg, isMaster) => {
         tools.logInfo('Linting...');
 
         let tsLintPath;
-        if (pkg.build && pkg.build.euiVersion && pkg.build.euiVersion === '9.x') {
-          tsLintPath = path.join(pkg.paths.pkgRootDirectory, 'tslint-eui9.json');
-        } else {
+        // if (pkg.build && pkg.build.euiVersion && pkg.build.euiVersion === '>7.x') {
+        //   tsLintPath = path.join(pkg.paths.pkgRootDirectory, 'tslint-eui-next.json');
+        // } else {
           tsLintPath = path.join(pkg.paths.pkgRootDirectory, 'tslint.json');
-        }
+        // }
         const tsConfigPath = path.join(pkg.paths.pkgRootDirectory, 'tsconfig.lib.json');
         tools.logInfo(`running tslint -c ${tsLintPath} -p ${tsConfigPath}`);
         return tools.runScript(`tslint -c ${tsLintPath} -p ${tsConfigPath} -t verbose`);

package/scripts/utils/build/package/build-package-utils.js

@@ -3,11 +3,11 @@
 // GLOBAL
 const path = require('path');
 const glob = require('glob');
+const execa = require('execa');
 
 // LOCAL
 const tools = require('../../tools');
 const configUtils = require('../../../csdr/config/config-utils');
-const notificationUtils = require('../../notification/notification-utils');
 
 // INNER MODULES
 const innerNodeJs = require('./nodeJs');
@@ -188,3 +188,52 @@ module.exports.postBuild = (pkg) => {
     })
 }
 
+
+module.exports.buildSubEntry = (pkg, subEntry) => {
+  return Promise.resolve()
+    .then(() => {
+      tools.logInfo(`Building sub-entry : ${subEntry} of package : ${pkg.name}`);
+      // console.log(pkg);
+      return tools.getFilesGlob(pkg.paths.pkgRootDirectory, `**/package.json`);
+    })
+
+    .then((files) => {
+      // console.log(files);
+
+      if (files.length === 0) {
+        tools.logWarning(`no sub-entries found within package ${pkg.name}`);
+        return;
+
+      } else {
+        let subEntryPath = files.filter((f) => {
+          return f.indexOf(subEntry) > -1;
+        })[0];
+
+        if (!subEntryPath) {
+          tools.logWarning(`${subEntry} can't be found in sub-folders of package (must contains package.json file for sub-entry definition)`);
+          return;
+
+        } else {
+          subEntryPath = subEntryPath.replace('/package.json', '');
+          tools.logInfo(`${subEntryPath} found... injecting angular.json for sub entry`);
+
+          return configUtils.angular.registerAngularPackageSubEntry(subEntry, subEntryPath);
+        };
+      }
+    })
+
+    .then(() => {
+      const ng = path.resolve(process.cwd(), 'node_modules', '@angular', 'cli', 'bin', 'ng');
+
+      let args = ['--max_old_space_size=8096', ng, 'build', subEntry];
+
+      return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
+    })
+
+    .then(() => {
+      tools.logSuccess();
+    })
+    .catch((e) => {
+      throw e;
+    })
+}

package/scripts/utils/build/package/element.js

@@ -24,20 +24,9 @@ module.exports.build = (pkg, isMaster) => {
   .then(() => {
     tools.logTitle(`Building element : ${pkg.name}...`);
 
-    // getting param from project config
-    if (pkg.build) {
-      if (pkg.build.skipLint) {
-        skipLint = true;
-      }
-      if (pkg.build.skipTest) {
-        skipTest = true;
-      }
-    }
-
-    // if (isMaster) {
-    //   skipLint = true;
-    //   skipTest = true;
-    // }
+    // force skipLint and skipTest on element
+    skipLint = true;
+    skipTest = true;
   })
 
   .then(() => {
@@ -102,7 +91,7 @@ module.exports.build = (pkg, isMaster) => {
 
       tools.logInfo(`ng test : watching = ${watch || false}`);
 
-      console.log(`running Angular TEST with args: ${args} on`);
+      tools.logInfo(`running Angular TEST with args: ${args} on`);
       console.log(pkg.paths.pkgRootDirectory);
 
       if (!dryRun) {
@@ -151,7 +140,7 @@ module.exports.build = (pkg, isMaster) => {
 
     tools.logInfo(`ng build for configuration : ${configuration || 'production'}`);
 
-    console.log(`running Angular BUILD with args: ${args} on`);
+    tools.logInfo(`running Angular BUILD with args: ${args} on`);
     console.log(pkg.paths.pkgRootDirectory);
 
     if (!dryRun) {