nx 22.0.0-canary.20251006-738b06b → 22.0.0-canary.20251008-05ab516

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

@@ -19,19 +19,18 @@ const path_1 = require("../../utils/path");
 const workspace_root_1 = require("../../utils/workspace-root");
 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 git_1 = require("./utils/git");
 const launch_editor_1 = require("./utils/launch-editor");
 const markdown_1 = require("./utils/markdown");
 const print_changes_1 = require("./utils/print-changes");
 const print_config_1 = require("./utils/print-config");
+const release_graph_1 = require("./utils/release-graph");
 const remote_release_client_1 = require("./utils/remote-release-clients/remote-release-client");
 const resolve_changelog_renderer_1 = require("./utils/resolve-changelog-renderer");
 const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
-const version_plan_utils_1 = require("./utils/version-plan-utils");
 const shared_1 = require("./utils/shared");
-const console = require("node:console");
+const version_plan_utils_1 = require("./utils/version-plan-utils");
 const releaseChangelogCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releaseChangelogCLIHandler = releaseChangelogCLIHandler;
 function createAPI(overrideReleaseConfig) {
@@ -75,19 +74,30 @@ function createAPI(overrideReleaseConfig) {
             });
             process.exit(1);
         }
-        const { error: filterError, filterLog, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, args.projects, args.groups);
-        if (filterError) {
-            output_1.output.error(filterError);
-            process.exit(1);
-        }
-        if (filterLog &&
+        const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, args.verbose);
+        // Use pre-built release graph if provided, otherwise create a new one
+        const releaseGraph = args.releaseGraph ||
+            (await (0, release_graph_1.createReleaseGraph)({
+                tree,
+                projectGraph,
+                nxReleaseConfig,
+                filters: {
+                    projects: args.projects,
+                    groups: args.groups,
+                },
+                firstRelease: args.firstRelease,
+                verbose: args.verbose,
+            }));
+        // Display filter log if filters were applied (only when graph was created, not reused)
+        if (!args.releaseGraph &&
+            releaseGraph.filterLog &&
             process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG !== 'true') {
-            output_1.output.note(filterLog);
+            output_1.output.note(releaseGraph.filterLog);
         }
         const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
-        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
+        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGraph.releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
         // Validate version plans against the filter after resolution
-        const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGroups, releaseGroupToFilteredProjects);
+        const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects);
         if (versionPlanValidationError) {
             output_1.output.error(versionPlanValidationError);
             process.exit(1);
@@ -107,7 +117,6 @@ function createAPI(overrideReleaseConfig) {
             });
             return {};
         }
-        const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, args.verbose);
         const useAutomaticFromRef = nxReleaseConfig.changelog?.automaticFromRef || args.firstRelease;
         /**
          * For determining the versions to use within changelog files, there are a few different possibilities:
@@ -123,7 +132,7 @@ function createAPI(overrideReleaseConfig) {
          *     - in this case, the version property will be used as the reference for the workspace changelog, and the versionData object will be used
          *    to generate project changelogs
          */
-        const { workspaceChangelogVersion, projectsVersionData } = resolveChangelogVersions(args, releaseGroups, releaseGroupToFilteredProjects);
+        const { workspaceChangelogVersion, projectsVersionData } = resolveChangelogVersions(args, releaseGraph);
         const to = args.to || 'HEAD';
         const toSHA = await (0, git_1.getCommitHash)(to);
         const headSHA = to === 'HEAD' ? toSHA : await (0, git_1.getCommitHash)('HEAD');
@@ -146,19 +155,19 @@ function createAPI(overrideReleaseConfig) {
             throw new Error(`You are attempting to recreate the changelog for an old release, but you have enabled auto-commit mode. Please disable auto-commit mode by updating your nx.json, or passing --git-commit=false`);
         }
         const commitMessage = args.gitCommitMessage || nxReleaseConfig.changelog.git.commitMessage;
-        const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, projectsVersionData, commitMessage);
+        const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects, projectsVersionData, commitMessage);
         // Resolve any git tags as early as possible so that we can hard error in case of any duplicates before reaching the actual git command
         const gitTagValues = args.gitTag ?? nxReleaseConfig.changelog.git.tag
