nx 19.7.0-canary.20240831-18e5535 → 19.7.0-canary.20240904-f39b995

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.7.0-canary.20240831-18e5535",
+  "version": "19.7.0-canary.20240904-f39b995",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.7.0-canary.20240831-18e5535"
+    "@nrwl/tao": "19.7.0-canary.20240904-f39b995"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.7.0-canary.20240831-18e5535",
-    "@nx/nx-darwin-arm64": "19.7.0-canary.20240831-18e5535",
-    "@nx/nx-linux-x64-gnu": "19.7.0-canary.20240831-18e5535",
-    "@nx/nx-linux-x64-musl": "19.7.0-canary.20240831-18e5535",
-    "@nx/nx-win32-x64-msvc": "19.7.0-canary.20240831-18e5535",
-    "@nx/nx-linux-arm64-gnu": "19.7.0-canary.20240831-18e5535",
-    "@nx/nx-linux-arm64-musl": "19.7.0-canary.20240831-18e5535",
-    "@nx/nx-linux-arm-gnueabihf": "19.7.0-canary.20240831-18e5535",
-    "@nx/nx-win32-arm64-msvc": "19.7.0-canary.20240831-18e5535",
-    "@nx/nx-freebsd-x64": "19.7.0-canary.20240831-18e5535"
+    "@nx/nx-darwin-x64": "19.7.0-canary.20240904-f39b995",
+    "@nx/nx-darwin-arm64": "19.7.0-canary.20240904-f39b995",
+    "@nx/nx-linux-x64-gnu": "19.7.0-canary.20240904-f39b995",
+    "@nx/nx-linux-x64-musl": "19.7.0-canary.20240904-f39b995",
+    "@nx/nx-win32-x64-msvc": "19.7.0-canary.20240904-f39b995",
+    "@nx/nx-linux-arm64-gnu": "19.7.0-canary.20240904-f39b995",
+    "@nx/nx-linux-arm64-musl": "19.7.0-canary.20240904-f39b995",
+    "@nx/nx-linux-arm-gnueabihf": "19.7.0-canary.20240904-f39b995",
+    "@nx/nx-win32-arm64-msvc": "19.7.0-canary.20240904-f39b995",
+    "@nx/nx-freebsd-x64": "19.7.0-canary.20240904-f39b995"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/release/changelog-renderer/index.d.ts

