nx 19.2.0-canary.20240604-0594deb → 19.2.0-rc.0

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

@@ -0,0 +1,184 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.releasePlan = exports.releasePlanCLIHandler = void 0;
+const enquirer_1 = require("enquirer");
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const semver_1 = require("semver");
+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 output_1 = require("../../utils/output");
+const params_1 = require("../../utils/params");
+const config_1 = require("./config/config");
+const filter_release_groups_1 = require("./config/filter-release-groups");
+const version_plans_1 = require("./config/version-plans");
+const git_1 = require("./utils/git");
+const print_changes_1 = require("./utils/print-changes");
+const releasePlanCLIHandler = (args) => (0, params_1.handleErrors)(args.verbose, () => releasePlan(args));
+exports.releasePlanCLIHandler = releasePlanCLIHandler;
+async function releasePlan(args) {
+    const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
+    const nxJson = (0, nx_json_1.readNxJson)();
+    if (args.verbose) {
+        process.env.NX_VERBOSE_LOGGING = 'true';
+    }
+    // Apply default configuration to any optional user configuration
+    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) {
+        output_1.output.error(filterError);
+        process.exit(1);
+    }
+    const versionPlanBumps = {};
+    const setBumpIfNotNone = (projectOrGroup, version) => {
+        if (version !== 'none') {
+            versionPlanBumps[projectOrGroup] = version;
+        }
+    };
+    if (args.message) {
+        const message = (0, git_1.parseConventionalCommitsMessage)(args.message);
+        if (!message) {
+            output_1.output.error({
+                title: 'Changelog message is not in conventional commits format.',
+                bodyLines: [
+                    'Please ensure your message is in the form of:',
+                    '  type(optional scope): description',
+                    '',
+                    'For example:',
+                    '  feat(pkg-b): add new feature',
+                    '  fix(pkg-a): correct a bug',
+                    '  chore: update build process',
+                    '  fix(core)!: breaking change in core package',
+                ],
+            });
+            process.exit(1);
+        }
+    }
+    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}"?`)));
+            }
+        }
+        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?`)));
+        }
+    }
+    else {
+        for (const group of releaseGroups) {
+            if (group.projectsRelationship === 'independent') {
+                for (const project of releaseGroupToFilteredProjects.get(group)) {
+                    setBumpIfNotNone(project, args.bump ||
+                        (await promptForVersion(`How do you want to bump the version of the project "${project}" within group "${group.name}"?`)));
+                }
+            }
+            else {
+                setBumpIfNotNone(group.name, args.bump ||
+                    (await promptForVersion(`How do you want to bump the versions of the projects in the group "${group.name}"?`)));
+            }
+        }
+    }
+    if (!Object.keys(versionPlanBumps).length) {
+        output_1.output.warn({
+            title: 'No version bumps were selected so no version plan file was created.',
+        });
+        return 0;
+    }
+    const versionPlanMessage = args.message || (await promptForMessage());
+    const versionPlanFileContent = getVersionPlanFileContent(versionPlanBumps, versionPlanMessage);
+    const versionPlanFileName = `version-plan-${new Date().getTime()}.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, path_1.join)(versionPlansAbsolutePath, versionPlanFileName), versionPlanFileContent);
+    }
+    return 0;
+}
+exports.releasePlan = releasePlan;
+async function promptForVersion(message) {
+    try {
+        const reply = await (0, enquirer_1.prompt)([
+            {
+                name: 'version',
+                message,
+                type: 'select',
+                choices: [...semver_1.RELEASE_TYPES, 'none'],
+            },
+        ]);
+        return reply.version;
+    }
+    catch (e) {
+        output_1.output.log({
+            title: 'Cancelled version plan creation.',
+        });
+        process.exit(0);
+    }
+}
+async function promptForMessage() {
+    let message;
+    do {
+        message = await _promptForMessage();
+    } while (!message);
+    return message;
+}
+// TODO: support non-conventional commits messages (will require significant changelog renderer changes)
+async function _promptForMessage() {
+    try {
+        const reply = await (0, enquirer_1.prompt)([
+            {
+                name: 'message',
+                message: 'What changelog message would you like associated with this change?',
+                type: 'input',
+            },
+        ]);
+        const conventionalCommitsMessage = (0, git_1.parseConventionalCommitsMessage)(reply.message);
+        if (!conventionalCommitsMessage) {
+            output_1.output.warn({
+                title: 'Changelog message is not in conventional commits format.',
+                bodyLines: [
+                    'Please ensure your message is in the form of:',
+                    '  type(optional scope): description',
+                    '',
+                    'For example:',
+                    '  feat(pkg-b): add new feature',
+                    '  fix(pkg-a): correct a bug',
+                    '  chore: update build process',
+                    '  fix(core)!: breaking change in core package',
+                ],
+            });
+            return null;
+        }
+        return reply.message;
+    }
+    catch (e) {
+        output_1.output.log({
+            title: 'Cancelled version plan creation.',
+        });
+        process.exit(0);
+    }
+}
+function getVersionPlanFileContent(bumps, message) {
+    return `---
+${Object.entries(bumps)
+        .filter(([_, version]) => version !== 'none')
+        .map(([projectOrGroup, version]) => `${projectOrGroup}: ${version}`)
+        .join('\n')}
+---
+
+${message}
+`;
+}

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

