nx 18.1.0-canary.20240313-81df848 → 18.1.0-canary.20240314-cbb88f0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.0-canary.20240313-81df848",
+  "version": "18.1.0-canary.20240314-cbb88f0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.1.0-canary.20240313-81df848"
+    "@nrwl/tao": "18.1.0-canary.20240314-cbb88f0"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.0-canary.20240313-81df848",
-    "@nx/nx-darwin-arm64": "18.1.0-canary.20240313-81df848",
-    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240313-81df848",
-    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240313-81df848",
-    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240313-81df848",
-    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240313-81df848",
-    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240313-81df848",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240313-81df848",
-    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240313-81df848",
-    "@nx/nx-freebsd-x64": "18.1.0-canary.20240313-81df848"
+    "@nx/nx-darwin-x64": "18.1.0-canary.20240314-cbb88f0",
+    "@nx/nx-darwin-arm64": "18.1.0-canary.20240314-cbb88f0",
+    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240314-cbb88f0",
+    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240314-cbb88f0",
+    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240314-cbb88f0",
+    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240314-cbb88f0",
+    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240314-cbb88f0",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240314-cbb88f0",
+    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240314-cbb88f0",
+    "@nx/nx-freebsd-x64": "18.1.0-canary.20240314-cbb88f0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/release/changelog-renderer/index.d.ts

@@ -1,3 +1,4 @@
+import { NxReleaseConfig } from '../../src/command-line/release/config/config';
 import type { GitCommit } from '../../src/command-line/release/utils/git';
 import { RepoSlug } from '../../src/command-line/release/utils/github';
 import type { ProjectGraph } from '../../src/config/project-graph';
@@ -26,6 +27,7 @@ export type ChangelogRenderer = (config: {
     entryWhenNoChanges: string | false;
     changelogRenderOptions: DefaultChangelogRenderOptions;
     repoSlug?: RepoSlug;
+    conventionalCommitsConfig: NxReleaseConfig['conventionalCommits'];
 }) => Promise<string> | string;
 /**
  * The specific options available to the default implementation of the ChangelogRenderer that nx exports

package/release/changelog-renderer/index.js

@@ -10,24 +10,10 @@ const axios = _axios;
  * The default ChangelogRenderer implementation that nx exports for the common case of generating markdown
  * from the given commits and other metadata.
  */
