nx 18.1.0 → 18.1.1

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

@@ -1,12 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleNxReleaseConfigError = exports.createNxReleaseConfig = exports.IMPLICIT_DEFAULT_RELEASE_GROUP = void 0;
-const devkit_exports_1 = require("../../../devkit-exports");
+/**
+ * `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.
+ */
+const path_1 = require("path");
+const fileutils_1 = require("../../../utils/fileutils");
 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, userConfig = {}) {
+async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig = {}) {
     if (userConfig.projects && userConfig.groups) {
         return {
             error: {
@@ -67,6 +84,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             userGroups[0].projectsRelationship === 'independent') ||
         (userConfig.projectsRelationship === 'independent' &&
             !userGroups.some((g) => g.projectsRelationship === 'fixed'));
+    const defaultRendererPath = (0, path_1.join)(__dirname, '../../../../release/changelog-renderer');
     const WORKSPACE_DEFAULTS = {
         // By default all projects in all groups are released together
         projectsRelationship: workspaceProjectsRelationship,
@@ -76,6 +94,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             conventionalCommits: userConfig.version?.conventionalCommits || false,
             generator: '@nx/js:release-version',
             generatorOptions: defaultGeneratorOptions,
+            preVersionCommand: userConfig.version?.preVersionCommand || '',
         },
         changelog: {
             git: changelogGitDefaults,
@@ -85,7 +104,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
                     createRelease: false,
                     entryWhenNoChanges: 'This was a version bump only, there were no code changes.',
                     file: '{workspaceRoot}/CHANGELOG.md',
-                    renderer: 'nx/release/changelog-renderer',
+                    renderer: defaultRendererPath,
                     renderOptions: {
                         authors: true,
                         commitReferences: true,
@@ -98,7 +117,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
                     createRelease: false,
                     file: '{projectRoot}/CHANGELOG.md',
                     entryWhenNoChanges: 'This was a version bump only for {projectName} to align it with other projects, there were no code changes.',
-                    renderer: 'nx/release/changelog-renderer',
+                    renderer: defaultRendererPath,
                     renderOptions: {
                         authors: true,
                         commitReferences: true,
@@ -113,6 +132,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             (workspaceProjectsRelationship === 'independent'
                 ? defaultIndependentReleaseTagPattern
                 : defaultFixedReleaseTagPattern),
+        conventionalCommits: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG,
     };
     const groupProjectsRelationship = userConfig.projectsRelationship || WORKSPACE_DEFAULTS.projectsRelationship;
     const GROUP_DEFAULTS = {
@@ -126,7 +146,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             createRelease: false,
             entryWhenNoChanges: 'This was a version bump only for {projectName} to align it with other projects, there were no code changes.',
             file: '{projectRoot}/CHANGELOG.md',
-            renderer: 'nx/release/changelog-renderer',
+            renderer: defaultRendererPath,
             renderOptions: {
                 authors: true,
                 commitReferences: true,
@@ -166,20 +186,23 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             git: userConfig.git,
         },
     ], normalizeTrueToEmptyObject(userConfig.changelog));
-    // git configuration is not supported at the group level, only the root/command level
-    const rootVersionWithoutGit = { ...rootVersionConfig };
-    delete rootVersionWithoutGit.git;
+    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;
+    delete rootVersionWithoutGlobalOptions.preVersionCommand;
     // Apply conventionalCommits shorthand to the final group defaults if explicitly configured in the original user config
     if (userConfig.version?.conventionalCommits === true) {
-        rootVersionWithoutGit.generatorOptions = {
-            ...rootVersionWithoutGit.generatorOptions,
+        rootVersionWithoutGlobalOptions.generatorOptions = {
+            ...rootVersionWithoutGlobalOptions.generatorOptions,
             currentVersionResolver: 'git-tag',
             specifierSource: 'conventional-commits',
         };
     }
     if (userConfig.version?.conventionalCommits === false) {
-        delete rootVersionWithoutGit.generatorOptions.currentVersionResolver;
-        delete rootVersionWithoutGit.generatorOptions.specifierSource;
+        delete rootVersionWithoutGlobalOptions.generatorOptions
+            .currentVersionResolver;
+        delete rootVersionWithoutGlobalOptions.generatorOptions.specifierSource;
     }
     const groups = userConfig.groups && Object.keys(userConfig.groups).length
         ? ensureProjectsConfigIsArray(userConfig.groups)
@@ -193,14 +216,13 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
                     projects: userConfig.projects
                         ? // user-defined top level "projects" config takes priority if set
                             (0, find_matching_projects_1.findMatchingProjects)(ensureArray(userConfig.projects), projectGraph.nodes)
-                        : // default to all library projects in the workspace
-                            (0, find_matching_projects_1.findMatchingProjects)(['*'], projectGraph.nodes).filter((project) => projectGraph.nodes[project].type === 'lib'),
+                        : await getDefaultProjects(projectGraph, projectFileMap),
                     /**
                      * For properties which are overriding config at the root, we use the root level config as the
                      * default values to merge with so that the group that matches a specific project will always
                      * be the valid source of truth for that type of config.
                      */
-                    version: deepMergeDefaults([GROUP_DEFAULTS.version], rootVersionWithoutGit),
+                    version: deepMergeDefaults([GROUP_DEFAULTS.version], rootVersionWithoutGlobalOptions),
                     // If the user has set something custom for releaseTagPattern at the top level, respect it for the implicit default group
                     releaseTagPattern: userConfig.releaseTagPattern || GROUP_DEFAULTS.releaseTagPattern,
                     // Directly inherit the root level config for projectChangelogs, if set
@@ -265,7 +287,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             projects: matchingProjects,
             version: deepMergeDefaults(
             // First apply any group level defaults, then apply actual root level config, then group level config
-            [GROUP_DEFAULTS.version, rootVersionWithoutGit], releaseGroup.version),
+            [GROUP_DEFAULTS.version, rootVersionWithoutGlobalOptions], releaseGroup.version),
             // If the user has set any changelog config at all, including at the root level, then use one set of defaults, otherwise default to false for the whole feature
             changelog: releaseGroup.changelog || rootChangelogConfig.projectChangelogs
                 ? deepMergeDefaults(groupChangelogDefaults, releaseGroup.changelog || {})
@@ -305,6 +327,7 @@ async function createNxReleaseConfig(projectGraph, userConfig = {}) {
             version: rootVersionConfig,
             changelog: rootChangelogConfig,
             groups: releaseGroups,
+            conventionalCommits: rootConventionalCommitsConfig,
         },
     };
 }
@@ -317,6 +340,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':
@@ -325,7 +429,7 @@ async function handleNxReleaseConfigError(error) {
                     'release',
                     'projects',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `"projects" is not valid when explicitly defining release groups, and everything should be expressed within "groups" in that case. If you are using "groups" then you should remove the "projects" property`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -337,7 +441,7 @@ async function handleNxReleaseConfigError(error) {
                     'release',
                     'groups',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `Release group "${error.data.releaseGroupName}" matches no projects. Please ensure all release groups match at least one project:`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -349,7 +453,7 @@ async function handleNxReleaseConfigError(error) {
                     'release',
                     'groups',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `Project "${error.data.project}" matches multiple release groups. Please ensure all projects are part of only one release group:`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -363,7 +467,7 @@ async function handleNxReleaseConfigError(error) {
                     error.data.releaseGroupName,
                     'releaseTagPattern',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `Release group "${error.data.releaseGroupName}" has an invalid releaseTagPattern. Please ensure the pattern contains exactly one instance of the "{version}" placeholder`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -374,7 +478,7 @@ async function handleNxReleaseConfigError(error) {
                 const nxJsonMessage = await (0, resolve_nx_json_error_message_1.resolveNxJsonConfigErrorMessage)([
                     'release',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `You have configured both the shorthand "version.conventionalCommits" and one or more of the related "version.generatorOptions" that it sets for you. Please use one or the other:`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -386,7 +490,7 @@ async function handleNxReleaseConfigError(error) {
                     'release',
                     'git',
                 ]);
-                devkit_exports_1.output.error({
+                output_1.output.error({
                     title: `You have duplicate conflicting git configurations. If you are using the top level 'nx release' command, then remove the 'release.version.git' and 'release.changelog.git' properties in favor of 'release.git'. If you are using the subcommands or the programmatic API, then remove the 'release.git' property in favor of 'release.version.git' and 'release.changelog.git':`,
                     bodyLines: [nxJsonMessage],
                 });
@@ -499,3 +603,28 @@ function hasInvalidConventionalCommitsConfig(userConfig) {
 function hasInvalidGitConfig(userConfig) {
     return (!!userConfig.git && !!(userConfig.version?.git || userConfig.changelog?.git));
 }
+async function getDefaultProjects(projectGraph, projectFileMap) {
+    // default to all library projects in the workspace with a package.json file
+    return (0, find_matching_projects_1.findMatchingProjects)(['*'], projectGraph.nodes).filter((project) => projectGraph.nodes[project].type === 'lib' &&
+        // Exclude all projects with "private": true in their package.json because this is
+        // a common indicator that a project is not intended for release.
+        // Users can override this behavior by explicitly defining the projects they want to release.
+        isProjectPublic(project, projectGraph, projectFileMap));
+}
+function isProjectPublic(project, projectGraph, projectFileMap) {
+    const projectNode = projectGraph.nodes[project];
+    const packageJsonPath = (0, path_1.join)(projectNode.data.root, 'package.json');
+    if (!projectFileMap[project]?.find((f) => f.file === packageJsonPath)) {
+        return false;
+    }
+    try {
+        const fullPackageJsonPath = (0, path_1.join)(workspace_root_1.workspaceRoot, packageJsonPath);
+        const packageJson = (0, fileutils_1.readJsonFile)(fullPackageJsonPath);
+        return !(packageJson.private === true);
+    }
+    catch (e) {
+        // do nothing and assume that the project is not public if there is a parsing issue
+        // this will result in it being excluded from the default projects list
+        return false;
+    }
+}

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/publish.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.releasePublish = exports.releasePublishCLIHandler = void 0;
 const nx_json_1 = require("../../config/nx-json");
-const devkit_exports_1 = require("../../devkit-exports");
+const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
+const output_1 = require("../../utils/output");
 const params_1 = require("../../utils/params");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
 const graph_1 = require("../graph/graph");
@@ -33,13 +34,13 @@ async function releasePublish(args, isCLI = false) {
         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);
     }
     const { error: filterError, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, _args.projects, _args.groups);
     if (filterError) {
-        devkit_exports_1.output.error(filterError);
+        output_1.output.error(filterError);
         process.exit(1);
     }
     /**

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

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.release = exports.releaseCLIHandler = void 0;
 const enquirer_1 = require("enquirer");
 const nx_json_1 = require("../../config/nx-json");
-const devkit_exports_1 = require("../../devkit-exports");
+const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
+const output_1 = require("../../utils/output");
 const params_1 = require("../../utils/params");
 const changelog_1 = require("./changelog");
 const config_1 = require("./config/config");
@@ -30,14 +31,14 @@ async function release(args) {
             ? ['release', 'version', 'git']
             : ['release', 'changelog', 'git'];
         const nxJsonMessage = await (0, resolve_nx_json_error_message_1.resolveNxJsonConfigErrorMessage)(jsonConfigErrorPath);
-        devkit_exports_1.output.error({
+        output_1.output.error({
             title: `The "release" top level command cannot be used with granular git configuration. Instead, configure git options in the "release.git" property in nx.json, or use the version, changelog, and publish subcommands or programmatic API directly.`,
             bodyLines: [nxJsonMessage],
         });
         process.exit(1);
     }
     // 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);
     }
@@ -63,11 +64,11 @@ async function release(args) {
     });
     const { error: filterError, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, args.projects, args.groups);
     if (filterError) {
-        devkit_exports_1.output.error(filterError);
+        output_1.output.error(filterError);
         process.exit(1);
     }
     if (shouldCommit) {
-        devkit_exports_1.output.logSingleLine(`Committing changes with git`);
+        output_1.output.logSingleLine(`Committing changes with git`);
         const commitMessage = nxReleaseConfig.git.commitMessage;
         const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionResult.projectsVersionData, commitMessage);
         await (0, git_1.gitCommit)({
@@ -78,7 +79,7 @@ async function release(args) {
         });
     }
     if (shouldTag) {
-        devkit_exports_1.output.logSingleLine(`Tagging commit with git`);
+        output_1.output.logSingleLine(`Tagging commit with git`);
         // Resolve any git tags as early as possible so that we can hard error in case of any duplicates before reaching the actual git command
         const gitTagValues = (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects, versionResult.projectsVersionData);
         (0, shared_1.handleDuplicateGitTags)(gitTagValues);
@@ -96,14 +97,14 @@ async function release(args) {
     let hasPushedChanges = false;
     let latestCommit;
     if (shouldCreateWorkspaceRelease && changelogResult.workspaceChangelog) {
-        devkit_exports_1.output.logSingleLine(`Pushing to git remote`);
+        output_1.output.logSingleLine(`Pushing to git remote`);
         // Before we can create/update the release we need to ensure the commit exists on the remote
         await (0, git_1.gitPush)({
             dryRun: args.dryRun,
             verbose: args.verbose,
         });
         hasPushedChanges = true;
-        devkit_exports_1.output.logSingleLine(`Creating GitHub Release`);
+        output_1.output.logSingleLine(`Creating GitHub Release`);
         latestCommit = await (0, git_1.getCommitHash)('HEAD');
         await (0, github_1.createOrUpdateGithubRelease)(changelogResult.workspaceChangelog.releaseVersion, changelogResult.workspaceChangelog.contents, latestCommit, { dryRun: args.dryRun });
     }
@@ -122,7 +123,7 @@ async function release(args) {
                     continue;
                 }
                 if (!hasPushedChanges) {
-                    devkit_exports_1.output.logSingleLine(`Pushing to git remote`);
+                    output_1.output.logSingleLine(`Pushing to git remote`);
                     // Before we can create/update the release we need to ensure the commit exists on the remote
                     await (0, git_1.gitPush)({
                         dryRun: args.dryRun,
@@ -130,7 +131,7 @@ async function release(args) {
                     });
                     hasPushedChanges = true;
                 }
-                devkit_exports_1.output.logSingleLine(`Creating GitHub Release`);
+                output_1.output.logSingleLine(`Creating GitHub Release`);
                 if (!latestCommit) {
                     latestCommit = await (0, git_1.getCommitHash)('HEAD');
                 }
@@ -152,7 +153,7 @@ async function release(args) {
         await (0, publish_1.releasePublish)(args);
     }
     else {
-        devkit_exports_1.output.logSingleLine('Skipped publishing packages.');
+        output_1.output.logSingleLine('Skipped publishing packages.');
     }
     return versionResult;
 }

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

@@ -92,7 +92,26 @@ async function getGitDiff(from, to = 'HEAD') {
 exports.getGitDiff = getGitDiff;
 async function gitAdd({ changedFiles, dryRun, verbose, logFn, }) {
     logFn = logFn || console.log;
-    const commandArgs = ['add', ...changedFiles];
+    let ignoredFiles = [];
+    let filesToAdd = [];
+    for (const f of changedFiles) {
+        const isFileIgnored = await isIgnored(f);
+        if (isFileIgnored) {
+            ignoredFiles.push(f);
+        }
+        else {
+            filesToAdd.push(f);
+        }
+    }
+    if (verbose && ignoredFiles.length) {
+        logFn(`Will not add the following files because they are ignored by git:`);
+        ignoredFiles.forEach((f) => logFn(f));
+    }
+    if (!filesToAdd.length) {
+        logFn('\nNo files to stage. Skipping git add.');
+        return;
+    }
+    const commandArgs = ['add', ...filesToAdd];
     const message = dryRun
         ? `Would stage files in git with the following command, but --dry-run was set:`
         : `Staging files in git with the following command:`;
@@ -106,6 +125,16 @@ async function gitAdd({ changedFiles, dryRun, verbose, logFn, }) {
     return (0, exec_command_1.execCommand)('git', commandArgs);
 }
 exports.gitAdd = gitAdd;
+async function isIgnored(filePath) {
+    try {
+        // This command will error if the file is not ignored
+        await (0, exec_command_1.execCommand)('git', ['check-ignore', filePath]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 async function gitCommit({ messages, additionalArgs, dryRun, verbose, logFn, }) {
     logFn = logFn || console.log;
     const commandArgs = ['commit'];

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;
 }