@storm-software/git-tools 2.131.20 → 2.131.22

package/bin/git.cjs

@@ -3623,9 +3623,10 @@ function formatConfigLog(config5) {
 }
 var validReleaseVersionPrefixes = ["auto", "", "~", "^", "="];
 var ReleaseGraph = class _ReleaseGraph {
-  constructor(releaseGroups, filters) {
+  constructor(releaseGroups, filters, workspaceConfig) {
     this.releaseGroups = releaseGroups;
     this.filters = filters;
+    this.workspaceConfig = workspaceConfig;
   }
   projectToReleaseGroup = /* @__PURE__ */ new Map();
   projectToDependents = /* @__PURE__ */ new Map();
@@ -4017,15 +4018,22 @@ var ReleaseGraph = class _ReleaseGraph {
               this.resolveRepositoryTags.bind(this),
               options
             );
+            const projectReleaseTagPattern = releaseTagPattern.includes(
+              "{releaseGroupName}"
+            ) ? releaseTagPattern.replace("{releaseGroupName}", "{projectName}") : `{projectName}@${releaseTagPattern}`;
             const projectReleaseTag = await git.getLatestGitTagForPattern(
-              releaseTagPattern.includes("{releaseGroupName}") ? releaseTagPattern.replace(
-                /\{releaseGroupName\}/g,
-                "{projectName}"
-              ) : `{projectName}@${releaseTagPattern}`,
+              projectReleaseTagPattern,
               additionalInterpolationData,
               this.resolveRepositoryTags.bind(this),
               options
             );
+            chunkOOFHIS6Q_cjs.writeDebug(
+              `Group release tag pattern: ${releaseTagPattern} 
+Project release tag pattern: ${projectReleaseTagPattern} 
+Group release tag: ${groupReleaseTag?.tag} 
+Project release tag: ${projectReleaseTag?.tag}`,
+              this.workspaceConfig
+            );
             if (projectReleaseTag?.extractedVersion && groupReleaseTag?.extractedVersion && gte__default.default(
               projectReleaseTag.extractedVersion,
               groupReleaseTag.extractedVersion
@@ -4286,7 +4294,7 @@ Valid values are: ${validReleaseVersionPrefixes.map((s) => `"${s}"`).join(", ")}
     await Promise.all(validationPromises);
   }
 };
-async function createReleaseGraph(options) {
+async function createReleaseGraph(options, workspaceConfig) {
   const releaseGroups = Object.entries(
     options.nxReleaseConfig.groups ?? {}
   ).map(([name, group]) => {
@@ -4296,7 +4304,11 @@ async function createReleaseGraph(options) {
       resolvedVersionPlans: group.versionPlans ? [] : false
     };
   });
-  const graph = new ReleaseGraph(releaseGroups, options.filters);
+  const graph = new ReleaseGraph(
+    releaseGroups,
+    options.filters,
+    workspaceConfig
+  );
   await graph.init(options);
   return graph;
 }
@@ -5088,17 +5100,20 @@ ${formatConfigLog(config5)}`,
         v.newVersion ? extractPreid(v.newVersion) : void 0
       ])
     );
-    const releaseGraph = await createReleaseGraph({
-      tree: this.tree,
-      projectGraph: this.projectGraph,
-      nxReleaseConfig: this.releaseConfig,
-      filters: {
-        projects: options.projects,
-        groups: options.groups
+    const releaseGraph = await createReleaseGraph(
+      {
+        tree: this.tree,
+        projectGraph: this.projectGraph,
+        nxReleaseConfig: this.releaseConfig,
+        filters: {
+          projects: options.projects,
+          groups: options.groups
+        },
+        firstRelease: !!options.firstRelease,
+        verbose: chunkOOFHIS6Q_cjs.isVerbose(this.workspaceConfig.logLevel)
       },
-      firstRelease: !!options.firstRelease,
-      verbose: chunkOOFHIS6Q_cjs.isVerbose(this.workspaceConfig.logLevel)
-    });
+      this.workspaceConfig
+    );
     const projectToAdditionalDependencyBumps = /* @__PURE__ */ new Map();
     for (const releaseGroup of releaseGraph.releaseGroups) {
       if (releaseGroup.projectsRelationship !== "independent") {
@@ -5417,19 +5432,22 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         "Failed to load the project graph. Please run `nx reset`, then run the `storm-git commit` command again."
       );
     }
-    const releaseGraph = await createReleaseGraph({
-      tree: this.tree,
-      projectGraph: this.projectGraph,
-      nxReleaseConfig: this.releaseConfig,
-      filters: {
-        projects: options.projects,
-        groups: options.groups
+    const releaseGraph = await createReleaseGraph(
+      {
+        tree: this.tree,
+        projectGraph: this.projectGraph,
+        nxReleaseConfig: this.releaseConfig,
+        filters: {
+          projects: options.projects,
+          groups: options.groups
+        },
+        firstRelease: !!options.firstRelease,
+        verbose,
+        preid: options.preid ?? this.workspaceConfig.preid,
+        versionActionsOptionsOverrides: options.versionActionsOptionsOverrides
       },
-      firstRelease: !!options.firstRelease,
-      verbose,
-      preid: options.preid ?? this.workspaceConfig.preid,
-      versionActionsOptionsOverrides: options.versionActionsOptionsOverrides
-    });
+      this.workspaceConfig
+    );
     if (releaseGraph.filterLog && process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG !== "true") {
       chunkOOFHIS6Q_cjs.writeDebug(formatNxLog(releaseGraph.filterLog), this.workspaceConfig);
     }