@storm-software/git-tools 2.111.25 → 2.111.26

package/bin/git.js

@@ -82112,10 +82112,7 @@ var runCommit = async (commitizenFile = "@storm-software/git-tools/commit/config
 
     `);
   await runCommitLint(config, { message: message2 });
-  const commandItems = ["git", "commit"];
-  if (!process.env.CI && !process.env.STORM_CI) {
-    commandItems.push("-S");
-  }
+  const commandItems = ["git", "commit", "-S"];
   commandItems.push(...["--file", commitMsgFile]);
   const command = (0, import_any_shell_escape.default)(commandItems);
   if (dryRun) {
@@ -87928,7 +87925,7 @@ import {
   getFirstGitCommit,
   getGitDiff,
   getLatestGitTagForPattern,
-  gitAdd,
+  gitAdd as gitAdd2,
   gitPush,
   parseCommits,
   parseGitCommit
@@ -87937,11 +87934,9 @@ import { launchEditor } from "nx/src/command-line/release/utils/launch-editor";
 import { printAndFlushChanges } from "nx/src/command-line/release/utils/print-changes";
 import { printConfigAndExit } from "nx/src/command-line/release/utils/print-config";
 import { defaultCreateReleaseProvider as defaultCreateReleaseProvider2 } from "nx/src/command-line/release/utils/remote-release-clients/github";
-import { createRemoteReleaseClient } from "nx/src/command-line/release/utils/remote-release-clients/remote-release-client";
 import { resolveNxJsonConfigErrorMessage } from "nx/src/command-line/release/utils/resolve-nx-json-error-message";
 import {
   ReleaseVersion as ReleaseVersion2,
-  commitChanges,
   createCommitMessageValues,
   createGitTagValues,
   handleDuplicateGitTags,
@@ -87959,7 +87954,7 @@ import { createProjectGraphAsync as createProjectGraphAsync4 } from "nx/src/proj
 import { interpolate } from "nx/src/tasks-runner/utils";
 import { isCI } from "nx/src/utils/is-ci";
 import { output as output2 } from "nx/src/utils/output";
-import { joinPathFragments } from "nx/src/utils/path";
+import { joinPathFragments as joinPathFragments2 } from "nx/src/utils/path";
 import { workspaceRoot } from "nx/src/utils/workspace-root";
 
 // src/utilities/changelog-utils.ts
@@ -88044,6 +88039,7 @@ function parseChangelogMarkdown(contents) {
 // src/utilities/git-utils.ts
 init_esm_shims();
 import { execCommand } from "nx/src/command-line/release/utils/exec-command.js";
+import { gitAdd } from "nx/src/command-line/release/utils/git";
 async function gitTag({
   tag,
   message: message2,
@@ -88086,6 +88082,76 @@ async function gitTag({
 ${err}`);
   }
 }
+async function gitCommit({
+  messages,
+  additionalArgs,
+  dryRun,
+  verbose,
+  logFn
+}) {
+  logFn = logFn || console.log;
+  const commandArgs = ["commit", "-S"];
+  for (const message2 of messages) {
+    commandArgs.push("--message", message2);
+  }
+  if (additionalArgs) {
+    if (Array.isArray(additionalArgs)) {
+      commandArgs.push(...additionalArgs);
+    } else {
+      commandArgs.push(...additionalArgs.split(" "));
+    }
+  }
+  if (verbose) {
+    logFn(
+      dryRun ? `Would commit all previously staged files in git with the following command, but --dry-run was set:` : `Committing files in git with the following command:`
+    );
+    logFn(`git ${commandArgs.join(" ")}`);
+  }
+  if (dryRun) {
+    return;
+  }
+  let hasStagedFiles = false;
+  try {
+    await execCommand("git", ["diff-index", "--quiet", "HEAD", "--cached"]);
+  } catch {
+    hasStagedFiles = true;
+  }
+  if (!hasStagedFiles) {
+    logFn("\nNo staged files found. Skipping commit.");
+    return;
+  }
+  return execCommand("git", commandArgs);
+}
+async function commitChanges({
+  changedFiles,
+  deletedFiles,
+  isDryRun,
+  isVerbose: isVerbose2,
+  gitCommitMessages,
+  gitCommitArgs,
+  logFn
+}) {
+  logFn = logFn || console.log;
+  if (!changedFiles?.length && !deletedFiles?.length) {
+    throw new Error("Error: No changed files to commit");
+  }
+  logFn(`Committing changes with git`);
+  await gitAdd({
+    changedFiles,
+    deletedFiles,
+    dryRun: isDryRun,
+    verbose: isVerbose2
+  });
+  if (isVerbose2) {
+    console.log("");
+  }
+  await gitCommit({
+    messages: gitCommitMessages || [],
+    additionalArgs: gitCommitArgs,
+    dryRun: isDryRun,
+    verbose: isVerbose2
+  });
+}
 
 // src/release/changelog-renderer.ts
 init_esm_shims();