@@ -41,7 +41,7 @@ export type ChangelogRenderer = (config: {
     changelogRenderOptions: DefaultChangelogRenderOptions;
     dependencyBumps?: DependencyBump[];
     repoSlug?: RepoSlug;
-    conventionalCommitsConfig: NxReleaseConfig['conventionalCommits'];
+    conventionalCommitsConfig: NxReleaseConfig['conventionalCommits'] | null;
 }) => Promise<string> | string;
 /**
  * The specific options available to the default implementation of the ChangelogRenderer that nx exports

package/release/changelog-renderer/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const semver_1 = require("semver");
+const conventional_commits_1 = require("../../src/command-line/release/config/conventional-commits");
 const github_1 = require("../../src/command-line/release/utils/github");
 // axios types and values don't seem to match
 const _axios = require("axios");
@@ -10,9 +11,7 @@ const axios = _axios;
  * from the given commits and other metadata.
  */
 const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion, project, entryWhenNoChanges, changelogRenderOptions, dependencyBumps, repoSlug, conventionalCommitsConfig, }) => {
-    const changeTypes = conventionalCommitsConfig.types;
     const markdownLines = [];
-    const breakingChanges = [];
     // If the current range of changes contains both a commit and its revert, we strip them both from the final list. Changes from version plans are unaffected, as they have no hashes.
     for (const change of changes) {
         if (change.type === 'revert' && change.revertedHashes) {
@@ -26,10 +25,38 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
         }
     }
     let relevantChanges = changes;
+    const breakingChanges = [];
+    // For now to keep the interface of the changelog renderer non-breaking for v19 releases we have a somewhat indirect check for whether or not we are generating a changelog for version plans
+    const isVersionPlans = !conventionalCommitsConfig;
+    // Only applicable for version plans
+    const additionalChangesForAuthorsSection = [];
+    // Provide a default configuration for version plans to allow most of the subsequent logic to work in the same way it would for conventional commits
+    // NOTE: The one exception is breaking/major changes, where we do not follow the same structure and instead only show the changes once
+    if (isVersionPlans) {
+        conventionalCommitsConfig = {
+            types: {
+                feat: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG.types.feat,
+                fix: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG.types.fix,
+            },
+        };
+        // Trim down "relevant changes" to only include non-breaking ones so that we can render them differently under version plans,
+        // but keep track of the changes for the purposes of the authors section
+        // TODO(v20): Clean this abstraction up as part of the larger overall refactor of changelog rendering
+        for (let i = 0; i < relevantChanges.length; i++) {
+            if (relevantChanges[i].isBreaking) {
+                const change = relevantChanges[i];
+                additionalChangesForAuthorsSection.push(change);
+                const line = formatChange(change, changelogRenderOptions, isVersionPlans, repoSlug);
+                breakingChanges.push(line);
+                relevantChanges.splice(i, 1);
+            }
+        }
+    }
+    const changeTypes = conventionalCommitsConfig.types;
     // workspace root level changelog
     if (project === null) {
         // No changes for the workspace
-        if (relevantChanges.length === 0) {
+        if (relevantChanges.length === 0 && breakingChanges.length === 0) {
             if (dependencyBumps?.length) {
                 applyAdditionalDependencyBumps({
                     markdownLines,
@@ -62,7 +89,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
             for (const scope of scopesSortedAlphabetically) {
                 const changes = changesGroupedByScope[scope];
                 for (const change of changes) {
-                    const line = formatChange(change, changelogRenderOptions, repoSlug);
+                    const line = formatChange(change, changelogRenderOptions, isVersionPlans, repoSlug);
                     markdownLines.push(line);
                     if (change.isBreaking) {
                         const breakingChangeExplanation = extractBreakingChangeExplanation(change.body);
@@ -79,7 +106,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
         relevantChanges = relevantChanges.filter((c) => c.affectedProjects &&
             (c.affectedProjects === '*' || c.affectedProjects.includes(project)));
         // Generating for a named project, but that project has no relevant changes in the current set of commits, exit early
-        if (relevantChanges.length === 0) {
+        if (relevantChanges.length === 0 && breakingChanges.length === 0) {
             if (dependencyBumps?.length) {
                 applyAdditionalDependencyBumps({
                     markdownLines,
@@ -105,7 +132,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
             markdownLines.push('', `### ${changeTypes[type].changelog.title}`, '');
             const changesInChronologicalOrder = group.reverse();
             for (const change of changesInChronologicalOrder) {
-                const line = formatChange(change, changelogRenderOptions, repoSlug);
+                const line = formatChange(change, changelogRenderOptions, isVersionPlans, repoSlug);
                 markdownLines.push(line + '\n');
                 if (change.isBreaking) {
                     const breakingChangeExplanation = extractBreakingChangeExplanation(change.body);
@@ -117,7 +144,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
         }
     }
     if (breakingChanges.length > 0) {
-        markdownLines.push('', '#### ⚠️  Breaking Changes', '', ...breakingChanges);
+        markdownLines.push('', '### ⚠️  Breaking Changes', '', ...breakingChanges);
     }
     if (dependencyBumps?.length) {
         applyAdditionalDependencyBumps({
@@ -129,7 +156,10 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
     }
     if (changelogRenderOptions.authors) {
         const _authors = new Map();
-        for (const change of relevantChanges) {
+        for (const change of [
+            ...relevantChanges,
+            ...additionalChangesForAuthorsSection,
+        ]) {
             if (!change.author) {
                 continue;
             }
@@ -215,7 +245,7 @@ function groupBy(items, key) {
     }
     return groups;
 }
-function formatChange(change, changelogRenderOptions, repoSlug) {
+function formatChange(change, changelogRenderOptions, isVersionPlans, repoSlug) {
     let description = change.description;
     let extraLines = [];
     let extraLinesStr = '';
@@ -228,9 +258,14 @@ function formatChange(change, changelogRenderOptions, repoSlug) {
             .map((l) => `${indentation}${l}`)
             .join('\n');
     }
+    /**
+     * In version plans changelogs:
+     * - don't repeat the breaking change icon
+     * - don't render the scope
+     */
     let changeLine = '- ' +
-        (change.isBreaking ? '⚠️  ' : '') +
-        (change.scope ? `**${change.scope.trim()}:** ` : '') +
+        (!isVersionPlans && change.isBreaking ? '⚠️  ' : '') +
+        (!isVersionPlans && change.scope ? `**${change.scope.trim()}:** ` : '') +
         description;
     if (repoSlug && changelogRenderOptions.commitReferences) {
         changeLine += (0, github_1.formatReferences)(change.githubReferences, repoSlug);

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

@@ -4,7 +4,7 @@ exports.yargsLoginCommand = void 0;
 const shared_options_1 = require("../../command-line/yargs-utils/shared-options");
 exports.yargsLoginCommand = {
     command: 'login [nxCloudUrl]',
-    describe: 'Login to Nx Cloud',
+    describe: false,
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs.positional('nxCloudUrl', {
         describe: 'The Nx Cloud URL of the instance you are trying to connect to. If no positional argument is provided, this command will connect to https://cloud.nx.app.',
         type: 'string',

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

@@ -4,7 +4,7 @@ exports.yargsLogoutCommand = void 0;
 const shared_options_1 = require("../../command-line/yargs-utils/shared-options");
 exports.yargsLogoutCommand = {
     command: 'logout',
-    describe: 'Logout from Nx Cloud',
+    describe: false,
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs),
     handler: async (args) => {
         process.exit(await (await Promise.resolve().then(() => require('./logout'))).logoutHandler(args));

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],
                                 };
                             });
@@ -811,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/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

@@ -53,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,

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/git.d.ts

@@ -62,6 +62,6 @@ export declare function parseConventionalCommitsMessage(message: string): {
     description: string;
     breaking: boolean;
 } | null;
-export declare function parseGitCommit(commit: RawGitCommit): GitCommit | null;
+export declare function parseGitCommit(commit: RawGitCommit, isVersionPlanCommit?: boolean): GitCommit | null;
 export declare function getCommitHash(ref: string): Promise<string>;
 export declare function getFirstGitCommit(): Promise<string>;

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

@@ -281,6 +281,30 @@ function parseConventionalCommitsMessage(message) {
         breaking: Boolean(match.groups.breaking),
     };
 }
+function extractReferencesFromCommitMessage(message, shortHash) {
+    const references = [];
+    for (const m of message.matchAll(PullRequestRE)) {
+        references.push({ type: 'pull-request', value: m[1] });
+    }
+    for (const m of message.matchAll(IssueRE)) {
+        if (!references.some((i) => i.value === m[1])) {
+            references.push({ type: 'issue', value: m[1] });
+        }
+    }
+    references.push({ value: shortHash, type: 'hash' });
+    return references;
+}
+function getAllAuthorsForCommit(commit) {
+    const authors = [commit.author];
+    // Additional authors can be specified in the commit body (depending on the VCS provider)
+    for (const match of commit.body.matchAll(CoAuthoredByRegex)) {
+        authors.push({
+            name: (match.groups.name || '').trim(),
+            email: (match.groups.email || '').trim(),
+        });
+    }
+    return authors;
+}
 // https://www.conventionalcommits.org/en/v1.0.0/
 // https://regex101.com/r/FSfNvA/1
 const ConventionalCommitRegex = /(?<type>[a-z]+)(\((?<scope>.+)\))?(?<breaking>!)?: (?<description>.+)/i;
@@ -289,7 +313,25 @@ const PullRequestRE = /\([ a-z]*(#\d+)\s*\)/gm;
 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) {
+function parseGitCommit(commit, isVersionPlanCommit = false) {
+    // For version plans, we do not require conventional commits and therefore cannot extract data based on that format
+    if (isVersionPlanCommit) {
+        return {
+            ...commit,
+            description: commit.message,
+            type: '',
+            scope: '',
+            references: extractReferencesFromCommitMessage(commit.message, commit.shortHash),
+            // The commit message is not the source of truth for a breaking (major) change in version plans, so the value is not relevant
+            // TODO(v20): Make the current GitCommit interface more clearly tied to conventional commits
+            isBreaking: false,
+            authors: getAllAuthorsForCommit(commit),
+            // Not applicable to version plans
+            affectedFiles: [],
+            // Not applicable, a version plan cannot have been added in a commit that also reverts another commit
+            revertedHashes: [],
+        };
+    }
     const parsedMessage = parseConventionalCommitsMessage(commit.message);
     if (!parsedMessage) {
         return null;
@@ -298,16 +340,7 @@ function parseGitCommit(commit) {
     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)) {
-        references.push({ type: 'pull-request', value: m[1] });
-    }
-    for (const m of description.matchAll(IssueRE)) {
-        if (!references.some((i) => i.value === m[1])) {
-            references.push({ type: 'issue', value: m[1] });
-        }
-    }
-    references.push({ value: commit.shortHash, type: 'hash' });
+    const references = extractReferencesFromCommitMessage(description, commit.shortHash);
     // Remove references and normalize
     description = description.replace(PullRequestRE, '').trim();
     let type = parsedMessage.type;
@@ -322,13 +355,7 @@ function parseGitCommit(commit) {
         description = commit.message;
     }
     // Find all authors
-    const authors = [commit.author];
-    for (const match of commit.body.matchAll(CoAuthoredByRegex)) {
-        authors.push({
-            name: (match.groups.name || '').trim(),
-            email: (match.groups.email || '').trim(),
-        });
-    }
+    const authors = getAllAuthorsForCommit(commit);
     // Extract file changes from commit body
     const affectedFiles = Array.from(commit.body.matchAll(ChangedFileRegex)).reduce((prev, [fullLine, changeType, file1, file2]) => 
     // file2 only exists for some change types, such as renames

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

@@ -82,7 +82,7 @@ function createAPI(overrideReleaseConfig) {
         }
         if (!args.specifier) {
             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);
         }
         else {
             if (args.verbose && releaseGroups.some((g) => !!g.versionPlans)) {

package/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -42,6 +42,18 @@ function getNxInitDate() {
         return null;
     }
 }
+async function createNxCloudWorkspaceV1(workspaceName, installationSource, nxInitDate) {
+    const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
+    const response = await require('axios').post(`${apiUrl}/nx-cloud/create-org-and-workspace`, {
+        workspaceName,
+        installationSource,
+        nxInitDate,
+    });
+    if (response.data.message) {
+        throw new Error(response.data.message);
+    }
+    return response.data;
+}
 async function createNxCloudWorkspaceV2(workspaceName, installationSource, nxInitDate) {
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
     const response = await require('axios').post(`${apiUrl}/nx-cloud/v2/create-org-and-workspace`, {
@@ -69,6 +81,19 @@ async function printSuccessMessage(token, installationSource, usesGithub) {
     });
     return connectCloudUrl;
 }
+function addNxCloudOptionsToNxJson(tree, token, directory = '') {
+    const nxJsonPath = (0, path_1.join)(directory, 'nx.json');
+    if (tree.exists(nxJsonPath)) {
+        (0, json_1.updateJson)(tree, (0, path_1.join)(directory, 'nx.json'), (nxJson) => {
+            const overrideUrl = process.env.NX_CLOUD_API || process.env.NRWL_API;
+            if (overrideUrl) {
+                nxJson.nxCloudUrl = overrideUrl;
+            }
+            nxJson.nxCloudAccessToken = token;
+            return nxJson;
+        });
+    }
+}
 function addNxCloudIdToNxJson(tree, nxCloudId, directory = '') {
     const nxJsonPath = (0, path_1.join)(directory, 'nx.json');
     if (tree.exists(nxJsonPath)) {
@@ -89,6 +114,7 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
         return null;
     }
     const isGitHubDetected = schema.github ?? (await (0, url_shorten_1.repoUsesGithub)(schema.github));
+    let responseFromCreateNxCloudWorkspaceV1;
     let responseFromCreateNxCloudWorkspaceV2;
     /**
      * Do not create an Nx Cloud token if the user is using GitHub and
@@ -98,12 +124,22 @@ async function connectToNxCloud(tree, schema, nxJson = (0, nx_json_1.readNxJson)
         isGitHubDetected &&
         schema.installationSource === 'nx-connect')
         return null;
-    responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree), schema.installationSource, getNxInitDate());
-    addNxCloudIdToNxJson(tree, responseFromCreateNxCloudWorkspaceV2?.nxCloudId, schema.directory);
-    await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
-        silent: schema.hideFormatLogs,
-    });
-    return responseFromCreateNxCloudWorkspaceV2.nxCloudId;
+    if (process.env.NX_ENABLE_LOGIN === 'true') {
+        responseFromCreateNxCloudWorkspaceV2 = await createNxCloudWorkspaceV2(getRootPackageName(tree), schema.installationSource, getNxInitDate());
+        addNxCloudIdToNxJson(tree, responseFromCreateNxCloudWorkspaceV2?.nxCloudId, schema.directory);
+        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
+            silent: schema.hideFormatLogs,
+        });
+        return responseFromCreateNxCloudWorkspaceV2.nxCloudId;
+    }
+    else {
+        responseFromCreateNxCloudWorkspaceV1 = await createNxCloudWorkspaceV1(getRootPackageName(tree), schema.installationSource, getNxInitDate());
+        addNxCloudOptionsToNxJson(tree, responseFromCreateNxCloudWorkspaceV1?.token, schema.directory);
+        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, {
+            silent: schema.hideFormatLogs,
+        });
+        return responseFromCreateNxCloudWorkspaceV1.token;
+    }
 }
 async function connectToNxCloudGenerator(tree, options) {
     await connectToNxCloud(tree, options);

package/src/project-graph/plugins/isolation/plugin-pool.js

@@ -273,7 +273,7 @@ async function startPluginWorker() {
                     socket,
                 });
             }
-            else if (attempts > 1000) {
+            else if (attempts > 10000) {
                 // daemon fails to start, the process probably exited
                 // we print the logs and exit the client
                 reject('Failed to start plugin worker.');