nx 22.0.0-beta.3 → 22.0.0-beta.5

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

@@ -193,7 +193,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             preserveLocalDependencyProtocols: userConfig.version?.preserveLocalDependencyProtocols ?? true,
             preserveMatchingDependencyRanges: userConfig.version?.preserveMatchingDependencyRanges ?? true,
             logUnchangedProjects: userConfig.version?.logUnchangedProjects ?? true,
-            updateDependents: userConfig.version?.updateDependents ?? 'auto',
+            updateDependents: userConfig.version?.updateDependents ?? 'always',
         },
         changelog: {
             git: changelogGitDefaults,
@@ -228,24 +228,36 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
                 : false,
             automaticFromRef: false,
         },
-        releaseTagPattern: userConfig.releaseTagPattern ||
-            // The appropriate default releaseTagPattern is dependent upon the projectRelationships
-            (workspaceProjectsRelationship === 'independent'
-                ? defaultIndependentReleaseTagPattern
-                : defaultFixedReleaseTagPattern),
-        releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
-        releaseTagPatternRequireSemver: userConfig.releaseTagPatternRequireSemver ??
-            defaultReleaseTagPatternRequireSemver,
-        releaseTagPatternStrictPreid: userConfig.releaseTagPatternStrictPreid ??
-            defaultReleaseTagPatternStrictPreid,
+        releaseTag: {
+            pattern: userConfig.releaseTag?.pattern ||
+                userConfig.releaseTagPattern ||
+                // The appropriate default pattern is dependent upon the projectRelationships
+                (workspaceProjectsRelationship === 'independent'
+                    ? defaultIndependentReleaseTagPattern
+                    : defaultFixedReleaseTagPattern),
+            checkAllBranchesWhen: userConfig.releaseTag?.checkAllBranchesWhen ??
+                userConfig.releaseTagPatternCheckAllBranchesWhen ??
+                undefined,
+            requireSemver: userConfig.releaseTag?.requireSemver ??
+                userConfig.releaseTagPatternRequireSemver ??
+                defaultReleaseTagPatternRequireSemver,
+            preferDockerVersion: userConfig.releaseTag?.preferDockerVersion ??
+                userConfig.releaseTagPatternPreferDockerVersion ??
+                false,
+            strictPreid: userConfig.releaseTag?.strictPreid ??
+                userConfig.releaseTagPatternStrictPreid ??
+                defaultReleaseTagPatternStrictPreid,
+        },
         conventionalCommits: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG,
         versionPlans: (userConfig.versionPlans ||
             false),
     };
     const groupProjectsRelationship = userConfig.projectsRelationship || WORKSPACE_DEFAULTS.projectsRelationship;
-    const groupReleaseTagPatternRequireSemver = userConfig.releaseTagPatternRequireSemver ??
-        WORKSPACE_DEFAULTS.releaseTagPatternRequireSemver;
-    const groupReleaseTagPatternStrictPreid = userConfig.releaseTagPatternStrictPreid ??
+    const groupReleaseTagRequireSemver = userConfig.releaseTag?.requireSemver ??
+        userConfig.releaseTagPatternRequireSemver ??
+        WORKSPACE_DEFAULTS.releaseTag.requireSemver;
+    const groupReleaseTagStrictPreid = userConfig.releaseTag?.strictPreid ??
+        userConfig.releaseTagPatternStrictPreid ??
         defaultReleaseTagPatternStrictPreid;
     const groupDocker = normalizeDockerConfig(userConfig.docker ?? WORKSPACE_DEFAULTS.docker);
     const GROUP_DEFAULTS = {
@@ -275,18 +287,23 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
                 versionTitleDate: true,
             },
         },