@@ -1,5 +1,5 @@
 import { PublishOptions } from './command-object';
-export declare const releasePublishCLIHandler: (args: PublishOptions) => Promise<any>;
+export declare const releasePublishCLIHandler: (args: PublishOptions) => Promise<number>;
 /**
  * NOTE: This function is also exported for programmatic usage and forms part of the public API
  * of Nx. We intentionally do not wrap the implementation with handleErrors because users need

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

@@ -1,4 +1,4 @@
 import { ReleaseOptions, VersionOptions } from './command-object';
 import { NxReleaseVersionResult } from './version';
-export declare const releaseCLIHandler: (args: VersionOptions) => Promise<any>;
+export declare const releaseCLIHandler: (args: VersionOptions) => Promise<number>;
 export declare function release(args: ReleaseOptions): Promise<NxReleaseVersionResult | number>;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.release = exports.releaseCLIHandler = void 0;
 const enquirer_1 = require("enquirer");
+const fs_extra_1 = require("fs-extra");
 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");
@@ -10,6 +11,7 @@ const params_1 = require("../../utils/params");
 const changelog_1 = require("./changelog");
 const config_1 = require("./config/config");
 const filter_release_groups_1 = require("./config/filter-release-groups");
+const version_plans_1 = require("./config/version-plans");
 const publish_1 = require("./publish");
 const git_1 = require("./utils/git");
 const github_1 = require("./utils/github");
@@ -52,6 +54,7 @@ async function release(args) {
         stageChanges: shouldStage,
         gitCommit: false,
         gitTag: false,
+        deleteVersionPlans: false,
     });
     const changelogResult = await (0, changelog_1.releaseChangelog)({
         ...args,
@@ -61,12 +64,49 @@ async function release(args) {
         gitCommit: false,
         gitTag: false,
         createRelease: false,
+        deleteVersionPlans: false,
     });
     const { error: filterError, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, args.projects, args.groups);
     if (filterError) {
         output_1.output.error(filterError);
         process.exit(1);
     }
+    const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
+    (0, version_plans_1.setVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes));
+    const planFiles = new Set();
+    releaseGroups.forEach((group) => {
+        if (group.versionPlans) {
+            if (group.name === config_1.IMPLICIT_DEFAULT_RELEASE_GROUP) {
+                output_1.output.logSingleLine(`Removing version plan files`);
+            }
+            else {
+                output_1.output.logSingleLine(`Removing version plan files for group ${group.name}`);
+            }
+            group.versionPlans.forEach((plan) => {
+                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);
+            });
+        }
+    });
+    const deletedFiles = Array.from(planFiles);
+    if (deletedFiles.length > 0) {
+        await (0, git_1.gitAdd)({
+            changedFiles: [],
+            deletedFiles,
+            dryRun: args.dryRun,
+            verbose: args.verbose,
+        });
+    }
     if (shouldCommit) {
         output_1.output.logSingleLine(`Committing changes with git`);
         const commitMessage = nxReleaseConfig.git.commitMessage;

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

@@ -27,8 +27,10 @@ export declare function getLatestGitTagForPattern(releaseTagPattern: string, add
     extractedVersion: string;
 } | null>;
 export declare function getGitDiff(from: string | undefined, to?: string): Promise<RawGitCommit[]>;
-export declare function gitAdd({ changedFiles, dryRun, verbose, logFn, }: {
-    changedFiles: string[];
+export declare function getChangedTrackedFiles(): Promise<Set<string>>;
+export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }: {
+    changedFiles?: string[];
+    deletedFiles?: string[];
     dryRun?: boolean;
     verbose?: boolean;
     logFn?: (...messages: string[]) => void;
@@ -54,6 +56,12 @@ export declare function gitPush({ gitRemote, dryRun, verbose, }: {
     verbose?: boolean;
 }): Promise<void>;
 export declare function parseCommits(commits: RawGitCommit[]): GitCommit[];
+export declare function parseConventionalCommitsMessage(message: string): {
+    type: string;
+    scope: string;
+    description: string;
+    breaking: boolean;
+} | null;
 export declare function parseGitCommit(commit: RawGitCommit): GitCommit | null;
 export declare function getCommitHash(ref: string): Promise<string>;
 export declare function getFirstGitCommit(): Promise<string>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstGitCommit = exports.getCommitHash = exports.parseGitCommit = exports.parseCommits = exports.gitPush = exports.gitTag = exports.gitCommit = exports.gitAdd = exports.getGitDiff = exports.getLatestGitTagForPattern = void 0;
+exports.getFirstGitCommit = exports.getCommitHash = exports.parseGitCommit = exports.parseConventionalCommitsMessage = exports.parseCommits = exports.gitPush = exports.gitTag = exports.gitCommit = exports.gitAdd = exports.getChangedTrackedFiles = exports.getGitDiff = exports.getLatestGitTagForPattern = void 0;
 /**
  * Special thanks to changelogen for the original inspiration for many of these utilities:
  * https://github.com/unjs/changelogen
@@ -97,11 +97,17 @@ async function getGitDiff(from, to = 'HEAD') {
     });
 }
 exports.getGitDiff = getGitDiff;
-async function gitAdd({ changedFiles, dryRun, verbose, logFn, }) {
+async function getChangedTrackedFiles() {
+    const result = await (0, exec_command_1.execCommand)('git', ['status', '--porcelain']);
+    const lines = result.split('\n').filter((l) => l.trim().length > 0);
+    return new Set(lines.map((l) => l.substring(3)));
+}
+exports.getChangedTrackedFiles = getChangedTrackedFiles;
+async function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, }) {
     logFn = logFn || console.log;
     let ignoredFiles = [];
     let filesToAdd = [];
-    for (const f of changedFiles) {
+    for (const f of changedFiles ?? []) {
         const isFileIgnored = await isIgnored(f);
         if (isFileIgnored) {
             ignoredFiles.push(f);
@@ -110,12 +116,28 @@ async function gitAdd({ changedFiles, dryRun, verbose, logFn, }) {
             filesToAdd.push(f);
         }
     }
+    if (deletedFiles?.length > 0) {
+        const changedTrackedFiles = await getChangedTrackedFiles();
+        for (const f of deletedFiles ?? []) {
+            const isFileIgnored = await isIgnored(f);
+            if (isFileIgnored) {
+                ignoredFiles.push(f);
+                // git add will fail if trying to add an untracked file that doesn't exist
+            }
+            else if (changedTrackedFiles.has(f)) {
+                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.');
+        if (!dryRun) {
+            logFn('\nNo files to stage. Skipping git add.');
+        }
+        // if this is a dry run, it's possible that there would have been actual files to add, so it's deceptive to say "No files to stage".
         return;
     }
     const commandArgs = ['add', ...filesToAdd];
@@ -236,6 +258,19 @@ function parseCommits(commits) {
     return commits.map((commit) => parseGitCommit(commit)).filter(Boolean);
 }
 exports.parseCommits = parseCommits;
+function parseConventionalCommitsMessage(message) {
+    const match = message.match(ConventionalCommitRegex);
+    if (!match) {
+        return null;
+    }
+    return {
+        type: match.groups.type || '',
+        scope: match.groups.scope || '',
+        description: match.groups.description || '',
+        breaking: Boolean(match.groups.breaking),
+    };
+}
+exports.parseConventionalCommitsMessage = parseConventionalCommitsMessage;
 // https://www.conventionalcommits.org/en/v1.0.0/
 // https://regex101.com/r/FSfNvA/1
 const ConventionalCommitRegex = /(?<type>[a-z]+)(\((?<scope>.+)\))?(?<breaking>!)?: (?<description>.+)/i;
@@ -245,13 +280,13 @@ const IssueRE = /(#\d+)/gm;
 const ChangedFileRegex = /(A|M|D|R\d*|C\d*)\t([^\t\n]*)\t?(.*)?/gm;
 const RevertHashRE = /This reverts commit (?<hash>[\da-f]{40})./gm;
 function parseGitCommit(commit) {
-    const match = commit.message.match(ConventionalCommitRegex);
-    if (!match) {
+    const parsedMessage = parseConventionalCommitsMessage(commit.message);
+    if (!parsedMessage) {
         return null;
     }
-    const scope = match.groups.scope || '';
-    const isBreaking = Boolean(match.groups.breaking) || commit.body.includes('BREAKING CHANGE:');
-    let description = match.groups.description;
+    const scope = parsedMessage.scope;
+    const isBreaking = parsedMessage.breaking || commit.body.includes('BREAKING CHANGE:');
+    let description = parsedMessage.description;
     // Extract references from message
     const references = [];
     for (const m of description.matchAll(PullRequestRE)) {
@@ -265,7 +300,7 @@ function parseGitCommit(commit) {
     references.push({ value: commit.shortHash, type: 'hash' });
     // Remove references and normalize
     description = description.replace(PullRequestRE, '').trim();
-    let type = match.groups.type;
+    let type = parsedMessage.type;
     // Extract any reverted hashes, if applicable
     const revertedHashes = [];
     const matchedHashes = commit.body.matchAll(RevertHashRE);

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

@@ -9,7 +9,10 @@ export type ReleaseVersionGeneratorResult = {
         dryRun?: boolean;
         verbose?: boolean;
         generatorOptions?: Record<string, unknown>;
-    }) => Promise<string[]>;
+    }) => Promise<string[] | {
+        changedFiles: string[];
+        deletedFiles: string[];
+    }>;
 };
 export type VersionData = Record<string, {
     /**
@@ -36,7 +39,14 @@ export declare class ReleaseVersion {
         projectName?: string;
     });
 }
-export declare function commitChanges(changedFiles: string[], isDryRun: boolean, isVerbose: boolean, gitCommitMessages: string[], gitCommitArgs?: string): Promise<void>;
+export declare function commitChanges({ changedFiles, deletedFiles, isDryRun, isVerbose, gitCommitMessages, gitCommitArgs, }: {
+    changedFiles?: string[];
+    deletedFiles?: string[];
+    isDryRun?: boolean;
+    isVerbose?: boolean;
+    gitCommitMessages?: string[];
+    gitCommitArgs?: string;
+}): Promise<void>;
 export declare function createCommitMessageValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData, commitMessage: string): string[];
 export declare function createGitTagValues(releaseGroups: ReleaseGroupWithName[], releaseGroupToFilteredProjects: Map<ReleaseGroupWithName, Set<string>>, versionData: VersionData): string[];
 export declare function handleDuplicateGitTags(gitTagValues: string[]): void;

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

@@ -26,13 +26,14 @@ class ReleaseVersion {
     }
 }
 exports.ReleaseVersion = ReleaseVersion;
-async function commitChanges(changedFiles, isDryRun, isVerbose, gitCommitMessages, gitCommitArgs) {
-    if (!changedFiles.length) {
+async function commitChanges({ changedFiles, deletedFiles, isDryRun, isVerbose, gitCommitMessages, gitCommitArgs, }) {
+    if (!changedFiles?.length && !deletedFiles?.length) {
         throw new Error('Error: No changed files to commit');
     }
     output_1.output.logSingleLine(`Committing changes with git`);
     await (0, git_1.gitAdd)({
         changedFiles,
+        deletedFiles,
         dryRun: isDryRun,
         verbose: isVerbose,
     });

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

@@ -11,7 +11,7 @@ export interface ReleaseVersionGeneratorSchema {
     releaseGroup: ReleaseGroupWithName;
     projectGraph: ProjectGraph;
     specifier?: string;
-    specifierSource?: 'prompt' | 'conventional-commits';
+    specifierSource?: 'prompt' | 'conventional-commits' | 'version-plans';
     preid?: string;
     packageRoot?: string;
     currentVersionResolver?: 'registry' | 'disk' | 'git-tag';
@@ -23,6 +23,7 @@ export interface ReleaseVersionGeneratorSchema {
     installArgs?: string;
     installIgnoreScripts?: boolean;
     conventionalCommitsConfig?: NxReleaseConfig['conventionalCommits'];
+    deleteVersionPlans?: boolean;
     /**
      * 'auto' allows users to opt into dependents being updated (a patch version bump) when a dependency is versioned.
      * This is only applicable to independently released projects.
@@ -43,7 +44,7 @@ export interface NxReleaseVersionResult {
     workspaceVersion: (string | null) | undefined;
     projectsVersionData: VersionData;
 }
-export declare const releaseVersionCLIHandler: (args: VersionOptions) => Promise<any>;
+export declare const releaseVersionCLIHandler: (args: VersionOptions) => Promise<number>;
 /**
  * NOTE: This function is also exported for programmatic usage and forms part of the public API
  * of Nx. We intentionally do not wrap the implementation with handleErrors because users need

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

@@ -17,6 +17,7 @@ const generate_1 = require("../generate/generate");
 const generator_utils_1 = require("../generate/generator-utils");
 const config_1 = require("./config/config");
 const filter_release_groups_1 = require("./config/filter-release-groups");
+const version_plans_1 = require("./config/version-plans");
 const batch_projects_by_generator_config_1 = require("./utils/batch-projects-by-generator-config");
 const git_1 = require("./utils/git");
 const print_changes_1 = require("./utils/print-changes");
@@ -69,6 +70,12 @@ async function releaseVersion(args) {
         output_1.output.error(filterError);
         process.exit(1);
     }
+    const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
+    (0, version_plans_1.setVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes));
+    if (args.deleteVersionPlans === undefined) {
+        // default to not delete version plans after versioning as they may be needed for changelog generation
+        args.deleteVersionPlans = false;
+    }
     runPreVersionCommand(nxReleaseConfig.version.preVersionCommand, {
         dryRun: args.dryRun,
         verbose: args.verbose,
@@ -82,6 +89,7 @@ async function releaseVersion(args) {
      * and need to get staged and committed as part of the existing commit, if applicable.
      */
     const additionalChangedFiles = new Set();
