@storm-software/git-tools 2.131.7 → 2.131.9

package/README.md

@@ -27,7 +27,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-2.130.40-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
+[![Version](https://img.shields.io/badge/version-2.131.7-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->

package/bin/git.cjs

@@ -54,18 +54,17 @@ var utils = require('nx/src/tasks-runner/utils');
 var execCommand_js = require('nx/src/command-line/release/utils/exec-command.js');
 var git = require('nx/src/command-line/release/utils/git');
 var semver = require('semver');
-var clone = require('nanoclone');
 var release = require('nx/release');
 var versionPlans = require('nx/src/command-line/release/config/version-plans');
 var printChanges_js = require('nx/src/command-line/release/utils/print-changes.js');
 var releaseGraph = require('nx/src/command-line/release/utils/release-graph');
 var versionPlanUtils = require('nx/src/command-line/release/utils/version-plan-utils');
-var nxJson = require('nx/src/config/nx-json');
 var tree = require('nx/src/generators/tree');
 var fileMapUtils = require('nx/src/project-graph/file-map-utils');
 var importsPlugin = require('prettier-plugin-organize-imports');
 var DefaultChangelogRenderer = require('nx/release/changelog-renderer');
 var conventionalCommits = require('nx/src/command-line/release/config/conventional-commits');
+var nxJson = require('nx/src/config/nx-json');
 var findMatchingProjects = require('nx/src/utils/find-matching-projects');
 var config_js = require('nx/src/command-line/release/config/config.js');
 var deriveSpecifierFromConventionalCommits = require('nx/src/command-line/release/version/derive-specifier-from-conventional-commits');
@@ -94,7 +93,6 @@ var updateSection__default = /*#__PURE__*/_interopDefault(updateSection);
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 var chalk__default = /*#__PURE__*/_interopDefault(chalk);
 var semver__default = /*#__PURE__*/_interopDefault(semver);
-var clone__default = /*#__PURE__*/_interopDefault(clone);
 var importsPlugin__default = /*#__PURE__*/_interopDefault(importsPlugin);
 var DefaultChangelogRenderer__default = /*#__PURE__*/_interopDefault(DefaultChangelogRenderer);
 
@@ -3355,8 +3353,6 @@ var DEFAULT_VERSION_RELEASE_CONFIG = {
 };
 var DEFAULT_CHANGELOG_RELEASE_CONFIG = {
   createRelease: "github",
-  entryWhenNoChanges: "This was a version bump only for {projectName} to align it with other projects, there were no code changes.",
-  file: false,
   renderOptions: {
     authors: false,
     commitReferences: true,
@@ -3559,6 +3555,41 @@ function getReleaseGroupConfig(projectGraph, releaseConfig, workspaceConfig) {
     })
   );
 }
+function getReleaseConfig(projectGraph, releaseConfig, workspaceConfig, ignoreNxJsonConfig = false) {
+  let nxJson$1 = {};
+  if (!ignoreNxJsonConfig && fs$1.existsSync(chunk4ILBJTRR_cjs.joinPaths(workspaceConfig.workspaceRoot, "nx.json"))) {
+    nxJson$1 = nxJson.readNxJson();
+  }
+  const baseConfig = chunk4ILBJTRR_cjs.defu(
+    {
+      changelog: {
+        renderOptions: {
+          workspaceConfig
+        }
+      },
+      groups: {}
+    },
+    omit(releaseConfig, ["groups"]),
+    nxJson$1.release ? omit(nxJson$1.release, ["groups"]) : {},
+    omit(DEFAULT_RELEASE_CONFIG, ["groups"])
+  );
+  let groups = {};
+  if (releaseConfig?.groups && Object.keys(releaseConfig.groups).length > 0) {
+    groups = releaseConfig.groups;
+  } else if (nxJson$1.release?.groups && Object.keys(nxJson$1.release.groups).length > 0) {
+    groups = nxJson$1.release.groups;
+  } else {
+    groups = DEFAULT_RELEASE_CONFIG.groups;
+  }
+  return {
+    ...baseConfig,
+    groups: getReleaseGroupConfig(
+      projectGraph,
+      { ...baseConfig, groups },
+      workspaceConfig
+    )
+  };
+}
 var StormReleaseGroupProcessor = class extends releaseGroupProcessor.ReleaseGroupProcessor {
   constructor(tree, workspaceConfig, projectGraph, nxReleaseConfig, releaseGraph, versionOptions) {
     super(tree, projectGraph, nxReleaseConfig, releaseGraph, {
@@ -4227,68 +4258,21 @@ var StormReleaseClient = class _StormReleaseClient extends release.ReleaseClient
         "Failed to load the project graph. Please run `nx reset`, then run the `storm-git commit` command again."
       );
     }
-    let nxJson$1;
-    if (!ignoreNxJsonConfig && fs$1.existsSync(chunk4ILBJTRR_cjs.joinPaths(workspaceConfig.workspaceRoot, "nx.json"))) {
-      nxJson$1 = nxJson.readNxJson();
-    }
-    const config5 = chunk4ILBJTRR_cjs.defu(
-      {
-        changelog: {
-          renderOptions: {
-            workspaceConfig
-          }
-        }
-      },
-      {
-        groups: getReleaseGroupConfig(
-          projectGraph,
-          releaseConfig,
-          workspaceConfig
-        )
-      },
-      {
-        groups: getReleaseGroupConfig(
-          projectGraph,
-          nxJson$1.release ?? {},
-          workspaceConfig
-        )
-      },
-      omit(releaseConfig, ["groups"]),
-      nxJson$1.release ? omit(nxJson$1.release, ["groups"]) : {},
-      omit(DEFAULT_RELEASE_CONFIG, ["groups"])
-    );
-    const normalizedConfig = clone__default.default(config5);
-    if (workspaceConfig.preid) {
-      normalizedConfig.groups = Object.fromEntries(
-        Object.entries(normalizedConfig.groups ?? {}).map(([name, group]) => {
-          return [
-            name,
-            {
-              ...group,
-              version: {
-                ...group.version,
-                preid: workspaceConfig.preid
-              }
-            }
-          ];
-        })
-      );
-    }
     return new _StormReleaseClient(
       projectGraph,
-      config5,
-      normalizedConfig,
+      getReleaseConfig(
+        projectGraph,
+        releaseConfig,
+        workspaceConfig,
+        ignoreNxJsonConfig
+      ),
       workspaceConfig
     );
   }
-  /**
-   * The release configuration used by this release client.
-   */
-  config;
   /**
    * The normalized release configuration used by this release client.
    */
-  normalizedConfig;
+  releaseConfig;
   /**
    * The workspace configuration used by this release client.
    */
@@ -4313,16 +4297,15 @@ var StormReleaseClient = class _StormReleaseClient extends release.ReleaseClient
    * @param ignoreNxJsonConfig - Whether to ignore the nx.json configuration and use only the provided {@link releaseConfig}. Default is false.
    * @param workspaceConfig - Optional Storm workspace configuration object for logging purposes.
    */
-  constructor(projectGraph, config5, normalizedConfig, workspaceConfig) {
-    super(normalizedConfig, true);
+  constructor(projectGraph, releaseConfig, workspaceConfig) {
+    super(releaseConfig, true);
     chunk4ILBJTRR_cjs.writeDebug(
       "Executing release with the following configuration",
       workspaceConfig
     );
-    chunk4ILBJTRR_cjs.writeDebug(normalizedConfig, workspaceConfig);
+    chunk4ILBJTRR_cjs.writeDebug(releaseConfig, workspaceConfig);
     this.projectGraph = projectGraph;
-    this.config = config5;
-    this.normalizedConfig = normalizedConfig;
+    this.releaseConfig = releaseConfig;
     this.workspaceConfig = workspaceConfig;
     this.tree = new tree.FsTree(workspaceConfig.workspaceRoot, false);
     this.projectConfigurations = devkit.readProjectsConfigurationFromProjectGraph(projectGraph);
@@ -4341,7 +4324,7 @@ var StormReleaseClient = class _StormReleaseClient extends release.ReleaseClient
     const releaseGraph$1 = options.releaseGraph ?? await releaseGraph.createReleaseGraph({
       tree: this.tree,
       projectGraph: this.projectGraph,
-      nxReleaseConfig: this.normalizedConfig,
+      nxReleaseConfig: this.releaseConfig,
       filters: {
         projects: options.projects,
         groups: options.groups
@@ -4472,7 +4455,7 @@ var StormReleaseClient = class _StormReleaseClient extends release.ReleaseClient
                 fileMap.nonProjectFiles
               ) ? "*" : getProjectsAffectedByCommit(c, fileToProjectMap)
             })),
-            this.normalizedConfig.conventionalCommits
+            this.releaseConfig.conventionalCommits
           );
           chunk4ILBJTRR_cjs.writeDebug(
             `Running changelog generation for the ${releaseGroup.name} release group`,
@@ -4486,7 +4469,7 @@ var StormReleaseClient = class _StormReleaseClient extends release.ReleaseClient
             projectsVersionData: options.versionData,
             releaseGroup,
             projects: [project],
-            releaseConfig: this.config,
+            releaseConfig: this.releaseConfig,
             projectToAdditionalDependencyBumps,
             workspaceConfig: this.workspaceConfig,
             ChangelogRendererClass: StormChangelogRenderer
@@ -4546,7 +4529,7 @@ var StormReleaseClient = class _StormReleaseClient extends release.ReleaseClient
               fileMap.nonProjectFiles
             ) ? "*" : getProjectsAffectedByCommit(c, fileToProjectMap)
           })),
