nx 22.5.0-beta.2 → 22.5.0-beta.4

package/README.md

@@ -1,7 +1,7 @@
 <p style="text-align: center;">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Repos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+    <img alt="Nx - Smart Monorepos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
   </picture>
 </p>
 
@@ -20,7 +20,7 @@
 
 <hr>
 
-# Nx: Smart Repos · Fast Builds
+# Nx: Smart Monorepos · Fast Builds
 
 Get to green PRs in half the time. Nx optimizes your builds, scales your CI, and fixes failed PRs. Built for developers and AI agents.
 
@@ -62,5 +62,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://nx.dev/blog)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Repos · Fast Builds"></a></p>
+width="100%" alt="Nx - Smart Monorepos · Fast Builds"></a></p>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.5.0-beta.2",
+  "version": "22.5.0-beta.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -72,8 +72,8 @@
     "yargs-parser": "21.1.1"
   },
   "peerDependencies": {
-    "@swc-node/register": "^1.11.1",
-    "@swc/core": "^1.15.5"
+    "@swc-node/register": "1.11.1",
+    "@swc/core": "1.15.8"
   },
   "peerDependenciesMeta": {
     "@swc-node/register": {
@@ -84,16 +84,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.5.0-beta.2",
-    "@nx/nx-darwin-x64": "22.5.0-beta.2",
-    "@nx/nx-freebsd-x64": "22.5.0-beta.2",
-    "@nx/nx-linux-arm-gnueabihf": "22.5.0-beta.2",
-    "@nx/nx-linux-arm64-gnu": "22.5.0-beta.2",
-    "@nx/nx-linux-arm64-musl": "22.5.0-beta.2",
-    "@nx/nx-linux-x64-gnu": "22.5.0-beta.2",
-    "@nx/nx-linux-x64-musl": "22.5.0-beta.2",
-    "@nx/nx-win32-arm64-msvc": "22.5.0-beta.2",
-    "@nx/nx-win32-x64-msvc": "22.5.0-beta.2"
+    "@nx/nx-darwin-arm64": "22.5.0-beta.4",
+    "@nx/nx-darwin-x64": "22.5.0-beta.4",
+    "@nx/nx-freebsd-x64": "22.5.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "22.5.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "22.5.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "22.5.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "22.5.0-beta.4",
+    "@nx/nx-linux-x64-musl": "22.5.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "22.5.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "22.5.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/ai/constants.d.ts

@@ -3,6 +3,7 @@ export declare function geminiMdPath(root: string): string;
 export declare function parseGeminiSettings(root: string): any | undefined;
 export declare function geminiSettingsPath(root: string): string;
 export declare function claudeMdPath(root: string): string;
+export declare function claudeMcpJsonPath(root: string): string;
 export declare function opencodeMcpPath(root: string): string;
 export declare const codexConfigTomlPath: string;
 export declare const nxRulesMarkerCommentStart = "<!-- nx configuration start-->";

package/src/ai/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/ai/constants.ts"],"names":[],"mappings":"AAMA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAOjE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,eAAO,MAAM,mBAAmB,QAA2C,CAAC;AAE5E,eAAO,MAAM,yBAAyB,mCAAmC,CAAC;AAC1E,eAAO,MAAM,+BAA+B,8EAA8E,CAAC;AAC3H,eAAO,MAAM,uBAAuB,iCAAiC,CAAC;AACtE,eAAO,MAAM,UAAU,QAGtB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,mBAAmB,OAAO,WAG9D,CAAC;AAEF,eAAO,MAAM,eAAe,6BAA2B,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAQ5D"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/ai/constants.ts"],"names":[],"mappings":"AAMA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAOjE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,eAAO,MAAM,mBAAmB,QAA2C,CAAC;AAE5E,eAAO,MAAM,yBAAyB,mCAAmC,CAAC;AAC1E,eAAO,MAAM,+BAA+B,8EAA8E,CAAC;AAC3H,eAAO,MAAM,uBAAuB,iCAAiC,CAAC;AACtE,eAAO,MAAM,UAAU,QAGtB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,mBAAmB,OAAO,WAG9D,CAAC;AAEF,eAAO,MAAM,eAAe,6BAA2B,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAQ5D"}