-        releaseTagPattern: 
-        // The appropriate group default releaseTagPattern is dependent upon the projectRelationships
-        groupProjectsRelationship === 'independent'
-            ? // If the default pattern contains {projectName} then it will create unique release tags for each project.
-                // Otherwise, use the default value to guarantee unique tags
-                WORKSPACE_DEFAULTS.releaseTagPattern?.includes('{projectName}')
-                    ? WORKSPACE_DEFAULTS.releaseTagPattern
-                    : defaultIndependentReleaseTagPattern
-            : WORKSPACE_DEFAULTS.releaseTagPattern,
-        releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
-        releaseTagPatternRequireSemver: groupReleaseTagPatternRequireSemver,
-        releaseTagPatternStrictPreid: groupReleaseTagPatternStrictPreid,
+        releaseTag: {
+            pattern: 
+            // The appropriate group default pattern is dependent upon the projectRelationships
+            groupProjectsRelationship === 'independent'
+                ? // If the default pattern contains {projectName} then it will create unique release tags for each project.
+                    // Otherwise, use the default value to guarantee unique tags
+                    WORKSPACE_DEFAULTS.releaseTag.pattern?.includes('{projectName}')
+                        ? WORKSPACE_DEFAULTS.releaseTag.pattern
+                        : defaultIndependentReleaseTagPattern
+                : WORKSPACE_DEFAULTS.releaseTag.pattern,
+            checkAllBranchesWhen: userConfig.releaseTag?.checkAllBranchesWhen ??
+                userConfig.releaseTagPatternCheckAllBranchesWhen ??
+                undefined,
+            requireSemver: groupReleaseTagRequireSemver,
+            preferDockerVersion: false,
+            strictPreid: groupReleaseTagStrictPreid,
+        },
         versionPlans: false,
     };
     /**
@@ -372,10 +389,24 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
                      * be the valid source of truth for that type of config.
                      */
                     version: deepMergeDefaults([GROUP_DEFAULTS.version], rootVersionWithoutGlobalOptions),
-                    // If the user has set something custom for releaseTagPattern at the top level, respect it for the implicit default group
-                    releaseTagPattern: userConfig.releaseTagPattern || GROUP_DEFAULTS.releaseTagPattern,
-                    releaseTagPatternRequireSemver: userConfig.releaseTagPatternRequireSemver ??
-                        GROUP_DEFAULTS.releaseTagPatternRequireSemver,
+                    // If the user has set something custom for releaseTag at the top level, respect it for the implicit default group
+                    releaseTag: {
+                        pattern: userConfig.releaseTag?.pattern ||
+                            userConfig.releaseTagPattern ||
+                            GROUP_DEFAULTS.releaseTag.pattern,
+                        checkAllBranchesWhen: userConfig.releaseTag?.checkAllBranchesWhen ??
+                            userConfig.releaseTagPatternCheckAllBranchesWhen ??
+                            GROUP_DEFAULTS.releaseTag.checkAllBranchesWhen,
+                        requireSemver: userConfig.releaseTag?.requireSemver ??
+                            userConfig.releaseTagPatternRequireSemver ??
+                            GROUP_DEFAULTS.releaseTag.requireSemver,
+                        preferDockerVersion: userConfig.releaseTag?.preferDockerVersion ??
+                            userConfig.releaseTagPatternPreferDockerVersion ??
+                            GROUP_DEFAULTS.releaseTag.preferDockerVersion,
+                        strictPreid: userConfig.releaseTag?.strictPreid ??
+                            userConfig.releaseTagPatternStrictPreid ??
+                            GROUP_DEFAULTS.releaseTag.strictPreid,
+                    },
                     // Directly inherit the root level config for projectChangelogs, if set
                     changelog: rootChangelogConfig.projectChangelogs || false,
                     versionPlans: rootVersionPlansConfig || GROUP_DEFAULTS.versionPlans,
@@ -402,8 +433,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             };
         }
         // If provided, ensure release tag pattern is valid
