nx 19.6.4 → 19.6.5

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

@@ -81,7 +81,7 @@ function createAPI(overrideReleaseConfig) {
             process.exit(1);
         }
         const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
-        (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes));
+        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
         if (args.deleteVersionPlans === undefined) {
             // default to deleting version plans in this command instead of after versioning
             args.deleteVersionPlans = true;
@@ -146,6 +146,15 @@ function createAPI(overrideReleaseConfig) {
                     workspaceChangelogChanges = versionPlans
                         .flatMap((vp) => {
                         const releaseType = versionPlanSemverReleaseTypeToChangelogType(vp.groupVersionBump);
+                        let githubReferences = [];
+                        let author = undefined;
+                        const parsedCommit = vp.commit
+                            ? (0, git_1.parseGitCommit)(vp.commit, true)
+                            : null;
+                        if (parsedCommit) {
+                            githubReferences = parsedCommit.references;
+                            author = parsedCommit.author;
+                        }
                         const changes = !vp.triggeredByProjects
                             ? {
                                 type: releaseType.type,
@@ -153,7 +162,8 @@ function createAPI(overrideReleaseConfig) {
                                 description: vp.message,
                                 body: '',
                                 isBreaking: releaseType.isBreaking,
-                                githubReferences: [],
+                                githubReferences,
+                                author,
                                 affectedProjects: '*',
                             }
                             : vp.triggeredByProjects.map((project) => {
@@ -162,9 +172,9 @@ function createAPI(overrideReleaseConfig) {
                                     scope: project,
                                     description: vp.message,
                                     body: '',
-                                    // TODO: what about github references?
                                     isBreaking: releaseType.isBreaking,
-                                    githubReferences: [],
+                                    githubReferences,
+                                    author,
                                     affectedProjects: [project],
                                 };
                             });
@@ -301,6 +311,15 @@ function createAPI(overrideReleaseConfig) {
                                 return null;
                             }
                             const releaseType = versionPlanSemverReleaseTypeToChangelogType(bumpForProject);
+                            let githubReferences = [];
+                            let author = undefined;
+                            const parsedCommit = vp.commit
+                                ? (0, git_1.parseGitCommit)(vp.commit, true)
+                                : null;
+                            if (parsedCommit) {
+                                githubReferences = parsedCommit.references;
+                                author = parsedCommit.author;
+                            }
                             return {
                                 type: releaseType.type,
                                 scope: project.name,
@@ -308,8 +327,8 @@ function createAPI(overrideReleaseConfig) {
                                 body: '',
                                 isBreaking: releaseType.isBreaking,
                                 affectedProjects: Object.keys(vp.projectVersionBumps),
-                                // TODO: can we include github references when using version plans?
-                                githubReferences: [],
+                                githubReferences,
+                                author,
                             };
                         })
                             .filter(Boolean);
@@ -397,6 +416,15 @@ function createAPI(overrideReleaseConfig) {
                     changes = releaseGroup.resolvedVersionPlans
                         .flatMap((vp) => {
                         const releaseType = versionPlanSemverReleaseTypeToChangelogType(vp.groupVersionBump);
+                        let githubReferences = [];
+                        let author = undefined;
+                        const parsedCommit = vp.commit
+                            ? (0, git_1.parseGitCommit)(vp.commit, true)
+                            : null;
+                        if (parsedCommit) {
+                            githubReferences = parsedCommit.references;
+                            author = parsedCommit.author;
+                        }
                         const changes = !vp.triggeredByProjects
                             ? {
                                 type: releaseType.type,
@@ -404,7 +432,8 @@ function createAPI(overrideReleaseConfig) {
                                 description: vp.message,
                                 body: '',
                                 isBreaking: releaseType.isBreaking,
-                                githubReferences: [],
+                                githubReferences,
+                                author,
                                 affectedProjects: '*',
                             }
                             : vp.triggeredByProjects.map((project) => {
@@ -413,9 +442,9 @@ function createAPI(overrideReleaseConfig) {
                                     scope: project,
                                     description: vp.message,
                                     body: '',
-                                    // TODO: what about github references?
                                     isBreaking: releaseType.isBreaking,
-                                    githubReferences: [],
+                                    githubReferences,
+                                    author,
                                     affectedProjects: [project],
                                 };
                             });
@@ -584,7 +613,17 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
         releaseGroups.forEach((group) => {
             if (group.resolvedVersionPlans) {
                 group.resolvedVersionPlans.forEach((plan) => {
-                    (0, fs_extra_1.removeSync)(plan.absolutePath);
+                    if (!args.dryRun) {
+                        (0, fs_extra_1.removeSync)(plan.absolutePath);
+                        if (args.verbose) {
+                            console.log(`Removing ${plan.relativePath}`);
+                        }
+                    }
+                    else {
+                        if (args.verbose) {
+                            console.log(`Would remove ${plan.relativePath}, but --dry-run was set`);
+                        }
+                    }
                     planFiles.add(plan.relativePath);
                 });
             }
@@ -801,7 +840,9 @@ async function generateChangelogForProjects({ tree, args, projectGraph, changes,
                 })
                 : false,
             changelogRenderOptions: config.renderOptions,
-            conventionalCommitsConfig: nxReleaseConfig.conventionalCommits,
+            conventionalCommitsConfig: releaseGroup.versionPlans
+                ? null
+                : nxReleaseConfig.conventionalCommits,
             dependencyBumps: projectToAdditionalDependencyBumps.get(project.name),
         });
         /**

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

@@ -44,6 +44,7 @@ export type PublishOptions = NxReleaseArgs & Partial<RunManyOptions> & {
 export type PlanOptions = NxReleaseArgs & {
     bump?: string;
     message?: string;
+    onlyTouched?: boolean;
 };
 export type PlanCheckOptions = BaseNxReleaseArgs & {
     base?: string;

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

@@ -207,7 +207,7 @@ const planCommand = {
     // Create a plan to pick a new version and generate a changelog entry.
     // Hidden for now until the feature is more stable
     describe: false,
-    builder: (yargs) => yargs
+    builder: (yargs) => (0, shared_options_1.withAffectedOptions)(yargs)
         .positional('bump', {
         type: 'string',
         describe: 'Semver keyword to use for the selected release group.',
@@ -225,6 +225,11 @@ const planCommand = {
         type: 'string',
         alias: 'm',
         describe: 'Custom message to use for the changelog entry',
+    })
+        .option('onlyTouched', {
+        type: 'boolean',
+        describe: 'Only include projects that have been affected by the current changes',
+        default: true,
     }),
     handler: async (args) => {
         const release = await Promise.resolve().then(() => require('./plan'));

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

@@ -1,4 +1,5 @@
 import { ReleaseType } from 'semver';
+import { RawGitCommit } from '../utils/git';
 import { ReleaseGroupWithName } from './filter-release-groups';
 export interface VersionPlanFile {
     absolutePath: string;
@@ -12,9 +13,21 @@ export interface RawVersionPlan extends VersionPlanFile {
 }
 export interface VersionPlan extends VersionPlanFile {
     message: string;
+    /**
+     * The commit that added the version plan file, will be null if the file was never committed.
+     * For optimal performance, we don't apply it at the time of reading the raw contents, because
+     * it hasn't yet passed further validation at that point.
+     */
+    commit: RawGitCommit | null;
 }
 export interface GroupVersionPlan extends VersionPlan {
     groupVersionBump: ReleaseType;
+    /**
+     * The commit that added the version plan file, will be null if the file was never committed.
+     * For optimal performance, we don't apply it at the time of reading the raw contents, because.
+     * it hasn't yet passed validation.
+     */
+    commit: RawGitCommit | null;
     /**
      * Will not be set if the group name was the trigger, otherwise will be a list of
      * all the individual project names explicitly found in the version plan file.
@@ -25,5 +38,5 @@ export interface ProjectsVersionPlan extends VersionPlan {
     projectVersionBumps: Record<string, ReleaseType>;
 }
 export declare function readRawVersionPlans(): Promise<RawVersionPlan[]>;
-export declare function setResolvedVersionPlansOnGroups(rawVersionPlans: RawVersionPlan[], releaseGroups: ReleaseGroupWithName[], allProjectNamesInWorkspace: string[]): ReleaseGroupWithName[];
+export declare function setResolvedVersionPlansOnGroups(rawVersionPlans: RawVersionPlan[], releaseGroups: ReleaseGroupWithName[], allProjectNamesInWorkspace: string[], isVerbose: boolean): Promise<ReleaseGroupWithName[]>;
 export declare function getVersionPlansAbsolutePath(): string;

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

@@ -5,6 +5,7 @@ exports.setResolvedVersionPlansOnGroups = setResolvedVersionPlansOnGroups;
 exports.getVersionPlansAbsolutePath = getVersionPlansAbsolutePath;
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
+const node_child_process_1 = require("node:child_process");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const workspace_root_1 = require("../../../utils/workspace-root");
@@ -35,7 +36,7 @@ async function readRawVersionPlans() {
     }
     return versionPlans;
 }
-function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNamesInWorkspace) {
+async function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProjectNamesInWorkspace, isVerbose) {
     const groupsByName = releaseGroups.reduce((acc, group) => acc.set(group.name, group), new Map());
     const isDefaultGroup = isDefault(releaseGroups);
     for (const rawVersionPlan of rawVersionPlans) {
@@ -88,6 +89,7 @@ function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProj
                         createdOnMs: rawVersionPlan.createdOnMs,
                         message: rawVersionPlan.message,
                         groupVersionBump: value,
+                        commit: await getCommitForVersionPlanFile(rawVersionPlan, isVerbose),
                     });
                 }
             }
@@ -130,6 +132,7 @@ function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProj
                             projectVersionBumps: {
                                 [key]: value,
                             },
+                            commit: await getCommitForVersionPlanFile(rawVersionPlan, isVerbose),
                         });
                     }
                 }
@@ -161,6 +164,7 @@ function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, allProj
                             // but we track the projects that triggered the version bump so that we can accurately produce changelog entries.
                             groupVersionBump: value,
                             triggeredByProjects: [key],
+                            commit: await getCommitForVersionPlanFile(rawVersionPlan, isVerbose),
                         });
                     }
                 }
@@ -185,3 +189,31 @@ function getVersionPlansAbsolutePath() {
 function isReleaseType(value) {
     return semver_1.RELEASE_TYPES.includes(value);
 }
+async function getCommitForVersionPlanFile(rawVersionPlan, isVerbose) {
+    return new Promise((resolve) => {
+        (0, node_child_process_1.exec)(`git log --diff-filter=A --pretty=format:"%s|%h|%an|%ae|%b" -n 1 -- ${rawVersionPlan.absolutePath}`, (error, stdout, stderr) => {
+            if (error) {
+                if (isVerbose) {
+                    console.error(`Error executing git command for ${rawVersionPlan.relativePath}: ${error.message}`);
+                }
+                return resolve(null);
+            }
+            if (stderr) {
+                if (isVerbose) {
+                    console.error(`Git command stderr for ${rawVersionPlan.relativePath}: ${stderr}`);
+                }
+                return resolve(null);
+            }
+            const [message, shortHash, authorName, authorEmail, ...body] = stdout
+                .trim()
+                .split('|');
+            const commitDetails = {
+                message: message || '',
+                shortHash: shortHash || '',
+                author: { name: authorName || '', email: authorEmail || '' },
+                body: body.join('|') || '', // Handle case where body might be empty or contain multiple '|'
+            };
+            return resolve(commitDetails);
+        });
+    });
+}

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

@@ -3,19 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.releasePlanCheckCLIHandler = void 0;
 exports.createAPI = createAPI;
 const nx_json_1 = require("../../config/nx-json");
-const workspace_projects_1 = require("../../project-graph/affected/locators/workspace-projects");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
-const file_utils_1 = require("../../project-graph/file-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const all_file_data_1 = require("../../utils/all-file-data");
 const command_line_utils_1 = require("../../utils/command-line-utils");
-const ignore_1 = require("../../utils/ignore");
 const output_1 = require("../../utils/output");
 const params_1 = require("../../utils/params");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
 const version_plans_1 = require("./config/version-plans");
+const get_touched_projects_for_group_1 = require("./utils/get-touched-projects-for-group");
 const print_config_1 = require("./utils/print-config");
 const releasePlanCheckCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releasePlanCheckCLIHandler = releasePlanCheckCLIHandler;
@@ -37,7 +35,8 @@ function createAPI(overrideReleaseConfig) {
                 isDebug: args.printConfig === 'debug',
             });
         }
-        const { error: filterError, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, args.projects, args.groups);
+        // No filtering is applied here, as we want to consider all release groups for plan:check
+        const { error: filterError, releaseGroups } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig);
         if (filterError) {
             output_1.output.error(filterError);
             process.exit(1);
@@ -54,7 +53,7 @@ function createAPI(overrideReleaseConfig) {
             return 1;
         }
         const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
-        (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes));
+        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
         // Resolve the final values for base, head etc to use when resolving the changes to consider
         const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', {
             printWarnings: args.verbose,
@@ -74,11 +73,7 @@ function createAPI(overrideReleaseConfig) {
             }
         }
         const resolvedAllFileData = await (0, all_file_data_1.allFileData)();
-        /**
-         * Create a minimal subset of touched projects based on the configured ignore patterns, we only need
-         * to recompute when the ignorePatternsForPlanCheck differs between release groups.
-         */
-        const serializedIgnorePatternsToTouchedProjects = new Map();
+        const getTouchedProjectsForGroup = (0, get_touched_projects_for_group_1.createGetTouchedProjectsForGroup)(nxArgs, projectGraph, changedFiles, resolvedAllFileData);
         const NOTE_ABOUT_VERBOSE_LOGGING = 'Run with --verbose to see the full list of changed files used for the touched projects logic.';
         let hasErrors = false;
         for (const releaseGroup of releaseGroups) {
@@ -100,57 +95,9 @@ function createAPI(overrideReleaseConfig) {
                 });
                 continue;
             }
-            // Exclude patterns from .nxignore, .gitignore and explicit version plan config
-            let serializedIgnorePatterns = '[]';
-            const ignore = (0, ignore_1.getIgnoreObject)();
-            if (typeof releaseGroup.versionPlans !== 'boolean' &&
-                Array.isArray(releaseGroup.versionPlans.ignorePatternsForPlanCheck) &&
-                releaseGroup.versionPlans.ignorePatternsForPlanCheck.length) {
-                output_1.output.note({
-                    title: `Applying configured ignore patterns to changed files${releaseGroup.name !== config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
-                        ? ` for release group "${releaseGroup.name}"`
-                        : ''}`,
-                    bodyLines: [
-                        ...releaseGroup.versionPlans.ignorePatternsForPlanCheck.map((pattern) => `  - ${pattern}`),
-                    ],
-                });
-                ignore.add(releaseGroup.versionPlans.ignorePatternsForPlanCheck);
-                serializedIgnorePatterns = JSON.stringify(releaseGroup.versionPlans.ignorePatternsForPlanCheck);
-            }
-            let touchedProjects = {};
-            if (serializedIgnorePatternsToTouchedProjects.has(serializedIgnorePatterns)) {
-                touchedProjects = serializedIgnorePatternsToTouchedProjects.get(serializedIgnorePatterns);
-            }
-            else {
-                // We only care about directly touched projects, not implicitly affected ones etc
-                const touchedProjectsArr = await (0, workspace_projects_1.getTouchedProjects)((0, file_utils_1.calculateFileChanges)(changedFiles, resolvedAllFileData, nxArgs, undefined, ignore), projectGraph.nodes);
-                touchedProjects = touchedProjectsArr.reduce((acc, project) => ({ ...acc, [project]: true }), {});
-                serializedIgnorePatternsToTouchedProjects.set(serializedIgnorePatterns, touchedProjects);
-            }
-            const touchedProjectsUnderReleaseGroup = releaseGroup.projects.filter((project) => touchedProjects[project]);
-            if (touchedProjectsUnderReleaseGroup.length) {
-                output_1.output.log({
-                    title: `Touched projects based on changed files${releaseGroup.name !== config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
-                        ? ` under release group "${releaseGroup.name}"`
-                        : ''}`,
-                    bodyLines: [
-                        ...touchedProjectsUnderReleaseGroup.map((project) => `  - ${project}`),
-                        '',
-                        'NOTE: You can adjust your "versionPlans.ignorePatternsForPlanCheck" config to stop certain files from resulting in projects being classed as touched for the purposes of this command.',
-                    ],
-                });
-            }
-            else {
-                output_1.output.log({
-                    title: `No touched projects found based on changed files${typeof releaseGroup.versionPlans !== 'boolean' &&
-                        Array.isArray(releaseGroup.versionPlans.ignorePatternsForPlanCheck) &&
-                        releaseGroup.versionPlans.ignorePatternsForPlanCheck.length
-                        ? ' combined with configured ignore patterns'
-                        : ''}${releaseGroup.name !== config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
-                        ? ` under release group "${releaseGroup.name}"`
-                        : ''}`,
-                });
-            }
+            const touchedProjectsUnderReleaseGroup = await getTouchedProjectsForGroup(releaseGroup, 
+            // We do not take any --projects or --groups filtering into account for plan:check
+            releaseGroup.projects, false);
             const projectsInResolvedVersionPlans = resolvedVersionPlans.reduce((acc, plan) => {
                 if ('projectVersionBumps' in plan) {
                     for (const project in plan.projectVersionBumps) {

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

@@ -10,6 +10,8 @@ const tmp_1 = require("tmp");
 const nx_json_1 = require("../../config/nx-json");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
+const all_file_data_1 = require("../../utils/all-file-data");
+const command_line_utils_1 = require("../../utils/command-line-utils");
 const output_1 = require("../../utils/output");
 const params_1 = require("../../utils/params");
 const config_1 = require("./config/config");
@@ -17,6 +19,7 @@ const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
 const version_plans_1 = require("./config/version-plans");
 const generate_version_plan_content_1 = require("./utils/generate-version-plan-content");
+const get_touched_projects_for_group_1 = require("./utils/get-touched-projects-for-group");
 const launch_editor_1 = require("./utils/launch-editor");
 const print_changes_1 = require("./utils/print-changes");
 const print_config_1 = require("./utils/print-config");
@@ -45,64 +48,155 @@ function createAPI(overrideReleaseConfig) {
             output_1.output.error(filterError);
             process.exit(1);
         }
+        // If no release groups have version plans enabled, it doesn't make sense to use the plan command only to set yourself up for an error at release time
+        if (!releaseGroups.some((group) => group.versionPlans === true)) {
+            if (releaseGroups.length === 1) {
+                output_1.output.warn({
+                    title: `Version plans are not enabled in your release configuration`,
+                    bodyLines: [
+                        'To enable version plans, set `"versionPlans": true` at the top level of your `"release"` configuration',
+                    ],
+                });
+                return 0;
+            }
+            output_1.output.warn({
+                title: 'No release groups have version plans enabled',
+                bodyLines: [
+                    'To enable version plans, set `"versionPlans": true` at the top level of your `"release"` configuration to apply it to all groups, otherwise set it at the release group level',
+                ],
+            });
+            return 0;
+        }
+        // Resolve the final values for base, head etc to use when resolving the changes to consider
+        const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', {
+            printWarnings: args.verbose,
+        }, nxJson);
         const versionPlanBumps = {};
         const setBumpIfNotNone = (projectOrGroup, version) => {
             if (version !== 'none') {
                 versionPlanBumps[projectOrGroup] = version;
             }
         };
-        if (releaseGroups[0].name === config_1.IMPLICIT_DEFAULT_RELEASE_GROUP) {
-            const group = releaseGroups[0];
-            if (group.projectsRelationship === 'independent') {
-                for (const project of group.projects) {
-                    setBumpIfNotNone(project, args.bump ||
-                        (await promptForVersion(`How do you want to bump the version of the project "${project}"?`)));
+        // Changed files are only relevant if considering touched projects
+        let changedFiles = [];
+        let getProjectsToVersionForGroup;
+        if (args.onlyTouched) {
+            changedFiles = (0, command_line_utils_1.parseFiles)(nxArgs).files;
+            if (nxArgs.verbose) {
+                if (changedFiles.length) {
+                    output_1.output.log({
+                        title: `Changed files based on resolved "base" (${nxArgs.base}) and "head" (${nxArgs.head ?? 'HEAD'})`,
+                        bodyLines: changedFiles.map((file) => `  - ${file}`),
+                    });
+                }
+                else {
+                    output_1.output.warn({
+                        title: 'No changed files found based on resolved "base" and "head"',
+                    });
                 }
             }
-            else {
-                // TODO: use project names instead of the implicit default release group name? (though this might be confusing, as users might think they can just delete one of the project bumps to change the behavior to independent versioning)
-                setBumpIfNotNone(group.name, args.bump ||
-                    (await promptForVersion(`How do you want to bump the versions of all projects?`)));
-            }
+            const resolvedAllFileData = await (0, all_file_data_1.allFileData)();
+            getProjectsToVersionForGroup = (0, get_touched_projects_for_group_1.createGetTouchedProjectsForGroup)(nxArgs, projectGraph, changedFiles, resolvedAllFileData);
         }
-        else {
-            for (const group of releaseGroups) {
-                if (group.projectsRelationship === 'independent') {
-                    for (const project of releaseGroupToFilteredProjects.get(group)) {
+        if (args.projects?.length) {
+            /**
+             * Run plan for all remaining release groups and filtered projects within them
+             */
+            for (const releaseGroup of releaseGroups) {
+                const releaseGroupName = releaseGroup.name;
+                const releaseGroupProjectNames = Array.from(releaseGroupToFilteredProjects.get(releaseGroup));
+                let applicableProjects = releaseGroupProjectNames;
+                if (args.onlyTouched &&
+                    typeof getProjectsToVersionForGroup === 'function') {
+                    applicableProjects = await getProjectsToVersionForGroup(releaseGroup, releaseGroupProjectNames, true);
+                }
+                if (!applicableProjects.length) {
+                    continue;
+                }
+                if (releaseGroup.projectsRelationship === 'independent') {
+                    for (const project of applicableProjects) {
                         setBumpIfNotNone(project, args.bump ||
-                            (await promptForVersion(`How do you want to bump the version of the project "${project}" within group "${group.name}"?`)));
+                            (await promptForVersion(`How do you want to bump the version of the project "${project}"${releaseGroupName === config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
+                                ? ''
+                                : ` within group "${releaseGroupName}"`}?`)));
                     }
                 }
                 else {
-                    setBumpIfNotNone(group.name, args.bump ||
-                        (await promptForVersion(`How do you want to bump the versions of the projects in the group "${group.name}"?`)));
+                    setBumpIfNotNone(releaseGroupName, args.bump ||
+                        (await promptForVersion(`How do you want to bump the versions of ${releaseGroupName === config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
+                            ? 'all projects'
+                            : `the projects in the group "${releaseGroupName}"`}?`)));
                 }
             }
-        }
-        if (!Object.keys(versionPlanBumps).length) {
-            output_1.output.warn({
-                title: 'No version bumps were selected so no version plan file was created.',
-            });
+            // Create a version plan file if applicable
+            await createVersionPlanFileForBumps(args, versionPlanBumps);
             return 0;
         }
-        const versionPlanName = `version-plan-${new Date().getTime()}`;
-        const versionPlanMessage = args.message || (await promptForMessage(versionPlanName));
-        const versionPlanFileContent = (0, generate_version_plan_content_1.generateVersionPlanContent)(versionPlanBumps, versionPlanMessage);
-        const versionPlanFileName = `${versionPlanName}.md`;
-        if (args.dryRun) {
-            output_1.output.logSingleLine(`Would create version plan file "${versionPlanFileName}", but --dry-run was set.`);
-            (0, print_changes_1.printDiff)('', versionPlanFileContent, 1);
-        }
-        else {
-            output_1.output.logSingleLine(`Creating version plan file "${versionPlanFileName}"`);
-            (0, print_changes_1.printDiff)('', versionPlanFileContent, 1);
-            const versionPlansAbsolutePath = (0, version_plans_1.getVersionPlansAbsolutePath)();
-            await (0, fs_extra_1.ensureDir)(versionPlansAbsolutePath);
-            await (0, fs_extra_1.writeFile)((0, node_path_1.join)(versionPlansAbsolutePath, versionPlanFileName), versionPlanFileContent);
+        /**
+         * Run plan for all remaining release groups
+         */
+        for (const releaseGroup of releaseGroups) {
+            const releaseGroupName = releaseGroup.name;
+            let applicableProjects = releaseGroup.projects;
+            if (args.onlyTouched &&
+                typeof getProjectsToVersionForGroup === 'function') {
+                applicableProjects = await getProjectsToVersionForGroup(releaseGroup, releaseGroup.projects, false);
+            }
+            if (!applicableProjects.length) {
+                continue;
+            }
+            if (releaseGroup.projectsRelationship === 'independent') {
+                for (const project of applicableProjects) {
+                    setBumpIfNotNone(project, args.bump ||
+                        (await promptForVersion(`How do you want to bump the version of the project "${project}"${releaseGroupName === config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
+                            ? ''
+                            : ` within group "${releaseGroupName}"`}?`)));
+                }
+            }
+            else {
+                setBumpIfNotNone(releaseGroupName, args.bump ||
+                    (await promptForVersion(`How do you want to bump the versions of ${releaseGroupName === config_1.IMPLICIT_DEFAULT_RELEASE_GROUP
+                        ? 'all projects'
+                        : `the projects in the group "${releaseGroupName}"`}?`)));
+            }
         }
+        // Create a version plan file if applicable
+        await createVersionPlanFileForBumps(args, versionPlanBumps);
         return 0;
     };
 }
+async function createVersionPlanFileForBumps(args, versionPlanBumps) {
+    if (!Object.keys(versionPlanBumps).length) {
+        let bodyLines = [];
+        if (args.onlyTouched) {
+            bodyLines = [
+                'This might be because no projects have been changed, or projects you expected to release have not been touched',
+                'To include all projects, not just those that have been changed, pass --only-touched=false',
+                'Alternatively, you can specify alternate --base and --head refs to include only changes from certain commits',
+            ];
+        }
+        output_1.output.warn({
+            title: 'No version bumps were selected so no version plan file was created.',
+            bodyLines,
+        });
+        return 0;
+    }
+    const versionPlanName = `version-plan-${new Date().getTime()}`;
+    const versionPlanMessage = args.message || (await promptForMessage(versionPlanName));
+    const versionPlanFileContent = (0, generate_version_plan_content_1.generateVersionPlanContent)(versionPlanBumps, versionPlanMessage);
+    const versionPlanFileName = `${versionPlanName}.md`;
+    if (args.dryRun) {
+        output_1.output.logSingleLine(`Would create version plan file "${versionPlanFileName}", but --dry-run was set.`);
+        (0, print_changes_1.printDiff)('', versionPlanFileContent, 1);
+    }
+    else {
+        output_1.output.logSingleLine(`Creating version plan file "${versionPlanFileName}"`);
+        (0, print_changes_1.printDiff)('', versionPlanFileContent, 1);
+        const versionPlansAbsolutePath = (0, version_plans_1.getVersionPlansAbsolutePath)();
+        await (0, fs_extra_1.ensureDir)(versionPlansAbsolutePath);
+        await (0, fs_extra_1.writeFile)((0, node_path_1.join)(versionPlansAbsolutePath, versionPlanFileName), versionPlanFileContent);
+    }
+}
 async function promptForVersion(message) {
     try {
         const reply = await (0, enquirer_1.prompt)([

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

@@ -94,7 +94,7 @@ function createAPI(overrideReleaseConfig) {
             output_1.output.error(filterError);
             process.exit(1);
         }
-        (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes));
+        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
         const planFiles = new Set();
         releaseGroups.forEach((group) => {
             if (group.resolvedVersionPlans) {

package/src/command-line/release/utils/get-touched-projects-for-group.d.ts

@@ -0,0 +1,7 @@
+import { FileData, ProjectGraph } from '../../../config/project-graph';
+import { NxArgs } from '../../../utils/command-line-utils';
+import { ReleaseGroupWithName } from '../config/filter-release-groups';
+/**
+ * Create a function that returns the touched projects for a given release group. Only relevant when version plans are enabled.
+ */
+export declare function createGetTouchedProjectsForGroup(nxArgs: NxArgs, projectGraph: ProjectGraph, changedFiles: string[], fileData: FileData[]): (releaseGroup: ReleaseGroupWithName, releaseGroupFilteredProjectNames: string[], hasProjectsFilter: boolean) => Promise<string[]>;