nx 22.1.0-canary.20251110-73ecb30 → 22.1.0-canary.20251112-36b9f7a

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

@@ -31,6 +31,9 @@ const resolve_changelog_renderer_1 = require("./utils/resolve-changelog-renderer
 const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
 const shared_1 = require("./utils/shared");
 const version_plan_utils_1 = require("./utils/version-plan-utils");
+const version_plan_utils_2 = require("./changelog/version-plan-utils");
+const commit_utils_1 = require("./changelog/commit-utils");
+const version_plan_filtering_1 = require("./changelog/version-plan-filtering");
 const releaseChangelogCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({}, false)(args));
 exports.releaseChangelogCLIHandler = releaseChangelogCLIHandler;
 function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
@@ -96,14 +99,7 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
             process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG !== 'true') {
             output_1.output.note(releaseGraph.filterLog);
         }
-        const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
-        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGraph.releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
-        // Validate version plans against the filter after resolution
-        const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects);
-        if (versionPlanValidationError) {
-            output_1.output.error(versionPlanValidationError);
-            process.exit(1);
-        }
+        let rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
         if (args.deleteVersionPlans === undefined) {
             // default to deleting version plans in this command instead of after versioning
             args.deleteVersionPlans = true;
@@ -138,6 +134,28 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
         const to = args.to || 'HEAD';
         const toSHA = await (0, git_1.getCommitHash)(to);
         const headSHA = to === 'HEAD' ? toSHA : await (0, git_1.getCommitHash)('HEAD');
+        // Resolve the from SHA once for reuse across different contexts
+        const fromSHA = await (0, version_plan_filtering_1.resolveWorkspaceChangelogFromSHA)({
+            args,
+            nxReleaseConfig,
+            useAutomaticFromRef,
+        });
+        // Filter version plans based on resolveVersionPlans option
+        const shouldFilterVersionPlans = args.resolveVersionPlans === 'using-from-and-to';
+        if (shouldFilterVersionPlans && rawVersionPlans.length > 0 && fromSHA) {
+            rawVersionPlans = await (0, version_plan_filtering_1.filterVersionPlansByCommitRange)(rawVersionPlans, fromSHA, toSHA, args.verbose);
+            if (args.verbose) {
+                console.log(`Using version plans committed between ${fromSHA} and ${toSHA}`);
+            }
+        }
+        // Set resolved version plans on groups
+        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGraph.releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
+        // Validate version plans against the filter after resolution
+        const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects);
+        if (versionPlanValidationError) {
+            output_1.output.error(versionPlanValidationError);
+            process.exit(1);
+        }
         /**
          * Extract the preid from the workspace version and the project versions
          */
@@ -164,92 +182,16 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
             : [];
         (0, shared_1.handleDuplicateGitTags)(gitTagValues);
         const postGitTasks = [];
