@eui/tools 6.20.0 → 6.20.2

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

@@ -63,6 +63,55 @@ const getPackageVersions = (module.exports.getPackageVersions = (pkg) => {
   return versions;
 });
 
+
+const getPackageVersionsByNpmPkg = (module.exports.getPackageVersionsByNpmPkg = (npmPkg) => {
+  let npmOutput;
+  try {
+    npmOutput = execa.sync('npm', ['view', npmPkg, '--json']).stdout;
+    if (npmOutput.trim() === '') {
+      npmOutput = execa.sync('npm', ['view', `${npmPkg}@snapshot`, '--json']).stdout;
+    }
+  } catch(e) {
+    npmOutput = e.stdout;
+  }
+  // console.log(npmOutput);
+
+  let versions = [];
+
+  if (!npmOutput) {
+    tools.logWarning('Cannot find version of pkg - package is probably not published yet');
+    return versions;
+  }
+
+  const json = JSON.parse(npmOutput);
+
+  if (json.error) {
+    tools.logWarning('Error detected while trying to fetch the pkg version');
+    console.log(json.error);
+
+  } else {
+    if (json.versions) {
+      versions = json.versions.map((v) => {
+        return {
+          name: npmPkg,
+          version: v,
+          major: v.split('.')[0],
+          snapshot: v.indexOf('snapshot') > -1,
+          hotfix: v.indexOf('snapshot') === -1 && v.indexOf('-rc.') === -1 && v.indexOf('-next.') === -1 && v.indexOf('-') > -1,
+          rc: v.indexOf('-rc.') > -1,
+          date: json.time[v],
+        };
+      });
+    }
+  }
+
+  if (versions.length === 0) {
+    tools.logWarning(`Pkg versions not found for ${npmPkg}`);
+  }
+
+  return versions;
+});
+
 module.exports.getPackageVersionsLatest = (pkg) => {
   const versions = getPackageVersions(pkg);
   return versions.filter((v) => !v.snapshot);
@@ -142,39 +191,55 @@ module.exports.isNewPackageBuild = (pkg) => {
   }
 };
 
