@storm-software/git-tools 2.131.11 → 2.131.14

package/bin/git.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
-import { postCheckoutHook } from './chunk-IAZL2KCV.js';
-import { postCommitHook } from './chunk-CVTLZKKX.js';
-import { postMergeHook } from './chunk-CDUCLZJV.js';
-import { preCommitHook } from './chunk-32WE3MHJ.js';
-import './chunk-NOZEXVLA.js';
-import { prePushHook } from './chunk-ABI4JM6L.js';
+import { postCheckoutHook } from './chunk-O4NH73SU.js';
+import { postCommitHook } from './chunk-PAUQYLGE.js';
+import { postMergeHook } from './chunk-VXOTRXPC.js';
+import { preCommitHook } from './chunk-4KUJG3RB.js';
+import './chunk-27FK2BQD.js';
+import { prePushHook } from './chunk-CRTMVCFC.js';
 import './chunk-HBLWPOJV.js';
-import { prepareHook } from './chunk-AZGQVIYO.js';
+import { prepareHook } from './chunk-NBHO5BK4.js';
 import { run, runAsync } from './chunk-RPK5AKGK.js';
-import { defu, getConfig, handleProcess, writeSuccess, exitWithSuccess, exitWithError, writeInfo, brandIcon, findWorkspaceRootSafe, writeFatal, getWorkspaceConfig, joinPaths, writeDebug, isVerbose, writeWarning, writeTrace, __require, STORM_DEFAULT_RELEASE_BANNER } from './chunk-7ES3CGZQ.js';
+import { defu, getConfig, handleProcess, writeSuccess, exitWithSuccess, exitWithError, writeInfo, brandIcon, findWorkspaceRootSafe, writeFatal, getWorkspaceConfig, joinPaths, writeDebug, isVerbose, writeWarning, writeTrace, formatLogMessage, __require, STORM_DEFAULT_RELEASE_BANNER } from './chunk-NZK4I3QQ.js';
 import TOML from '@ltd/j-toml';
 import { Command } from 'commander';
 import '@inquirer/checkbox';
@@ -3552,6 +3552,12 @@ function getReleaseConfig(projectGraph, releaseConfig, workspaceConfig, ignoreNx
   let groups = {};
   if (releaseConfig?.groups && Object.keys(releaseConfig.groups).length > 0) {
     groups = releaseConfig.groups;
+    if (nxJson.release?.groups && Object.keys(nxJson.release.groups).length > 0) {
+      groups = defu(
+        groups,
+        nxJson.release.groups
+      );
+    }
   } else if (nxJson.release?.groups && Object.keys(nxJson.release.groups).length > 0) {
     groups = nxJson.release.groups;
   } else {
@@ -3777,12 +3783,22 @@ var StormReleaseGroupProcessor = class extends ReleaseGroupProcessor {
       return false;
     }
     let bumped = false;
-    const firstProject = releaseGroup.projects.reduce((acc, project) => {
+    const firstProject = releaseGroup.projects.reduce((ret, project) => {
       const currentVersion = this.#getCurrentCachedVersionForProject(project);
-      if (currentVersion && semver.gt(currentVersion, acc)) {
+      if (!ret) {
+        return currentVersion;
+      }
+      const largestVersion = this.#getCurrentCachedVersionForProject(ret);
+      if (!largestVersion) {
         return currentVersion;
       }
-      return acc;
+      writeDebug(
+        `Comparing versions for fixed group ${releaseGroup.name}: Current Greatest Version: ${largestVersion}, Current Project Version: ${currentVersion} (project: ${project})`
+      );
+      if (currentVersion && semver.gt(currentVersion, largestVersion)) {
+        return currentVersion;
+      }
+      return ret;
     }, "");
     const {
       newVersionInput,
@@ -4234,16 +4250,23 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
         "Failed to load the project graph. Please run `nx reset`, then run the `storm-git commit` command again."
       );
     }
-    return new _StormReleaseClient(
+    writeTrace(
+      `Provided release configuration: 
+${formatLogMessage(releaseConfig)}`,
+      workspaceConfig
+    );
+    const config5 = getReleaseConfig(
       projectGraph,
-      getReleaseConfig(
-        projectGraph,
-        releaseConfig,
-        workspaceConfig,
-        ignoreNxJsonConfig
-      ),
+      releaseConfig,
+      workspaceConfig,
+      ignoreNxJsonConfig
+    );
+    writeDebug(
+      `Resolved release configuration: 
+${formatLogMessage(config5)}`,
       workspaceConfig
     );
+    return new _StormReleaseClient(projectGraph, config5, workspaceConfig);
   }
   /**
    * The normalized release configuration used by this release client.