nx 18.1.0 → 18.1.1

package/bin/init-local.js

@@ -99,7 +99,14 @@ function isKnownCommand(command) {
 }
 function shouldDelegateToAngularCLI() {
     const command = process.argv[2];
-    const commands = ['analytics', 'config', 'doc', 'update', 'completion'];
+    const commands = [
+        'analytics',
+        'cache',
+        'completion',
+        'config',
+        'doc',
+        'update',
+    ];
     return commands.indexOf(command) > -1;
 }
 function handleAngularCLIFallbacks(workspace) {
@@ -122,6 +129,11 @@ function handleAngularCLIFallbacks(workspace) {
   For more information, see https://nx.dev/features/integrate-with-editors`);
         }
     }
+    else if (process.argv[2] === 'cache') {
+        console.log(`"ng cache" is not natively supported by Nx.
+To clear the cache, you can delete the ".angular/cache" directory (or the directory configured by "cli.cache.path" in the "nx.json" file).
+To update the cache configuration, you can directly update the relevant options in your "nx.json" file (https://angular.io/guide/workspace-config#cache-options).`);
+    }
     else {
         try {
             // nx-ignore-next-line

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.0",
+  "version": "18.1.1",
   "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"
+    "@nrwl/tao": "18.1.1"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.0",
-    "@nx/nx-darwin-arm64": "18.1.0",
-    "@nx/nx-linux-x64-gnu": "18.1.0",
-    "@nx/nx-linux-x64-musl": "18.1.0",
-    "@nx/nx-win32-x64-msvc": "18.1.0",
-    "@nx/nx-linux-arm64-gnu": "18.1.0",
-    "@nx/nx-linux-arm64-musl": "18.1.0",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.0",
-    "@nx/nx-win32-arm64-msvc": "18.1.0",
-    "@nx/nx-freebsd-x64": "18.1.0"
+    "@nx/nx-darwin-x64": "18.1.1",
+    "@nx/nx-darwin-arm64": "18.1.1",
+    "@nx/nx-linux-x64-gnu": "18.1.1",
+    "@nx/nx-linux-x64-musl": "18.1.1",
+    "@nx/nx-win32-x64-msvc": "18.1.1",
+    "@nx/nx-linux-arm64-gnu": "18.1.1",
+    "@nx/nx-linux-arm64-musl": "18.1.1",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.1",
+    "@nx/nx-win32-arm64-msvc": "18.1.1",
+    "@nx/nx-freebsd-x64": "18.1.1"
   },
   "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

@@ -157,11 +157,16 @@
                     "$ref": "#/definitions/NxReleaseVersionConfiguration"
                   },
                   {
-                    "anyOf": [
+                    "allOf": [
                       {
                         "not": {
                           "required": ["git"]
                         }
+                      },
+                      {
+                        "not": {
+                          "required": ["preVersionCommand"]
+                        }
                       }
                     ]
                   }
@@ -216,6 +221,9 @@
             }
           }
         },
+        "conventionalCommits": {
+          "$ref": "#/definitions/NxReleaseConventionalCommitsConfiguration"
+        },
         "projectsRelationship": {
           "type": "string",
           "enum": ["fixed", "independent"]
@@ -576,6 +584,10 @@
         },
         "git": {
           "$ref": "#/definitions/NxReleaseGitConfiguration"
+        },
+        "preVersionCommand": {
+          "type": "string",
+          "description": "A command to run after validation of nx release configuration, but before versioning begins. Used for preparing build artifacts. If --dry-run is passed, the command is still executed, but with the NX_DRY_RUN environment variable set to 'true'."
         }
       }
     },
@@ -627,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/schemas/project-schema.json

@@ -127,6 +127,26 @@
       "items": {
         "type": "string"
       }