@@ -91489,6 +91555,195 @@ var {
 var import_semver = __toESM(require_semver4(), 1);
 import DefaultChangelogRenderer from "nx/release/changelog-renderer";
 import { DEFAULT_CONVENTIONAL_COMMITS_CONFIG } from "nx/src/command-line/release/config/conventional-commits";
+var StormChangelogRenderer = class extends DefaultChangelogRenderer {
+  /**
+   * The Storm workspace configuration object, which is loaded from the storm-workspace.json file.
+   */
+  workspaceConfig = null;
+  /**
+   * The configuration object for the ChangelogRenderer, which includes the changes, version, project, and other options.
+   */
+  config;
+  /**
+   * A ChangelogRenderer class takes in the determined changes and other relevant metadata and returns a string, or a Promise of a string of changelog contents (usually markdown).
+   *
+   * @param config - The configuration object for the ChangelogRenderer
+   */
+  constructor(config) {
+    super(config);
+    this.config = {
+      ...config,
+      repoData: config.remoteReleaseClient.getRemoteRepoData()
+    };
+  }
+  async render() {
+    this.workspaceConfig = await getWorkspaceConfig();
+    return await super.render();
+  }
+  preprocessChanges() {
+    this.relevantChanges = [...this.changes];
+    this.breakingChanges = [];
+    this.additionalChangesForAuthorsSection = [];
+    for (let i = this.relevantChanges.length - 1; i >= 0; i--) {
+      const change = this.relevantChanges[i];
+      if (change && change.type === "revert" && change.revertedHashes) {
+        for (const revertedHash of change.revertedHashes) {
+          const revertedCommitIndex = this.relevantChanges.findIndex(
+            (c) => c.shortHash && revertedHash.startsWith(c.shortHash)
+          );
+          if (revertedCommitIndex !== -1) {
+            this.relevantChanges.splice(revertedCommitIndex, 1);
+            this.relevantChanges.splice(i, 1);
+            i--;
+            break;
+          }
+        }
+      }
+    }
+    if (this.isVersionPlans) {
+      this.conventionalCommitsConfig = {
+        types: {
+          feat: DEFAULT_CONVENTIONAL_COMMITS_CONFIG.types.feat,
+          fix: DEFAULT_CONVENTIONAL_COMMITS_CONFIG.types.fix
+        }
+      };
+      for (let i = this.relevantChanges.length - 1; i >= 0; i--) {
+        if (this.relevantChanges[i]?.isBreaking) {
+          const change = this.relevantChanges[i];
+          if (change) {
+            this.additionalChangesForAuthorsSection.push(change);
+            const line = this.formatChange(change);
+            this.breakingChanges.push(line);
+            this.relevantChanges.splice(i, 1);
+          }
+        }
+      }
+    } else {
+      for (const change of this.relevantChanges) {
+        if (change.isBreaking) {
+          const breakingChangeExplanation = change.body ? this.extractBreakingChangeExplanation(change.body) : "";
+          this.breakingChanges.push(
+            breakingChangeExplanation ? `- ${change.scope ? `**${change.scope.trim()}:** ` : ""}${breakingChangeExplanation}` : this.formatChange(change)
+          );
+        }
+      }
+    }
+  }
+  /**
+   * Determines if the changelog entry should be rendered as empty. This is the case when there are no relevant changes, breaking changes, or dependency bumps.
+   */
+  // protected override shouldRenderEmptyEntry(): boolean {
+  //   return true;
+  // }
+  renderVersionTitle() {
+    const isMajorVersion = `${(0, import_semver.major)(this.changelogEntryVersion)}.0.0` === this.changelogEntryVersion.replace(/^v/, "");
+    return isMajorVersion ? `# ${generateChangelogTitle(this.changelogEntryVersion, this.project, this.workspaceConfig)}` : `## ${generateChangelogTitle(this.changelogEntryVersion, this.project, this.workspaceConfig)}`;
+  }
+  renderBreakingChanges() {
+    return [
+      "### Breaking Changes",
+      "",
+      ...Array.from(new Set(this.breakingChanges))
+    ];
+  }
+  renderDependencyBumps() {
+    const markdownLines = ["", "### Updated Dependencies", ""];
+    this.dependencyBumps?.forEach(({ dependencyName, newVersion }) => {
+      markdownLines.push(`- Updated ${dependencyName} to ${newVersion}`);
+    });
+    return markdownLines;
+  }
+  async renderAuthors() {
+    const markdownLines = [];
+    const _authors = /* @__PURE__ */ new Map();
+    for (const change of [
+      ...this.relevantChanges,
+      ...this.additionalChangesForAuthorsSection
+    ]) {
+      if (!change.authors) {
+        continue;
+      }
+      for (const author of change.authors) {
+        const name = this.formatName(author.name);
+        if (!name || name.includes("[bot]") || name === this.workspaceConfig?.bot.name) {
+          continue;
+        }
+        if (_authors.has(name)) {
+          const entry = _authors.get(name);
+          entry?.email.add(author.email);
+        } else {
+          _authors.set(name, { email: /* @__PURE__ */ new Set([author.email]) });
+        }
+      }
+    }
+    if (this.config.repoData && this.changelogRenderOptions.mapAuthorsToGitHubUsernames) {
+      await Promise.all(
+        [..._authors.keys()].map(async (authorName) => {
+          const meta = _authors.get(authorName);
+          if (!meta) {
+            return;
+          }
+          for (const email of meta.email) {
+            if (email.endsWith("@users.noreply.github.com")) {
+              const match = email.match(
+                /^(\d+\+)?([^@]+)@users\.noreply\.github\.com$/
+              );
+              if (match && match[2]) {
+                meta.github = match[2];
+                break;
+              }
+            }
+            const { data } = await axios_default.get(`https://ungh.cc/users/find/${email}`).catch(() => ({ data: { user: null } }));
+            if (data?.user) {
+              meta.github = data.user.username;
+              break;
+            }
+          }
+        })
+      );
+    }
+    const authors = [..._authors.entries()].map((e) => ({
+      name: e[0],
+      ...e[1]
+    }));
+    if (authors.length > 0) {
+      markdownLines.push(
+        "",
+        "### \u2764\uFE0F Thank You",
+        "",
+        ...authors.sort((a, b) => a.name.localeCompare(b.name)).map((i) => {
+          const github = i.github ? ` @${i.github}` : "";
+          return `- ${i.name}${github}`;
+        })
+      );
+    }
+    return markdownLines;
+  }
+  formatChange(change) {
+    let description = change.description || "";
+    let extraLines = [];
+    let extraLinesStr = "";
+    if (description.includes("\n")) {
+      const lines2 = description.split("\n");
+      if (lines2.length > 1) {
+        description = lines2[0];
+        extraLines = lines2.slice(1);
+      }
+      const indentation = "  ";
+      extraLinesStr = extraLines.filter((l2) => l2.trim().length > 0).map((l2) => `${indentation}${l2}`).join("\n");
+    }
+    let changeLine = "- " + (!this.isVersionPlans && change.scope ? `**${change.scope.trim()}:** ` : "") + description;
+    if (this.config.repoData && change.githubReferences) {
+      changeLine += this.remoteReleaseClient.formatReferences(
+        change.githubReferences
+      );
+    }
+    if (extraLinesStr) {
+      changeLine += "\n\n" + extraLinesStr;
+    }
+    return changeLine;
+  }
+};
 
 // src/release/github.ts
 init_esm_shims();
@@ -91499,7 +91754,10 @@ import { execSync as execSync2 } from "node:child_process";
 import { existsSync as existsSync5, promises as fsp } from "node:fs";
 import { homedir } from "node:os";
 import { printDiff } from "nx/src/command-line/release/utils/print-changes";
-import { defaultCreateReleaseProvider } from "nx/src/command-line/release/utils/remote-release-clients/github";
+import {
+  defaultCreateReleaseProvider,
+  GithubRemoteReleaseClient
+} from "nx/src/command-line/release/utils/remote-release-clients/github";
 import {
   noDiffInChangelogMessage
 } from "nx/src/command-line/release/utils/shared";
@@ -91532,7 +91790,11 @@ function getGitHubRepoData(remoteName = "origin", createReleaseConfig) {
       );
     }
   } catch (error) {
-    return null;
+    import_devkit.output.error({
+      title: `Failed to get GitHub repo data`,
+      bodyLines: [error.message]
+    });
+    return void 0;
   }
 }
 async function createOrUpdateGithubRelease(createReleaseConfig, releaseVersion, changelogContents, latestCommit, { dryRun }) {
@@ -91546,12 +91808,12 @@ async function createOrUpdateGithubRelease(createReleaseConfig, releaseVersion,
     });
     process.exit(1);
   }