-        if (releaseGroup.releaseTagPattern) {
-            const error = ensureReleaseGroupReleaseTagPatternIsValid(releaseGroup.releaseTagPattern, releaseGroupName);
+        const releaseTagPattern = releaseGroup.releaseTag?.pattern || releaseGroup.releaseTagPattern;
+        if (releaseTagPattern) {
+            const error = ensureReleaseGroupReleaseTagPatternIsValid(releaseTagPattern, releaseGroupName);
             if (error) {
                 return {
                     error,
@@ -412,12 +444,19 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             }
         }
         else {
-            releaseGroup.releaseTagPattern =
-                releaseGroup.projectsRelationship === 'independent'
-                    ? WORKSPACE_DEFAULTS.releaseTagPattern?.includes('{projectName}')
-                        ? WORKSPACE_DEFAULTS.releaseTagPattern
-                        : defaultIndependentReleaseTagPattern
-                    : userConfig?.releaseTagPattern ?? defaultFixedGroupReleaseTagPattern;
+            // Set default pattern if not provided
+            const defaultPattern = releaseGroup.projectsRelationship === 'independent'
+                ? WORKSPACE_DEFAULTS.releaseTag.pattern?.includes('{projectName}')
+                    ? WORKSPACE_DEFAULTS.releaseTag.pattern
+                    : defaultIndependentReleaseTagPattern
+                : userConfig?.releaseTag?.pattern ??
+                    userConfig?.releaseTagPattern ??
+                    defaultFixedGroupReleaseTagPattern;
+            // Initialize releaseTag object if it doesn't exist
+            if (!releaseGroup.releaseTag) {
+                releaseGroup.releaseTag = {};
+            }
+            releaseGroup.releaseTag.pattern = defaultPattern;
         }
         for (const project of matchingProjects) {
             if (alreadyMatchedProjects.has(project)) {
@@ -468,24 +507,40 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             changelog: releaseGroup.changelog || rootChangelogConfig.projectChangelogs
                 ? deepMergeDefaults(groupChangelogDefaults, releaseGroup.changelog || {})
                 : false,
-            releaseTagPattern: releaseGroup.releaseTagPattern ||
-                // The appropriate group default releaseTagPattern is dependent upon the projectRelationships
-                (projectsRelationship === 'independent'
-                    ? // If the default pattern contains {projectName} then it will create unique release tags for each project.
-                        // Otherwise, use the default value to guarantee unique tags
-                        userConfig.releaseTagPattern?.includes('{projectName}')
-                            ? userConfig.releaseTagPattern
-                            : defaultIndependentReleaseTagPattern
-                    : userConfig.releaseTagPattern || defaultFixedReleaseTagPattern),
-            releaseTagPatternCheckAllBranchesWhen: releaseGroup.releaseTagPatternCheckAllBranchesWhen ??
-                userConfig.releaseTagPatternCheckAllBranchesWhen ??
-                undefined,
-            releaseTagPatternRequireSemver: releaseGroup.releaseTagPatternRequireSemver ??
-                userConfig.releaseTagPatternRequireSemver ??
-                defaultReleaseTagPatternRequireSemver,
-            releaseTagPatternStrictPreid: releaseGroup.releaseTagPatternStrictPreid ??
-                userConfig.releaseTagPatternStrictPreid ??
-                defaultReleaseTagPatternStrictPreid,
+            releaseTag: {
+                pattern: releaseGroup.releaseTag?.pattern ||
+                    releaseGroup.releaseTagPattern ||
+                    // The appropriate group default pattern is dependent upon the projectRelationships
+                    (projectsRelationship === 'independent'
+                        ? // If the default pattern contains {projectName} then it will create unique release tags for each project.
+                            // Otherwise, use the default value to guarantee unique tags
+                            (userConfig.releaseTag?.pattern || userConfig.releaseTagPattern)?.includes('{projectName}')
+                                ? userConfig.releaseTag?.pattern || userConfig.releaseTagPattern
+                                : defaultIndependentReleaseTagPattern
+                        : userConfig.releaseTag?.pattern ||
+                            userConfig.releaseTagPattern ||
+                            defaultFixedReleaseTagPattern),
+                checkAllBranchesWhen: releaseGroup.releaseTag?.checkAllBranchesWhen ??
+                    releaseGroup.releaseTagPatternCheckAllBranchesWhen ??
+                    userConfig.releaseTag?.checkAllBranchesWhen ??
+                    userConfig.releaseTagPatternCheckAllBranchesWhen ??
+                    undefined,
+                requireSemver: releaseGroup.releaseTag?.requireSemver ??
+                    releaseGroup.releaseTagPatternRequireSemver ??
+                    userConfig.releaseTag?.requireSemver ??
+                    userConfig.releaseTagPatternRequireSemver ??
+                    defaultReleaseTagPatternRequireSemver,
+                preferDockerVersion: releaseGroup.releaseTag?.preferDockerVersion ??
+                    releaseGroup.releaseTagPatternPreferDockerVersion ??
+                    userConfig.releaseTag?.preferDockerVersion ??
+                    userConfig.releaseTagPatternPreferDockerVersion ??
+                    false,
+                strictPreid: releaseGroup.releaseTag?.strictPreid ??
+                    releaseGroup.releaseTagPatternStrictPreid ??
+                    userConfig.releaseTag?.strictPreid ??
+                    userConfig.releaseTagPatternStrictPreid ??
+                    defaultReleaseTagPatternStrictPreid,
+            },
             versionPlans: releaseGroup.versionPlans ?? rootVersionPlansConfig,
         };
         const finalReleaseGroup = deepMergeDefaults([groupDefaults], {
@@ -532,7 +587,18 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         });
         if (hasDockerProjects) {
             // If any project in the group has docker configuration, disable semver requirement
-            releaseGroup.releaseTagPatternRequireSemver = false;
+            releaseGroup.releaseTag.requireSemver = false;
+            // Set preferDockerVersion to true by default when docker projects exist,
+            // unless user has explicitly configured it
+            if (releaseGroup.releaseTag.preferDockerVersion === false &&
+                userConfig.groups?.[releaseGroupName]?.releaseTag
+                    ?.preferDockerVersion === undefined &&
+                userConfig.groups?.[releaseGroupName]
+                    ?.releaseTagPatternPreferDockerVersion === undefined &&
+                userConfig.releaseTag?.preferDockerVersion === undefined &&
+                userConfig.releaseTagPatternPreferDockerVersion === undefined) {
+                releaseGroup.releaseTag.preferDockerVersion = true;
+            }
         }
     }
     const configError = validateChangelogConfig(releaseGroups, rootChangelogConfig);
@@ -550,10 +616,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             ...(WORKSPACE_DEFAULTS.docker
                 ? { docker: WORKSPACE_DEFAULTS.docker }
                 : {}),
-            releaseTagPattern: WORKSPACE_DEFAULTS.releaseTagPattern,
-            releaseTagPatternCheckAllBranchesWhen: WORKSPACE_DEFAULTS.releaseTagPatternCheckAllBranchesWhen,
-            releaseTagPatternRequireSemver: WORKSPACE_DEFAULTS.releaseTagPatternRequireSemver,
-            releaseTagPatternStrictPreid: WORKSPACE_DEFAULTS.releaseTagPatternStrictPreid,
+            releaseTag: WORKSPACE_DEFAULTS.releaseTag,
             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() {

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

@@ -29,8 +29,8 @@ export interface GitCommit extends RawGitCommit {
 export interface GetLatestGitTagForPatternOptions {
     checkAllBranchesWhen?: boolean | string[];
     preid?: string;
-    releaseTagPatternRequireSemver: boolean;
-    releaseTagPatternStrictPreid: boolean;
+    requireSemver: boolean;
+    strictPreid: boolean;
 }
 /**
  * Extract the tag and version from a tag string

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

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

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

@@ -38,9 +38,9 @@ const SEMVER_REGEX = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d
  * @returns The tag and version
  */
 function extractTagAndVersion(tag, tagRegexp, options) {
-    const { releaseTagPatternRequireSemver } = options;
+    const { requireSemver } = options;
     const [latestMatchingTag, ...rest] = tag.match(tagRegexp);
-    let version = releaseTagPatternRequireSemver
+    let version = requireSemver
         ? rest.filter((r) => {
             return r.match(SEMVER_REGEX);
         })[0]
@@ -66,7 +66,7 @@ function extractTagAndVersion(tag, tagRegexp, options) {
  * @returns The tag and version
  */
 async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}, options) {
-    const { checkAllBranchesWhen, releaseTagPatternRequireSemver, releaseTagPatternStrictPreid, preid, } = options;
+    const { checkAllBranchesWhen, requireSemver, strictPreid, preid } = options;
     /**
      * By default, we will try and resolve the latest match for the releaseTagPattern from the current branch,
      * falling back to all branches if no match is found on the current branch.
@@ -148,7 +148,7 @@ async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolat
             .replace('%p%', '(.+)')
             .replace('%rg%', '(.+)')}`;
         const matchingTags = tags.filter((tag) => {
-            if (releaseTagPatternRequireSemver) {
+            if (requireSemver) {
                 // Match against Semver Regex when using semverVersioning to ensure only valid semver tags are matched
                 return (!!tag.match(tagRegexp) &&
                     tag.match(tagRegexp).some((r) => r.match(SEMVER_REGEX)));
@@ -160,7 +160,7 @@ async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolat
         if (!matchingTags.length) {
             return null;
         }
-        if (!releaseTagPatternStrictPreid) {
+        if (!strictPreid) {
             // If not using strict preid, we can just return the first matching tag
             return extractTagAndVersion(matchingTags[0], tagRegexp, options);
         }