package/src/ai/constants.js

@@ -6,6 +6,7 @@ exports.geminiMdPath = geminiMdPath;
 exports.parseGeminiSettings = parseGeminiSettings;
 exports.geminiSettingsPath = geminiSettingsPath;
 exports.claudeMdPath = claudeMdPath;
+exports.claudeMcpJsonPath = claudeMcpJsonPath;
 exports.opencodeMcpPath = opencodeMcpPath;
 exports.getNxMcpTomlConfig = getNxMcpTomlConfig;
 const os_1 = require("os");
@@ -34,6 +35,9 @@ function geminiSettingsPath(root) {
 function claudeMdPath(root) {
     return (0, path_1.join)(root, 'CLAUDE.md');
 }
+function claudeMcpJsonPath(root) {
+    return (0, path_1.join)(root, '.mcp.json');
+}
 function opencodeMcpPath(root) {
     return (0, path_1.join)(root, 'opencode.json');
 }

package/src/ai/set-up-ai-agents/set-up-ai-agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-up-ai-agents.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/ai/set-up-ai-agents/set-up-ai-agents.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAS7C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAwB5B,OAAO,EACL,sCAAsC,EACtC,4BAA4B,EAC7B,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC,MAAM,EAAE,qBAAqB,EAAE,CAAC;CACjC,CAAC;AAmCF,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,EACrC,KAAK,UAAQ,GACZ,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAmC5D;AAaD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sCAAsC,GAC9C,OAAO,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAuN7C;AAkFD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"set-up-ai-agents.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/ai/set-up-ai-agents/set-up-ai-agents.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAS7C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAyB5B,OAAO,EACL,sCAAsC,EACtC,4BAA4B,EAC7B,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC,MAAM,EAAE,qBAAqB,EAAE,CAAC;CACjC,CAAC;AAmCF,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,EACrC,KAAK,UAAQ,GACZ,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAmC5D;AAaD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,sCAAsC,GAC9C,OAAO,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,CA4O7C;AAkFD,eAAe,sBAAsB,CAAC"}

package/src/ai/set-up-ai-agents/set-up-ai-agents.js

@@ -108,6 +108,28 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
                 'nx@nx-claude-plugins': true,
             },
         }));
+        // Clean up .mcp.json (nx-mcp now handled by plugin)
+        const mcpJsonPath = (0, constants_1.claudeMcpJsonPath)(options.directory);
+        if (tree.exists(mcpJsonPath)) {
+            try {
+                const mcpJsonContents = (0, json_1.readJson)(tree, mcpJsonPath);
+                if (mcpJsonContents?.mcpServers?.['nx-mcp']) {
+                    const serverKeys = Object.keys(mcpJsonContents.mcpServers || {});
+                    if (serverKeys.length === 1 && serverKeys[0] === 'nx-mcp') {
+                        // nx-mcp is the only server, delete the file
+                        tree.delete(mcpJsonPath);
+                    }
+                    else {
+                        // Other servers exist, just remove nx-mcp entry
+                        delete mcpJsonContents.mcpServers['nx-mcp'];
+                        (0, json_1.writeJson)(tree, mcpJsonPath, mcpJsonContents);
+                    }
+                }
+            }
+            catch {
+                // Ignore errors reading .mcp.json
+            }
+        }
     }
     if (hasAgent('opencode')) {
         const opencodeMcpJsonPath = (0, constants_1.opencodeMcpPath)(options.directory);

package/src/command-line/configure-ai-agents/configure-ai-agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configure-ai-agents.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/configure-ai-agents/configure-ai-agents.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAI5D,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,wBAAwB,EAC9B,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CAyOf"}
+{"version":3,"file":"configure-ai-agents.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/configure-ai-agents/configure-ai-agents.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAK5D,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,wBAAwB,EAC9B,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CA4Nf"}

package/src/command-line/configure-ai-agents/configure-ai-agents.js

@@ -7,10 +7,12 @@ const output_1 = require("../../utils/output");
 const provenance_1 = require("../../utils/provenance");
 const chalk = require("chalk");
 const utils_1 = require("../../ai/utils");
+const constants_1 = require("../../ai/constants");
 const devkit_internals_1 = require("../../devkit-internals");
 const workspace_root_1 = require("../../utils/workspace-root");
 const ora = require("ora");
 const path_1 = require("path");
+const fs_1 = require("fs");
 async function configureAiAgentsHandler(args, inner = false) {
     // Use environment variable to force local execution
     if (process.env.NX_USE_LOCAL === 'true' ||
@@ -169,18 +171,7 @@ async function configureAiAgentsHandlerImpl(options) {
                 required: true,
                 footer: function () {
                     const focused = this.focused;
-                    if (focused.partial) {
-                        return chalk.dim(focused.partialReason);
-                    }
-                    if (focused.agentConfiguration.outdated) {
-                        return chalk.dim(`  The rules file at ${focused.rulesDisplayPath} can be updated with the latest Nx recommendations`);
-                    }
-                    if (!focused.agentConfiguration.mcp &&
-                        !focused.agentConfiguration.rules) {
-                        return chalk.dim(`  Configures agent rules at ${focused.rulesDisplayPath} and the Nx MCP server ${focused.mcpDisplayPath
-                            ? `at ${focused.mcpDisplayPath}`
-                            : 'via Nx Console'}`);
-                    }
+                    return chalk.dim(`  ${getAgentFooterDescription(focused.agentConfiguration)}`);
                 },
             })).agents;
         }