+    const additionalDeletedFiles = new Set();
     if (args.projects?.length) {
         /**
          * Run versioning for all remaining release groups and filtered projects within them
@@ -104,7 +112,7 @@ async function releaseVersion(args) {
                 const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData, nxReleaseConfig.conventionalCommits);
                 // Capture the callback so that we can run it after flushing the changes to disk
                 generatorCallbacks.push(async () => {
-                    const changedFiles = await generatorCallback(tree, {
+                    const result = await generatorCallback(tree, {
                         dryRun: !!args.dryRun,
                         verbose: !!args.verbose,
                         generatorOptions: {
@@ -112,7 +120,9 @@ async function releaseVersion(args) {
                             ...args.generatorOptionsOverrides,
                         },
                     });
+                    const { changedFiles, deletedFiles } = parseGeneratorCallbackResult(result);
                     changedFiles.forEach((f) => additionalChangedFiles.add(f));
+                    deletedFiles.forEach((f) => additionalDeletedFiles.add(f));
                 });
             }
         }
@@ -138,7 +148,14 @@ async function releaseVersion(args) {
             };
         }
         if (args.gitCommit ?? nxReleaseConfig.version.git.commit) {
-            await (0, shared_1.commitChanges)(changedFiles, !!args.dryRun, !!args.verbose, (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage), args.gitCommitArgs || nxReleaseConfig.version.git.commitArgs);
+            await (0, shared_1.commitChanges)({
+                changedFiles,
+                deletedFiles: Array.from(additionalDeletedFiles),
+                isDryRun: !!args.dryRun,
+                isVerbose: !!args.verbose,
+                gitCommitMessages: (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage),
+                gitCommitArgs: args.gitCommitArgs || nxReleaseConfig.version.git.commitArgs,
+            });
         }
         else if (args.stageChanges ?? nxReleaseConfig.version.git.stageChanges) {
             output_1.output.logSingleLine(`Staging changed files with git`);
@@ -186,7 +203,7 @@ async function releaseVersion(args) {
             const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData, nxReleaseConfig.conventionalCommits);
             // Capture the callback so that we can run it after flushing the changes to disk
             generatorCallbacks.push(async () => {
-                const changedFiles = await generatorCallback(tree, {
+                const result = await generatorCallback(tree, {
                     dryRun: !!args.dryRun,
                     verbose: !!args.verbose,
                     generatorOptions: {
@@ -194,7 +211,9 @@ async function releaseVersion(args) {
                         ...args.generatorOptionsOverrides,
                     },
                 });
+                const { changedFiles, deletedFiles } = parseGeneratorCallbackResult(result);
                 changedFiles.forEach((f) => additionalChangedFiles.add(f));
+                deletedFiles.forEach((f) => additionalDeletedFiles.add(f));
             });
         }
     }
@@ -228,7 +247,14 @@ async function releaseVersion(args) {
         };
     }
     if (args.gitCommit ?? nxReleaseConfig.version.git.commit) {
-        await (0, shared_1.commitChanges)(changedFiles, !!args.dryRun, !!args.verbose, (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage), args.gitCommitArgs || nxReleaseConfig.version.git.commitArgs);
+        await (0, shared_1.commitChanges)({
+            changedFiles,
+            deletedFiles: Array.from(additionalDeletedFiles),
+            isDryRun: !!args.dryRun,
+            isVerbose: !!args.verbose,
+            gitCommitMessages: (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage),
+            gitCommitArgs: args.gitCommitArgs || nxReleaseConfig.version.git.commitArgs,
+        });
     }
     else if (args.stageChanges ?? nxReleaseConfig.version.git.stageChanges) {
         output_1.output.logSingleLine(`Staging changed files with git`);
@@ -279,6 +305,7 @@ async function runVersionOnProjects(projectGraph, nxJson, args, tree, generatorD
         releaseGroup,
         firstRelease: args.firstRelease ?? false,
         conventionalCommitsConfig,
+        deleteVersionPlans: args.deleteVersionPlans,
     };
     // Apply generator defaults from schema.json file etc
     const combinedOpts = await (0, params_1.combineOptionsForGenerator)(generatorOptions, generatorData.collectionName, generatorData.normalizedGeneratorName, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson, generatorData.schema, false, null, (0, node_path_1.relative)(process.cwd(), workspace_root_1.workspaceRoot), args.verbose);
@@ -306,7 +333,7 @@ function printAndFlushChanges(tree, isDryRun) {
             const currentContentsOnDisk = (0, node_fs_1.readFileSync)((0, path_1.joinPathFragments)(tree.root, f.path)).toString();
             (0, print_changes_1.printDiff)(currentContentsOnDisk, f.content?.toString() || '');
         }
-        else if (f.type === 'DELETE') {
+        else if (f.type === 'DELETE' && !f.path.includes('.nx')) {
             throw new Error('Unexpected DELETE change, please report this as an issue');
         }
     });
@@ -395,3 +422,14 @@ function runPreVersionCommand(preVersionCommand, { dryRun, verbose }) {
         process.exit(1);
     }
 }
+function parseGeneratorCallbackResult(result) {
+    if (Array.isArray(result)) {
+        return {
+            changedFiles: result,
+            deletedFiles: [],
+        };
+    }
+    else {
+        return result;
+    }
+}

package/src/command-line/repair/repair.d.ts

@@ -1,3 +1,3 @@
 export declare function repair(args: {
     verbose: boolean;
-}, extraMigrations?: any[]): Promise<any>;
+}, extraMigrations?: any[]): Promise<number>;

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

@@ -1,2 +1,7 @@
 import { CommandModule } from 'yargs';
-export declare const yargsResetCommand: CommandModule;
+export type ResetCommandOptions = {
+    onlyCache?: boolean;
+    onlyDaemon?: boolean;
+    onlyWorkspaceData?: boolean;
+};
+export declare const yargsResetCommand: CommandModule<Record<string, unknown>, ResetCommandOptions>;

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

@@ -3,7 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsResetCommand = void 0;
 exports.yargsResetCommand = {
     command: 'reset',
-    describe: 'Clears all the cached Nx artifacts and metadata about the workspace and shuts down the Nx Daemon.',
+    describe: 'Clears cached Nx artifacts and metadata about the workspace and shuts down the Nx Daemon.',
     aliases: ['clear-cache'],
-    handler: async () => (await Promise.resolve().then(() => require('./reset'))).resetHandler(),
+    builder: (yargs) => yargs
+        .option('onlyCache', {
+        description: 'Clears the Nx cache directory. This will remove all local cache entries for tasks, but will not affect the remote cache.',
+        type: 'boolean',
+    })
+        .option('onlyDaemon', {
+        description: 'Stops the Nx Daemon, it will be restarted fresh when the next Nx command is run.',
+        type: 'boolean',
+    })
+        .option('onlyWorkspaceData', {
+        description: 'Clears the workspace data directory. Used by Nx to store cached data about the current workspace (e.g. partial results, incremental data, etc)',
+        type: 'boolean',
+    }),
+    handler: async (argv) => (await Promise.resolve().then(() => require('./reset'))).resetHandler(argv),
 };

package/src/command-line/reset/reset.d.ts

@@ -1 +1,2 @@
-export declare function resetHandler(): Promise<void>;
+import { ResetCommandOptions } from './command-object';
+export declare function resetHandler(args: ResetCommandOptions): Promise<void>;