-          this.normalizedConfig.conventionalCommits
+          this.releaseConfig.conventionalCommits
         );
         chunk4ILBJTRR_cjs.writeDebug(
           `Running changelog generation for the ${releaseGroup.name} release group`,
@@ -4560,7 +4543,7 @@ var StormReleaseClient = class _StormReleaseClient extends release.ReleaseClient
           projectsVersionData: options.versionData,
           releaseGroup,
           projects: projectNodes,
-          releaseConfig: this.config,
+          releaseConfig: this.releaseConfig,
           projectToAdditionalDependencyBumps,
           workspaceConfig: this.workspaceConfig,
           ChangelogRendererClass: StormChangelogRenderer
@@ -4602,7 +4585,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       options.releaseGraph.releaseGroups,
       options.releaseGraph.releaseGroupToFilteredProjects,
       options.versionData,
-      options.gitCommitMessage || this.normalizedConfig.changelog?.git?.commitMessage || DEFAULT_COMMIT_MESSAGE
+      options.gitCommitMessage || this.releaseConfig.changelog?.git?.commitMessage || DEFAULT_COMMIT_MESSAGE
     );
     const changes = this.tree.listChanges();
     if (!changes.length) {
@@ -4625,7 +4608,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       isDryRun: !!options.dryRun,
       isVerbose: !!options.verbose,
       gitCommitMessages: commitMessageValues,
-      gitCommitArgs: options.gitCommitArgs || this.normalizedConfig.changelog?.git?.commitArgs
+      gitCommitArgs: options.gitCommitArgs || this.releaseConfig.changelog?.git?.commitArgs
     });
     latestCommit = await git.getCommitHash("HEAD");
     chunk4ILBJTRR_cjs.writeDebug(
@@ -4635,8 +4618,8 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
     for (const tag of gitTagValues) {
       await gitTag({
         tag,
-        message: options.gitTagMessage || this.normalizedConfig.changelog?.git?.tagMessage,
-        additionalArgs: options.gitTagArgs || this.normalizedConfig.changelog?.git?.tagArgs,
+        message: options.gitTagMessage || this.releaseConfig.changelog?.git?.tagMessage,
+        additionalArgs: options.gitTagArgs || this.releaseConfig.changelog?.git?.tagArgs,
         dryRun: options.dryRun,
         verbose: options.verbose
       });
@@ -4649,7 +4632,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       gitRemote: options.gitRemote,
       dryRun: options.dryRun,
       verbose: options.verbose,
-      additionalArgs: options.gitPushArgs || this.normalizedConfig.changelog?.git?.pushArgs
+      additionalArgs: options.gitPushArgs || this.releaseConfig.changelog?.git?.pushArgs
     });
     for (const postGitTask of postGitTasks) {
       await postGitTask(latestCommit);
@@ -4670,7 +4653,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
     const releaseGraph$1 = options.releaseGraph ?? await releaseGraph.createReleaseGraph({
       tree: this.tree,
       projectGraph: this.projectGraph,
-      nxReleaseConfig: this.normalizedConfig,
+      nxReleaseConfig: this.releaseConfig,
       filters: {
         projects: options.projects,
         groups: options.groups
@@ -4709,15 +4692,15 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
     if (options.deleteVersionPlans === void 0) {
       options.deleteVersionPlans = false;
     }
-    if (this.normalizedConfig.version?.preVersionCommand) {
+    if (this.releaseConfig.version?.preVersionCommand) {
       chunk4ILBJTRR_cjs.writeDebug(
-        "Executing the following pre-version command: \n" + this.normalizedConfig.version.preVersionCommand,
+        "Executing the following pre-version command: \n" + this.releaseConfig.version.preVersionCommand,
         this.workspaceConfig
       );
       try {
         const childProcess2 = chunkMTAYUS7E_cjs.runAsync(
           this.workspaceConfig,
-          this.normalizedConfig.version.preVersionCommand,
+          this.releaseConfig.version.preVersionCommand,
           this.workspaceConfig.workspaceRoot,
           {
             ...process.env,
@@ -4733,7 +4716,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         throw new Error(
           formatNxLog({
             title: `The pre-version command failed. See the full output above.`,
-            bodyLines: [this.normalizedConfig.version.preVersionCommand, e]
+            bodyLines: [this.releaseConfig.version.preVersionCommand, e]
           })
         );
       }
@@ -4777,14 +4760,14 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       }
     }
     await releaseGraph$1.validate(this.tree);
-    const commitMessage = options.gitCommitMessage || this.normalizedConfig.version?.git?.commitMessage;
+    const commitMessage = options.gitCommitMessage || this.releaseConfig.version?.git?.commitMessage;
     const additionalChangedFiles = /* @__PURE__ */ new Set();
     const additionalDeletedFiles = /* @__PURE__ */ new Set();
     const processor = new StormReleaseGroupProcessor(
       this.tree,
       this.workspaceConfig,
       this.projectGraph,
-      this.normalizedConfig,
+      this.releaseConfig,
       releaseGraph$1,
       options
     );
@@ -4800,21 +4783,21 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
     await formatChangedFiles(this.tree);
     printChanges_js.printAndFlushChanges(this.tree, !!options.dryRun);
     const { changedFiles: changed, deletedFiles: deleted } = await processor.afterAllProjectsVersioned({
-      ...this.normalizedConfig.version.versionActionsOptions,
+      ...this.releaseConfig.version.versionActionsOptions,
       ...options.versionActionsOptionsOverrides ?? {}
     });
     changed.forEach((f) => additionalChangedFiles.add(f));
     deleted.forEach((f) => additionalDeletedFiles.add(f));
-    if (this.normalizedConfig.docker && typeof this.normalizedConfig.docker === "object" && this.normalizedConfig.docker?.preVersionCommand) {
+    if (this.releaseConfig.docker && typeof this.releaseConfig.docker === "object" && this.releaseConfig.docker?.preVersionCommand) {
       chunk4ILBJTRR_cjs.writeDebug(
         `Executing the docker pre-version command: 
-` + this.normalizedConfig.docker.preVersionCommand,
+` + this.releaseConfig.docker.preVersionCommand,
         this.workspaceConfig
       );
       try {
         const childProcess2 = chunkMTAYUS7E_cjs.runAsync(
           this.workspaceConfig,
-          this.normalizedConfig.docker.preVersionCommand,
+          this.releaseConfig.docker.preVersionCommand,
           this.workspaceConfig.workspaceRoot,
           {
             ...process.env,
@@ -4830,7 +4813,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         throw new Error(
           formatNxLog({
             title: `The docker pre-version command failed. See the full output above.`,
-            bodyLines: [this.normalizedConfig.docker.preVersionCommand, e]
+            bodyLines: [this.releaseConfig.docker.preVersionCommand, e]
           })
         );
       }
@@ -4873,7 +4856,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         }
       }
     }
-    if (this.normalizedConfig.docker || releaseGraph$1.releaseGroups.some((rg) => rg.docker)) {
+    if (this.releaseConfig.docker || releaseGraph$1.releaseGroups.some((rg) => rg.docker)) {
       chunk4ILBJTRR_cjs.writeWarning(
         formatNxLog({
           title: "Warning",
@@ -4888,7 +4871,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
       options.dockerVersion
     );
     const versionData = processor.getVersionData();
-    const gitTagValues = options.gitTag ?? this.normalizedConfig.version?.git?.tag ? shared.createGitTagValues(
+    const gitTagValues = options.gitTag ?? this.releaseConfig.version?.git?.tag ? shared.createGitTagValues(
       releaseGraph$1.releaseGroups,
       releaseGraph$1.releaseGroupToFilteredProjects,
       versionData
@@ -4916,7 +4899,7 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         releaseGraph: releaseGraph$1
       };
     }
-    if (options.gitCommit ?? this.normalizedConfig.version?.git?.commit) {
+    if (options.gitCommit ?? this.releaseConfig.version?.git?.commit) {
       await commitChanges({
         changedFiles,
         deletedFiles,
@@ -4928,9 +4911,9 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
           versionData,
           commitMessage
         ),
-        gitCommitArgs: options.gitCommitArgs || this.normalizedConfig.version?.git?.commitArgs
+        gitCommitArgs: options.gitCommitArgs || this.releaseConfig.version?.git?.commitArgs
       });
-    } else if (options.stageChanges ?? this.normalizedConfig.version?.git?.stageChanges) {
+    } else if (options.stageChanges ?? this.releaseConfig.version?.git?.stageChanges) {
       chunk4ILBJTRR_cjs.writeDebug(`Staging changed files with git`);
       await git.gitAdd({
         changedFiles,
@@ -4939,25 +4922,25 @@ ${Object.keys(allProjectChangelogs).map((p) => `  - ${p}`).join("\n")}
         verbose
       });
     }
-    if (options.gitTag ?? this.normalizedConfig.version?.git?.tag) {
+    if (options.gitTag ?? this.releaseConfig.version?.git?.tag) {
       chunk4ILBJTRR_cjs.writeDebug(`Tagging commit with git`);
       for (const tag of gitTagValues) {
         await gitTag({
           tag,
-          message: options.gitTagMessage || this.normalizedConfig.version?.git?.tagMessage,
-          additionalArgs: options.gitTagArgs || this.normalizedConfig.version?.git?.tagArgs,
+          message: options.gitTagMessage || this.releaseConfig.version?.git?.tagMessage,
+          additionalArgs: options.gitTagArgs || this.releaseConfig.version?.git?.tagArgs,
           dryRun: options.dryRun,
           verbose: options.verbose
         });
       }
     }
-    if (options.gitPush ?? this.normalizedConfig.version?.git?.push) {
+    if (options.gitPush ?? this.releaseConfig.version?.git?.push) {
       chunk4ILBJTRR_cjs.writeDebug(`Pushing to git remote "${options.gitRemote ?? "origin"}"`);
       await git.gitPush({
         gitRemote: options.gitRemote,
         dryRun: options.dryRun,
         verbose: options.verbose,
-        additionalArgs: options.gitPushArgs || this.normalizedConfig.version?.git?.pushArgs
+        additionalArgs: options.gitPushArgs || this.releaseConfig.version?.git?.pushArgs
       });
     }
     return {