-        let workspaceChangelogChanges = [];
-        // If there are multiple release groups, we'll just skip the workspace changelog anyway.
-        const versionPlansEnabledForWorkspaceChangelog = releaseGraph.releaseGroups[0].resolvedVersionPlans;
-        if (versionPlansEnabledForWorkspaceChangelog) {
-            if (releaseGraph.releaseGroups.length === 1) {
-                const releaseGroup = releaseGraph.releaseGroups[0];
-                if (releaseGroup.projectsRelationship === 'fixed') {
-                    const versionPlans = releaseGroup.resolvedVersionPlans;
-                    workspaceChangelogChanges = versionPlans
-                        .flatMap((vp) => {
-                        const releaseType = versionPlanSemverReleaseTypeToChangelogType(vp.groupVersionBump);
-                        let githubReferences = [];
-                        let authors = undefined;
-                        const parsedCommit = vp.commit
-                            ? (0, git_1.parseVersionPlanCommit)(vp.commit)
-                            : null;
-                        if (parsedCommit) {
-                            githubReferences = parsedCommit.references;
-                            authors = parsedCommit.authors;
-                        }
-                        const changes = !vp.triggeredByProjects
-                            ? {
-                                type: releaseType.type,
-                                scope: '',
-                                description: vp.message,
-                                body: '',
-                                isBreaking: releaseType.isBreaking,
-                                githubReferences,
-                                authors,
-                                affectedProjects: '*',
-                            }
-                            : vp.triggeredByProjects.map((project) => {
-                                return {
-                                    type: releaseType.type,
-                                    scope: project,
-                                    description: vp.message,
-                                    body: '',
-                                    isBreaking: releaseType.isBreaking,
-                                    githubReferences,
-                                    authors,
-                                    affectedProjects: [project],
-                                };
-                            });
-                        return changes;
-                    })
-                        .filter(Boolean);
-                }
-            }
-        }
-        else {
-            let workspaceChangelogFromRef = args.from ||
-                (await (0, git_1.getLatestGitTagForPattern)(nxReleaseConfig.releaseTag.pattern, {}, {
-                    checkAllBranchesWhen: nxReleaseConfig.releaseTag.checkAllBranchesWhen,
-                    preid: workspacePreid ??
-                        projectsPreid?.[Object.keys(projectsPreid)[0]],
-                    requireSemver: nxReleaseConfig.releaseTag.requireSemver,
-                    strictPreid: nxReleaseConfig.releaseTag.strictPreid,
-                }))?.tag;
-            if (!workspaceChangelogFromRef) {
-                if (useAutomaticFromRef) {
-                    workspaceChangelogFromRef = await (0, git_1.getFirstGitCommit)();
-                    if (args.verbose) {
-                        console.log(`Determined workspace --from ref from the first commit in the workspace: ${workspaceChangelogFromRef}`);
-                    }
-                }
-                else {
-                    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.releaseTag.pattern" property in nx.json to match the structure of your repository's git tags.`);
-                }
-            }
-            // Make sure that the fromRef is actually resolvable
-            const workspaceChangelogFromSHA = await (0, git_1.getCommitHash)(workspaceChangelogFromRef);
-            workspaceChangelogChanges = filterHiddenChanges((await getCommits(workspaceChangelogFromSHA, toSHA)).map((c) => {
-                return {
-                    type: c.type,
-                    scope: c.scope,
-                    description: c.description,
-                    body: c.body,
-                    isBreaking: c.isBreaking,
-                    githubReferences: c.references,
-                    authors: c.authors,
-                    shortHash: c.shortHash,
-                    revertedHashes: c.revertedHashes,
-                    affectedProjects: '*',
-                };
-            }), nxReleaseConfig.conventionalCommits);
-        }
+        const workspaceChangelogChanges = await resolveWorkspaceChangelogChanges({
+            releaseGraph,
+            nxReleaseConfig,
+            args,
+            workspacePreid,
+            projectsPreid,
+            useAutomaticFromRef,
+            toSHA,
+            fromSHA,
+        });
         const workspaceChangelog = await generateChangelogForWorkspace({
             tree,
             args,
@@ -261,6 +203,32 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
         if (workspaceChangelog && workspaceChangelog.postGitTask) {
             postGitTasks.push(workspaceChangelog.postGitTask);
         }
+        /**
+         * Create a cache for from SHA resolution to avoid duplicate git operations
+         */
+        const fromSHACache = new Map();
+        // Cache the workspace from SHA if available
+        if (fromSHA) {
+            fromSHACache.set('workspace', fromSHA);
+        }
+        // Helper function to get cached from SHA or resolve and cache it
+        const getCachedFromSHA = async (cacheKey, pattern, templateValues, preid, checkAllBranchesWhen, requireSemver, strictPreid) => {
+            if (fromSHACache.has(cacheKey)) {
+                return fromSHACache.get(cacheKey);
+            }
+            const sha = await (0, version_plan_filtering_1.resolveChangelogFromSHA)({
+                fromRef: args.from,
+                tagPattern: pattern,
+                tagPatternValues: templateValues,
+                checkAllBranchesWhen,
+                preid,
+                requireSemver,
+                strictPreid,
+                useAutomaticFromRef,
+            });
+            fromSHACache.set(cacheKey, sha);
+            return sha;
+        };
         /**
          * Compute any additional dependency bumps up front because there could be cases of circular dependencies,
          * and figuring them out during the main iteration would be too late.
@@ -318,57 +286,29 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
                 for (const project of projectNodes) {
                     let changes = null;
                     if (releaseGroup.resolvedVersionPlans) {
-                        changes = releaseGroup.resolvedVersionPlans
-                            .map((vp) => {
-                            const bumpForProject = vp.projectVersionBumps[project.name];
-                            if (!bumpForProject) {
-                                return null;
-                            }
-                            const releaseType = versionPlanSemverReleaseTypeToChangelogType(bumpForProject);
-                            let githubReferences = [];
-                            let authors = [];
-                            const parsedCommit = vp.commit
-                                ? (0, git_1.parseVersionPlanCommit)(vp.commit)
-                                : null;
-                            if (parsedCommit) {
-                                githubReferences = parsedCommit.references;
-                                authors = parsedCommit.authors;
-                            }
-                            return {
-                                type: releaseType.type,
-                                scope: project.name,
-                                description: vp.message,
-                                body: '',
-                                isBreaking: releaseType.isBreaking,
-                                affectedProjects: Object.keys(vp.projectVersionBumps),
-                                githubReferences,
-                                authors,
-                            };
-                        })
-                            .filter(Boolean);
+                        changes = (0, version_plan_utils_2.createChangesFromProjectsVersionPlans)(releaseGroup.resolvedVersionPlans, project.name);
                     }
                     else {
-                        let fromRef = args.from ||
-                            (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTag.pattern, {
-                                projectName: project.name,
-                                releaseGroupName: releaseGroup.name,
-                            }, {
-                                checkAllBranchesWhen: releaseGroup.releaseTag.checkAllBranchesWhen,
-                                preid: projectsPreid[project.name],
-                                requireSemver: releaseGroup.releaseTag.requireSemver,
-                                strictPreid: releaseGroup.releaseTag.strictPreid,
-                            }))?.tag;
+                        const projectCacheKey = `${releaseGroup.name}:${project.name}`;
+                        const fromSHA = await getCachedFromSHA(projectCacheKey, releaseGroup.releaseTag.pattern, {
+                            projectName: project.name,
+                            releaseGroupName: releaseGroup.name,
+                        }, projectsPreid[project.name], releaseGroup.releaseTag.checkAllBranchesWhen, releaseGroup.releaseTag.requireSemver, releaseGroup.releaseTag.strictPreid);
                         let commits;
+                        let fromRef = fromSHA;
                         if (!fromRef && useAutomaticFromRef) {
-                            const firstCommit = await (0, git_1.getFirstGitCommit)();
-                            commits = await filterProjectCommits({
-                                fromSHA: firstCommit,
-                                toSHA,
-                                projectPath: project.data.root,
-                            });
-                            fromRef = commits[0]?.shortHash;
-                            if (args.verbose) {
-                                console.log(`Determined --from ref for ${project.name} from the first commit in which it exists: ${fromRef}`);
+                            // For automatic from ref, we already have it cached
+                            fromRef = fromSHACache.get(projectCacheKey);
+                            if (fromRef) {
+                                commits = await filterProjectCommits({
+                                    fromSHA: fromRef,
+                                    toSHA,
+                                    projectPath: project.data.root,
+                                });
+                                fromRef = commits[0]?.shortHash;
+                                if (args.verbose) {
+                                    console.log(`Determined --from ref for ${project.name} from the first commit in which it exists: ${fromRef}`);
+                                }
                             }
                         }
                         if (!fromRef && !commits) {
@@ -382,21 +322,8 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
                             });
                         }
                         const { fileMap } = await (0, file_map_utils_1.createFileMapUsingProjectGraph)(projectGraph);
-                        const fileToProjectMap = createFileToProjectMap(fileMap.projectFileMap);
-                        changes = filterHiddenChanges(commits.map((c) => ({
-                            type: c.type,
-                            scope: c.scope,
-                            description: c.description,
-                            body: c.body,
-                            isBreaking: c.isBreaking,
-                            githubReferences: c.references,
-                            authors: c.authors,
-                            shortHash: c.shortHash,
-                            revertedHashes: c.revertedHashes,
-                            affectedProjects: commitChangesNonProjectFiles(c, fileMap.nonProjectFiles)
-                                ? '*'
-                                : getProjectsAffectedByCommit(c, fileToProjectMap),
-                        })), nxReleaseConfig.conventionalCommits);
+                        const fileToProjectMap = (0, commit_utils_1.createFileToProjectMap)(fileMap.projectFileMap);
+                        changes = (0, commit_utils_1.createChangesFromCommits)(commits, fileMap, fileToProjectMap, nxReleaseConfig.conventionalCommits);
                     }
                     const projectChangelogs = await generateChangelogForProjects({
                         tree,
@@ -422,83 +349,22 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
             else {
                 let changes = [];
                 if (releaseGroup.resolvedVersionPlans) {
-                    changes = releaseGroup.resolvedVersionPlans
-                        .flatMap((vp) => {
-                        const releaseType = versionPlanSemverReleaseTypeToChangelogType(vp.groupVersionBump);
-                        let githubReferences = [];
-                        let authors = undefined;
-                        const parsedCommit = vp.commit
-                            ? (0, git_1.parseVersionPlanCommit)(vp.commit)
-                            : null;
-                        if (parsedCommit) {
-                            githubReferences = parsedCommit.references;
-                            authors = parsedCommit.authors;
-                        }
-                        const changes = !vp.triggeredByProjects
-                            ? {
-                                type: releaseType.type,
-                                scope: '',
-                                description: vp.message,
-                                body: '',
-                                isBreaking: releaseType.isBreaking,
-                                githubReferences,
-                                authors,
-                                affectedProjects: '*',
-                            }
-                            : vp.triggeredByProjects.map((project) => {
-                                return {
-                                    type: releaseType.type,
-                                    scope: project,
-                                    description: vp.message,
-                                    body: '',
-                                    isBreaking: releaseType.isBreaking,
-                                    githubReferences,
-                                    authors,
-                                    affectedProjects: [project],
-                                };
-                            });
-                        return changes;
-                    })
-                        .filter(Boolean);
+                    // This is identical to workspace changelog for fixed groups
+                    changes = (0, version_plan_utils_2.createChangesFromGroupVersionPlans)(releaseGroup.resolvedVersionPlans);
                 }
                 else {
-                    let fromRef = args.from ||
-                        (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTag.pattern, {}, {
-                            checkAllBranchesWhen: releaseGroup.releaseTag.checkAllBranchesWhen,
-                            preid: workspacePreid ??
-                                projectsPreid?.[Object.keys(projectsPreid)[0]],
-                            requireSemver: releaseGroup.releaseTag.requireSemver,
-                            strictPreid: releaseGroup.releaseTag.strictPreid,
-                        }))?.tag;
-                    if (!fromRef) {
-                        if (useAutomaticFromRef) {
-                            fromRef = await (0, git_1.getFirstGitCommit)();
-                            if (args.verbose) {
-                                console.log(`Determined release group --from ref from the first commit in the workspace: ${fromRef}`);
-                            }
-                        }
-                        else {
-                            throw new Error(`Unable to determine the previous git tag. If this is the first release of your release group, 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.releaseTag.pattern" property in nx.json to match the structure of your repository's git tags.`);
-                        }
+                    const groupCacheKey = `${releaseGroup.name}:fixed`;
+                    const fromSHA = await getCachedFromSHA(groupCacheKey, releaseGroup.releaseTag.pattern, {}, workspacePreid ?? projectsPreid?.[Object.keys(projectsPreid)[0]], releaseGroup.releaseTag.checkAllBranchesWhen, releaseGroup.releaseTag.requireSemver, releaseGroup.releaseTag.strictPreid);
+                    if (!fromSHA) {
+                        throw new Error(`Unable to determine the previous git tag. If this is the first release of your release group, 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.releaseTag.pattern" property in nx.json to match the structure of your repository's git tags.`);
+                    }
+                    if (args.verbose && useAutomaticFromRef && !args.from) {
+                        console.log(`Determined release group --from ref from the first commit in the workspace: ${fromSHA}`);
                     }
-                    // Make sure that the fromRef is actually resolvable
-                    const fromSHA = await (0, git_1.getCommitHash)(fromRef);
                     const { fileMap } = await (0, file_map_utils_1.createFileMapUsingProjectGraph)(projectGraph);
-                    const fileToProjectMap = createFileToProjectMap(fileMap.projectFileMap);
-                    changes = filterHiddenChanges((await getCommits(fromSHA, toSHA)).map((c) => ({
-                        type: c.type,
-                        scope: c.scope,
-                        description: c.description,
-                        body: c.body,
-                        isBreaking: c.isBreaking,
-                        githubReferences: c.references,
-                        authors: c.authors,
-                        shortHash: c.shortHash,
-                        revertedHashes: c.revertedHashes,
-                        affectedProjects: commitChangesNonProjectFiles(c, fileMap.nonProjectFiles)
-                            ? '*'
-                            : getProjectsAffectedByCommit(c, fileToProjectMap),
-                    })), nxReleaseConfig.conventionalCommits);
+                    const fileToProjectMap = (0, commit_utils_1.createFileToProjectMap)(fileMap.projectFileMap);
+                    const commits = await getCommits(fromSHA, toSHA);
+                    changes = (0, commit_utils_1.createChangesFromCommits)(commits, fileMap, fileToProjectMap, nxReleaseConfig.conventionalCommits);
                 }
                 const projectChangelogs = await generateChangelogForProjects({
                     tree,
@@ -948,17 +814,6 @@ async function filterProjectCommits({ fromSHA, toSHA, projectPath, }) {
     const allCommits = await getCommits(fromSHA, toSHA);
     return allCommits.filter((c) => c.affectedFiles.find((f) => f.startsWith(projectPath)));
 }
-function filterHiddenChanges(changes, conventionalCommitsConfig) {
-    return changes.filter((change) => {
-        const type = change.type;
-        const typeConfig = conventionalCommitsConfig.types[type];
-        if (!typeConfig) {
-            // don't include changes with unknown types
-            return false;
-        }
-        return !typeConfig.changelog.hidden;
-    });
-}
 async function promptForRemoteRelease() {
     try {
         const result = await (0, enquirer_1.prompt)([
@@ -977,40 +832,43 @@ async function promptForRemoteRelease() {
         return false;
     }
 }
-function getProjectsAffectedByCommit(commit, fileToProjectMap) {
-    const affectedProjects = new Set();
-    for (const file of commit.affectedFiles) {
-        affectedProjects.add(fileToProjectMap[file]);
+async function resolveWorkspaceChangelogChanges({ releaseGraph, nxReleaseConfig, args, workspacePreid, projectsPreid, useAutomaticFromRef, toSHA, fromSHA, }) {
+    // NOTE: If there are multiple release groups, we'll just skip the workspace changelog anyway.
+    const versionPlansEnabledForWorkspaceChangelog = releaseGraph.releaseGroups[0]?.resolvedVersionPlans;
+    // Derive changes from version plan files
+    if (versionPlansEnabledForWorkspaceChangelog) {
+        return resolveWorkspaceChangelogFromVersionPlans(releaseGraph);
     }
-    return Array.from(affectedProjects);
-}
-function commitChangesNonProjectFiles(commit, nonProjectFiles) {
-    return nonProjectFiles.some((fileData) => commit.affectedFiles.includes(fileData.file));
+    // Derive changes from commits
+    return resolveWorkspaceChangelogFromCommits({
+        nxReleaseConfig,
+        args,
+        workspacePreid,
+        projectsPreid,
+        useAutomaticFromRef,
+        toSHA,
+        fromSHA,
+    });
 }
-function createFileToProjectMap(projectFileMap) {
-    const fileToProjectMap = {};
-    for (const [projectName, projectFiles] of Object.entries(projectFileMap)) {
-        for (const file of projectFiles) {
-            fileToProjectMap[file.file] = projectName;
-        }
+function resolveWorkspaceChangelogFromVersionPlans(releaseGraph) {
+    const firstReleaseGroup = releaseGraph.releaseGroups[0];
+    // We only produce a workspace changelog in the case of a single, fixed relationship release group
+    if (releaseGraph.releaseGroups.length !== 1 ||
+        firstReleaseGroup?.projectsRelationship !== 'fixed') {
+        return [];
     }
-    return fileToProjectMap;
+    const versionPlans = firstReleaseGroup.resolvedVersionPlans;
+    return (0, version_plan_utils_2.createChangesFromGroupVersionPlans)(versionPlans);
 }
-function versionPlanSemverReleaseTypeToChangelogType(bump) {
-    switch (bump) {
-        case 'premajor':
-        case 'major':
-            return { type: 'feat', isBreaking: true };
-        case 'preminor':
-        case 'minor':
-            return { type: 'feat', isBreaking: false };
-        case 'prerelease':
-        case 'prepatch':
-        case 'patch':
-            return { type: 'fix', isBreaking: false };
-        default:
-            throw new Error(`Invalid semver bump type: ${bump}`);
+async function resolveWorkspaceChangelogFromCommits({ nxReleaseConfig, args, workspacePreid, projectsPreid, useAutomaticFromRef, toSHA, fromSHA, }) {
+    // Use the cached fromSHA if available, otherwise throw an error
+    if (!fromSHA) {
+        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.releaseTag.pattern" property in nx.json to match the structure of your repository's git tags.`);
     }
+    const workspaceChangelogFromSHA = fromSHA;
+    const commits = await getCommits(workspaceChangelogFromSHA, toSHA);
+    // For workspace changelog, all commits affect all projects
+    return (0, commit_utils_1.filterHiddenChanges)(commits.map((c) => (0, commit_utils_1.mapCommitToChange)(c, '*')), nxReleaseConfig.conventionalCommits);
 }
 function extractPreid(version) {
     if (!(0, shared_1.isPrerelease)(version)) {

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

@@ -41,6 +41,7 @@ export type ChangelogOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & Fi
     from?: string;
     interactive?: string;
     createRelease?: false | 'github' | 'gitlab';
+    resolveVersionPlans?: 'all' | 'using-from-and-to';
     replaceExistingContents?: boolean;
     releaseGraph?: ReleaseGraph;
 };

package/src/command-line/release/command-object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/command-object.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/command-object.ts"],"names":[],"mappings":"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"}

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

@@ -162,6 +162,12 @@ const changelogCommand = {
         type: 'boolean',
         description: 'Whether to overwrite the existing changelog contents instead of prepending to them.',
         default: false,
+    })
+        .option('resolve-version-plans', {
+        type: 'string',
+        description: 'How to resolve version plans for changelog generation, defaults to resolving all version plan files available on disk.',
+        choices: ['all', 'using-from-and-to'],
+        default: 'all',
     })
         .check((argv) => {
         if (!argv.version) {

package/src/command-line/release/utils/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/shared.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAK7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAqB,MAAM,OAAO,CAAC;AAErD,eAAO,MAAM,wBAAwB,QAEpC,CAAC;AAGF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,iBAAiB,EAAE;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,oBAAoB,EAAE,MAAM,CAAC;QAC7B,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED,qBAAa,cAAc;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;gBAEV,EACV,OAAO,EAAE,qEAAqE;IAC9E,iBAAiB,EAAE,8EAA8E;IACjG,WAAW,GACZ,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;CAQF;AAED,wBAAsB,aAAa,CAAC,EAClC,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,iBAAiB,EACjB,aAAa,GACd,EAAE;IACD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACnC,iBAsBA;AAED,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,oBAAoB,EAAE,EACrC,8BAA8B,EAAE,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtE,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,MAAM,GACpB,MAAM,EAAE,CA0GV;AAcD,wBAAgB,wCAAwC,CACtD,YAAY,EAAE,oBAAoB,GACjC,OAAO,GAAG,MAAM,CAElB;AAED,wBAAgB,wBAAwB,CACtC,aAAa,EAAE;IAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;CAAE,EAC1D,WAAW,EAAE,MAAM,GAClB,OAAO,CAOT;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,oBAAoB,EAAE,EACrC,8BAA8B,EAAE,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtE,WAAW,EAAE,WAAW,GACvB,MAAM,EAAE,CA6FV;AAeD,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAcnE;AAED,wBAAsB,4BAA4B,CAChD,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,SAAS,EAAE,EACpB,QAAQ,EAAE,MAAM,EAAE,GAEpB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAAC,CAwC5E"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/utils/shared.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAK7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAqB,MAAM,OAAO,CAAC;AAErD,eAAO,MAAM,wBAAwB,QAEpC,CAAC;AAGF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,iBAAiB,EAAE;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,oBAAoB,EAAE,MAAM,CAAC;QAC7B,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED,qBAAa,cAAc;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;gBAEV,EACV,OAAO,EAAE,qEAAqE;IAC9E,iBAAiB,EAAE,8EAA8E;IACjG,WAAW,GACZ,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;CAQF;AAED,wBAAsB,aAAa,CAAC,EAClC,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,iBAAiB,EACjB,aAAa,GACd,EAAE;IACD,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACnC,iBAsBA;AAED,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,oBAAoB,EAAE,EACrC,8BAA8B,EAAE,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtE,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,MAAM,GACpB,MAAM,EAAE,CA0GV;AAcD,wBAAgB,wCAAwC,CACtD,YAAY,EAAE,oBAAoB,GACjC,OAAO,GAAG,MAAM,CAElB;AAED,wBAAgB,wBAAwB,CACtC,aAAa,EAAE;IAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;CAAE,EAC1D,WAAW,EAAE,MAAM,GAClB,OAAO,CAOT;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,oBAAoB,EAAE,EACrC,8BAA8B,EAAE,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EACtE,WAAW,EAAE,WAAW,GACvB,MAAM,EAAE,CA6FV;AAeD,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAcnE;AAED,wBAAsB,4BAA4B,CAChD,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,SAAS,EAAE,EACpB,QAAQ,EAAE,MAAM,EAAE,GAEpB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAAC,CAwC5E"}

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

@@ -11,10 +11,10 @@ exports.handleDuplicateGitTags = handleDuplicateGitTags;
 exports.getCommitsRelevantToProjects = getCommitsRelevantToProjects;
 const chalk = require("chalk");
 const semver_1 = require("semver");
-const utils_1 = require("../../../tasks-runner/utils");
-const output_1 = require("../../../utils/output");
 const affected_project_graph_1 = require("../../../project-graph/affected/affected-project-graph");
 const file_utils_1 = require("../../../project-graph/file-utils");
+const utils_1 = require("../../../tasks-runner/utils");
+const output_1 = require("../../../utils/output");
 const git_1 = require("./git");
 exports.noDiffInChangelogMessage = chalk.yellow(`NOTE: There was no diff detected for the changelog entry. Maybe you intended to pass alternative git references via --from and --to?`);
 function isPrerelease(version) {