@@ -201,16 +192,18 @@ async function configureAiAgentsHandlerImpl(options) {
     const configSpinner = ora(`Configuring agent(s)...`).start();
     try {
         await (0, utils_1.configureAgents)(selectedAgents, workspace_root_1.workspaceRoot, false);
-        const configuredOrUpdatedAgents = [
-            ...new Set([
-                ...fullyConfiguredAgents.map((a) => a.name),
-                ...selectedAgents,
-            ]),
+        // Combine all agent configurations for display
+        const allAgentConfigs = [
+            ...nonConfiguredAgents,
+            ...partiallyConfiguredAgents,
+            ...fullyConfiguredAgents,
         ];
+        const configuredOrUpdatedAgents = allAgentConfigs.filter((a) => selectedAgents.includes(a.name) ||
+            fullyConfiguredAgents.some((f) => f.name === a.name));
         configSpinner.stop();
-        output_1.output.log({
-            title: 'AI agents set up successfully. Configured Agents:',
-            bodyLines: configuredOrUpdatedAgents.map((agent) => `- ${utils_1.agentDisplayMap[agent]}`),
+        output_1.output.success({
+            title: 'AI agents configured successfully',
+            bodyLines: configuredOrUpdatedAgents.map((agent) => `${agent.displayName}: ${getAgentConfiguredDescription(agent)}`),
         });
         return;
     }
@@ -223,34 +216,75 @@ async function configureAiAgentsHandlerImpl(options) {
         process.exit(1);
     }
 }
-function getAgentChoiceForPrompt(agent) {
-    const partiallyConfigured = agent.mcp !== agent.rules;
-    let message = agent.displayName;
-    if (partiallyConfigured) {
-        message += ` (${agent.rules ? 'MCP missing' : 'rules missing'})`;
+/**
+ * Get the verbose footer description for an agent.
+ * Describes the end state per agent type.
+ */
+function getAgentFooterDescription(agent) {
+    // Extract filename from rulesPath
+    const rulesFile = agent.rulesPath.split('/').pop() || 'AGENTS.md';
+    switch (agent.name) {
+        case 'claude': {
+            let description = `Installs Nx plugin (MCP + skills + agents). Updates ${rulesFile}.`;
+            // Check if .mcp.json exists with nx-mcp - if so, mention cleanup
+            const mcpJsonPath = (0, constants_1.claudeMcpJsonPath)(workspace_root_1.workspaceRoot);
+            if ((0, fs_1.existsSync)(mcpJsonPath)) {
+                try {
+                    const mcpJsonContents = JSON.parse((0, fs_1.readFileSync)(mcpJsonPath, 'utf-8'));
+                    if (mcpJsonContents?.mcpServers?.['nx-mcp']) {
+                        description +=
+                            ' Removes nx-mcp from .mcp.json (now handled by plugin).';
+                    }
+                }
+                catch {
+                    // Ignore errors reading .mcp.json
+                }
+            }
+            return description;
+        }
+        case 'cursor':
+        case 'copilot':
+            return `Installs Nx Console (MCP). Adds skills and agents. Updates ${rulesFile}.`;
+        case 'gemini':
+        case 'opencode':
+            return `Configures MCP server. Adds skills and agents. Updates ${rulesFile}.`;
+        case 'codex':
+            return `Configures MCP server. Updates ${rulesFile}.`;
+        default:
+            return '';
     }
-    else if (agent.outdated) {
-        message += ' (out of date)';
+}
+/**
+ * Get a compact description of what was configured for an agent.
+ * Used in the post-configuration output.
+ */
+function getAgentConfiguredDescription(agent) {
+    // Extract filename from rulesPath
+    const rulesFile = agent.rulesPath.split('/').pop() || 'AGENTS.md';
+    switch (agent.name) {
+        case 'claude':
+            return `Nx plugin (MCP + skills + agents) + ${rulesFile}`;
+        case 'cursor':
+        case 'copilot':
+            return `Nx Console (MCP) + skills + ${rulesFile}`;
+        case 'gemini':
+        case 'opencode':
+            return `MCP + skills + ${rulesFile}`;
+        case 'codex':
+            return `MCP + ${rulesFile}`;
+        default:
+            return '';
     }
-    const rulesDisplayPath = agent.rulesPath.startsWith(workspace_root_1.workspaceRoot)
-        ? (0, path_1.relative)(workspace_root_1.workspaceRoot, agent.rulesPath)
-        : agent.rulesPath;
-    const mcpDisplayPath = agent.mcpPath?.startsWith(workspace_root_1.workspaceRoot)
-        ? (0, path_1.relative)(workspace_root_1.workspaceRoot, agent.mcpPath)
-        : agent.mcpPath;
-    const partialReason = partiallyConfigured
-        ? agent.rules
-            ? `  Partially configured: MCP missing ${agent.mcpPath ? `at ${mcpDisplayPath}` : 'via Nx Console'}`
-            : `  Partially configured: rules file missing at ${rulesDisplayPath}`
-        : undefined;
+}
+function getAgentChoiceForPrompt(agent) {
+    const partiallyConfigured = agent.mcp !== agent.rules;
+    const needsUpdate = partiallyConfigured || agent.outdated;
     return {
         name: agent.name,
-        message,
-        partial: partiallyConfigured,
-        partialReason,
+        message: needsUpdate
+            ? `${agent.displayName} (update available)`
+            : agent.displayName,
         agentConfiguration: agent,
-        rulesDisplayPath,
-        mcpDisplayPath,
     };
 }
 function normalizeOptions(options) {

package/src/command-line/nx-commands.js

@@ -51,7 +51,7 @@ exports.parserConfiguration = {
  */
 exports.commandsObject = yargs
     .parserConfiguration(exports.parserConfiguration)
-    .usage(chalk.bold('Smart Repos · Fast Builds'))
+    .usage(chalk.bold('Smart Monorepos · Fast Builds'))
     .demandCommand(1, '')
     .command(command_object_1.yargsRegisterCommand)
     .command(command_object_22.yargsAddCommand)

package/src/command-line/release/changelog/version-plan-filtering.d.ts

@@ -2,6 +2,7 @@ import type { ChangelogOptions } from '../command-object';
 import type { NxReleaseConfig } from '../config/config';
 import { RawVersionPlan } from '../config/version-plans';
 import type { VersionData } from '../utils/shared';
+import type { CheckAllBranchesWhen, RepoGitTags } from '../utils/repository-git-tags';
 /**
  * Filters version plans to only include those that were committed between the specified SHAs
  * @param versionPlans The raw version plans to filter
@@ -15,24 +16,26 @@ export declare function filterVersionPlansByCommitRange(versionPlans: RawVersion
  * Resolves the "from SHA" for changelog purposes.
  * This determines the starting point for changelog generation and optional version plan filtering.
  */
-export declare function resolveChangelogFromSHA({ fromRef, tagPattern, tagPatternValues, checkAllBranchesWhen, preid, requireSemver, strictPreid, useAutomaticFromRef, }: {
+export declare function resolveChangelogFromSHA({ fromRef, tagPattern, tagPatternValues, checkAllBranchesWhen, preid, requireSemver, strictPreid, useAutomaticFromRef, resolveRepositoryTags, }: {
     fromRef?: string;
     tagPattern: string;
     tagPatternValues: Record<string, string>;
-    checkAllBranchesWhen: boolean | string[];
+    checkAllBranchesWhen: CheckAllBranchesWhen;
     preid?: string;
     requireSemver: boolean;
     strictPreid: boolean;
     useAutomaticFromRef: boolean;
+    resolveRepositoryTags: RepoGitTags['resolveTags'];
 }): Promise<string | null>;
 /**
  * Helper function for workspace-level "from SHA" resolution.
  * Extracts preids and calls the generic resolver.
  */
-export declare function resolveWorkspaceChangelogFromSHA({ args, nxReleaseConfig, useAutomaticFromRef, }: {
+export declare function resolveWorkspaceChangelogFromSHA({ args, nxReleaseConfig, useAutomaticFromRef, resolveRepositoryTags, }: {
     args: ChangelogOptions;
     nxReleaseConfig: NxReleaseConfig;
     useAutomaticFromRef: boolean;
+    resolveRepositoryTags: RepoGitTags['resolveTags'];
 }): Promise<string | null>;
 export declare function extractPreidFromVersion(version: string | null | undefined): string | undefined;
 export declare function extractProjectsPreidFromVersionData(versionData: VersionData | undefined): Record<string, string | undefined> | undefined;

package/src/command-line/release/changelog/version-plan-filtering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-plan-filtering.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/changelog/version-plan-filtering.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAOzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAsB,+BAA+B,CACnD,YAAY,EAAE,cAAc,EAAE,EAC9B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,cAAc,EAAE,CAAC,CAgC3B;AA0DD;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,EAC5C,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,oBAAoB,EACpB,KAAK,EACL,aAAa,EACb,WAAW,EACX,mBAAmB,GACpB,EAAE;IACD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,oBAAoB,EAAE,OAAO,GAAG,MAAM,EAAE,CAAC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyBzB;AAED;;;GAGG;AACH,wBAAsB,gCAAgC,CAAC,EACrD,IAAI,EACJ,eAAe,EACf,mBAAmB,GACpB,EAAE;IACD,IAAI,EAAE,gBAAgB,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,OAAO,CAAC;CAC9B,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAczB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACjC,MAAM,GAAG,SAAS,CAOpB;AAED,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,CAYhD"}
+{"version":3,"file":"version-plan-filtering.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/changelog/version-plan-filtering.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAOzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAEtC;;;;;;;GAOG;AACH,wBAAsB,+BAA+B,CACnD,YAAY,EAAE,cAAc,EAAE,EAC9B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,cAAc,EAAE,CAAC,CAgC3B;AA0DD;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,EAC5C,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,oBAAoB,EACpB,KAAK,EACL,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,qBAAqB,GACtB,EAAE;IACD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,qBAAqB,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CACnD,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA0BzB;AAED;;;GAGG;AACH,wBAAsB,gCAAgC,CAAC,EACrD,IAAI,EACJ,eAAe,EACf,mBAAmB,EACnB,qBAAqB,GACtB,EAAE;IACD,IAAI,EAAE,gBAAgB,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,qBAAqB,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;CACnD,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAezB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACjC,MAAM,GAAG,SAAS,CAOpB;AAED,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,CAYhD"}

package/src/command-line/release/changelog/version-plan-filtering.js

@@ -89,13 +89,13 @@ async function getFilesAddedInCommitRange(fromSHA, toSHA, isVerbose) {
  * Resolves the "from SHA" for changelog purposes.
  * This determines the starting point for changelog generation and optional version plan filtering.
  */
-async function resolveChangelogFromSHA({ fromRef, tagPattern, tagPatternValues, checkAllBranchesWhen, preid, requireSemver, strictPreid, useAutomaticFromRef, }) {
+async function resolveChangelogFromSHA({ fromRef, tagPattern, tagPatternValues, checkAllBranchesWhen, preid, requireSemver, strictPreid, useAutomaticFromRef, resolveRepositoryTags, }) {
     // If user provided a from ref, resolve it to a SHA
     if (fromRef) {
         return await (0, git_1.getCommitHash)(fromRef);
     }
     // Otherwise, try to resolve it from the latest tag
-    const latestTag = await (0, git_1.getLatestGitTagForPattern)(tagPattern, tagPatternValues, {
+    const latestTag = await (0, git_1.getLatestGitTagForPattern)(tagPattern, tagPatternValues, resolveRepositoryTags, {
         checkAllBranchesWhen,
         preid,
         requireSemver,
@@ -114,7 +114,7 @@ async function resolveChangelogFromSHA({ fromRef, tagPattern, tagPatternValues,
  * Helper function for workspace-level "from SHA" resolution.
  * Extracts preids and calls the generic resolver.
  */
-async function resolveWorkspaceChangelogFromSHA({ args, nxReleaseConfig, useAutomaticFromRef, }) {
+async function resolveWorkspaceChangelogFromSHA({ args, nxReleaseConfig, useAutomaticFromRef, resolveRepositoryTags, }) {
     const workspacePreid = extractPreidFromVersion(args.version);
     const projectsPreid = extractProjectsPreidFromVersionData(args.versionData);
     return resolveChangelogFromSHA({
@@ -126,6 +126,7 @@ async function resolveWorkspaceChangelogFromSHA({ args, nxReleaseConfig, useAuto
         requireSemver: nxReleaseConfig.releaseTag.requireSemver,
         strictPreid: nxReleaseConfig.releaseTag.strictPreid,
         useAutomaticFromRef,
+        resolveRepositoryTags,
     });
 }
 function extractPreidFromVersion(version) {

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

@@ -1 +1 @@
-{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/changelog.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AAkB1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAmCpD,OAAO,EACL,cAAc,EASf,MAAM,gBAAgB,CAAC;AAsBxB,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;SACjC,CAAC;KACH,CAAC;CACH;AAGD,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,oBACH,CAAC;AAE/D,wBAAgB,SAAS,CACvB,qBAAqB,EAAE,sBAAsB,EAC7C,kBAAkB,EAAE,OAAO,IAQzB,MAAM,gBAAgB,KACrB,OAAO,CAAC,wBAAwB,CAAC,CAghBrC"}
+{"version":3,"file":"changelog.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/release/changelog.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,sBAAsB,EAAc,MAAM,sBAAsB,CAAC;AA8B1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAiCpD,OAAO,EACL,cAAc,EASf,MAAM,gBAAgB,CAAC;AAMxB,MAAM,WAAW,wBAAwB;IACvC,kBAAkB,CAAC,EAAE;QACnB,cAAc,EAAE,cAAc,CAAC;QAC/B,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;KACjC,CAAC;IACF,iBAAiB,CAAC,EAAE;QAClB,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC;YACjB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;SACjC,CAAC;KACH,CAAC;CACH;AAGD,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,oBACH,CAAC;AAE/D,wBAAgB,SAAS,CACvB,qBAAqB,EAAE,sBAAsB,EAC7C,kBAAkB,EAAE,OAAO,IAQzB,MAAM,gBAAgB,KACrB,OAAO,CAAC,wBAAwB,CAAC,CAohBrC"}

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

@@ -17,6 +17,9 @@ const is_ci_1 = require("../../utils/is-ci");
 const output_1 = require("../../utils/output");
 const path_1 = require("../../utils/path");
 const workspace_root_1 = require("../../utils/workspace-root");
+const commit_utils_1 = require("./changelog/commit-utils");
+const version_plan_filtering_1 = require("./changelog/version-plan-filtering");
+const version_plan_utils_1 = require("./changelog/version-plan-utils");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const version_plans_1 = require("./config/version-plans");
@@ -30,10 +33,7 @@ const remote_release_client_1 = require("./utils/remote-release-clients/remote-r
 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 shared_1 = require("./utils/shared");
-const version_plan_utils_1 = require("./utils/version-plan-utils");
-const version_plan_utils_2 = require("./changelog/version-plan-utils");
-const commit_utils_1 = require("./changelog/commit-utils");
-const version_plan_filtering_1 = require("./changelog/version-plan-filtering");
+const version_plan_utils_2 = require("./utils/version-plan-utils");
 const releaseChangelogCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({}, false)(args));
 exports.releaseChangelogCLIHandler = releaseChangelogCLIHandler;
 function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
@@ -139,6 +139,7 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
             args,
             nxReleaseConfig,
             useAutomaticFromRef,
+            resolveRepositoryTags: releaseGraph.resolveRepositoryTags.bind(releaseGraph),
         });
         // Filter version plans based on resolveVersionPlans option
         const shouldFilterVersionPlans = args.resolveVersionPlans === 'using-from-and-to';
@@ -151,7 +152,7 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
         // Set resolved version plans on groups
         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)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects);
+        const versionPlanValidationError = (0, version_plan_utils_2.validateResolvedVersionPlansAgainstFilter)(releaseGraph.releaseGroups, releaseGraph.releaseGroupToFilteredProjects);
         if (versionPlanValidationError) {
             output_1.output.error(versionPlanValidationError);
             process.exit(1);
@@ -220,6 +221,7 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
                 fromRef: args.from,
                 tagPattern: pattern,
                 tagPatternValues: templateValues,
+                resolveRepositoryTags: releaseGraph.resolveRepositoryTags.bind(releaseGraph),
                 checkAllBranchesWhen,
                 preid,
                 requireSemver,
@@ -286,7 +288,7 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
                 for (const project of projectNodes) {
                     let changes = null;
                     if (releaseGroup.resolvedVersionPlans) {
-                        changes = (0, version_plan_utils_2.createChangesFromProjectsVersionPlans)(releaseGroup.resolvedVersionPlans, project.name);
+                        changes = (0, version_plan_utils_1.createChangesFromProjectsVersionPlans)(releaseGroup.resolvedVersionPlans, project.name);
                     }
                     else {
                         const projectCacheKey = `${releaseGroup.name}:${project.name}`;
@@ -350,7 +352,7 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
                 let changes = [];
                 if (releaseGroup.resolvedVersionPlans) {
                     // This is identical to workspace changelog for fixed groups
-                    changes = (0, version_plan_utils_2.createChangesFromGroupVersionPlans)(releaseGroup.resolvedVersionPlans);
+                    changes = (0, version_plan_utils_1.createChangesFromGroupVersionPlans)(releaseGroup.resolvedVersionPlans);
                 }
                 else {
                     const groupCacheKey = `${releaseGroup.name}:fixed`;
@@ -488,7 +490,7 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
                 const plansToDelete = [];
                 for (const plan of group.resolvedVersionPlans) {
                     // Only delete if ALL projects in the version plan are being filtered/released
-                    if ((0, version_plan_utils_1.areAllVersionPlanProjectsFiltered)(plan, group, filteredProjects)) {
+                    if ((0, version_plan_utils_2.areAllVersionPlanProjectsFiltered)(plan, group, filteredProjects)) {
                         plansToDelete.push(plan);
                     }
                 }
@@ -860,7 +862,7 @@ function resolveWorkspaceChangelogFromVersionPlans(releaseGraph) {
         return [];
     }
     const versionPlans = firstReleaseGroup.resolvedVersionPlans;
-    return (0, version_plan_utils_2.createChangesFromGroupVersionPlans)(versionPlans);
+    return (0, version_plan_utils_1.createChangesFromGroupVersionPlans)(versionPlans);
 }
 async function resolveWorkspaceChangelogFromCommits({ nxReleaseConfig, args, workspacePreid, projectsPreid, useAutomaticFromRef, toSHA, fromSHA, }) {
     // Use the cached fromSHA if available, otherwise throw an error

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

@@ -1,3 +1,4 @@
+import type { CheckAllBranchesWhen, RepoGitTags } from './repository-git-tags';
 export interface GitCommitAuthor {
     name: string;
     email: string;
@@ -27,7 +28,7 @@ export interface GitCommit extends RawGitCommit {
     revertedHashes: string[];
 }
 export interface GetLatestGitTagForPatternOptions {
-    checkAllBranchesWhen?: boolean | string[];
+    checkAllBranchesWhen?: CheckAllBranchesWhen;
     preid?: string;
     requireSemver: boolean;
     strictPreid: boolean;
@@ -71,7 +72,7 @@ export declare function extractTagAndVersion(tag: string, tagRegexp: string, opt
  *
  * @returns The tag and version
  */
-export declare function getLatestGitTagForPattern(releaseTagPattern: string, additionalInterpolationData: {}, options: GetLatestGitTagForPatternOptions): Promise<GitTagAndVersion | null>;
+export declare function getLatestGitTagForPattern(releaseTagPattern: string, additionalInterpolationData: {}, resolveTags: RepoGitTags['resolveTags'], options: GetLatestGitTagForPatternOptions): Promise<GitTagAndVersion | null>;
 export declare function getGitDiff(from: string | undefined, to?: string): Promise<RawGitCommit[]>;
 export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, cwd, }: {
     changedFiles?: 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

@@ -20,7 +20,6 @@ exports.getFirstGitCommit = getFirstGitCommit;
  * https://github.com/unjs/changelogen
  */
 const node_path_1 = require("node:path");
-const minimatch_1 = require("minimatch");
 const semver_1 = require("semver");
 const utils_1 = require("../../../tasks-runner/utils");
 const workspace_root_1 = require("../../../utils/workspace-root");
@@ -101,75 +100,10 @@ function extractTagAndVersion(tag, tagRegexp, options) {
  *
  * @returns The tag and version
  */
-async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}, 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.
-     *
-     * - If checkAllBranchesWhen is true it will cause us to ALWAYS check all branches for the latest match.
-     * - If checkAllBranchesWhen is explicitly set to false it will cause us to ONLY check the current branch for the latest match.
-     * - If checkAllBranchesWhen is an array of strings it will cause us to check all branches WHEN the current branch is one of the strings in the array.
-     */
-    let alwaysCheckAllBranches = false;
-    if (typeof checkAllBranchesWhen !== 'undefined') {
-        if (typeof checkAllBranchesWhen === 'boolean') {
-            alwaysCheckAllBranches = checkAllBranchesWhen;
-        }
-        else if (Array.isArray(checkAllBranchesWhen)) {
-            /**
-             * Get the current git branch and determine whether to check all branches based on the checkAllBranchesWhen parameter
-             */
-            const currentBranch = await (0, exec_command_1.execCommand)('git', [
-                'rev-parse',
-                '--abbrev-ref',
-                'HEAD',
-            ]).then((r) => r.trim());
-            // Check exact match first
-            alwaysCheckAllBranches = checkAllBranchesWhen.includes(currentBranch);
-            // Check if any glob pattern matches next
-            if (!alwaysCheckAllBranches) {
-                alwaysCheckAllBranches = checkAllBranchesWhen.some((pattern) => {
-                    const r = minimatch_1.minimatch.makeRe(pattern, { dot: true });
-                    if (!r) {
-                        return false;
-                    }
-                    return r.test(currentBranch);
-                });
-            }
-        }
-    }
-    const defaultGitArgs = [
-        // Apply git config to take version suffixes into account when sorting, e.g. 1.0.0 is newer than 1.0.0-beta.1
-        '-c',
-        'versionsort.suffix=-',
-        'tag',
-        '--sort',
-        '-v:refname',
-    ];
+async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}, resolveTags, options) {
+    const { requireSemver, strictPreid, preid, checkAllBranchesWhen } = options;
     try {
-        let tags;
-        tags = await (0, exec_command_1.execCommand)('git', [
-            ...defaultGitArgs,
-            ...(alwaysCheckAllBranches ? [] : ['--merged']),
-        ]).then((r) => r
-            .trim()
-            .split('\n')
-            .map((t) => t.trim())
-            .filter(Boolean));
-        if (
-        // Do not run this fallback if the user explicitly set checkAllBranchesWhen to false
-        checkAllBranchesWhen !== false &&
-            !tags.length &&
-            // There is no point in running this fallback if we already checked against all branches
-            !alwaysCheckAllBranches) {
-            // try again, but include all tags on the repo instead of just --merged ones
-            tags = await (0, exec_command_1.execCommand)('git', defaultGitArgs).then((r) => r
-                .trim()
-                .split('\n')
-                .map((t) => t.trim())
-                .filter(Boolean));
-        }
+        let tags = await resolveTags(checkAllBranchesWhen);
         if (!tags.length) {
             return null;
         }