-const getPackageVersionsByMajor = (pkg, major, isMaster, isDevEnvTarget) => {
-  const pkgVersions = getPackageVersions(pkg);
 
-  if (pkgVersions) {
-    if (debug) tools.logInfo(`----> ${pkgVersions.length} metadata versions found for package`);
-    let versions = [];
+
+const filterMajorVersions = (pkgVersions, major, isMaster, isDevEnvTarget) => {
+  if (debug) tools.logInfo(`----> ${pkgVersions.length} metadata versions found for package`);
+
+  let versions = [];
+  versions = pkgVersions.filter((v) => v.major === major);
+
+  if (debug) tools.logInfo(`----> ${versions.length} metadata versions found for major version : ${major}`);
+
+  if (isMaster) {
+    versions = versions.filter((v) => !v.snapshot);
+    if (debug) tools.logInfo(`----> ${versions.length} metadata versions found excluding snapshots`);
+  } else {
     versions = pkgVersions.filter((v) => v.major === major);
+    if (debug) tools.logInfo(`----> ${versions.length} metadata versions non-master release for major`);
+  }
 
-    if (debug) tools.logInfo(`----> ${versions.length} metadata versions found for major version : ${major}`);
+  if (debug) tools.logInfo('----> exluding hotfix package versions type');
+  versions = versions.filter((v) => !v.hotfix);
+  if (debug) tools.logInfo(`----> ${versions.length} metadata versions excluding hotfix version type`);
 
-    if (isMaster) {
-      versions = versions.filter((v) => !v.snapshot);
-      if (debug) tools.logInfo(`----> ${versions.length} metadata versions found excluding snapshots`);
-    } else {
-      versions = pkgVersions.filter((v) => v.major === major);
-      if (debug) tools.logInfo(`----> ${versions.length} metadata versions non-master release for major`);
+  if (!isDevEnvTarget) {
+    if (debug) {
+      tools.logInfo(
+        '----=> excluding RC release of versions found for non-DEV build (preventing RC releases to go to another env than DEV'
+      );
     }
+    versions = versions.filter((v) => !v.rc);
+    if (debug) tools.logInfo(`----> ${versions.length} metadata versions excluding RC version type`);
+  }
+
+  return versions;
+}
 
-    if (debug) tools.logInfo('----> exluding hotfix package versions type');
-    versions = versions.filter((v) => !v.hotfix);
-    if (debug) tools.logInfo(`----> ${versions.length} metadata versions excluding hotfix version type`);
 
-    if (!isDevEnvTarget) {
-      if (debug) {
-        tools.logInfo(
-          '----=> excluding RC release of versions found for non-DEV build (preventing RC releases to go to another env than DEV'
-        );
-      }
-      versions = versions.filter((v) => !v.rc);
-      if (debug) tools.logInfo(`----> ${versions.length} metadata versions excluding RC version type`);
-    }
+const getPackageVersionsByMajor = (pkg, major, isMaster, isDevEnvTarget) => {
+  const pkgVersions = getPackageVersions(pkg);
 
-    return versions;
+  if (pkgVersions) {
+    return filterMajorVersions(pkgVersions, major, isMaster, isDevEnvTarget);
+  }
+};
+
+const getPackageVersionsByMajorByNpmPkg = (npmPkg, major, isMaster, isDevEnvTarget) => {
+  const pkgVersions = getPackageVersionsByNpmPkg(npmPkg);
+
+  if (pkgVersions) {
+    return filterMajorVersions(pkgVersions, major, isMaster, isDevEnvTarget);
   }
 };
 
@@ -188,6 +253,16 @@ module.exports.getLastMajorVersion = (pkg, major, isMaster, isDevEnvTarget) => {
   }
 };
 
+module.exports.getLastMajorVersionByNpmPkg = (npmPkg, major, isMaster, isDevEnvTarget) => {
+  tools.logInfo(`--Getting registry pkg version for ${npmPkg} - major: ${major}`);
+
+  const pkgVersionsMajor = getPackageVersionsByMajorByNpmPkg(npmPkg, major, isMaster, isDevEnvTarget);
+
+  if (pkgVersionsMajor && pkgVersionsMajor.length !== 0) {
+    return pkgVersionsMajor.splice(-1)[0].version;
+  }
+};
+
 module.exports.getVersionMetadata = (pkg, version) => {
   const pkgVersions = getPackageVersions(pkg);
   if (pkgVersions) {

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

@@ -12,7 +12,7 @@ const versionUtils = require('../../version/version-utils');
 const configUtils = require('../../config/config-utils');
 
 // GLOBAL ARGS
-const { dryRun, pipelineId } = utils.tools.getArgs();
+const { dryRun, pipelineId, skipCommitsCheck } = utils.tools.getArgs();
 
 const getBranchDefs = (branch) => {
   if (!branch) {
@@ -287,6 +287,11 @@ module.exports.commitMetadataChecks = (pkg) => {
   utils.tools.logTitle('Checking package commit metadata');
   let pkgMetadata;
 
+  if (skipCommitsCheck) {
+    utils.tools.logInfo('Commits checks skip active...skippping');
+    return {};
+  }
+
   if (pkg.remote) {
     utils.tools.logWarning('Remote package...skipping');
     return {};
@@ -337,7 +342,13 @@ module.exports.updateVersion = (pkg, pkgMetadata, envTarget) => {
   utils.tools.logBanner('UPDATE VERSION');
 
   // getting branch flags
-  const branches = this.getBranches();
+  let branches;
+
+  if (pkg.standalone) {
+    branches = this.getBranchesFromRepo();
+  } else {
+    branches = this.getBranches();
+  }
 
   // local vars
   let newVersion;
@@ -470,7 +481,7 @@ const commitPackage = (pkg, version, branches) => {
   .then(() => {
     return utils.git.commitAndPush(
       branches.branch,
-      `chore(release): update version: ${version} - from CI server`,
+      `chore(release): update version: ${version} - from CI server [skip ci]`,
       pkg.paths.root
     );
   })
@@ -487,7 +498,7 @@ const tagAndMerge = (pkg, version, branches) => {
     if (!branches.isSnapshot && !branches.isSupportSnapshot) {
       return utils.git.tagVersion(
         version, branches.branch,
-        `chore(release): tagging ${version} - from CI server`,
+        `chore(release): tagging ${version} - from CI server [skip ci]`,
         pkg.paths.root
       );
     }
@@ -519,7 +530,12 @@ const tagAndMerge = (pkg, version, branches) => {
 module.exports.runGitOperations = (pkg, version) => {
   utils.tools.logBanner('RUN GIT OPERATIONS');
 
-  const branches = this.getBranches();
+  let branches;
+  if (pkg.standalone) {
+    branches = this.getBranchesFromRepo();
+  } else {
+    branches = this.getBranches();
+  }
   console.log(branches);
 
   if (pkg.remote && pkg.build && pkg.build.envTargetActive) {
@@ -646,7 +662,7 @@ module.exports.sendSuccessNotification = (pkg, version, pkgMetadata) => {
       if (!pkg.backend) {
         return Promise.resolve()
         .then(() => {
-          if (pkg.build && pkg.build.skipLock) {
+          if ((pkg.build && pkg.build.skipLock) || pkg.standalone) {
             utils.tools.logInfo('lock package de-activated...skipping');
           } else {
             return metadataUtils.packageUtils.unlockPackage(pkg);
@@ -689,7 +705,7 @@ module.exports.sendErrorNotification = (pkg, exception, pkgMetadata) => {
         if (exception !== 'PACKAGE_LOCKED') {
           return Promise.resolve()
           .then(() => {
-            if (pkg.build && pkg.build.skipLock) {
+            if ((pkg.build && pkg.build.skipLock) || pkg.standalone) {
               utils.tools.logInfo('lock package de-activated...skipping');
             } else {
               return metadataUtils.packageUtils.unlockPackage(pkg);

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

@@ -22,190 +22,3 @@ module.exports.run = () => {
       throw e;
     })
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-'use strict';
-
-// UTILS
-const utils = require('../../../utils');
-
-// CSDR RELATED
-const configUtils = require('../../config/config-utils');
-const auditUtils = require('../../audit/audit-utils');
-const installUtils = require('../../install/install-utils');
-
-// INNER MODULES
-const innerCommon = require('./common');
-
-
-module.exports.run = () => {
-  // pre-requisites : package repository cloned - on gitlab script is run on the repo pipeline itself
-
-  const { dryRun } = utils.tools.getArgs();
-
-  utils.tools.logBanner('Starting UI stand-alone pipeline');
-
-  // local saved vars
-  let newVersion, commitsMetadata;
-
-  // getting the package information - mimics CSDR package config
-  const pkg = configUtils.packages.getStandalonePackage();
-
-  // get branches config
-  const branches = innerCommon.getBranchesFromRepo();
-
-  // get global config options
-  const configOptions = configUtils.standalone.getConfigOptions();
-
-  return (
-    Promise.resolve()
-
-      // RELEASE PACKAGE START
-
-      // Starting the release flow
-      .then(() => {
-        return innerCommon.initMessage(pkg, branches);
-      })
-
-      // CHECK BRANCH VALIDITY
-      .then(() => {
-        innerCommon.checkBranchValidity(branches);
-      })
-
-      // COMMIT METADATA CHECKS
-      .then(() => {
-        return innerCommon.commitMetadataChecks(pkg);
-      })
-      .then((metadata) => {
-        commitsMetadata = metadata;
-      })
-
-
-      // INIT PACKAGE CONFIG
-      .then(() => {
-        // generating angular.json config if not existing
-        configUtils.angular.checkAngularConfig();
-
-        // registering package angular config
-        configUtils.angular.registerAngularPackage(pkg);
-      })
-
-      // INIT ROOT FILES - yarn lock and resolution based on current eUI version of the package
-      // TODO - get the raw eUI version from package.json dependencies - need to test and adapt the config.global.getLocalEuiversion
-      // .then(() => {
-      //   return initUtils.global.initRootFilesAndResolutions();
-      // })
-
-
-      // INSTALL dependencies by type
-      .then(() => {
-        utils.tools.logBanner('INSTALL DEPENDENCIES');
-
-        return (
-          Promise.resolve()
-            // executing install for current package - based on package.json
-            .then(() => {
-              return installUtils.common.executeInstall(process.cwd(), configOptions.NPM_REGISTRY_INSTALL);
-            })
-
-            // auditing dependencies
-            .then(() => {
-              return auditUtils.yarn.audit(pkg);
-            })
-            .catch((e) => {
-              throw e;
-            })
-        );
-      })
-
-      // BUILD PACKAGE
-      .then(() => {
-        return utils.buildPackage.build(pkg, branches.isMaster, false);
-      })
-
-      // EXECUTING SONAR ANALYSIS
-      .then(() => {
-        return utils.sonar.run(pkg, branches.isMaster);
-      })
-
-      // GENERATE and UPDATE new version
-      .then(() => {
-        return innerCommon.updateVersion(pkg, commitsMetadata);
-      })
-      .then((version) => {
-        // storing version for later use
-        newVersion = version;
-      })
-
-      // GENERATE CHANGELOG
-      .then(() => {
-        utils.tools.logTitle('generating changelog...');
-        return utils.changelog.generate(pkg, newVersion, commitsMetadata.commits);
-      })
-
-      // WRITE CHANGELOG for MASTER and SUPPORT
-      .then((changelogContent) => {
-        utils.tools.logTitle('writing changelog...');
-
-        if ((branches.isSupport || branches.isNext || branches.isMaster) && !dryRun) {
-          return utils.changelog.writeChangelog(changelogContent, pkg.paths.root);
-
-        } else {
-          utils.tools.logInfo('WRITING SKIPPED - (either DRY-RUN or snapshot release) - Actual changelog :');
-          console.log(changelogContent);
-        }
-      })
-
-      // PUBLISH PACKAGE
-      .then(() => {
-        return utils.publish.publish(pkg);
-      })
-
-      // GIT OPERATIONS
-      .then(() => {
-        return innerCommon.commitPackage(pkg, newVersion, branches);
-      })
-      .then(() => {
-        return innerCommon.tagAndMerge(pkg, newVersion, branches);
-      })
-
-      // SEND SUCCESS NOTIFICATION
-      .then(() => {
-        return innerCommon.sendSuccessNotification(pkg, newVersion, commitsMetadata, false).then(() => {
-          return innerCommon.close(pkg);
-        });
-      })
-
-      // SEND ERROR NOTIFICATION
-      .catch((e) => {
-        return innerCommon
-          .sendErrorNotification(pkg, e, commitsMetadata, false)
-          .then(() => {
-            return innerCommon.close(pkg);
-          })
-          .then(() => {
-            process.exit(1);
-          });
-      })
-  );
-};

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

@@ -6,19 +6,27 @@ const utils = require('../../../utils');
 // CSDR RELATED
 const configUtils = require('../../config/config-utils');
 const auditUtils = require('../../audit/audit-utils');
+const initUtils = require('../../init/init-utils');
 const installUtils = require('../../install/install-utils');
 
 // INNER MODULES
 const innerCommon = require('./common');
 
 
-module.exports.run = () => {
-  // pre-requisites : package repository cloned - on gitlab script is run on the repo pipeline itself
+// LOCAL TEST :
+// - symlink eUI tools sources to node_modules of standalone pkg folder node_modules to test
+// - execute this command on the standalone pkg folder :
+// npx @eui/tools release-package-standalone --dryRun --debug --debugNotification --skipCommitsCheck --skipAudit --skipPublish --skipGitUpdates
+
 
+module.exports.run = () => {
   const { dryRun } = utils.tools.getArgs();
 
   utils.tools.logBanner('Starting UI stand-alone pipeline');
 
+  // utils.tools.logTitle('Provided arguments : ');
+  // console.log(utils.tools.getArgs());
+
   // local saved vars
   let newVersion, commitsMetadata;
 
@@ -28,9 +36,6 @@ module.exports.run = () => {
   // get branches config
   const branches = innerCommon.getBranchesFromRepo();
 
-  // get global config options
-  const configOptions = configUtils.standalone.getConfigOptions();
-
   return (
     Promise.resolve()
 
@@ -54,6 +59,10 @@ module.exports.run = () => {
         commitsMetadata = metadata;
       })
 
+      // SPECIFIC INJECTION FOR STANDALONE PKG ROOT FILES
+      .then(() => {
+        return initUtils.packages.injectStandaloneResources(pkg);
+      })
 
       // INIT PACKAGE CONFIG
       .then(() => {
@@ -65,11 +74,10 @@ module.exports.run = () => {
       })
 
       // INIT ROOT FILES - yarn lock and resolution based on current eUI version of the package
-      // TODO - get the raw eUI version from package.json dependencies - need to test and adapt the config.global.getLocalEuiversion
-      // .then(() => {
-      //   return initUtils.global.initRootFilesAndResolutions();
-      // })
-
+      .then(() => {
+        const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
+        return initUtils.global.initRootFilesAndResolutions(euiVersion);
+      })
 
       // INSTALL dependencies by type
       .then(() => {
@@ -77,9 +85,8 @@ module.exports.run = () => {
 
         return (
           Promise.resolve()
-            // executing install for current package - based on package.json
             .then(() => {
-              return installUtils.common.executeInstall(process.cwd(), configOptions.NPM_REGISTRY_INSTALL);
+              return installUtils.packages.installDepsStandalone(pkg, branches.isMaster);
             })
 
             // auditing dependencies
@@ -137,10 +144,7 @@ module.exports.run = () => {
 
       // GIT OPERATIONS
       .then(() => {
-        return innerCommon.commitPackage(pkg, newVersion, branches);
-      })
-      .then(() => {
-        return innerCommon.tagAndMerge(pkg, newVersion, branches);
+        return innerCommon.runGitOperations(pkg, newVersion);
       })
 
       // SEND SUCCESS NOTIFICATION

package/scripts/index.js

@@ -99,7 +99,6 @@ module.exports.configPackages = require('./csdr/config/packages');
 module.exports.configProjects = require('./csdr/config/projects');
 module.exports.configRegister = require('./csdr/config/register');
 module.exports.configRemotes = require('./csdr/config/remotes');
-module.exports.configStandalone = require('./csdr/config/standalone');
 module.exports.configSync = require('./csdr/config/sync');
 
 // csdr -init

package/scripts/utils/changelog-utils.js

@@ -38,6 +38,11 @@ module.exports.generate = (pkg, version, commits) => {
 
   let repoUrl;
 
+  if (!commits) {
+    tools.logWarning('Unable to find commits metadata to parse');
+    return null;
+  }
+
   heading += ' ' + version + ' (' + date + ')';
 
   content.push(heading);
@@ -46,7 +51,7 @@ module.exports.generate = (pkg, version, commits) => {
   let ISSUES_MANAGER_HOST;
 
   if (pkg.standalone) {
-    ISSUES_MANAGER_HOST = configUtils.standalone.getConfigOptions().ISSUES_MANAGER_HOST;
+    ISSUES_MANAGER_HOST = configUtils.global.getConfigOptionsStandalone().ISSUES_MANAGER_HOST;
   } else {
     ISSUES_MANAGER_HOST = configUtils.global.getConfigOptions().ISSUES_MANAGER_HOST;
   }

package/scripts/utils/clean/clean-utils.js

@@ -7,7 +7,11 @@ module.exports.cleanPackage = (pkg) => {
   return Promise.resolve()
     .then(() => {
       tools.logInfo('Cleaning dist')
-      return tools.rimraf(pkg.paths.root + '/**/dist');
+      if (pkg.standalone) {
+        return tools.rimraf(pkg.paths.root + '/dist');
+      } else {
+        return tools.rimraf(pkg.paths.root + '/**/dist');
+      }
     })
     .then(() => {
       tools.logInfo('Cleaning out-tsc')
@@ -23,7 +27,11 @@ module.exports.cleanPackage = (pkg) => {
     })
     .then(() => {
       tools.logInfo('Cleaning test files')
-      return tools.rimraf(pkg.paths.root + '/**/test');
+      if (pkg.standalone) {
+        return tools.rimraf(pkg.paths.root + '/test');
+      } else {
+        return tools.rimraf(pkg.paths.root + '/**/test');
+      }
     })
     .then(() => {
       tools.logSuccess();

package/scripts/utils/git-utils.js

@@ -11,7 +11,7 @@ const { getPackageConfig } = require('./notification/config');
 // const versionUtils = require('./version-utils');
 
 // FETCH ARGS
-const { dryRun, git, debug, build } = tools.getArgs();
+const { dryRun, git, debug, build, skipGitUpdates } = tools.getArgs();
 
 
 const getLastTag = (folder) => {
@@ -31,7 +31,7 @@ const getLastTag = (folder) => {
 }
 
 const getBranchName = (folder = process.cwd()) => {
-  const branchName = execa.sync('git', ['rev-parse','--abbrev-ref', 'HEAD'], { cwd: folder }).stdout;
+  const branchName = execa.sync('git', ['symbolic-ref','--short', 'HEAD'], { cwd: folder }).stdout;
   return branchName;
 }
 
@@ -96,7 +96,7 @@ const commitAndPush = (branch, message, folder) => {
   tools.logTitle('Commit and pushing files');
   tools.logInfo(`on branch : ${branch} / folder provided : ${folder}`);
 
-  if (dryRun) {
+  if (dryRun || skipGitUpdates) {
     tools.logInfo('DRY-RUN: skipping commit and push files');
 
   } else {
@@ -134,7 +134,7 @@ const tagVersion = (version, branch, message, folder) => {
   tools.logInfo(`Pushing changes to origin/${branch}...`);
   tools.logInfo(`Tagging MASTER branch with v${version}...`);
 
-  if (dryRun) {
+  if (dryRun || skipGitUpdates) {
     tools.logInfo('DRY-RUN: skipping tagging of version');
     return Promise.resolve();
 
@@ -167,7 +167,7 @@ const mergeMasterToDevelop = (pkg, folder, version) => {
   tools.logTitle('Merge back on develop');
   tools.logInfo(`Merging release changes into "develop" branch...`);
 
-  if (dryRun) {
+  if (dryRun || skipGitUpdates) {
     tools.logInfo('DRY-RUN: skipping merge master to develop');
     return;
 
@@ -207,7 +207,7 @@ const mergeSupportToSupportDevelop = (pkg, folder, supportBranch, supportSnapsho
   tools.logTitle(`Merge back on ${supportSnapshotBranch}`);
   tools.logInfo(`Merging release changes into ${supportSnapshotBranch} branch...`);
 
-  if (dryRun) {
+  if (dryRun || skipGitUpdates) {
     tools.logInfo('DRY-RUN: skipping merge support to supportDevelop');
     return Promise.resolve();
   }

package/scripts/utils/notification/config.js

@@ -13,7 +13,7 @@ module.exports.getPackageConfig = (pkg) => {
   let globalConfig;
 
   if (pkg.standalone) {
-    globalConfig = configUtils.standalone.getConfigOptions();
+    globalConfig = configUtils.global.getConfigOptionsStandalone()
   } else {
     globalConfig = configUtils.global.getConfigOptions();
   }

package/scripts/utils/publish/npm.js

@@ -10,7 +10,7 @@ const notificationUtils = require('../notification/notification-utils');
 const configUtils = require('../../csdr/config/config-utils');
 
 // FETCH ARGS
-const { dryRun, registry } = tools.getArgs();
+const { dryRun, registry, skipPublish } = tools.getArgs();
 
 
 
@@ -42,7 +42,7 @@ const publishCore = module.exports.publishCore = (pkg, registry, isPublicAccess)
     // command += ' --access public';
   }
 
-  if (dryRun) {
+  if (dryRun || skipPublish) {
     tools.logInfo(`DRY-RUN: npm publish command to be executed : ${args}`);
 
     return notificationUtils.package.sendPackageMessage({
@@ -112,7 +112,7 @@ const publishPackage = (pkg, parentPkg) => {
   let configOptions;
 
   if (pkg.standalone) {
-    configOptions = configUtils.standalone.getConfigOptions();
+    configOptions = configUtils.global.getConfigOptionsStandalone();
   } else {
     configOptions = configUtils.global.getConfigOptions();
   }

package/scripts/utils/sonar/sonar-utils.js

@@ -120,7 +120,7 @@ const runUI = (pkg, isMaster) => {
 
         let SONAR_HOST;
         if (pkg.standalone) {
-          SONAR_HOST = configUtils.standalone.getConfigOptions().SONAR_HOST;
+          SONAR_HOST = configUtils.global.getConfigOptionsStandalone().SONAR_HOST;
         } else {
           SONAR_HOST = configUtils.global.getConfigOptions().SONAR_HOST;
         }