-  const token = await resolveGithubToken(githubRepoData.hostname);
+  const tokenData = await resolveTokenData(githubRepoData.hostname);
   const githubRequestConfig = {
     repo: githubRepoData.slug,
     hostname: githubRepoData.hostname,
     apiBaseUrl: githubRepoData.apiBaseUrl,
-    token
+    token: tokenData?.token || null
   };
   let existingGithubReleaseForVersion;
   try {
@@ -91725,13 +91987,13 @@ async function syncGithubRelease(githubRequestConfig, release, existingGithubRel
     };
   }
 }
-async function resolveGithubToken(hostname) {
-  const tokenFromEnv = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+async function resolveTokenData(hostname) {
+  const tokenFromEnv = process.env.STORM_BOT_GITHUB_TOKEN || process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
   if (tokenFromEnv) {
-    return tokenFromEnv;
+    return { token: tokenFromEnv, headerName: "Authorization" };
   }
-  const ghCLIPath = joinPaths(
-    process.env.XDG_CONFIG_HOME || joinPaths(homedir(), ".config"),
+  const ghCLIPath = (0, import_devkit.joinPathFragments)(
+    process.env.XDG_CONFIG_HOME || (0, import_devkit.joinPathFragments)(homedir(), ".config"),
     "gh",
     "hosts.yml"
   );
@@ -91744,11 +92006,12 @@ async function resolveGithubToken(hostname) {
         return ghCLIConfig[hostname].oauth_token;
       }
       if (ghCLIConfig[hostname].user && ghCLIConfig[hostname].git_protocol === "ssh") {
-        return execSync2(`gh auth token`, {
+        const token = execSync2(`gh auth token`, {
           encoding: "utf8",
           stdio: "pipe",
           windowsHide: false
         }).trim();
+        return { token, headerName: "Authorization" };
       }
     }
   }
@@ -91757,7 +92020,9 @@ async function resolveGithubToken(hostname) {
       `Warning: It was not possible to automatically resolve a GitHub token from your environment for hostname ${hostname}. If you set the GITHUB_TOKEN or GH_TOKEN environment variable, that will be used for GitHub API requests.`
     );
   }
-  return null;
+  throw new Error(
+    `Unable to resolve a GitHub token for hostname ${hostname}. Please set the GITHUB_TOKEN or GH_TOKEN environment variable, or ensure you have an active session via the official gh CLI tool (https://cli.github.com).`
+  );
 }
 async function getGithubReleaseByTag(config, tag) {
   return await makeGithubRequest(
@@ -91799,210 +92064,24 @@ function githubNewReleaseURL(config, release) {
   }
   return url2;
 }
-var providerToRefSpec = {
-  github: { "pull-request": "pull", hash: "commit", issue: "issues" }
-};
-function formatReference(ref, repoData) {
-  const refSpec = providerToRefSpec["github"];
-  return `[${ref.value}](https://${repoData.hostname}/${repoData.slug}/${refSpec[ref.type]}/${ref.value.replace(/^#/, "")})`;
-}
-function formatReferences(references, repoData) {
-  const pr2 = references.filter((ref) => ref.type === "pull-request");
-  const issue = references.filter((ref) => ref.type === "issue");
-  if (pr2.length > 0 || issue.length > 0) {
-    return " (" + [...pr2, ...issue].map((ref) => formatReference(ref, repoData)).join(", ") + ")";
-  }
-  if (references.length > 0) {
-    return " (" + formatReference(references[0], repoData) + ")";
+async function createGithubRemoteReleaseClient(remoteName = "origin") {
+  const repoData = getGitHubRepoData(remoteName, "github");
+  if (!repoData) {
+    throw new Error(
+      `Unable to create a remote release client because the GitHub repo slug could not be determined. Please ensure you have a valid GitHub remote configured.`
+    );
   }
-  return "";
+  return new GithubRemoteReleaseClient(
+    repoData,
+    {
+      provider: "github",
+      hostname: repoData.hostname,
+      apiBaseUrl: repoData.apiBaseUrl
+    },
+    await resolveTokenData(repoData.hostname)
+  );
 }
 
-// src/release/changelog-renderer.ts
-var StormChangelogRenderer = class extends DefaultChangelogRenderer {
-  /**
-   * A ChangelogRenderer class takes in the determined changes and other relevant metadata and returns a string, or a Promise of a string of changelog contents (usually markdown).
-   *
-   * @param config - The configuration object for the ChangelogRenderer
-   */
-  constructor(config) {
-    super(config);
-    this.config = config;
-  }
-  /**
-   * The Storm workspace configuration object, which is loaded from the storm-workspace.json file.
-   */
-  workspaceConfig = null;
-  async render() {
-    this.workspaceConfig = await getWorkspaceConfig();
-    return await super.render();
-  }
-  preprocessChanges() {
-    this.relevantChanges = [...this.changes];
-    this.breakingChanges = [];
-    this.additionalChangesForAuthorsSection = [];
-    for (let i = this.relevantChanges.length - 1; i >= 0; i--) {
-      const change = this.relevantChanges[i];
-      if (change && change.type === "revert" && change.revertedHashes) {
-        for (const revertedHash of change.revertedHashes) {
-          const revertedCommitIndex = this.relevantChanges.findIndex(
-            (c) => c.shortHash && revertedHash.startsWith(c.shortHash)
-          );
-          if (revertedCommitIndex !== -1) {
-            this.relevantChanges.splice(revertedCommitIndex, 1);
-            this.relevantChanges.splice(i, 1);
-            i--;
-            break;
-          }
-        }
-      }
-    }
-    if (this.isVersionPlans) {
-      this.conventionalCommitsConfig = {
-        types: {
-          feat: DEFAULT_CONVENTIONAL_COMMITS_CONFIG.types.feat,
-          fix: DEFAULT_CONVENTIONAL_COMMITS_CONFIG.types.fix
-        }
-      };
-      for (let i = this.relevantChanges.length - 1; i >= 0; i--) {
-        if (this.relevantChanges[i]?.isBreaking) {
-          const change = this.relevantChanges[i];
-          if (change) {
-            this.additionalChangesForAuthorsSection.push(change);
-            const line = this.formatChange(change);
-            this.breakingChanges.push(line);
-            this.relevantChanges.splice(i, 1);
-          }
-        }
-      }
-    } else {
-      for (const change of this.relevantChanges) {
-        if (change.isBreaking) {
-          const breakingChangeExplanation = change.body ? this.extractBreakingChangeExplanation(change.body) : "";
-          this.breakingChanges.push(
-            breakingChangeExplanation ? `- ${change.scope ? `**${change.scope.trim()}:** ` : ""}${breakingChangeExplanation}` : this.formatChange(change)
-          );
-        }
-      }
-    }
-  }
-  /**
-   * Determines if the changelog entry should be rendered as empty. This is the case when there are no relevant changes, breaking changes, or dependency bumps.
-   */
-  // protected override shouldRenderEmptyEntry(): boolean {
-  //   return true;
-  // }
-  renderVersionTitle() {
-    const isMajorVersion = `${(0, import_semver.major)(this.changelogEntryVersion)}.0.0` === this.changelogEntryVersion.replace(/^v/, "");
-    return isMajorVersion ? `# ${generateChangelogTitle(this.changelogEntryVersion, this.project, this.workspaceConfig)}` : `## ${generateChangelogTitle(this.changelogEntryVersion, this.project, this.workspaceConfig)}`;
-  }
-  renderBreakingChanges() {
-    return [
-      "### Breaking Changes",
-      "",
-      ...Array.from(new Set(this.breakingChanges))
-    ];
-  }
-  renderDependencyBumps() {
-    const markdownLines = ["", "### Updated Dependencies", ""];
-    this.dependencyBumps?.forEach(({ dependencyName, newVersion }) => {
-      markdownLines.push(`- Updated ${dependencyName} to ${newVersion}`);
-    });
-    return markdownLines;
-  }
-  async renderAuthors() {
-    const markdownLines = [];
-    const _authors = /* @__PURE__ */ new Map();
-    for (const change of [
-      ...this.relevantChanges,
-      ...this.additionalChangesForAuthorsSection
-    ]) {
-      if (!change.authors) {
-        continue;
-      }
-      for (const author of change.authors) {
-        const name = this.formatName(author.name);
-        if (!name || name.includes("[bot]") || name === this.workspaceConfig?.bot.name) {
-          continue;
-        }
-        if (_authors.has(name)) {
-          const entry = _authors.get(name);
-          entry?.email.add(author.email);
-        } else {
-          _authors.set(name, { email: /* @__PURE__ */ new Set([author.email]) });
-        }
-      }
-    }
-    if (this.config.repoData && this.changelogRenderOptions.mapAuthorsToGitHubUsernames) {
-      await Promise.all(
-        [..._authors.keys()].map(async (authorName) => {
-          const meta = _authors.get(authorName);
-          if (!meta) {
-            return;
-          }
-          for (const email of meta.email) {
-            if (email.endsWith("@users.noreply.github.com")) {
-              const match = email.match(
-                /^(\d+\+)?([^@]+)@users\.noreply\.github\.com$/
-              );
-              if (match && match[2]) {
-                meta.github = match[2];
-                break;
-              }
-            }
-            const { data } = await axios_default.get(`https://ungh.cc/users/find/${email}`).catch(() => ({ data: { user: null } }));
-            if (data?.user) {
-              meta.github = data.user.username;
-              break;
-            }
-          }
-        })
-      );
-    }
-    const authors = [..._authors.entries()].map((e) => ({
-      name: e[0],
-      ...e[1]
-    }));
-    if (authors.length > 0) {
-      markdownLines.push(
-        "",
-        "### \u2764\uFE0F Thank You",
-        "",
-        ...authors.sort((a, b) => a.name.localeCompare(b.name)).map((i) => {
-          const github = i.github ? ` @${i.github}` : "";
-          return `- ${i.name}${github}`;
-        })
-      );
-    }
-    return markdownLines;
-  }
-  formatChange(change) {
-    let description = change.description || "";
-    let extraLines = [];
-    let extraLinesStr = "";
-    if (description.includes("\n")) {
-      const lines2 = description.split("\n");
-      if (lines2.length > 1) {
-        description = lines2[0];
-        extraLines = lines2.slice(1);
-      }
-      const indentation = "  ";
-      extraLinesStr = extraLines.filter((l2) => l2.trim().length > 0).map((l2) => `${indentation}${l2}`).join("\n");
-    }
-    let changeLine = "- " + (!this.isVersionPlans && change.scope ? `**${change.scope.trim()}:** ` : "") + description;
-    if (this.config.repoData && this.changelogRenderOptions.commitReferences && change.githubReferences) {
-      changeLine += formatReferences(
-        change.githubReferences,
-        this.config.repoData
-      );
-    }
-    if (extraLinesStr) {
-      changeLine += "\n\n" + extraLinesStr;
-    }
-    return changeLine;
-  }
-};
-
 // src/release/changelog.ts
 function createAPI(overrideReleaseConfig) {
   return async function releaseChangelog(args) {
@@ -92361,7 +92440,7 @@ ${contents}`);
                 body: c.body,
                 isBreaking: c.isBreaking,
                 githubReferences: c.references,
-                // TODO(JamesHenry): Implement support for Co-authored-by and adding multiple authors
+                // TODO: Implement support for Co-authored-by and adding multiple authors
                 authors: [c.author],
                 shortHash: c.shortHash,
                 revertedHashes: c.revertedHashes,
@@ -92490,7 +92569,7 @@ ${contents}`);
               body: c.body,
               isBreaking: c.isBreaking,
               githubReferences: c.references,
-              // TODO(JamesHenry): Implement support for Co-authored-by and adding multiple authors
+              // TODO: Implement support for Co-authored-by and adding multiple authors
               authors: [c.author],
               shortHash: c.shortHash,
               revertedHashes: c.revertedHashes,
@@ -92657,12 +92736,12 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
       isDryRun: !!args.dryRun,
       isVerbose: !!args.verbose,
       gitCommitMessages: commitMessageValues,
-      gitCommitArgs: args.gitCommitArgs || nxReleaseConfig.changelog?.git.commitArgs
+      gitCommitArgs: args.gitCommitArgs ?? nxReleaseConfig.changelog?.git.commitArgs
     });
     latestCommit = await getCommitHash("HEAD");
   } else if ((args.stageChanges ?? nxReleaseConfig.changelog?.git.stageChanges) && changes.length) {
     output2.logSingleLine(`Staging changed files with git`);
-    await gitAdd({
+    await gitAdd2({
       changedFiles,
       deletedFiles,
       dryRun: args.dryRun,
@@ -92687,7 +92766,6 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
       gitRemote: args.gitRemote,
       dryRun: args.dryRun,
       verbose: args.verbose
-      // additionalArgs: ["--signed=if-asked"]
     });
   }
   for (const postGitTask of postGitTasks) {
@@ -92766,17 +92844,12 @@ async function generateChangelogForWorkspace({
       )}`
     });
   }
-  const githubRepoData = getGitHubRepoData(gitRemote, config.createRelease);
-  const remoteReleaseClient = await createRemoteReleaseClient(
-    config.createRelease,
-    gitRemote
-  );
+  const remoteReleaseClient = await createGithubRemoteReleaseClient(gitRemote);
   const changelogRenderer = new StormChangelogRenderer({
     changes,
     changelogEntryVersion: releaseVersion.rawVersion,
     project: null,
     isVersionPlans: false,
-    repoData: githubRepoData,
     entryWhenNoChanges: config.entryWhenNoChanges,
     changelogRenderOptions: config.renderOptions,
     conventionalCommitsConfig: nxReleaseConfig.conventionalCommits,
@@ -92785,7 +92858,7 @@ async function generateChangelogForWorkspace({
   let contents = await changelogRenderer.render();
   if (interactive) {
     const tmpDir = (0, import_tmp.dirSync)().name;
-    const changelogPath = joinPathFragments(
+    const changelogPath = joinPathFragments2(
       tmpDir,
       // Include the tree path in the name so that it is easier to identify which changelog file is being edited
       `PREVIEW__${interpolatedTreePath.replace(/\//g, "_")}`
@@ -92846,11 +92919,12 @@ async function generateChangelogForProjects({
         workspaceRoot: ""
       });
     }
-    if (!projectsVersionData[project.name]?.newVersion) {
+    const newVersion = projectsVersionData[project.name]?.newVersion;
+    if (!newVersion) {
       continue;
     }
     const releaseVersion = new ReleaseVersion2({
-      version: projectsVersionData[project.name].newVersion,
+      version: newVersion,
       releaseTagPattern: releaseGroup.releaseTagPattern,
       projectName: project.name
     });
@@ -92861,19 +92935,11 @@ async function generateChangelogForProjects({
           releaseVersion.gitTag
         )}`
       });
-      const githubRepoData = getGitHubRepoData(
-        gitRemote,
-        config.createRelease
-      );
-      const remoteReleaseClient = await createRemoteReleaseClient(
-        config.createRelease,
-        gitRemote
-      );
+      const remoteReleaseClient = await createGithubRemoteReleaseClient(gitRemote);
       const changelogRenderer = new StormChangelogRenderer({
         changes,
         changelogEntryVersion: releaseVersion.rawVersion,
         project: project.name,
-        repoData: githubRepoData,
         entryWhenNoChanges: typeof config.entryWhenNoChanges === "string" ? interpolate(config.entryWhenNoChanges, {
           projectName: project.name,
           projectRoot: project.data.root,
@@ -92893,7 +92959,7 @@ ${contents}`.trim()
       });
       if (interactive) {
         const tmpDir = (0, import_tmp.dirSync)().name;
-        const changelogPath = joinPathFragments(
+        const changelogPath = joinPathFragments2(
           tmpDir,
           // Include the tree path in the name so that it is easier to identify which changelog file is being edited
           `PREVIEW__${interpolatedTreePath.replace(/\//g, "_")}`
@@ -93121,10 +93187,12 @@ var DEFAULT_RELEASE_CONFIG = {
 
 // src/release/run.ts
 var runRelease = async (config, options) => {
-  process.env.GIT_AUTHOR_NAME = process.env.GITHUB_ACTOR;
-  process.env.GIT_AUTHOR_EMAIL = `${process.env.GITHUB_ACTOR}@users.noreply.github.com`;
-  process.env.GIT_COMMITTER_NAME = config.bot.name;
-  process.env.GIT_COMMITTER_EMAIL = config.bot.email || config.bot.name ? `${config.bot.name}@users.noreply.github.com` : "bot@stormsoftware.com";
+  const name = config.bot.name;
+  const email = config.bot.email ? config.bot.email : config.bot.name ? `${config.bot.name}@users.noreply.github.com` : "bot@stormsoftware.com";
+  process.env.GIT_AUTHOR_NAME = name;
+  process.env.GIT_AUTHOR_EMAIL = email;
+  process.env.GIT_COMMITTER_NAME = name;
+  process.env.GIT_COMMITTER_EMAIL = email;
   process.env.NODE_AUTH_TOKEN = process.env.NPM_TOKEN;
   process.env.NPM_AUTH_TOKEN = process.env.NPM_TOKEN;
   process.env.NPM_CONFIG_PROVENANCE = "true";