@eui/tools 6.20.2 → 6.20.4

package/.version.properties

@@ -1 +1 @@
-6.20.2
+6.20.4

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.20.4 (2024-08-07)
+
+##### Bug Fixes
+
+* **other:**
+  * audit-styles for standalone pkg release - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([fafdcc2a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/fafdcc2a9a32da15aeab49faec46da7d79b749c8))
+
+* * *
+* * *
+## 6.20.3 (2024-08-07)
+
+##### Bug Fixes
+
+* **other:**
+  * standalone pkg release - fetch branch as argument to pipeline script - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([8ff5847e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/8ff5847eab1b4981215ce9ae41a933f60e8a2e9a))
+
+* * *
+* * *
 ## 6.20.2 (2024-08-07)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/audit/styles.js

@@ -76,7 +76,11 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
     if (pkg.srcRootDefault) {
       srcPath = pkg.paths.src;
     } else {
-      srcPath = pkg.paths.root;
+      if (pkg.standalone) {
+        srcPath = pkg.paths.src;
+      } else {
+        srcPath = pkg.paths.root;
+      }
     }
     tools.logTitle(`Auditing : ${pkg.name}`);
   }
@@ -419,41 +423,42 @@ const runStylesAudit = (module.exports.runStylesAudit = (pkg, customPath) => {
 
 
   // Analyzing 3rd party dependencies usage
+  if (!pkg.standalone) {
+    tools.logInfo('Analyzing package deps for 3rd parties usage');
+    let deps = installUtils.packages.getLocalPackageDepsAll(pkg);
+    tools.logInfo('Deps found for package :');
+    deps = Object.keys(deps);
+    console.log(deps);
+
+    const allowedScopes = configUtils.packages.getPackageScopes();
+    const exclusions = ['ag-grid', 'file-saver'];
+
+    let thirdPartyDeps = [];
+    deps.forEach((d) => {
+      const scope = d.split('/')[0];
+
+      // checking against allowed CSDR known package scopes
+      if (!allowedScopes.includes(scope)) {
+        // exclusions known
+        let exclusionFound = false;
+        exclusions.forEach((exc) => {
+          if (scope.indexOf(exc) > -1) {
+            exclusionFound = true;
+          }
+        });
 
-  tools.logInfo('Analyzing package deps for 3rd parties usage');
-  let deps = installUtils.packages.getLocalPackageDepsAll(pkg);
-  tools.logInfo('Deps found for package :');
-  deps = Object.keys(deps);
-  console.log(deps);
-
-  const allowedScopes = configUtils.packages.getPackageScopes();
-  const exclusions = ['ag-grid', 'file-saver'];
-
-  let thirdPartyDeps = [];
-  deps.forEach((d) => {
-    const scope = d.split('/')[0];
-
-    // checking against allowed CSDR known package scopes
-    if (!allowedScopes.includes(scope)) {
-      // exclusions known
-      let exclusionFound = false;
-      exclusions.forEach((exc) => {
-        if (scope.indexOf(exc) > -1) {
-          exclusionFound = true;
+        if (!exclusionFound) {
+          thirdPartyDeps.push(d);
         }
-      });
-
-      if (!exclusionFound) {
-        thirdPartyDeps.push(d);
       }
-    }
-  });
+    });
 
-  tools.logInfo('3rd party deps found for package :');
-  console.log(thirdPartyDeps);
+    tools.logInfo('3rd party deps found for package :');
+    console.log(thirdPartyDeps);
 
-  report.thirdPartyDependencies.count = thirdPartyDeps.length;
-  report.thirdPartyDependencies.dependencies = thirdPartyDeps;
+    report.thirdPartyDependencies.count = thirdPartyDeps.length;
+    report.thirdPartyDependencies.dependencies = thirdPartyDeps;
+  }
 
   // GLOBAL STATS - ANALYZING DATA / SET STATUS
 
@@ -719,11 +724,17 @@ module.exports.audit = (pkg) => {
     })
 
     .then(() => {
-      // getting config options for gates defined
-      const configOptions = configUtils.global.getConfigOptions();
+      let configOptions, euiVersion;
 
-      // getting local csdr euiVersion
-      const euiVersion = configUtils.global.getLocalEuiVersion();
+      // getting config options for gates defined and euiVersion
+      if (pkg.standalone) {
+        configOptions = configUtils.global.getConfigOptionsStandalone();
+        euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
+
+      } else {
+        configOptions = configUtils.global.getConfigOptions();
+        euiVersion = configUtils.global.getLocalEuiVersion();
+      }
 
       // if eUI version not found, no action
       if (!euiVersion) {

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

@@ -50,14 +50,6 @@ const getBranches = module.exports.getBranches = () => {
   return getBranchDefs(branch);
 }
 
-const getBranchesFromRepo = module.exports.getBranchesFromRepo = () => {
-  let branch = utils.git.getBranchName();
-
-  return getBranchDefs(branch);
-}
-
-
-
 
 
 module.exports.getEnvTarget = () => {
@@ -342,13 +334,7 @@ module.exports.updateVersion = (pkg, pkgMetadata, envTarget) => {
   utils.tools.logBanner('UPDATE VERSION');
 
   // getting branch flags
-  let branches;
-
-  if (pkg.standalone) {
-    branches = this.getBranchesFromRepo();
-  } else {
-    branches = this.getBranches();
-  }
+  const branches = this.getBranches();
 
   // local vars
   let newVersion;
@@ -530,12 +516,8 @@ const tagAndMerge = (pkg, version, branches) => {
 module.exports.runGitOperations = (pkg, version) => {
   utils.tools.logBanner('RUN GIT OPERATIONS');
 
-  let branches;
-  if (pkg.standalone) {
-    branches = this.getBranchesFromRepo();
-  } else {
-    branches = this.getBranches();
-  }
+  const branches = this.getBranches();
+
   console.log(branches);
 
   if (pkg.remote && pkg.build && pkg.build.envTargetActive) {

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

@@ -16,7 +16,7 @@ const innerCommon = require('./common');
 // 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
+// npx @eui/tools release-package-standalone --dryRun --branch develop --debug --debugNotification --skipCommitsCheck --skipAudit --skipPublish --skipGitUpdates --skipLint --skipTest
 
 
 module.exports.run = () => {
@@ -34,7 +34,7 @@ module.exports.run = () => {
   const pkg = configUtils.packages.getStandalonePackage();
 
   // get branches config
-  const branches = innerCommon.getBranchesFromRepo();
+  const branches = innerCommon.getBranches();
 
   return (
     Promise.resolve()

package/scripts/utils/git-utils.js

@@ -30,11 +30,6 @@ const getLastTag = (folder) => {
     });
 }
 
-const getBranchName = (folder = process.cwd()) => {
-  const branchName = execa.sync('git', ['symbolic-ref','--short', 'HEAD'], { cwd: folder }).stdout;
-  return branchName;
-}
-
 const getRepoUrl = (folder) => {
   return Promise.resolve()
     .then(() => {
@@ -428,7 +423,6 @@ module.exports.getGitHost = getGitHost;
 module.exports.getLastTag = getLastTag;
 module.exports.getTags = getTags;
 module.exports.hasCommitsSinceLastTag = hasCommitsSinceLastTag;
-module.exports.getBranchName = getBranchName;
 module.exports.commitAndPush = commitAndPush;
 module.exports.tagVersion = tagVersion;
 module.exports.mergeMasterToDevelop = mergeMasterToDevelop;