@storm-software/git-tools 2.131.15 → 2.131.16

package/bin/git.js

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
-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 { postCheckoutHook } from './chunk-WVG2JDAL.js';
+import { postCommitHook } from './chunk-NFY3U5Y5.js';
+import { postMergeHook } from './chunk-S2KYF4B5.js';
+import { preCommitHook } from './chunk-K3M4EFXG.js';
+import './chunk-2K6K4B6C.js';
+import { prePushHook } from './chunk-JZL474YC.js';
 import './chunk-HBLWPOJV.js';
-import { prepareHook } from './chunk-NBHO5BK4.js';
+import { prepareHook } from './chunk-NPCKWTZG.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, formatLogMessage, __require, STORM_DEFAULT_RELEASE_BANNER } from './chunk-NZK4I3QQ.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-RNHFC7RJ.js';
 import TOML from '@ltd/j-toml';
 import { Command } from 'commander';
 import '@inquirer/checkbox';
@@ -3342,7 +3342,6 @@ var DEFAULT_CHANGELOG_RELEASE_CONFIG = {
   }
 };
 var DEFAULT_RELEASE_GROUP_CONFIG = {
-  projectsRelationship: "independent",
   changelog: {
     ...DEFAULT_CHANGELOG_RELEASE_CONFIG
   },
@@ -3350,7 +3349,6 @@ var DEFAULT_RELEASE_GROUP_CONFIG = {
     ...DEFAULT_VERSION_RELEASE_CONFIG
   },
   releaseTag: {
-    pattern: DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN,
     preferDockerVersion: false
   },
   versionPlans: false
@@ -3401,6 +3399,7 @@ var DEFAULT_RELEASE_CONFIG = {
         projects: ["packages/*"]
       },
       DEFAULT_JS_RELEASE_GROUP_CONFIG,
+      DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG,
       DEFAULT_RELEASE_GROUP_CONFIG
     ),
     crates: defu(
@@ -3408,6 +3407,7 @@ var DEFAULT_RELEASE_CONFIG = {
         projects: ["crates/*"]
       },
       DEFAULT_RUST_RELEASE_GROUP_CONFIG,
+      DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG,
       DEFAULT_RELEASE_GROUP_CONFIG
     )
   },
@@ -3457,9 +3457,10 @@ function getReleaseGroupConfig(projectGraph, releaseConfig, workspaceConfig) {
         projectGraph.nodes
       );
       if (!matchingProjects.length) {
-        throw new Error(
+        writeWarning(
           `Release group "${name}" does not have any matching projects.`
         );
+        return void 0;
       }
       for (const project of matchingProjects) {
         if (alreadyMatchedProjects.has(project)) {
@@ -3469,7 +3470,7 @@ function getReleaseGroupConfig(projectGraph, releaseConfig, workspaceConfig) {
         }
         alreadyMatchedProjects.add(project);
       }
-      let languageDefaultConfig = {};
+      let defaultConfig = {};
       if (matchingProjects.every(
         (project) => projectGraph.nodes[project]?.data && (projectGraph.nodes[project]?.data.metadata?.js || isEqualProjectTag(
           projectGraph.nodes[project]?.data,
@@ -3482,7 +3483,8 @@ function getReleaseGroupConfig(projectGraph, releaseConfig, workspaceConfig) {
           )
         ))
       )) {
-        languageDefaultConfig = defu(
+        defaultConfig = defu(
+          group.projectsRelationship === "fixed" ? DEFAULT_FIXED_RELEASE_GROUP_CONFIG : DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG,
           DEFAULT_JS_RELEASE_GROUP_CONFIG,
           DEFAULT_RELEASE_GROUP_CONFIG
         );
@@ -3498,18 +3500,15 @@ function getReleaseGroupConfig(projectGraph, releaseConfig, workspaceConfig) {
           )
         ))
       )) {
-        languageDefaultConfig = defu(
+        defaultConfig = defu(
+          group.projectsRelationship === "fixed" ? DEFAULT_FIXED_RELEASE_GROUP_CONFIG : DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG,
           DEFAULT_RUST_RELEASE_GROUP_CONFIG,
           DEFAULT_RELEASE_GROUP_CONFIG
         );
       }
       const config5 = mergeReleaseGroupConfig(
         group,
-        defu(
-          languageDefaultConfig,
-          group.projectsRelationship === "fixed" ? DEFAULT_FIXED_RELEASE_GROUP_CONFIG : DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG,
-          DEFAULT_RELEASE_GROUP_CONFIG
-        ),
+        defaultConfig,
         workspaceConfig
       );
       config5.projects = matchingProjects;
@@ -3528,7 +3527,7 @@ function getReleaseGroupConfig(projectGraph, releaseConfig, workspaceConfig) {
         }
       }
       return [name, config5];
-    })
+    }).filter(Boolean)
   );
 }
 function getReleaseConfig(projectGraph, releaseConfig, workspaceConfig, ignoreNxJsonConfig = false) {
@@ -3572,6 +3571,23 @@ function getReleaseConfig(projectGraph, releaseConfig, workspaceConfig, ignoreNx
     )
   };
 }
+function formatConfigLog(config5) {
+  return formatLogMessage(
+    {
+      ...omit(config5, ["groups"]),
+      groups: Object.fromEntries(
+        Object.entries(config5.groups ?? {}).map(([name, group]) => [
+          name,
+          {
+            ...omit(group, ["projects"]),
+            projects: group.projects.length ? group.projects : "No projects"
+          }
+        ])
+      )
+    },
+    { sort: true, skip: ["workspaceConfig"] }
+  );
+}
 var StormReleaseGroupProcessor = class extends ReleaseGroupProcessor {
   constructor(tree, workspaceConfig, projectGraph, nxReleaseConfig, releaseGraph, versionOptions) {
     super(tree, projectGraph, nxReleaseConfig, releaseGraph, {
@@ -3769,13 +3785,7 @@ var StormReleaseGroupProcessor = class extends ReleaseGroupProcessor {
     const groupNode = this.#releaseGraph.groupGraph.get(releaseGroupName);
     await this.#bumpVersions(groupNode.group);
     for (const project of groupNode.group.projects) {
-      const projectLogger = this.#releaseGraph.projectLoggers.get(project);
-      if (!projectLogger) {
-        throw new Error(
-          `No project logger found for project ${project} in release group ${releaseGroupName}. This should never happen.`
-        );
-      }
-      projectLogger.flush();
+      this.#getProjectLoggerForProject(project).flush();
     }
   }
   async #bumpFixedVersionGroup(releaseGroup) {
@@ -4268,7 +4278,7 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
     }
     writeTrace(
       `Provided release configuration: 
-${formatLogMessage(releaseConfig)}`,
+${formatConfigLog(releaseConfig)}`,
       workspaceConfig
     );
     const config5 = getReleaseConfig(
@@ -4279,7 +4289,7 @@ ${formatLogMessage(releaseConfig)}`,
     );
     writeDebug(
       `Resolved release configuration: 
-${formatLogMessage(config5)}`,
+${formatConfigLog(config5)}`,
       workspaceConfig
     );
     return new _StormReleaseClient(projectGraph, config5, workspaceConfig);