nx 22.0.0-beta.3 → 22.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.0.0-beta.3",
+  "version": "22.0.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": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.0.0-beta.3",
-    "@nx/nx-darwin-x64": "22.0.0-beta.3",
-    "@nx/nx-freebsd-x64": "22.0.0-beta.3",
-    "@nx/nx-linux-arm-gnueabihf": "22.0.0-beta.3",
-    "@nx/nx-linux-arm64-gnu": "22.0.0-beta.3",
-    "@nx/nx-linux-arm64-musl": "22.0.0-beta.3",
-    "@nx/nx-linux-x64-gnu": "22.0.0-beta.3",
-    "@nx/nx-linux-x64-musl": "22.0.0-beta.3",
-    "@nx/nx-win32-arm64-msvc": "22.0.0-beta.3",
-    "@nx/nx-win32-x64-msvc": "22.0.0-beta.3"
+    "@nx/nx-darwin-arm64": "22.0.0-beta.4",
+    "@nx/nx-darwin-x64": "22.0.0-beta.4",
+    "@nx/nx-freebsd-x64": "22.0.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "22.0.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "22.0.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "22.0.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "22.0.0-beta.4",
+    "@nx/nx-linux-x64-musl": "22.0.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "22.0.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "22.0.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -160,90 +160,98 @@
         },
         "groups": {
           "type": "object",
-          "properties": {
-            "projectsRelationship": {
-              "type": "string",
-              "enum": ["fixed", "independent"]
-            },
-            "projects": {
-              "oneOf": [
-                {
-                  "type": "string",
-                  "description": "A project name"
-                },
-                {
-                  "type": "array",
-                  "description": "An array of project names",
-                  "minItems": 1,
-                  "items": {
-                    "type": "string"
+          "additionalProperties": {
+            "type": "object",
+            "properties": {
+              "projectsRelationship": {
+                "type": "string",
+                "enum": ["fixed", "independent"]
+              },
+              "projects": {
+                "oneOf": [
+                  {
+                    "type": "string",
+                    "description": "A project name"
+                  },
+                  {
+                    "type": "array",
+                    "description": "An array of project names",
+                    "minItems": 1,
+                    "items": {
+                      "type": "string"
+                    }
                   }
-                }
-              ]
-            },
-            "version": {
-              "$ref": "#/definitions/NxReleaseGroupVersionConfiguration"
-            },
-            "changelog": {
-              "oneOf": [
-                {
-                  "$ref": "#/definitions/NxReleaseChangelogConfiguration"
-                },
-                {
-                  "type": "boolean"
-                }
-              ]
-            },
-            "releaseTagPattern": {
-              "type": "string",
-              "description": "Optionally override the git/release tag pattern to use for this group."
-            },
-            "releaseTagPatternCheckAllBranchesWhen": {
-              "oneOf": [
-                {
-                  "type": "boolean"
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
+                ]
+              },
+              "version": {
+                "$ref": "#/definitions/NxReleaseGroupVersionConfiguration"
+              },
+              "changelog": {
+                "oneOf": [
+                  {
+                    "$ref": "#/definitions/NxReleaseChangelogConfiguration"
+                  },
+                  {
+                    "type": "boolean"
                   }
-                }
-              ],
-              "description": "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. Setting this to true will cause us to ALWAYS check all branches for the latest match. Setting it to false will cause us to ONLY check the current branch for the latest match. Setting it to an array of strings will cause us to check all branches WHEN the current branch is one of the strings in the array. Glob patterns are supported."
-            },
-            "releaseTagPatternRequireSemver": {
-              "type": "boolean",
-              "description": "Whether to require semver to be used for the release tag pattern. If set to false, the release tag pattern will not be checked for semver compliance."
-            },
-            "releaseTagPatternStrictPreid": {
-              "$ref": "#/definitions/NxReleaseReleaseTagPatternStrictPreidConfiguration"
-            },
-            "versionPlans": {
-              "oneOf": [
-                {
-                  "$ref": "#/definitions/NxReleaseVersionPlansConfiguration"
-                },
-                {
-                  "type": "boolean",
-                  "description": "Enables using version plans as a specifier source for versioning and to determine changes for changelog generation."
-                }
-              ]
+                ]
+              },
+              "releaseTagPattern": {
+                "type": "string",
+                "description": "Optionally override the git/release tag pattern to use for this group."
+              },
+              "releaseTagPatternCheckAllBranchesWhen": {
+                "oneOf": [
+                  {
+                    "type": "boolean"
+                  },
+                  {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                ],
+                "description": "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. Setting this to true will cause us to ALWAYS check all branches for the latest match. Setting it to false will cause us to ONLY check the current branch for the latest match. Setting it to an array of strings will cause us to check all branches WHEN the current branch is one of the strings in the array. Glob patterns are supported."
+              },
+              "releaseTagPatternRequireSemver": {
+                "type": "boolean",
+                "description": "Whether to require semver to be used for the release tag pattern. If set to false, the release tag pattern will not be checked for semver compliance."
+              },
+              "releaseTagPatternPreferDockerVersion": {
+                "type": ["boolean", "string"],
+                "enum": [true, false, "both"],
+                "description": "Controls how docker versions are used relative to semver versions when creating git tags and changelog entries. Set to true to use only the docker version, false to use only the semver version, or 'both' to create tags and changelog entries for both docker and semver versions. By default, this is set to true when docker configuration is present, and false otherwise."
+              },
+              "releaseTagPatternStrictPreid": {
+                "$ref": "#/definitions/NxReleaseReleaseTagPatternStrictPreidConfiguration"
+              },
+              "versionPlans": {
+                "oneOf": [
+                  {
+                    "$ref": "#/definitions/NxReleaseVersionPlansConfiguration"
+                  },
+                  {
+                    "type": "boolean",
+                    "description": "Enables using version plans as a specifier source for versioning and to determine changes for changelog generation."
+                  }
+                ]
+              },
+              "docker": {
+                "oneOf": [
+                  {
+                    "type": "boolean",
+                    "enum": [true],
+                    "description": "Enable docker configuration with default settings. Warning: Docker support is experimental. Breaking changes may occur and not adhere to semver versioning. "
+                  },
+                  {
+                    "$ref": "#/definitions/NxReleaseGroupDockerConfiguration"
+                  }
+                ]
+              }
             },
-            "docker": {
-              "oneOf": [
-                {
-                  "type": "boolean",
-                  "enum": [true],
-                  "description": "Enable docker configuration with default settings. Warning: Docker support is experimental. Breaking changes may occur and not adhere to semver versioning. "
-                },
-                {
-                  "$ref": "#/definitions/NxReleaseGroupDockerConfiguration"
-                }
-              ]
-            }
-          },
-          "required": ["projects"]
+            "required": ["projects"]
+          }
         },
         "changelog": {
           "type": "object",
@@ -323,6 +331,11 @@
           "type": "boolean",
           "description": "Whether to require semver to be used for the release tag pattern. If set to false, the release tag pattern will not be checked for semver compliance."
         },
+        "releaseTagPatternPreferDockerVersion": {
+          "type": ["boolean", "string"],
+          "enum": [true, false, "both"],
+          "description": "Controls how docker versions are used relative to semver versions when creating git tags and changelog entries. Set to true to use only the docker version, false to use only the semver version, or 'both' to create tags and changelog entries for both docker and semver versions. By default, this is set to true when docker configuration is present, and false otherwise."
+        },
         "releaseTagPatternStrictPreid": {
           "$ref": "#/definitions/NxReleaseReleaseTagPatternStrictPreidConfiguration"
         },
@@ -833,9 +846,9 @@
         },
         "updateDependents": {
           "type": "string",
-          "enum": ["never", "auto"],
+          "enum": ["never", "auto", "always"],
           "default": "auto",
-          "description": "When versioning independent projects, this controls whether to update their dependents (i.e. the things that depend on them). 'never' means no dependents will be updated (unless they happen to be versioned directly as well). 'auto' is the default and will cause dependents to be updated (a patch version bump) when a dependency is versioned."
+          "description": "When versioning independent projects, this controls whether to update their dependents (i.e. the things that depend on them). 'never' means no dependents will be updated (unless they happen to be versioned directly as well). 'auto' is the default and will cause dependents to be updated (a patch version bump) when a dependency is versioned, as long as a group or projects filter is not applied that does not include them. 'always' will cause dependents to be updated (a patch version bump) when a dependency is versioned, even if they are not included in the group or projects filter."
         },
         "logUnchangedProjects": {
           "type": "boolean",

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

@@ -3,7 +3,7 @@ export interface ConfigureAiAgentsOptions {
     agents?: string[];
     interactive?: boolean;
     verbose?: boolean;
-    check?: boolean;
+    check?: boolean | 'outdated' | 'all';
 }
 export declare const yargsConfigureAiAgentsCommand: CommandModule<{}, ConfigureAiAgentsOptions>;
 //# sourceMappingURL=command-object.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/configure-ai-agents/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,eAAO,MAAM,6BAA6B,EAAE,aAAa,CACvD,EAAE,EACF,wBAAwB,CA6CzB,CAAC"}
+{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/configure-ai-agents/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,KAAK,CAAC;CACtC;AAED,eAAO,MAAM,6BAA6B,EAAE,aAAa,CACvD,EAAE,EACF,wBAAwB,CA2DzB,CAAC"}

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

@@ -18,14 +18,28 @@ exports.yargsConfigureAiAgentsCommand = {
         default: true,
     })
         .option('check', {
-        type: 'boolean',
-        description: 'Check if any configured agents are out of date and need to be updated. Does not make any changes.',
-        default: false,
+        type: 'string',
+        description: 'Check agent configurations. Use --check or --check=outdated to check only configured agents, or --check=all to include unconfigured/partial configurations. Does not make any changes.',
+        coerce: (value) => {
+            // --check (no value)
+            if (value === '')
+                return 'outdated';
+            // --check=true
+            if (value === 'true')
+                return 'outdated';
+            // --no-check or --check=false
+            if (value === 'false')
+                return false;
+            // --check=all or --check=outdated
+            return value;
+        },
+        choices: ['outdated', 'all'],
     })
         .example('$0 configure-ai-agents', 'Interactively select AI agents to update and configure')
         .example('$0 configure-ai-agents --agents claude gemini', 'Prompts for updates and and configuration of Claude and Gemini AI agents')
         .example('$0 configure-ai-agents --check', 'Checks if any configured agents are out of date and need to be updated')
-        .example('$0 configure-ai-agents --agents claude gemini --no-interactive', 'Configures and updates Claude and Gemini AI agents without prompts'),
+        .example('$0 configure-ai-agents --check=all', 'Checks if any agents are not configured, out of date or partially configured')
+        .example('$0 configure-ai-agents --agents claude gemini --no-interactive', 'Configures and updates Claude and Gemini AI agents without prompts'), // because of the coerce function
     handler: async (args) => {
         await (await Promise.resolve().then(() => require('./configure-ai-agents'))).configureAiAgentsHandler(args);
     },

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,CA+Bf;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CA2Mf"}
+{"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,CA+Bf;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CAyOf"}

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

@@ -64,38 +64,64 @@ async function configureAiAgentsHandlerImpl(options) {
         });
         process.exit(1);
     }
-    if (options.check) {
-        if (fullyConfiguredAgents.length === 0) {
-            output_1.output.log({
-                title: 'No AI agents are configured',
-                bodyLines: [
-                    'You can configure AI agents by running `nx configure-ai-agents`.',
-                ],
-            });
-            process.exit(0);
-        }
+    // important for wording
+    const usingAllAgents = normalizedOptions.agents.length === utils_1.supportedAgents.length;
+    if (normalizedOptions.check) {
         const outOfDateAgents = fullyConfiguredAgents.filter((a) => a?.outdated);
-        if (outOfDateAgents.length === 0) {
-            output_1.output.success({
-                title: 'All configured AI agents are up to date',
-                bodyLines: fullyConfiguredAgents.map((a) => `- ${a.displayName}`),
-            });
-            process.exit(0);
+        // only error if something is fully configured but outdated
+        if (normalizedOptions.check === 'outdated') {
+            if (fullyConfiguredAgents.length === 0) {
+                output_1.output.log({
+                    title: 'No AI agents are configured',
+                    bodyLines: [
+                        'You can configure AI agents by running `nx configure-ai-agents`.',
+                    ],
+                });
+                process.exit(0);
+            }
+            if (outOfDateAgents.length === 0) {
+                output_1.output.success({
+                    title: 'All configured AI agents are up to date',
+                    bodyLines: fullyConfiguredAgents.map((a) => `- ${a.displayName}`),
+                });
+                process.exit(0);
+            }
+            else {
+                output_1.output.log({
+                    title: 'The following AI agents are out of date:',
+                    bodyLines: [
+                        ...outOfDateAgents.map((a) => {
+                            const rulesPath = a.rulesPath;
+                            const displayPath = rulesPath.startsWith(workspace_root_1.workspaceRoot)
+                                ? (0, path_1.relative)(workspace_root_1.workspaceRoot, rulesPath)
+                                : rulesPath;
+                            return `- ${a.displayName} (${displayPath})`;
+                        }),
+                        '',
+                        'You can update them by running `nx configure-ai-agents`.',
+                    ],
+                });
+                process.exit(1);
+            }
+            // error on any partial, outdated or non-configured agent
         }
-        else {
-            output_1.output.log({
-                title: 'The following AI agents are out of date:',
+        else if (normalizedOptions.check === 'all') {
+            if (partiallyConfiguredAgents.length === 0 &&
+                outOfDateAgents.length === 0 &&
+                nonConfiguredAgents.length === 0) {
+                output_1.output.success({
+                    title: `All ${!usingAllAgents ? 'selected' : 'supported'} AI agents are fully configured and up to date`,
+                    bodyLines: fullyConfiguredAgents.map((a) => `- ${a.displayName}`),
+                });
+                process.exit(0);
+            }
+            output_1.output.error({
+                title: 'The following agents are not fully configured or up to date:',
                 bodyLines: [
-                    ...outOfDateAgents.map((a) => {
-                        const rulesPath = a.rulesPath;
-                        const displayPath = rulesPath.startsWith(workspace_root_1.workspaceRoot)
-                            ? (0, path_1.relative)(workspace_root_1.workspaceRoot, rulesPath)
-                            : rulesPath;
-                        return `- ${a.displayName} (${displayPath})`;
-                    }),
-                    '',
-                    'You can update them by running `nx configure-ai-agents`.',
-                ],
+                    ...partiallyConfiguredAgents,
+                    ...outOfDateAgents,
+                    ...nonConfiguredAgents,
+                ].map((a) => getAgentChoiceForPrompt(a).message),
             });
             process.exit(1);
         }
@@ -123,7 +149,6 @@ async function configureAiAgentsHandlerImpl(options) {
         currentIndex++;
     });
     if (allAgentChoices.length === 0) {
-        const usingAllAgents = normalizedOptions.agents.length === utils_1.supportedAgents.length;
         output_1.output.success({
             title: `No new agents to configure. All ${!usingAllAgents ? 'selected' : 'supported'} AI agents are already configured:`,
             bodyLines: fullyConfiguredAgents.map((agent) => `- ${agent.displayName}`),
@@ -228,9 +253,11 @@ function getAgentChoiceForPrompt(agent) {
 }
 function normalizeOptions(options) {
     const agents = (options.agents ?? utils_1.supportedAgents).filter((a) => utils_1.supportedAgents.includes(a));
+    // it used to be just --check which was implicitly 'outdated'
+    const check = (options.check === true ? 'outdated' : options.check) ?? false;
     return {
         ...options,
         agents,
-        check: options.check ?? false,
+        check,
     };
 }

package/src/command-line/nx-cloud/login/command-object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/login/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE,aAmB/B,CAAC"}
+{"version":3,"file":"command-object.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/nx-cloud/login/command-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE,aAkB/B,CAAC"}

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

@@ -4,9 +4,9 @@ exports.yargsLoginCommand = void 0;
 const shared_options_1 = require("../../yargs-utils/shared-options");
 exports.yargsLoginCommand = {
     command: 'login [nxCloudUrl]',
-    describe: 'Login to Nx Cloud. This command is an alias for [`nx-cloud login`](/ci/reference/nx-cloud-cli#npx-nxcloud-login).',
+    describe: 'Login to Nx Cloud. This command is an alias for `nx-cloud login`.',
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs.positional('nxCloudUrl', {
-        describe: 'The Nx Cloud URL of the instance you are trying to connect to. If no positional argument is provided, this command will connect to https://cloud.nx.app.',
+        describe: 'The Nx Cloud URL of the instance you are trying to connect to. If no positional argument is provided, this command will connect to your configured Nx Cloud instance by default.',
         type: 'string',
         required: false,
     }))

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

@@ -4,7 +4,7 @@ exports.yargsLogoutCommand = void 0;
 const shared_options_1 = require("../../yargs-utils/shared-options");
 exports.yargsLogoutCommand = {
     command: 'logout',
-    describe: 'Logout from Nx Cloud. This command is an alias for [`nx-cloud logout`](/ci/reference/nx-cloud-cli#npx-nxcloud-logout).',
+    describe: 'Logout from Nx Cloud. This command is an alias for `nx-cloud logout`.',
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs)
         .help(false)
         .showHelpOnFail(false)

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;AAkBpD,OAAO,EAEL,SAAS,EAWV,MAAM,aAAa,CAAC;AAYrB,OAAO,EACL,cAAc,EASf,MAAM,gBAAgB,CAAC;AAExB,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;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,oBACV,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,gBAAgB,KACrB,OAAO,CAAC,wBAAwB,CAAC,CAyqBrC"}
+{"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;AAepD,OAAO,EAEL,SAAS,EAUV,MAAM,aAAa,CAAC;AASrB,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;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,GAAI,MAAM,gBAAgB,oBACV,CAAC;AAExD,wBAAgB,SAAS,CAAC,qBAAqB,EAAE,sBAAsB,IAOnE,MAAM,gBAAgB,KACrB,OAAO,CAAC,wBAAwB,CAAC,CAsqBrC"}

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

@@ -19,18 +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 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) {
@@ -74,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);
@@ -106,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:
@@ -122,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');
@@ -145,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
@@ -254,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;
             }
@@ -285,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) {
@@ -293,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) || []),
@@ -509,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] = {
@@ -560,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();
     /**
@@ -603,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 = [];
@@ -835,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,