+    },
+    "release": {
+      "type": "object",
+      "description": "Configuration for the nx release commands.",
+      "properties": {
+        "version": {
+          "type": "object",
+          "description": "Configuration for the nx release version command.",
+          "properties": {
+            "generator": {
+              "type": "string",
+              "description": "The version generator to use. Defaults to @nx/js:release-version."
+            },
+            "generatorOptions": {
+              "type": "object",
+              "description": "Options for the version generator."
+            }
+          }
+        }
+      }
     }
   },
   "definitions": {

package/src/adapter/angular-json.d.ts

@@ -1,8 +1,7 @@
 import { ProjectsConfigurations } from '../config/workspace-json-project-json';
-import { NxPluginV2 } from '../project-graph/plugins';
+import { NxPluginV2 } from '../utils/nx-plugin';
 export declare const NX_ANGULAR_JSON_PLUGIN_NAME = "nx-angular-json-plugin";
 export declare const NxAngularJsonPlugin: NxPluginV2;
-export default NxAngularJsonPlugin;
 export declare function shouldMergeAngularProjects(root: string, includeProjectsFromAngularJson: boolean): boolean;
 export declare function isAngularPluginInstalled(): boolean;
 export declare function toNewFormat(w: any): ProjectsConfigurations;

package/src/adapter/angular-json.js

@@ -14,7 +14,6 @@ exports.NxAngularJsonPlugin = {
         }),
     ],
 };