-            ? (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects, projectsVersionData)
+            ? (0, shared_1.createGitTagValues)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects, projectsVersionData)
             : [];
         (0, shared_1.handleDuplicateGitTags)(gitTagValues);
         const postGitTasks = [];
         let workspaceChangelogChanges = [];
         // If there are multiple release groups, we'll just skip the workspace changelog anyway.
-        const versionPlansEnabledForWorkspaceChangelog = releaseGroups[0].resolvedVersionPlans;
+        const versionPlansEnabledForWorkspaceChangelog = releaseGraph.releaseGroups[0].resolvedVersionPlans;
         if (versionPlansEnabledForWorkspaceChangelog) {
-            if (releaseGroups.length === 1) {
-                const releaseGroup = releaseGroups[0];
+            if (releaseGraph.releaseGroups.length === 1) {
+                const releaseGroup = releaseGraph.releaseGroups[0];
                 if (releaseGroup.projectsRelationship === 'fixed') {
                     const versionPlans = releaseGroup.resolvedVersionPlans;
                     workspaceChangelogChanges = versionPlans
@@ -255,7 +264,7 @@ function createAPI(overrideReleaseConfig) {
          * and figuring them out during the main iteration would be too late.
          */
         const projectToAdditionalDependencyBumps = new Map();
-        for (const releaseGroup of releaseGroups) {
+        for (const releaseGroup of releaseGraph.releaseGroups) {
             if (releaseGroup.projectsRelationship !== 'independent') {
                 continue;
             }
@@ -286,7 +295,7 @@ function createAPI(overrideReleaseConfig) {
             }
         }
         const allProjectChangelogs = {};
-        for (const releaseGroup of releaseGroups) {
+        for (const releaseGroup of releaseGraph.releaseGroups) {
             const config = releaseGroup.changelog;
             // The entire feature is disabled at the release group level, exit early
             if (config === false) {
@@ -294,7 +303,7 @@ function createAPI(overrideReleaseConfig) {
             }
             const projects = args.projects?.length
                 ? // If the user has passed a list of projects, we need to use the filtered list of projects within the release group, plus any dependents
-                    Array.from(releaseGroupToFilteredProjects.get(releaseGroup)).flatMap((project) => {
+                    Array.from(releaseGraph.releaseGroupToFilteredProjects.get(releaseGroup)).flatMap((project) => {
                         return [
                             project,
                             ...(projectsVersionData[project]?.dependentProjects.map((dep) => dep.source) || []),
@@ -510,19 +519,19 @@ function createAPI(overrideReleaseConfig) {
                 }
             }
         }
-        await applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTasks, commitMessageValues, gitTagValues, releaseGroups, releaseGroupToFilteredProjects);
+        await applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTasks, commitMessageValues, gitTagValues, releaseGraph);
         return {
             workspaceChangelog,
             projectChangelogs: allProjectChangelogs,
         };
     };
 }
-function resolveChangelogVersions(args, releaseGroups, releaseGroupToFilteredProjects) {
+function resolveChangelogVersions(args, releaseGraph) {
     if (!args.version && !args.versionData) {
         throw new Error(`You must provide a version string and/or a versionData object.`);
     }
-    const versionData = releaseGroups.reduce((versionData, releaseGroup) => {
-        const releaseGroupProjectNames = Array.from(releaseGroupToFilteredProjects.get(releaseGroup));
+    const versionData = releaseGraph.releaseGroups.reduce((versionData, releaseGroup) => {
+        const releaseGroupProjectNames = Array.from(releaseGraph.releaseGroupToFilteredProjects.get(releaseGroup));
         for (const projectName of releaseGroupProjectNames) {
             if (!args.versionData) {
                 versionData[projectName] = {
@@ -561,7 +570,7 @@ function applyRemoteReleaseProviderName(newRemoteReleaseProviderName) {
         remoteReleaseProviderName = newRemoteReleaseProviderName;
     }
 }
-async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTasks, commitMessageValues, gitTagValues, releaseGroups, releaseGroupToFilteredProjects) {
+async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTasks, commitMessageValues, gitTagValues, releaseGraph) {
     let latestCommit = toSHA;
     const changes = tree.listChanges();
     /**
@@ -604,8 +613,8 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
     let deletedFiles = [];
     if (args.deleteVersionPlans) {
         const planFiles = new Set();
-        releaseGroups.forEach((group) => {
-            const filteredProjects = releaseGroupToFilteredProjects.get(group);
+        releaseGraph.releaseGroups.forEach((group) => {
+            const filteredProjects = releaseGraph.releaseGroupToFilteredProjects.get(group);
             if (group.resolvedVersionPlans) {
                 // Check each version plan individually to see if it should be deleted
                 const plansToDelete = [];
@@ -836,7 +845,8 @@ async function generateChangelogForProjects({ tree, args, changes, projectsVersi
         }
         const preferDockerVersion = (0, shared_1.shouldPreferDockerVersionForReleaseGroup)(releaseGroup);
         const releaseVersion = new shared_1.ReleaseVersion({
-            version: preferDockerVersion && projectsVersionData[project.name].dockerVersion
+            version: (preferDockerVersion === true || preferDockerVersion === 'both') &&
+                projectsVersionData[project.name].dockerVersion
                 ? projectsVersionData[project.name].dockerVersion
                 : projectsVersionData[project.name].newVersion,
             releaseTagPattern: releaseGroup.releaseTagPattern,

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

@@ -1,6 +1,7 @@
-import { CommandModule } from 'yargs';
-import { OutputStyle, RunManyOptions } from '../yargs-utils/shared-options';
-import { VersionData } from './utils/shared';
+import { type CommandModule } from 'yargs';
+import { type OutputStyle, type RunManyOptions } from '../yargs-utils/shared-options';
+import type { ReleaseGraph } from './utils/release-graph';
+import type { VersionData } from './utils/shared';
 export interface BaseNxReleaseArgs {
     verbose?: boolean;
     printConfig?: boolean | 'debug';
@@ -31,6 +32,7 @@ export type VersionOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & Firs
     preid?: string;
     stageChanges?: boolean;
     versionActionsOptionsOverrides?: Record<string, unknown>;
+    releaseGraph?: ReleaseGraph;
 };
 export type ChangelogOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & FirstReleaseArgs & {
     version?: string | null;
@@ -39,6 +41,7 @@ export type ChangelogOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & Fi
     from?: string;
     interactive?: string;
     createRelease?: false | 'github' | 'gitlab';
+    releaseGraph?: ReleaseGraph;
 };
 export type PublishOptions = NxReleaseArgs & Partial<RunManyOptions> & {
     outputStyle?: OutputStyle;
@@ -48,6 +51,7 @@ export type PublishOptions = NxReleaseArgs & Partial<RunManyOptions> & {
     access?: string;
     otp?: number;
     versionData?: VersionData;
+    releaseGraph?: ReleaseGraph;
 };
 export type PlanOptions = NxReleaseArgs & {
     bump?: string;

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

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

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

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

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

@@ -236,6 +236,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
         releaseTagPatternRequireSemver: userConfig.releaseTagPatternRequireSemver ??
             defaultReleaseTagPatternRequireSemver,
+        releaseTagPatternPreferDockerVersion: userConfig.releaseTagPatternPreferDockerVersion ?? false,
         releaseTagPatternStrictPreid: userConfig.releaseTagPatternStrictPreid ??
             defaultReleaseTagPatternStrictPreid,
         conventionalCommits: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG,
@@ -286,6 +287,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             : WORKSPACE_DEFAULTS.releaseTagPattern,
         releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
         releaseTagPatternRequireSemver: groupReleaseTagPatternRequireSemver,
+        releaseTagPatternPreferDockerVersion: false,
         releaseTagPatternStrictPreid: groupReleaseTagPatternStrictPreid,
         versionPlans: false,
     };
@@ -483,6 +485,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             releaseTagPatternRequireSemver: releaseGroup.releaseTagPatternRequireSemver ??
                 userConfig.releaseTagPatternRequireSemver ??
                 defaultReleaseTagPatternRequireSemver,
+            releaseTagPatternPreferDockerVersion: releaseGroup.releaseTagPatternPreferDockerVersion ??
+                userConfig.releaseTagPatternPreferDockerVersion ??
+                false,
             releaseTagPatternStrictPreid: releaseGroup.releaseTagPatternStrictPreid ??
                 userConfig.releaseTagPatternStrictPreid ??
                 defaultReleaseTagPatternStrictPreid,
@@ -533,6 +538,14 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         if (hasDockerProjects) {
             // If any project in the group has docker configuration, disable semver requirement
             releaseGroup.releaseTagPatternRequireSemver = false;
+            // Set releaseTagPatternPreferDockerVersion to true by default when docker projects exist,
+            // unless user has explicitly configured it
+            if (releaseGroup.releaseTagPatternPreferDockerVersion === false &&
+                userConfig.groups?.[releaseGroupName]
+                    ?.releaseTagPatternPreferDockerVersion === undefined &&
+                userConfig.releaseTagPatternPreferDockerVersion === undefined) {
+                releaseGroup.releaseTagPatternPreferDockerVersion = true;
+            }
         }
     }
     const configError = validateChangelogConfig(releaseGroups, rootChangelogConfig);
@@ -554,6 +567,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             releaseTagPatternCheckAllBranchesWhen: WORKSPACE_DEFAULTS.releaseTagPatternCheckAllBranchesWhen,
             releaseTagPatternRequireSemver: WORKSPACE_DEFAULTS.releaseTagPatternRequireSemver,
             releaseTagPatternStrictPreid: WORKSPACE_DEFAULTS.releaseTagPatternStrictPreid,
+            releaseTagPatternPreferDockerVersion: WORKSPACE_DEFAULTS.releaseTagPatternPreferDockerVersion,
             git: rootGitConfig,
             docker: rootDockerConfig,
             version: rootVersionConfig,

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

@@ -1 +1 @@
-{"version":3,"file":"version-plans.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/version-plans.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,WAAW,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,gBAAgB,EAAE,WAAW,CAAC;IAC9B;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CAClD;AAID,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CA0BrE;AAED,wBAAsB,+BAA+B,CACnD,eAAe,EAAE,cAAc,EAAE,EACjC,aAAa,EAAE,oBAAoB,EAAE,EACrC,0BAA0B,EAAE,MAAM,EAAE,EACpC,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAqNjC;AASD,wBAAgB,2BAA2B,WAE1C"}
+{"version":3,"file":"version-plans.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/config/version-plans.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,WAAW,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,gBAAgB,EAAE,WAAW,CAAC;IAC9B;;;;OAIG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CAClD;AAID,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CA0BrE;AAED,wBAAsB,+BAA+B,CACnD,eAAe,EAAE,cAAc,EAAE,EACjC,aAAa,EAAE,oBAAoB,EAAE,EACrC,0BAA0B,EAAE,MAAM,EAAE,EACpC,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAwNjC;AASD,wBAAgB,2BAA2B,WAE1C"}

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

@@ -149,7 +149,10 @@ async function setResolvedVersionPlansOnGroups(rawVersionPlans, releaseGroups, a
                             }
                         }
                         else {
-                            existingPlan.triggeredByProjects.push(key);
+                            // Avoid duplicates when releaseGraph is reused and version plans are resolved multiple times
+                            if (!existingPlan.triggeredByProjects.includes(key)) {
+                                existingPlan.triggeredByProjects.push(key);
+                            }
                         }
                     }
                     else {

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

@@ -1 +1 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EAEvB,MAAM,sBAAsB,CAAC;AAsB9B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASlD,MAAM,WAAW,qBAAqB;IACpC,CAAC,WAAW,EAAE,MAAM,GAAG;QACrB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH;AAED,eAAO,MAAM,wBAAwB,GAAI,MAAM,cAAc,oBAWzD,CAAC;AAEL,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,cAAc,KACnB,OAAO,CAAC,qBAAqB,CAAC,CAkHlC"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EAEvB,MAAM,sBAAsB,CAAC;AAuB9B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AASlD,MAAM,WAAW,qBAAqB;IACpC,CAAC,WAAW,EAAE,MAAM,GAAG;QACrB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH;AAED,eAAO,MAAM,wBAAwB,GAAI,MAAM,cAAc,oBAWzD,CAAC;AAEL,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,cAAc,KACnB,OAAO,CAAC,qBAAqB,CAAC,CAuIlC"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.releasePublishCLIHandler = void 0;
 exports.createAPI = createAPI;
 const nx_json_1 = require("../../config/nx-json");
+const tree_1 = require("../../generators/tree");
 const native_1 = require("../../native");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const tasks_execution_hooks_1 = require("../../project-graph/plugins/tasks-execution-hooks");
@@ -16,8 +17,8 @@ const workspace_root_1 = require("../../utils/workspace-root");
 const graph_1 = require("../graph/graph");
 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 print_config_1 = require("./utils/print-config");
+const release_graph_1 = require("./utils/release-graph");
 const releasePublishCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, async () => {
     const publishProjectsResult = await createAPI({})(args);
     // If all projects are published successfully, return 0, otherwise return 1
@@ -57,14 +58,26 @@ function createAPI(overrideReleaseConfig) {
                 isDebug: args.printConfig === 'debug',
             });
         }
-        const { error: filterError, filterLog, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, _args.projects, _args.groups);
-        if (filterError) {
-            output_1.output.error(filterError);
-            process.exit(1);
-        }
-        if (filterLog &&
+        // Use pre-built release graph if provided, otherwise create a new one
+        const releaseGraph = args.releaseGraph ||
+            (await (0, release_graph_1.createReleaseGraph)({
+                // Only build the tree if no existing graph, it's only needed for this
+                tree: new tree_1.FsTree(workspace_root_1.workspaceRoot, args.verbose),
+                projectGraph,
+                nxReleaseConfig,
+                filters: {
+                    projects: _args.projects,
+                    groups: _args.groups,
+                },
+                firstRelease: args.firstRelease,
+                verbose: args.verbose,
+                // Publish doesn't need to resolve current versions during graph construction
+                skipVersionResolution: true,
+            }));
+        // Display filter log if filters were applied
+        if (releaseGraph.filterLog &&
             process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG !== 'true') {
-            output_1.output.note(filterLog);
+            output_1.output.note(releaseGraph.filterLog);
         }
         /**
          * If the user is filtering to a subset of projects or groups, we should not run the publish task
@@ -77,9 +90,15 @@ function createAPI(overrideReleaseConfig) {
         if (args.projects?.length) {
             /**
              * Run publishing for all remaining release groups and filtered projects within them
+             * in topological order
              */
-            for (const releaseGroup of releaseGroups) {
-                const publishProjectsResult = await runPublishOnProjects(_args, projectGraph, nxJson, Array.from(releaseGroupToFilteredProjects.get(releaseGroup)), {
+            for (const releaseGroupName of releaseGraph.sortedReleaseGroups) {
+                const releaseGroup = releaseGraph.releaseGroups.find((g) => g.name === releaseGroupName);
+                if (!releaseGroup) {
+                    // Release group was filtered out, skip
+                    continue;
+                }
+                const publishProjectsResult = await runPublishOnProjects(_args, projectGraph, nxJson, Array.from(releaseGraph.releaseGroupToFilteredProjects.get(releaseGroup)), {
                     excludeTaskDependencies: shouldExcludeTaskDependencies,
                     loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',
                 });
@@ -93,7 +112,12 @@ function createAPI(overrideReleaseConfig) {
         /**
          * Run publishing for all remaining release groups
          */
-        for (const releaseGroup of releaseGroups) {
+        for (const releaseGroupName of releaseGraph.sortedReleaseGroups) {
+            const releaseGroup = releaseGraph.releaseGroups.find((g) => g.name === releaseGroupName);
+            if (!releaseGroup) {
+                // Release group was filtered out, skip
+                continue;
+            }
             const publishProjectsResult = await runPublishOnProjects(_args, projectGraph, nxJson, releaseGroup.projects, {
                 excludeTaskDependencies: shouldExcludeTaskDependencies,
                 loadDotEnvFiles: process.env.NX_LOAD_DOT_ENV_FILES !== 'false',

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

@@ -1 +1 @@
-{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/release.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAM1E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA4BlE,OAAO,EACL,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAEnB,eAAO,MAAM,iBAAiB,GAAI,MAAM,cAAc,oBACC,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAMnE,MAAM,cAAc,KACnB,OAAO,CAAC,sBAAsB,GAAG,MAAM,CAAC,CA4W5C"}
+{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/release.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAM1E,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AA2BlE,OAAO,EACL,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAEnB,eAAO,MAAM,iBAAiB,GAAI,MAAM,cAAc,oBACC,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAMnE,MAAM,cAAc,KACnB,OAAO,CAAC,sBAAsB,GAAG,MAAM,CAAC,CA4W5C"}

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

@@ -12,7 +12,6 @@ const output_1 = require("../../utils/output");
 const changelog_1 = require("./changelog");
 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 publish_1 = require("./publish");
 const git_1 = require("./utils/git");
@@ -58,16 +57,6 @@ function createAPI(overrideReleaseConfig) {
                 isDebug: args.printConfig === 'debug',
             });
         }
-        const { error: filterError, filterLog, releaseGroups, releaseGroupToFilteredProjects, } = (0, filter_release_groups_1.filterReleaseGroups)(projectGraph, nxReleaseConfig, args.projects, args.groups);
-        if (filterError) {
-            output_1.output.error(filterError);
-            process.exit(1);
-        }
-        if (filterLog) {
-            output_1.output.note(filterLog);
-        }
-        // Do not repeat the filter log in the release subcommands
-        process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG = 'true';
         const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)();
         if (args.specifier && rawVersionPlans.length > 0) {
             output_1.output.error({
@@ -84,21 +73,21 @@ function createAPI(overrideReleaseConfig) {
         const shouldStage = (shouldCommit || userProvidedReleaseConfig.git?.stageChanges) ?? false;
         const shouldTag = userProvidedReleaseConfig.git?.tag ?? true;
         const shouldCreateWorkspaceRemoteRelease = shouldCreateRemoteRelease(nxReleaseConfig.changelog.workspaceChangelog);
-        // If the workspace or any of the release groups specify that a remote release should be created, we need to push the changes to the remote
-        const shouldPush = (shouldCreateWorkspaceRemoteRelease ||
-            releaseGroups.some((group) => shouldCreateRemoteRelease(group.changelog))) ??
-            false;
-        const versionResult = await releaseVersion({
+        const { workspaceVersion, projectsVersionData, releaseGraph, } = await releaseVersion({
             ...args,
             stageChanges: shouldStage,
             gitCommit: false,
             gitTag: false,
             deleteVersionPlans: false,
         });
+        // Suppress the filter log for the changelog command as it would have already been printed by the version command
+        process.env.NX_RELEASE_INTERNAL_SUPPRESS_FILTER_LOG = 'true';
         const changelogResult = await releaseChangelog({
             ...args,
-            versionData: versionResult.projectsVersionData,
-            version: versionResult.workspaceVersion,
+            // Re-use existing release graph
+            releaseGraph,
+            versionData: projectsVersionData,
+            version: workspaceVersion,
             stageChanges: shouldStage,
             gitCommit: false,
             gitTag: false,
@@ -106,16 +95,16 @@ function createAPI(overrideReleaseConfig) {
             createRelease: false,
             deleteVersionPlans: false,
         });
-        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
+        await (0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGraph.releaseGroups, Object.keys(projectGraph.nodes), args.verbose);
         // Validate version plans against the filter after resolution
-        const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGroups, releaseGroupToFilteredProjects);
+        const versionPlanValidationError = (0, version_plan_utils_1.validateResolvedVersionPlansAgainstFilter)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects);
         if (versionPlanValidationError) {
             output_1.output.error(versionPlanValidationError);
             process.exit(1);
         }
         const planFiles = new Set();
-        releaseGroups.forEach((group) => {
-            const filteredProjects = releaseGroupToFilteredProjects.get(group);
+        releaseGraph.releaseGroups.forEach((group) => {
+            const filteredProjects = releaseGraph.releaseGroupToFilteredProjects.get(group);
             if (group.resolvedVersionPlans) {
                 // Check each version plan individually to see if it should be deleted
                 const plansToDelete = [];
@@ -162,7 +151,7 @@ function createAPI(overrideReleaseConfig) {
         if (shouldCommit) {
             output_1.output.logSingleLine(`Committing changes with git`);
             const commitMessage = nxReleaseConfig.git.commitMessage;
-            const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionResult.projectsVersionData, commitMessage);
+            const commitMessageValues = (0, shared_1.createCommitMessageValues)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects, projectsVersionData, commitMessage);
             await (0, git_1.gitCommit)({
                 messages: commitMessageValues,
                 additionalArgs: nxReleaseConfig.git.commitArgs,
@@ -173,7 +162,7 @@ function createAPI(overrideReleaseConfig) {
         if (shouldTag) {
             output_1.output.logSingleLine(`Tagging commit with git`);
             // Resolve any git tags as early as possible so that we can hard error in case of any duplicates before reaching the actual git command
-            const gitTagValues = (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects, versionResult.projectsVersionData);
+            const gitTagValues = (0, shared_1.createGitTagValues)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects, projectsVersionData);
             (0, shared_1.handleDuplicateGitTags)(gitTagValues);
             for (const tag of gitTagValues) {
                 await (0, git_1.gitTag)({
@@ -186,6 +175,10 @@ function createAPI(overrideReleaseConfig) {
             }
         }
         let hasPushedChanges = false;
+        // If the workspace or any of the release groups specify that a remote release should be created, we need to push the changes to the remote
+        const shouldPush = (shouldCreateWorkspaceRemoteRelease ||
+            releaseGraph.releaseGroups.some((group) => shouldCreateRemoteRelease(group.changelog))) ??
+            false;
         if (shouldPush) {
             output_1.output.logSingleLine(`Pushing to git remote "origin"`);
             await (0, git_1.gitPush)({
@@ -209,7 +202,11 @@ function createAPI(overrideReleaseConfig) {
             latestCommit = await (0, git_1.getCommitHash)('HEAD');
             await remoteReleaseClient.createOrUpdateRelease(changelogResult.workspaceChangelog.releaseVersion, changelogResult.workspaceChangelog.contents, latestCommit, { dryRun: args.dryRun });
         }
-        for (const releaseGroup of releaseGroups) {
+        for (const releaseGroupName of releaseGraph.sortedReleaseGroups) {
+            const releaseGroup = releaseGraph.releaseGroups.find((g) => g.name === releaseGroupName);
+            if (!releaseGroup) {
+                continue;
+            }
             const shouldCreateProjectRemoteReleases = shouldCreateRemoteRelease(releaseGroup.changelog);
             if (shouldCreateProjectRemoteReleases &&
                 changelogResult.projectChangelogs) {
@@ -219,7 +216,7 @@ function createAPI(overrideReleaseConfig) {
                     .createRelease);
                 const projects = args.projects?.length
                     ? // If the user has passed a list of projects, we need to use the filtered list of projects within the release group
-                        Array.from(releaseGroupToFilteredProjects.get(releaseGroup))
+                        Array.from(releaseGraph.releaseGroupToFilteredProjects.get(releaseGroup))
                     : // Otherwise, we use the full list of projects within the release group
                         releaseGroup.projects;
                 const projectNodes = projects.map((name) => projectGraph.nodes[name]);
@@ -241,8 +238,8 @@ function createAPI(overrideReleaseConfig) {
         }
         let hasNewVersion = false;
         // null means that all projects are versioned together but there were no changes
-        if (versionResult.workspaceVersion !== null) {
-            hasNewVersion = Object.values(versionResult.projectsVersionData).some((version) => 
+        if (workspaceVersion !== null) {
+            hasNewVersion = Object.values(projectsVersionData).some((version) => 
             /**
              * There is a scenario where applications will not have a newVersion created by VerisonActions,
              * however, there will still be a dockerVersion created from the docker release.
@@ -257,7 +254,7 @@ function createAPI(overrideReleaseConfig) {
         if (shouldPublish) {
             const publishResults = await releasePublish({
                 ...args,
-                versionData: versionResult.projectsVersionData,
+                versionData: projectsVersionData,
             });
             const allExitOk = Object.values(publishResults).every((result) => result.code === 0);
             if (!allExitOk) {
@@ -268,7 +265,11 @@ function createAPI(overrideReleaseConfig) {
         else {
             output_1.output.logSingleLine('Skipped publishing packages.');
         }
-        return versionResult;
+        return {
+            workspaceVersion,
+            projectsVersionData,
+            releaseGraph,
+        };
     };
 }
 async function promptForPublish() {