-const defaultChangelogRenderer = async ({ projectGraph, commits, releaseVersion, project, entryWhenNoChanges, changelogRenderOptions, repoSlug, }) => {
+const defaultChangelogRenderer = async ({ projectGraph, commits, releaseVersion, project, entryWhenNoChanges, changelogRenderOptions, repoSlug, conventionalCommitsConfig, }) => {
+    const commitTypes = conventionalCommitsConfig.types;
     const markdownLines = [];
     const breakingChanges = [];
-    const commitTypes = {
-        feat: { title: '🚀 Features' },
-        perf: { title: '🔥 Performance' },
-        fix: { title: '🩹 Fixes' },
-        refactor: { title: '💅 Refactors' },
-        docs: { title: '📖 Documentation' },
-        build: { title: '📦 Build' },
-        types: { title: '🌊 Types' },
-        chore: { title: '🏡 Chore' },
-        examples: { title: '🏀 Examples' },
-        test: { title: '✅ Tests' },
-        style: { title: '🎨 Styles' },
-        ci: { title: '🤖 CI' },
-        revert: { title: '⏪ Revert' },
-    };
     // If the current range of commits contains both a commit and its revert, we strip them both from the final list
     for (const commit of commits) {
         if (commit.type === 'revert') {
@@ -56,7 +42,7 @@ const defaultChangelogRenderer = async ({ projectGraph, commits, releaseVersion,
             if (!group || group.length === 0) {
                 continue;
             }
-            markdownLines.push('', '### ' + commitTypes[type].title, '');
+            markdownLines.push('', '### ' + commitTypes[type].changelog.title, '');
             /**
              * In order to make the final changelog most readable, we organize commits as follows:
              * - By scope, where scopes are in alphabetical order (commits with no scope are listed first)
@@ -99,7 +85,7 @@ const defaultChangelogRenderer = async ({ projectGraph, commits, releaseVersion,
             if (!group || group.length === 0) {
                 continue;
             }
-            markdownLines.push('', `### ${commitTypes[type].title}`, '');
+            markdownLines.push('', `### ${commitTypes[type].changelog.title}`, '');
             const commitsInChronologicalOrder = group.reverse();
             for (const commit of commitsInChronologicalOrder) {
                 const line = formatCommit(commit, changelogRenderOptions, repoSlug);

package/schemas/nx-schema.json

@@ -221,6 +221,9 @@
             }
           }
         },
+        "conventionalCommits": {
+          "$ref": "#/definitions/NxReleaseConventionalCommitsConfiguration"
+        },
         "projectsRelationship": {
           "type": "string",
           "enum": ["fixed", "independent"]
@@ -636,6 +639,55 @@
     "ChangelogRenderOptions": {
       "type": "object",
       "additionalProperties": true
+    },
+    "NxReleaseConventionalCommitsConfiguration": {
+      "type": "object",
+      "properties": {
+        "types": {
+          "type": "object",
+          "description": "A map of commit types to their configuration. If a type is set to 'true', then it will be enabled with the default 'semverBump' of 'patch' and will appear in the changelog. If a type is set to 'false', then it will not trigger a version bump and will be hidden from the changelog.",
+          "additionalProperties": {
+            "oneOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "semverBump": {
+                    "type": "string",
+                    "enum": ["major", "minor", "patch", "none"],
+                    "description": "The semver bump to apply to the version of the project(s) when a commit of this type is included in the release.",
+                    "default": "patch"
+                  },
+                  "changelog": {
+                    "description": "Configuration for the changelog section for commits of this type. If set to 'true', then commits of this type will be included in the changelog with their default title for the type. If set to 'false', then commits of this type will not be included in the changelog.",
+                    "oneOf": [
+                      {
+                        "type": "boolean"
+                      },
+                      {
+                        "type": "object",
+                        "properties": {
+                          "title": {
+                            "type": "string",
+                            "description": "The title of the section in the changelog for commits of this type"
+                          },
+                          "hidden": {
+                            "type": "boolean",
+                            "description": "Whether or not to include commits of this type in the changelog",
+                            "default": false
+                          }
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          }
+        }
+      }
     }
   }
 }

package/src/command-line/release/changelog.js

@@ -130,7 +130,7 @@ async function releaseChangelog(args) {
     }
     // Make sure that the fromRef is actually resolvable
     const workspaceChangelogFromSHA = await (0, git_1.getCommitHash)(workspaceChangelogFromRef);
-    const workspaceChangelogCommits = await getCommits(workspaceChangelogFromSHA, toSHA);
+    const workspaceChangelogCommits = await getCommits(workspaceChangelogFromSHA, toSHA, nxReleaseConfig.conventionalCommits);
     const workspaceChangelog = await generateChangelogForWorkspace(tree, args, projectGraph, nxReleaseConfig, workspaceChangelogVersion, workspaceChangelogCommits);
     if (workspaceChangelog &&
         shouldCreateGitHubRelease(nxReleaseConfig.changelog.workspaceChangelog, args.createRelease)) {
@@ -172,7 +172,7 @@ async function releaseChangelog(args) {
                 let commits = null;
                 if (!fromRef && useAutomaticFromRef) {
                     const firstCommit = await (0, git_1.getFirstGitCommit)();
-                    const allCommits = await getCommits(firstCommit, toSHA);
+                    const allCommits = await getCommits(firstCommit, toSHA, nxReleaseConfig.conventionalCommits);
                     const commitsForProject = allCommits.filter((c) => c.affectedFiles.find((f) => f.startsWith(project.data.root)));
                     fromRef = commitsForProject[0]?.shortHash;
                     if (args.verbose) {
@@ -184,9 +184,9 @@ async function releaseChangelog(args) {
                     throw new Error(`Unable to determine the previous git tag. If this is the first release of your workspace, use the --first-release option or set the "release.changelog.automaticFromRef" config property in nx.json to generate a changelog from the first commit. Otherwise, be sure to configure the "release.releaseTagPattern" property in nx.json to match the structure of your repository's git tags.`);
                 }
                 if (!commits) {
-                    commits = await getCommits(fromRef, toSHA);
+                    commits = await getCommits(fromRef, toSHA, nxReleaseConfig.conventionalCommits);
                 }
-                const projectChangelogs = await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, [project]);
+                const projectChangelogs = await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, releaseGroup, [project], nxReleaseConfig);
                 let hasPushed = false;
                 for (const [projectName, projectChangelog] of Object.entries(projectChangelogs)) {
                     if (projectChangelogs &&
@@ -218,8 +218,8 @@ async function releaseChangelog(args) {
             }
             // Make sure that the fromRef is actually resolvable
             const fromSHA = await (0, git_1.getCommitHash)(fromRef);
-            const commits = await getCommits(fromSHA, toSHA);
-            const projectChangelogs = await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, projectNodes);
+            const commits = await getCommits(fromSHA, toSHA, nxReleaseConfig.conventionalCommits);
+            const projectChangelogs = await generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, releaseGroup, projectNodes, nxReleaseConfig);
             let hasPushed = false;
             for (const [projectName, projectChangelog] of Object.entries(projectChangelogs)) {
                 if (projectChangelogs &&
@@ -449,6 +449,7 @@ async function generateChangelogForWorkspace(tree, args, projectGraph, nxRelease
         repoSlug: githubRepoSlug,
         entryWhenNoChanges: config.entryWhenNoChanges,
         changelogRenderOptions: config.renderOptions,
+        conventionalCommitsConfig: nxReleaseConfig.conventionalCommits,
     });
     /**
      * If interactive mode, make the changelog contents available for the user to modify in their editor of choice,
@@ -491,7 +492,7 @@ async function generateChangelogForWorkspace(tree, args, projectGraph, nxRelease
         contents,
     };
 }
-async function generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, postGitTasks, releaseGroup, projects) {
+async function generateChangelogForProjects(tree, args, projectGraph, commits, projectsVersionData, releaseGroup, projects, nxReleaseConfig) {
     const config = releaseGroup.changelog;
     // The entire feature is disabled at the release group level, exit early
     if (config === false) {
@@ -547,6 +548,7 @@ async function generateChangelogForProjects(tree, args, projectGraph, commits, p
                 })
                 : false,
             changelogRenderOptions: config.renderOptions,
+            conventionalCommitsConfig: nxReleaseConfig.conventionalCommits,
         });
         /**
          * If interactive mode, make the changelog contents available for the user to modify in their editor of choice,
@@ -605,17 +607,17 @@ function checkChangelogFilesEnabled(nxReleaseConfig) {
     }
     return false;
 }
-async function getCommits(fromSHA, toSHA) {
+async function getCommits(fromSHA, toSHA, conventionalCommitsConfig) {
     const rawCommits = await (0, git_1.getGitDiff)(fromSHA, toSHA);
     // Parse as conventional commits
     return (0, git_1.parseCommits)(rawCommits).filter((c) => {
         const type = c.type;
-        // Always ignore non user-facing commits for now
-        // TODO: allow this filter to be configurable via config in a future release
-        if (type === 'feat' || type === 'fix' || type === 'perf') {
-            return true;
+        const typeConfig = conventionalCommitsConfig.types[type];
+        if (!typeConfig) {
+            // don't include commits with unknown types
+            return false;
         }
-        return false;
+        return !typeConfig.changelog.hidden;
     });
 }
 function shouldCreateGitHubRelease(changelogConfig, createReleaseArg = undefined) {

package/src/command-line/release/config/config.d.ts

@@ -17,6 +17,13 @@ type RemoveTrueFromProperties<T, K extends keyof T> = {
 type RemoveTrueFromPropertiesOnEach<T, K extends keyof T[keyof T]> = {
     [U in keyof T]: RemoveTrueFromProperties<T[U], K>;
 };
+type RemoveBooleanFromType<T> = T extends boolean ? never : T;
+type RemoveBooleanFromProperties<T, K extends keyof T> = {
+    [P in keyof T]: P extends K ? RemoveBooleanFromType<T[P]> : T[P];
+};
+type RemoveBooleanFromPropertiesOnEach<T, K extends keyof T[keyof T]> = {
+    [U in keyof T]: RemoveBooleanFromProperties<T[U], K>;
+};
 export declare const IMPLICIT_DEFAULT_RELEASE_GROUP = "__default__";
 /**
  * Our source of truth is a deeply required variant of the user-facing config interface, so that command
@@ -30,6 +37,9 @@ export declare const IMPLICIT_DEFAULT_RELEASE_GROUP = "__default__";
 export type NxReleaseConfig = Omit<DeepRequired<NxJsonConfiguration['release'] & {
     groups: DeepRequired<RemoveTrueFromPropertiesOnEach<EnsureProjectsArray<NxJsonConfiguration['release']['groups']>, 'changelog'>>;
     changelog: RemoveTrueFromProperties<DeepRequired<NxJsonConfiguration['release']['changelog']>, 'workspaceChangelog' | 'projectChangelogs'>;
+    conventionalCommits: {
+        types: RemoveBooleanFromPropertiesOnEach<DeepRequired<RemoveBooleanFromProperties<DeepRequired<NxJsonConfiguration['release']['conventionalCommits']['types']>, string>>, 'changelog'>;
+    };
 }>, 'projects'>;
 export interface CreateNxReleaseConfigError {
     code: 'PROJECTS_AND_GROUPS_DEFINED' | 'RELEASE_GROUP_MATCHES_NO_PROJECTS' | 'RELEASE_GROUP_RELEASE_TAG_PATTERN_VERSION_PLACEHOLDER_MISSING_OR_EXCESSIVE' | 'PROJECT_MATCHES_MULTIPLE_GROUPS' | 'CONVENTIONAL_COMMITS_SHORTHAND_MIXED_WITH_OVERLAPPING_GENERATOR_OPTIONS' | 'GLOBAL_GIT_CONFIG_MIXED_WITH_GRANULAR_GIT_CONFIG';

package/src/command-line/release/config/config.js

@@ -20,6 +20,7 @@ const find_matching_projects_1 = require("../../../utils/find-matching-projects"
 const output_1 = require("../../../utils/output");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const resolve_nx_json_error_message_1 = require("../utils/resolve-nx-json-error-message");
+const conventional_commits_1 = require("./conventional-commits");
 exports.IMPLICIT_DEFAULT_RELEASE_GROUP = '__default__';
 // Apply default configuration to any optional user configuration and handle known errors
 async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig = {}) {
@@ -130,6 +131,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             (workspaceProjectsRelationship === 'independent'
                 ? defaultIndependentReleaseTagPattern
                 : defaultFixedReleaseTagPattern),
+        conventionalCommits: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG,
     };
     const groupProjectsRelationship = userConfig.projectsRelationship || WORKSPACE_DEFAULTS.projectsRelationship;
     const GROUP_DEFAULTS = {
@@ -183,6 +185,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             git: userConfig.git,
         },
     ], normalizeTrueToEmptyObject(userConfig.changelog));
+    const rootConventionalCommitsConfig = deepMergeDefaults([WORKSPACE_DEFAULTS.conventionalCommits], fillUnspecifiedConventionalCommitsProperties(normalizeConventionalCommitsConfig(userConfig.conventionalCommits)));
     // these options are not supported at the group level, only the root/command level
     const rootVersionWithoutGlobalOptions = { ...rootVersionConfig };
     delete rootVersionWithoutGlobalOptions.git;
@@ -323,6 +326,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             version: rootVersionConfig,
             changelog: rootChangelogConfig,
             groups: releaseGroups,
+            conventionalCommits: rootConventionalCommitsConfig,
         },
     };
 }
@@ -335,6 +339,87 @@ exports.createNxReleaseConfig = createNxReleaseConfig;
 function normalizeTrueToEmptyObject(value) {
     return value === true ? {} : value;
 }
+function normalizeConventionalCommitsConfig(userConventionalCommitsConfig) {
+    if (!userConventionalCommitsConfig || !userConventionalCommitsConfig.types) {
+        return userConventionalCommitsConfig;
+    }
+    const types = {};
+    for (const [t, typeConfig] of Object.entries(userConventionalCommitsConfig.types)) {
+        if (typeConfig === false) {
+            types[t] = {
+                semverBump: 'none',
+                changelog: {
+                    hidden: true,
+                },
+            };
+            continue;
+        }
+        if (typeConfig === true) {
+            types[t] = {};
+            continue;
+        }
+        if (typeConfig.changelog === false) {
+            types[t] = {
+                ...typeConfig,
+                changelog: {
+                    hidden: true,
+                },
+            };
+            continue;
+        }
+        if (typeConfig.changelog === true) {
+            types[t] = {
+                ...typeConfig,
+                changelog: {},
+            };
+            continue;
+        }
+        types[t] = typeConfig;
+    }
+    return {
+        ...userConventionalCommitsConfig,
+        types,
+    };
+}
+/**
+ * New, custom types specified by users will not be given the appropriate
+ * defaults with `deepMergeDefaults`, so we need to fill in the gaps here.
+ */
+function fillUnspecifiedConventionalCommitsProperties(config) {
+    if (!config || !config.types) {
+        return config;
+    }
+    const types = {};
+    for (const [t, typeConfig] of Object.entries(config.types)) {
+        const defaultTypeConfig = conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG.types[t];
+        const semverBump = typeConfig.semverBump ||
+            // preserve our default semver bump if it's not 'none'
+            // this prevents a 'feat' from becoming a 'patch' just
+            // because they modified the changelog config for 'feat'
+            (defaultTypeConfig?.semverBump !== 'none' &&
+                defaultTypeConfig?.semverBump) ||
+            'patch';
+        // don't preserve our default behavior for hidden, ever.
+        // we should assume that if users are explicitly enabling a
+        // type, then they intend it to be visible in the changelog
+        const hidden = typeConfig.changelog?.hidden || false;
+        const title = typeConfig.changelog?.title ||
+            // our default title is better than just the unmodified type name
+            defaultTypeConfig?.changelog.title ||
+            t;
+        types[t] = {
+            semverBump,
+            changelog: {
+                hidden,
+                title,
+            },
+        };
+    }
+    return {
+        ...config,
+        types,
+    };
+}
 async function handleNxReleaseConfigError(error) {
     switch (error.code) {
         case 'PROJECTS_AND_GROUPS_DEFINED':

package/src/command-line/release/config/conventional-commits.d.ts

@@ -0,0 +1,2 @@
+import { NxReleaseConfig } from './config';
+export declare const DEFAULT_CONVENTIONAL_COMMITS_CONFIG: NxReleaseConfig['conventionalCommits'];

package/src/command-line/release/config/conventional-commits.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_CONVENTIONAL_COMMITS_CONFIG = void 0;
+exports.DEFAULT_CONVENTIONAL_COMMITS_CONFIG = {
+    types: {
+        feat: {
+            semverBump: 'minor',
+            changelog: {
+                title: '🚀 Features',
+                hidden: false,
+            },
+        },
+        fix: {
+            semverBump: 'patch',
+            changelog: {
+                title: '🩹 Fixes',
+                hidden: false,
+            },
+        },
+        perf: {
+            semverBump: 'none',
+            changelog: {
+                title: '🔥 Performance',
+                hidden: false,
+            },
+        },
+        refactor: {
+            semverBump: 'none',
+            changelog: {
+                title: '💅 Refactors',
+                hidden: true,
+            },
+        },
+        docs: {
+            semverBump: 'none',
+            changelog: {
+                title: '📖 Documentation',
+                hidden: true,
+            },
+        },
+        build: {
+            semverBump: 'none',
+            changelog: {
+                title: '📦 Build',
+                hidden: true,
+            },
+        },
+        types: {
+            semverBump: 'none',
+            changelog: {
+                title: '🌊 Types',
+                hidden: true,
+            },
+        },
+        chore: {
+            semverBump: 'none',
+            changelog: {
+                title: '🏡 Chore',
+                hidden: true,
+            },
+        },
+        examples: {
+            semverBump: 'none',
+            changelog: {
+                title: '🏀 Examples',
+                hidden: true,
+            },
+        },
+        test: {
+            semverBump: 'none',
+            changelog: {
+                title: '✅ Tests',
+                hidden: true,
+            },
+        },
+        style: {
+            semverBump: 'none',
+            changelog: {
+                title: '🎨 Styles',
+                hidden: true,
+            },
+        },
+        ci: {
+            semverBump: 'none',
+            changelog: {
+                title: '🤖 CI',
+                hidden: true,
+            },
+        },
+        revert: {
+            semverBump: 'none',
+            changelog: {
+                title: '⏪ Revert',
+                hidden: true,
+            },
+        },
+    },
+};

package/src/command-line/release/utils/resolve-semver-specifier.d.ts

@@ -1,3 +1,4 @@
 import { ProjectGraph } from '../../../config/project-graph';
-export declare function resolveSemverSpecifierFromConventionalCommits(from: string, projectGraph: ProjectGraph, projectNames: string[]): Promise<string | null>;
+import { NxReleaseConfig } from '../config/config';
+export declare function resolveSemverSpecifierFromConventionalCommits(from: string, projectGraph: ProjectGraph, projectNames: string[], conventionalCommitsConfig: NxReleaseConfig['conventionalCommits']): Promise<string | null>;
 export declare function resolveSemverSpecifierFromPrompt(selectionMessage: string, customVersionMessage: string): Promise<string>;

package/src/command-line/release/utils/resolve-semver-specifier.js

@@ -6,22 +6,11 @@ const semver_1 = require("semver");
 const git_1 = require("./git");
 const semver_2 = require("./semver");
 const shared_1 = require("./shared");
-// TODO: Extract config to nx.json configuration when adding changelog customization
-const CONVENTIONAL_COMMITS_CONFIG = {
-    types: {
-        feat: {
-            semver: 'minor',
-        },
-        fix: {
-            semver: 'patch',
-        },
-    },
-};
-async function resolveSemverSpecifierFromConventionalCommits(from, projectGraph, projectNames) {
+async function resolveSemverSpecifierFromConventionalCommits(from, projectGraph, projectNames, conventionalCommitsConfig) {
     const commits = await (0, git_1.getGitDiff)(from);
     const parsedCommits = (0, git_1.parseCommits)(commits);
     const relevantCommits = await (0, shared_1.getCommitsRelevantToProjects)(projectGraph, parsedCommits, projectNames);
-    return (0, semver_2.determineSemverChange)(relevantCommits, CONVENTIONAL_COMMITS_CONFIG);
+    return (0, semver_2.determineSemverChange)(relevantCommits, conventionalCommitsConfig);
 }
 exports.resolveSemverSpecifierFromConventionalCommits = resolveSemverSpecifierFromConventionalCommits;
 async function resolveSemverSpecifierFromPrompt(selectionMessage, customVersionMessage) {

package/src/command-line/release/utils/semver.d.ts

@@ -3,15 +3,9 @@
  * https://github.com/unjs/changelogen
  */
 import { ReleaseType } from 'semver';
+import { NxReleaseConfig } from '../config/config';
 import { GitCommit } from './git';
 export declare function isRelativeVersionKeyword(val: string): val is ReleaseType;
 export declare function isValidSemverSpecifier(specifier: string): boolean;
-export interface ConventionalCommitsConfig {
-    types: {
-        [type: string]: {
-            semver: 'patch' | 'minor' | 'major';
-        };
-    };
-}
-export declare function determineSemverChange(commits: GitCommit[], config: ConventionalCommitsConfig): 'patch' | 'minor' | 'major' | null;
+export declare function determineSemverChange(commits: GitCommit[], config: NxReleaseConfig['conventionalCommits']): 'patch' | 'minor' | 'major' | null;
 export declare function deriveNewSemverVersion(currentSemverVersion: string, semverSpecifier: string, preid?: string): string;

package/src/command-line/release/utils/semver.js

@@ -18,7 +18,7 @@ exports.isValidSemverSpecifier = isValidSemverSpecifier;
 function determineSemverChange(commits, config) {
     let [hasMajor, hasMinor, hasPatch] = [false, false, false];
     for (const commit of commits) {
-        const semverType = config.types[commit.type]?.semver;
+        const semverType = config.types[commit.type]?.semverBump;
         if (semverType === 'major' || commit.isBreaking) {
             hasMajor = true;
         }
@@ -28,6 +28,9 @@ function determineSemverChange(commits, config) {
         else if (semverType === 'patch') {
             hasPatch = true;
         }
+        else if (semverType === 'none' || !semverType) {
+            // do not report a change
+        }
     }
     return hasMajor ? 'major' : hasMinor ? 'minor' : hasPatch ? 'patch' : null;
 }

package/src/command-line/release/version.d.ts

@@ -1,5 +1,6 @@
 import { ProjectGraph, ProjectGraphProjectNode } from '../../config/project-graph';
 import { VersionOptions } from './command-object';
+import { NxReleaseConfig } from './config/config';
 import { ReleaseGroupWithName } from './config/filter-release-groups';
 import { VersionData } from './utils/shared';
 export { deriveNewSemverVersion } from './utils/semver';
@@ -21,6 +22,7 @@ export interface ReleaseVersionGeneratorSchema {
     skipLockFileUpdate?: boolean;
     installArgs?: string;
     installIgnoreScripts?: boolean;
+    conventionalCommitsConfig?: NxReleaseConfig['conventionalCommits'];
 }
 export interface NxReleaseVersionResult {
     /**

package/src/command-line/release/version.js

@@ -97,7 +97,7 @@ async function releaseVersion(args) {
                     // all project data from the project graph (not to be confused with projectNamesToRunVersionOn)
                     projects,
                 });
-                const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData);
+                const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData, nxReleaseConfig.conventionalCommits);
                 // Capture the callback so that we can run it after flushing the changes to disk
                 generatorCallbacks.push(async () => {
                     const changedFiles = await generatorCallback(tree, {
@@ -179,7 +179,7 @@ async function releaseVersion(args) {
                 // all project data from the project graph (not to be confused with projectNamesToRunVersionOn)
                 projects,
             });
-            const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData);
+            const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData, nxReleaseConfig.conventionalCommits);
             // Capture the callback so that we can run it after flushing the changes to disk
             generatorCallbacks.push(async () => {
                 const changedFiles = await generatorCallback(tree, {
@@ -262,7 +262,7 @@ function appendVersionData(existingVersionData, newVersionData) {
     }
     return existingVersionData;
 }
-async function runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, generatorOverrides, projectNames, releaseGroup, versionData) {
+async function runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, generatorOverrides, projectNames, releaseGroup, versionData, conventionalCommitsConfig) {
     const generatorOptions = {
         // Always ensure a string to avoid generator schema validation errors
         specifier: args.specifier ?? '',
@@ -274,6 +274,7 @@ async function runVersionOnProjects(projectGraph, nxJson, args, tree, generatorD
         projectGraph,
         releaseGroup,
         firstRelease: args.firstRelease ?? false,
+        conventionalCommitsConfig,
     };
     // Apply generator defaults from schema.json file etc
     const combinedOpts = await (0, params_1.combineOptionsForGenerator)(generatorOptions, generatorData.collectionName, generatorData.normalizedGeneratorName, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson, generatorData.schema, false, null, (0, node_path_1.relative)(process.cwd(), workspace_root_1.workspaceRoot), args.verbose);

package/src/config/nx-json.d.ts

@@ -120,6 +120,30 @@ export interface NxReleaseGitConfiguration {
      */
     tagArgs?: string;
 }
+export interface NxReleaseConventionalCommitsConfiguration {
+    types?: Record<string, 
+    /**
+     * A map of commit types to their configuration.
+     * If a type is set to 'true', then it will be enabled with the default 'semverBump' of 'patch' and will appear in the changelog.
+     * If a type is set to 'false', then it will not trigger a version bump and will be hidden from the changelog.
+     */
+    {
+        /**
+         * The semver bump to apply when a commit of this type is found.
+         * If set to "none", the commit will be ignored for versioning purposes.
+         */
+        semverBump?: 'patch' | 'minor' | 'major' | 'none';
+        /**
+         * Configuration for the changelog section for commits of this type.
+         * If set to 'true', then commits of this type will be included in the changelog with their default title for the type.
+         * If set to 'false', then commits of this type will not be included in the changelog.
+         */
+        changelog?: {
+            title?: string;
+            hidden?: boolean;
+        } | boolean;
+    } | boolean>;
+}
 interface NxReleaseConfiguration {
     /**
      * Shorthand for amending the projects which will be included in the implicit default release group (all projects by default).
@@ -229,6 +253,7 @@ interface NxReleaseConfiguration {
      * Enable and configure automatic git operations as part of the release
      */
     git?: NxReleaseGitConfiguration;
+    conventionalCommits?: NxReleaseConventionalCommitsConfiguration;
 }
 /**
  * Nx.json configuration