-exports.default = exports.NxAngularJsonPlugin;
 function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
     if ((0, fs_1.existsSync)(path.join(root, 'angular.json')) &&
         // Include projects from angular.json if explicitly required.

package/src/adapter/ngcli-adapter.js

@@ -19,7 +19,7 @@ const package_json_1 = require("../utils/package-json");
 const package_manager_1 = require("../utils/package-manager");
 const angular_json_1 = require("./angular-json");
 const executor_utils_1 = require("../command-line/run/executor-utils");
-const plugins_1 = require("../project-graph/plugins");
+const nx_plugin_1 = require("../utils/nx-plugin");
 const schema_utils_1 = require("../config/schema-utils");
 async function createBuilderContext(builderInfo, context) {
     require('./compat');
@@ -146,7 +146,7 @@ function createNodeModulesEngineHost(resolvePaths, projects) {
                 collectionFilePath = require.resolve(name, { paths });
             }
             else {
-                const { json: { generators, schematics }, path: packageJsonPath, } = (0, plugins_1.readPluginPackageJson)(name, projects, paths);
+                const { json: { generators, schematics }, path: packageJsonPath, } = (0, nx_plugin_1.readPluginPackageJson)(name, projects, paths);
                 if (!schematics && !generators) {
                     throw new Error(`The "${name}" package does not support Nx generators or Angular Devkit schematics.`);
                 }
@@ -802,7 +802,7 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
             };
         }
         readExecutorsJson(nodeModule, builder) {
-            const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(nodeModule, this.projects, this.root ? [this.root, __dirname] : [__dirname]);
+            const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(nodeModule, this.projects, this.root ? [this.root, __dirname] : [__dirname]);
             const executorsFile = packageJson.executors ?? packageJson.builders;
             if (!executorsFile) {
                 throw new Error(`The "${nodeModule}" package does not support Nx executors or Angular Devkit Builders.`);

package/src/command-line/generate/generator-utils.js

@@ -4,7 +4,7 @@ exports.readGeneratorsJson = exports.getGeneratorInformation = void 0;
 const path_1 = require("path");
 const schema_utils_1 = require("../../config/schema-utils");
 const fileutils_1 = require("../../utils/fileutils");
-const plugins_1 = require("../../project-graph/plugins");
+const nx_plugin_1 = require("../../utils/nx-plugin");
 function getGeneratorInformation(collectionName, generatorName, root, projects) {
     try {
         const { generatorsFilePath, generatorsJson, resolvedCollectionName, normalizedGeneratorName, } = readGeneratorsJson(collectionName, generatorName, root, projects);
@@ -48,7 +48,7 @@ function readGeneratorsJson(collectionName, generator, root, projects) {
         });
     }
     else {
-        const { json: packageJson, path: packageJsonPath } = (0, plugins_1.readPluginPackageJson)(collectionName, projects, root ? [root, __dirname] : [__dirname]);
+        const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(collectionName, projects, root ? [root, __dirname] : [__dirname]);
         const generatorsFile = packageJson.generators ?? packageJson.schematics;
         if (!generatorsFile) {
             throw new Error(`The "${collectionName}" package does not support Nx generators.`);

package/src/command-line/init/implementation/add-nx-to-nest.js

@@ -73,12 +73,12 @@ async function addNxToNest(options, packageJson) {
                     ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
                     : false);
     }
-    (0, utils_1.createNxJsonFile)(repoRoot, [], [...cacheableOperations, ...nestCacheableScripts], {});
+    (0, utils_1.createNxJsonFile)(repoRoot, [], [...cacheableOperations, ...nestCacheableScripts], scriptOutputs);
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     addNestPluginToPackageJson(repoRoot);
-    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, scriptOutputs, pmc);
+    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, pmc);
     createProjectJson(repoRoot, packageJson, nestCLIConfiguration);
     removeFile(repoRoot, 'nest-cli.json');
     updatePackageJsonScripts(repoRoot, isJS);

package/src/command-line/init/implementation/add-nx-to-npm-repo.js

@@ -48,11 +48,11 @@ async function addNxToNpmRepo(options) {
                     ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
                     : false);
     }
-    (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, {});
+    (0, utils_1.createNxJsonFile)(repoRoot, [], cacheableOperations, scriptOutputs);
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
-    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, scriptOutputs, pmc);
+    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, pmc);
     output_1.output.log({ title: '📦 Installing dependencies' });
     (0, utils_1.runInstall)(repoRoot, pmc);
     if (useNxCloud) {

package/src/command-line/init/implementation/utils.d.ts

@@ -8,9 +8,7 @@ export declare function updateGitIgnore(root: string): void;
 export declare function runInstall(repoRoot: string, pmc?: PackageManagerCommands): void;
 export declare function initCloud(repoRoot: string, installationSource: 'nx-init-angular' | 'nx-init-cra' | 'nx-init-monorepo' | 'nx-init-nest' | 'nx-init-npm-repo'): void;
 export declare function addVsCodeRecommendedExtensions(repoRoot: string, extensions: string[]): void;
-export declare function markRootPackageJsonAsNxProject(repoRoot: string, cacheableScripts: string[], scriptOutputs: {
-    [script: string]: string;
-}, pmc: PackageManagerCommands): void;
+export declare function markRootPackageJsonAsNxProject(repoRoot: string, cacheableScripts: string[], pmc: PackageManagerCommands): void;
 export declare function printFinalMessage({ learnMoreLink, bodyLines, }: {
     learnMoreLink?: string;
     bodyLines?: string[];

package/src/command-line/init/implementation/utils.js

@@ -25,14 +25,14 @@ function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scr
             nxJson.targetDefaults[scriptName] ??= {};
             nxJson.targetDefaults[scriptName] = { dependsOn: [`^${scriptName}`] };
         }
-        for (const [scriptName, output] of Object.entries(scriptOutputs)) {
-            if (!output) {
-                // eslint-disable-next-line no-continue
-                continue;
-            }
-            nxJson.targetDefaults[scriptName] ??= {};
-            nxJson.targetDefaults[scriptName].outputs = [`{projectRoot}/${output}`];
+    }
+    for (const [scriptName, output] of Object.entries(scriptOutputs)) {
+        if (!output) {
+            // eslint-disable-next-line no-continue
+            continue;
         }
+        nxJson.targetDefaults[scriptName] ??= {};
+        nxJson.targetDefaults[scriptName].outputs = [`{projectRoot}/${output}`];
     }
     for (const target of cacheableOperations) {
         nxJson.targetDefaults[target] ??= {};
@@ -134,16 +134,9 @@ function addVsCodeRecommendedExtensions(repoRoot, extensions) {
     }
 }
 exports.addVsCodeRecommendedExtensions = addVsCodeRecommendedExtensions;
-function markRootPackageJsonAsNxProject(repoRoot, cacheableScripts, scriptOutputs, pmc) {
+function markRootPackageJsonAsNxProject(repoRoot, cacheableScripts, pmc) {
     const json = (0, fileutils_1.readJsonFile)((0, path_2.joinPathFragments)(repoRoot, `package.json`));
-    json.nx = { targets: {} };
-    for (let script of Object.keys(scriptOutputs)) {
-        if (scriptOutputs[script]) {
-            json.nx.targets[script] = {
-                outputs: [`{projectRoot}/${scriptOutputs[script]}`],
-            };
-        }
-    }
+    json.nx = {};
     for (let script of cacheableScripts) {
         const scriptDefinition = json.scripts[script];
         if (!scriptDefinition) {

package/src/command-line/init/init-v2.js

@@ -19,6 +19,7 @@ const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
 const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
 const path_1 = require("path");
 async function initHandler(options) {
+    process.env.NX_RUNNING_NX_INIT = 'true';
     const version = process.env.NX_VERSION ?? ((0, semver_1.prerelease)(versions_1.nxVersion) ? 'next' : 'latest');
     if (process.env.NX_VERSION) {
         output_1.output.log({ title: `Using version ${process.env.NX_VERSION}` });
@@ -32,7 +33,7 @@ async function initHandler(options) {
         }
         (0, add_nx_scripts_1.generateDotNxSetup)(version);
         // invokes the wrapper, thus invoking the initial installation process
-        (0, child_process_1.runNxSync)('');
+        (0, child_process_1.runNxSync)('--version', { stdio: 'ignore' });
         return;
     }
     // TODO(jack): Remove this Angular logic once `@nx/angular` is compatible with inferred targets.
@@ -80,7 +81,7 @@ async function initHandler(options) {
         if (!detectPluginsResponse.updatePackageScripts) {
             const rootPackageJsonPath = (0, path_1.join)(repoRoot, 'package.json');
             const json = (0, fileutils_1.readJsonFile)(rootPackageJsonPath);
-            json.nx = {};
+            json.nx = { includedScripts: [] };
             (0, fileutils_1.writeJsonFile)(rootPackageJsonPath, json);
         }
         if (useNxCloud) {

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

@@ -9,6 +9,7 @@ const tmp_1 = require("tmp");
 const nx_json_1 = require("../../config/nx-json");
 const tree_1 = require("../../generators/tree");
 const register_1 = require("../../plugins/js/utils/register");
+const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const utils_1 = require("../../tasks-runner/utils");
 const is_ci_1 = require("../../utils/is-ci");
@@ -40,7 +41,7 @@ async function releaseChangelog(args) {
         process.env.NX_VERBOSE_LOGGING = 'true';
     }
     // Apply default configuration to any optional user configuration
-    const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, nxJson.release);
+    const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), nxJson.release);
     if (configError) {
         return await (0, config_1.handleNxReleaseConfigError)(configError);
     }
@@ -129,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)) {
@@ -171,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) {
@@ -183,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 &&
@@ -217,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 &&
@@ -448,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,
@@ -490,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) {
@@ -546,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,
@@ -604,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/command-object.d.ts

@@ -21,6 +21,7 @@ export type VersionOptions = NxReleaseArgs & GitCommitAndTagOptions & {
     specifier?: string;
     preid?: string;
     stageChanges?: boolean;
+    generatorOptionsOverrides?: Record<string, unknown>;
 };
 export type ChangelogOptions = NxReleaseArgs & GitCommitAndTagOptions & {
     version?: string | null;

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

@@ -1,18 +1,5 @@
-/**
- * `nx release` is a powerful feature which spans many possible use cases. The possible variations
- * of configuration are therefore quite complex, particularly when you consider release groups.
- *
- * We want to provide the best possible DX for users so that they can harness the power of `nx release`
- * most effectively, therefore we need to both provide sensible defaults for common scenarios (to avoid
- * verbose nx.json files wherever possible), and proactively handle potential sources of config issues
- * in more complex use-cases.
- *
- * This file is the source of truth for all `nx release` configuration reconciliation, including sensible
- * defaults and user overrides, as well as handling common errors, up front to produce a single, consistent,
- * and easy to consume config object for all the `nx release` command implementations.
- */
 import { NxJsonConfiguration } from '../../../config/nx-json';
-import { type ProjectGraph } from '../../../devkit-exports';
+import { ProjectFileMap, ProjectGraph } from '../../../config/project-graph';
 type DeepRequired<T> = Required<{
     [K in keyof T]: T[K] extends Required<T[K]> ? T[K] : DeepRequired<T[K]>;
 }>;
@@ -30,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
@@ -43,12 +37,15 @@ 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';
     data: Record<string, string | string[]>;
 }
-export declare function createNxReleaseConfig(projectGraph: ProjectGraph, userConfig?: NxJsonConfiguration['release']): Promise<{
+export declare function createNxReleaseConfig(projectGraph: ProjectGraph, projectFileMap: ProjectFileMap, userConfig?: NxJsonConfiguration['release']): Promise<{
     error: null | CreateNxReleaseConfigError;
     nxReleaseConfig: NxReleaseConfig | null;
 }>;