nx 21.0.0-beta.8 → 21.0.0-beta.9

package/migrations.json

@@ -1,40 +1,5 @@
 {
   "generators": {
-    "17.0.0-move-cache-directory": {
-      "cli": "nx",
-      "version": "17.0.0-beta.1",
-      "description": "Updates the default cache directory to .nx/cache",
-      "implementation": "./src/migrations/update-17-0-0/move-cache-directory"
-    },
-    "17.0.0-use-minimal-config-for-tasks-runner-options": {
-      "cli": "nx",
-      "version": "17.0.0-beta.3",
-      "description": "Use minimal config for tasksRunnerOptions",
-      "implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options"
-    },
-    "rm-default-collection-npm-scope": {
-      "version": "17.0.0-rc.1",
-      "description": "Migration for v17.0.0-rc.1",
-      "implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope"
-    },
-    "17.3.0-update-nx-wrapper": {
-      "cli": "nx",
-      "version": "17.3.0-beta.6",
-      "description": "Updates the nx wrapper.",
-      "implementation": "./src/migrations/update-17-3-0/update-nxw"
-    },
-    "18.0.0-disable-adding-plugins-for-existing-workspaces": {
-      "cli": "nx",
-      "version": "18.0.0-beta.2",
-      "description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
-      "implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
-      "x-repair-skip": true
-    },
-    "move-default-base-to-nx-json-root": {
-      "version": "18.1.0-beta.3",
-      "description": "Moves affected.defaultBase to defaultBase in `nx.json`",
-      "implementation": "./src/migrations/update-17-2-0/move-default-base"
-    },
     "19-2-0-move-graph-cache-directory": {
       "cli": "nx",
       "version": "19.2.0-beta.2",
@@ -63,6 +28,11 @@
       "description": "Set `useLegacyCache` to true for migrating workspaces",
       "implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
       "x-repair-skip": true
+    },
+    "release-version-config-changes": {
+      "version": "21.0.0-beta.1",
+      "description": "Updates release version config based on the breaking changes in Nx v21",
+      "implementation": "./src/migrations/update-21-0-0/release-version-config-changes"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.0.0-beta.8",
+  "version": "21.0.0-beta.9",
   "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": "21.0.0-beta.8",
-    "@nx/nx-darwin-x64": "21.0.0-beta.8",
-    "@nx/nx-freebsd-x64": "21.0.0-beta.8",
-    "@nx/nx-linux-arm-gnueabihf": "21.0.0-beta.8",
-    "@nx/nx-linux-arm64-gnu": "21.0.0-beta.8",
-    "@nx/nx-linux-arm64-musl": "21.0.0-beta.8",
-    "@nx/nx-linux-x64-gnu": "21.0.0-beta.8",
-    "@nx/nx-linux-x64-musl": "21.0.0-beta.8",
-    "@nx/nx-win32-arm64-msvc": "21.0.0-beta.8",
-    "@nx/nx-win32-x64-msvc": "21.0.0-beta.8"
+    "@nx/nx-darwin-arm64": "21.0.0-beta.9",
+    "@nx/nx-darwin-x64": "21.0.0-beta.9",
+    "@nx/nx-freebsd-x64": "21.0.0-beta.9",
+    "@nx/nx-linux-arm-gnueabihf": "21.0.0-beta.9",
+    "@nx/nx-linux-arm64-gnu": "21.0.0-beta.9",
+    "@nx/nx-linux-arm64-musl": "21.0.0-beta.9",
+    "@nx/nx-linux-x64-gnu": "21.0.0-beta.9",
+    "@nx/nx-linux-x64-musl": "21.0.0-beta.9",
+    "@nx/nx-win32-arm64-msvc": "21.0.0-beta.9",
+    "@nx/nx-win32-x64-msvc": "21.0.0-beta.9"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -707,49 +707,17 @@
         "$comment": "When using the latest versioning implementation a lot of configuration has been able to move directly onto the version property.",
         "properties": {
           "useLegacyVersioning": {
-            "const": true
+            "const": false
           }
         }
       },
       "then": {
-        "properties": {
-          "useLegacyVersioning": {
-            "type": "boolean",
-            "description": "Whether to use the legacy versioning strategy. This value will be true in Nx v20 and false in Nx v21. The legacy versioning implementation will be removed in Nx v22, as will this flag.",
-            "default": true
-          },
-          "conventionalCommits": {
-            "type": "boolean",
-            "description": "Shorthand for enabling the current version of projects to be resolved from git tags, and the next version to be determined by analyzing commit messages according to the Conventional Commits specification.",
-            "default": false
-          },
-          "git": {
-            "$ref": "#/definitions/NxReleaseGitConfiguration"
-          },
-          "preVersionCommand": {
-            "type": "string",
-            "description": "A command to run after validation of nx release configuration, but before versioning begins. Useful for preparing build artifacts. If --dry-run is passed, the command is still executed, but with the NX_DRY_RUN environment variable set to 'true'."
-          },
-          "generator": {
-            "type": "string",
-            "description": "The generator implementation to use for versioning.",
-            "default": "@nx/js:release-version"
-          },
-          "generatorOptions": {
-            "type": "object",
-            "description": "These options will be passed to the configured \"release.version.generator\" (which will be \"@nx/js:release-version\" if not set explicitly).",
-            "additionalProperties": true
-          }
-        },
-        "additionalProperties": false
-      },
-      "else": {
         "additionalProperties": false,
         "properties": {
           "useLegacyVersioning": {
             "type": "boolean",
             "description": "Whether to use the legacy versioning strategy. This value will be true in Nx v20 and false in Nx v21. The legacy versioning implementation will be removed in Nx v22, as will this flag.",
-            "default": true
+            "default": false
           },
           "conventionalCommits": {
             "type": "boolean",
@@ -791,10 +759,6 @@
             "enum": ["disk"],
             "description": "The fallback version resolver to use when the configured currentVersionResolver fails to resolve the current version."
           },
-          "firstRelease": {
-            "type": "boolean",
-            "description": "Whether or not this is the first release of one of more projects. This removes certain validation checks that are not possible to enforce if the project has never been released before."
-          },
           "versionPrefix": {
             "type": "string",
             "enum": ["auto", "", "~", "^", "="],
@@ -833,6 +797,38 @@
             "additionalProperties": true
           }
         }
+      },
+      "else": {
+        "properties": {
+          "useLegacyVersioning": {
+            "type": "boolean",
+            "description": "Whether to use the legacy versioning strategy. This value was true in Nx v20 and became false in Nx v21. The legacy versioning implementation will be removed in Nx v22, as will this flag.",
+            "default": false
+          },
+          "conventionalCommits": {
+            "type": "boolean",
+            "description": "Shorthand for enabling the current version of projects to be resolved from git tags, and the next version to be determined by analyzing commit messages according to the Conventional Commits specification.",
+            "default": false
+          },
+          "git": {
+            "$ref": "#/definitions/NxReleaseGitConfiguration"
+          },
+          "preVersionCommand": {
+            "type": "string",
+            "description": "A command to run after validation of nx release configuration, but before versioning begins. Useful for preparing build artifacts. If --dry-run is passed, the command is still executed, but with the NX_DRY_RUN environment variable set to 'true'."
+          },
+          "generator": {
+            "type": "string",
+            "description": "The generator implementation to use for versioning.",
+            "default": "@nx/js:release-version"
+          },
+          "generatorOptions": {
+            "type": "object",
+            "description": "These options will be passed to the configured \"release.version.generator\" (which will be \"@nx/js:release-version\" if not set explicitly).",
+            "additionalProperties": true
+          }
+        },
+        "additionalProperties": false
       }
     },
     "NxReleaseGroupVersionConfiguration": {

package/src/command-line/migrate/migrate-ui-api.d.ts

@@ -33,6 +33,7 @@ export declare function runSingleMigration(workspacePath: string, migration: Mig
 export declare function getImplementationPath(workspacePath: string, migration: MigrationDetailsWithId): Promise<string>;
 export declare function modifyMigrationsJsonMetadata(workspacePath: string, modify: (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata): void;
 export declare function addSuccessfulMigration(id: string, fileChanges: Omit<FileChange, 'content'>[], ref: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;
+export declare function updateRefForSuccessfulMigration(id: string, ref: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;
 export declare function addFailedMigration(id: string, error: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => {
     completedMigrations?: Record<string, SuccessfulMigration | FailedMigration | SkippedMigration>;
     runningMigrations?: string[];
@@ -54,3 +55,4 @@ export declare function addSkippedMigration(id: string): (migrationsJsonMetadata
     targetVersion?: string;
 };
 export declare function readMigrationsJsonMetadata(workspacePath: string): MigrationsJsonMetadata;
+export declare function undoMigration(workspacePath: string, id: string): (migrationsJsonMetadata: MigrationsJsonMetadata) => MigrationsJsonMetadata;

package/src/command-line/migrate/migrate-ui-api.js

@@ -6,9 +6,11 @@ exports.runSingleMigration = runSingleMigration;
 exports.getImplementationPath = getImplementationPath;
 exports.modifyMigrationsJsonMetadata = modifyMigrationsJsonMetadata;
 exports.addSuccessfulMigration = addSuccessfulMigration;
+exports.updateRefForSuccessfulMigration = updateRefForSuccessfulMigration;
 exports.addFailedMigration = addFailedMigration;
 exports.addSkippedMigration = addSkippedMigration;
 exports.readMigrationsJsonMetadata = readMigrationsJsonMetadata;
+exports.undoMigration = undoMigration;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -88,6 +90,12 @@ async function runSingleMigration(workspacePath, migration, configuration) {
                 cwd: workspacePath,
                 encoding: 'utf-8',
             });
+            // The revision changes after the amend, so we need to update it
+            const amendedGitRef = (0, child_process_1.execSync)('git rev-parse HEAD', {
+                cwd: workspacePath,
+                encoding: 'utf-8',
+            }).trim();
+            modifyMigrationsJsonMetadata(workspacePath, updateRefForSuccessfulMigration(migration.id, amendedGitRef));
         }
     }
     catch (e) {
@@ -130,6 +138,22 @@ function addSuccessfulMigration(id, fileChanges, ref) {
         return copied;
     };
 }
+function updateRefForSuccessfulMigration(id, ref) {
+    return (migrationsJsonMetadata) => {
+        const copied = { ...migrationsJsonMetadata };
+        if (!copied.completedMigrations) {
+            copied.completedMigrations = {};
+        }
+        const existing = copied.completedMigrations[id];
+        if (existing && existing.type === 'successful') {
+            existing.ref = ref;
+        }
+        else {
+            throw new Error(`Attempted to update ref for unsuccessful migration`);
+        }
+        return copied;
+    };
+}
 function addFailedMigration(id, error) {
     return (migrationsJsonMetadata) => {
         const copied = { ...migrationsJsonMetadata };
@@ -186,3 +210,18 @@ function readMigrationsJsonMetadata(workspacePath) {
     const migrationsJson = JSON.parse((0, fs_1.readFileSync)(migrationsJsonPath, 'utf-8'));
     return migrationsJson['nx-console'];
 }
+function undoMigration(workspacePath, id) {
+    return (migrationsJsonMetadata) => {
+        const existing = migrationsJsonMetadata.completedMigrations[id];
+        if (existing.type !== 'successful')
+            throw new Error(`undoMigration called on unsuccessful migration: ${id}`);
+        (0, child_process_1.execSync)(`git reset --hard ${existing.ref}^`, {
+            cwd: workspacePath,
+            encoding: 'utf-8',
+        });
+        migrationsJsonMetadata.completedMigrations[id] = {
+            type: 'skipped',
+        };
+        return migrationsJsonMetadata;
+    };
+}

package/src/command-line/migrate/migrate.d.ts

@@ -41,7 +41,6 @@ export declare class Migrator {
             name: string;
             version: string;
             description?: string;
-            cli?: string;
             implementation?: string;
             factory?: string;
             requires?: Record<string, string>;
@@ -101,20 +100,17 @@ export declare function executeMigrations(root: string, migrations: {
     name: string;
     description?: string;
     version: string;
-    cli?: 'nx' | 'angular';
 }[], isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string): Promise<{
     package: string;
     name: string;
     description?: string;
     version: string;
-    cli?: "nx" | "angular";
 }[]>;
 export declare function runNxOrAngularMigration(root: string, migration: {
     package: string;
     name: string;
     description?: string;
     version: string;
-    cli?: 'nx' | 'angular';
 }, isVerbose: boolean, shouldCreateCommits: boolean, commitPrefix: string, installDepsIfChanged?: () => void, handleInstallDeps?: boolean): Promise<FileChange[]>;
 export declare function migrate(root: string, args: {
     [k: string]: any;

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

@@ -647,7 +647,11 @@ async function getPackageMigrationsUsingInstall(packageName, packageVersion) {
         result = { ...migrations, packageGroup, version: packageJson.version };
     }
     catch (e) {
-        logger_1.logger.warn(`Unable to fetch migrations for ${packageName}@${packageVersion}: ${e.message}`);
+        output_1.output.warn({
+            title: `Failed to fetch migrations for ${packageName}@${packageVersion}`,
+            bodyLines: [e.message],
+        });
+        return {};
     }
     finally {
         await cleanup();
@@ -870,7 +874,6 @@ function addSplitConfigurationMigrationIfAvailable(from, packageJson) {
             {
                 version: '15.7.0-beta.0',
                 description: 'Split global configuration files into individual project.json files. This migration has been added automatically to the beginning of your migration set to retroactively make them work with the new version of Nx.',
-                cli: 'nx',
                 implementation: './src/migrations/update-15-7-0/split-configuration-into-project-json-files',
                 package: '@nrwl/workspace',
                 name: '15-7-0-split-configuration-into-project-json-files',
@@ -973,7 +976,7 @@ async function runNxOrAngularMigration(root, migration, isVerbose, shouldCreateC
     }
     const { collection, collectionPath } = readMigrationCollection(migration.package, root);
     let changes = [];
-    if (!isAngularMigration(collection, collectionPath, migration.name)) {
+    if (!isAngularMigration(collection, migration.name)) {
         changes = await runNxMigration(root, collectionPath, collection, migration.name);
         logger_1.logger.info(`Ran ${migration.name} from ${migration.package}`);
         logger_1.logger.info(`  ${migration.description}\n`);
@@ -1214,24 +1217,8 @@ function addToNodePath(dir) {
     // Update the env variable.
     process.env.NODE_PATH = paths.join(delimiter);
 }
-// TODO (v21): Remove CLI determination of Angular Migration
-function isAngularMigration(collection, collectionPath, name) {
-    const entry = collection.generators?.[name] || collection.schematics?.[name];
-    const shouldBeNx = !!collection.generators?.[name];
-    const shouldBeNg = !!collection.schematics?.[name];
-    if (entry.cli && entry.cli !== 'nx' && collection.generators?.[name]) {
-        output_1.output.warn({
-            title: `The migration '${collection.name}:${name}' appears to be an Angular CLI migration, but is located in the 'generators' section of migrations.json.`,
-            bodyLines: [
-                'In Nx 21, migrations inside `generators` will be treated as Nx Devkit migrations and therefore may not run correctly if they are using Angular Devkit.',
-                'If the migration should be run with Angular Devkit, please place the migration inside `schematics` instead.',
-                "Please open an issue on the plugin's repository if you believe this is an error.",
-            ],
-        });
-    }
-    // Currently, if the cli property exists we listen to it. If its nx, its not an ng cli migration.
-    // If the property is not set, we will fall back to our intuition.
-    return entry.cli ? entry.cli !== 'nx' : !shouldBeNx && shouldBeNg;
+function isAngularMigration(collection, name) {
+    return !collection.generators?.[name] && collection.schematics?.[name];
 }
 const getNgCompatLayer = (() => {
     let _ngCliAdapter;

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

@@ -26,7 +26,13 @@ export type VersionOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & Firs
     specifier?: string;
     preid?: string;
     stageChanges?: boolean;
+    /**
+     * @deprecated Use versionActionsOptionsOverrides instead.
+     *
+     * Using generatorOptionsOverrides is only valid when release.version.useLegacyVersioning is set to true.
+     */
     generatorOptionsOverrides?: Record<string, unknown>;
+    versionActionsOptionsOverrides?: Record<string, unknown>;
 };
 export type ChangelogOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & FirstReleaseArgs & {
     version?: string | null;

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

@@ -151,9 +151,12 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
                     versionActionsOptions: {},
                     currentVersionResolver: defaultGeneratorOptions.currentVersionResolver,
                     specifierSource: defaultGeneratorOptions.specifierSource,
-                    preserveLocalDependencyProtocols: userConfig.version?.preserveLocalDependencyProtocols ?? true,
-                    logUnchangedProjects: userConfig.version?.logUnchangedProjects ?? true,
-                    updateDependents: userConfig.version?.updateDependents ?? 'auto',
+                    preserveLocalDependencyProtocols: userConfig.version
+                        ?.preserveLocalDependencyProtocols ?? true,
+                    logUnchangedProjects: userConfig.version
+                        ?.logUnchangedProjects ?? true,
+                    updateDependents: userConfig.version
+                        ?.updateDependents ?? 'auto',
                 }),
         },
         changelog: {
@@ -438,8 +441,11 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         }
         if (releaseGroup.version?.conventionalCommits === false &&
             releaseGroupName !== exports.IMPLICIT_DEFAULT_RELEASE_GROUP) {
-            delete finalReleaseGroup.version.generatorOptions.currentVersionResolver;
-            delete finalReleaseGroup.version.generatorOptions.specifierSource;
+            if (USE_LEGACY_VERSIONING) {
+                delete finalReleaseGroup.version.generatorOptions
+                    ?.currentVersionResolver;
+                delete finalReleaseGroup.version.generatorOptions?.specifierSource;
+            }
             delete finalReleaseGroup.version
                 .currentVersionResolver;
             delete finalReleaseGroup.version
@@ -462,7 +468,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         }
         if (releaseGroup.versionPlans === false &&
             releaseGroupName !== exports.IMPLICIT_DEFAULT_RELEASE_GROUP) {
-            delete finalReleaseGroup.version.generatorOptions.specifierSource;
+            if (USE_LEGACY_VERSIONING) {
+                delete finalReleaseGroup.version.generatorOptions?.specifierSource;
+            }
             delete finalReleaseGroup.version
                 .specifierSource;
         }
@@ -796,8 +804,7 @@ function hasInvalidConventionalCommitsConfig(userConfig) {
         // v2 config - directly on version config
         (userConfig.version
             ?.currentVersionResolver ||
-            userConfig.version
-                ?.specifierSource ||
+            userConfig.version?.specifierSource ||
             // Legacy config - on generatorOptions
             userConfig.version
                 ?.generatorOptions?.currentVersionResolver ||

package/src/command-line/release/config/use-legacy-versioning.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shouldUseLegacyVersioning = shouldUseLegacyVersioning;
+// TODO(v22): remove this function and entire concept of legacy versioning in v22
 function shouldUseLegacyVersioning(releaseConfig) {
-    return process.env.NX_INTERNAL_USE_LEGACY_VERSIONING === 'false'
-        ? false
-        : // TODO(v21): switch this to false by default in Nx v21 and remove this function in v22
-            releaseConfig?.version?.useLegacyVersioning ?? true;
+    return process.env.NX_INTERNAL_USE_LEGACY_VERSIONING === 'true'
+        ? true
+        : releaseConfig?.version?.useLegacyVersioning ?? false;
 }

package/src/command-line/release/version/release-group-processor.d.ts

@@ -1,4 +1,4 @@
-import { NxReleaseVersionV2Configuration } from '../../../config/nx-json';
+import { ManifestRootToUpdate, NxReleaseVersionConfiguration } from '../../../config/nx-json';
 import { ProjectGraph } from '../../../config/project-graph';
 import { Tree } from '../../../generators/tree';
 import { type NxReleaseConfig } from '../config/config';
@@ -10,14 +10,14 @@ import type { VersionData } from '../utils/shared';
  * and referenced throughout the versioning process.
  */
 export interface FinalConfigForProject {
-    specifierSource: NxReleaseVersionV2Configuration['specifierSource'];
-    currentVersionResolver: NxReleaseVersionV2Configuration['currentVersionResolver'];
-    currentVersionResolverMetadata: NxReleaseVersionV2Configuration['currentVersionResolverMetadata'];
-    fallbackCurrentVersionResolver: NxReleaseVersionV2Configuration['fallbackCurrentVersionResolver'];
-    versionPrefix: NxReleaseVersionV2Configuration['versionPrefix'];
-    preserveLocalDependencyProtocols: NxReleaseVersionV2Configuration['preserveLocalDependencyProtocols'];
-    versionActionsOptions: NxReleaseVersionV2Configuration['versionActionsOptions'];
-    manifestRootsToUpdate: NxReleaseVersionV2Configuration['manifestRootsToUpdate'];
+    specifierSource: NxReleaseVersionConfiguration['specifierSource'];
+    currentVersionResolver: NxReleaseVersionConfiguration['currentVersionResolver'];
+    currentVersionResolverMetadata: NxReleaseVersionConfiguration['currentVersionResolverMetadata'];
+    fallbackCurrentVersionResolver: NxReleaseVersionConfiguration['fallbackCurrentVersionResolver'];
+    versionPrefix: NxReleaseVersionConfiguration['versionPrefix'];
+    preserveLocalDependencyProtocols: NxReleaseVersionConfiguration['preserveLocalDependencyProtocols'];
+    versionActionsOptions: NxReleaseVersionConfiguration['versionActionsOptions'];
+    manifestRootsToUpdate: Array<Exclude<ManifestRootToUpdate, string>>;
 }
 export declare const BUMP_TYPE_REASON_TEXT: {
     readonly DEPENDENCY_WAS_BUMPED: ", because a dependency was bumped, ";
@@ -44,6 +44,7 @@ interface ReleaseGroupProcessorOptions {
         projects?: string[];
         groups?: string[];
     };
+    versionActionsOptionsOverrides?: Record<string, unknown>;
 }
 export declare class ReleaseGroupProcessor {
     private tree;

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

@@ -205,6 +205,14 @@ class ReleaseGroupProcessor {
                 const currentVersion = await (0, resolve_current_version_1.resolveCurrentVersion)(this.tree, projectGraphNode, releaseGroupNode.group, versionActions, this.projectLoggers.get(projectName), this.currentVersionsPerFixedReleaseGroup, finalConfigForProject, releaseTagPattern, latestMatchingGitTag);
                 this.cachedCurrentVersions.set(projectName, currentVersion);
             }
+            // Ensure that there is an entry in versionData for each project being processed, even if they don't end up being bumped
+            for (const projectName of this.allProjectsToProcess) {
+                this.versionData.set(projectName, {
+                    currentVersion: this.getCurrentCachedVersionForProject(projectName),
+                    newVersion: null,
+                    dependentProjects: this.getOriginalDependentProjects(projectName),
+                });
+            }
         }
         // Build the dependency relationships between groups
         this.buildGroupDependencyGraph();
@@ -775,12 +783,26 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
         /**
          * versionActionsOptions, defaults to {}
          */
-        const versionActionsOptions = projectVersionConfig?.versionActionsOptions ??
+        let versionActionsOptions = projectVersionConfig?.versionActionsOptions ??
             releaseGroupVersionConfig?.versionActionsOptions ??
             {};
-        const manifestRootsToUpdate = projectVersionConfig?.manifestRootsToUpdate ??
+        // Apply any optional overrides that may be passed in from the programmatic API
+        versionActionsOptions = {
+            ...versionActionsOptions,
+            ...(this.options.versionActionsOptionsOverrides ?? {}),
+        };
+        const manifestRootsToUpdate = (projectVersionConfig?.manifestRootsToUpdate ??
             releaseGroupVersionConfig?.manifestRootsToUpdate ??
-            [];
+            []).map((manifestRoot) => {
+            if (typeof manifestRoot === 'string') {
+                return {
+                    path: manifestRoot,
+                    // Apply the project level preserveLocalDependencyProtocols setting that was already resolved
+                    preserveLocalDependencyProtocols,
+                };
+            }
+            return manifestRoot;
+        });
         return {
             specifierSource,
             currentVersionResolver,
@@ -818,11 +840,6 @@ Valid values are: ${version_1.validReleaseVersionPrefixes
                     if (!currentDependencyVersion) {
                         continue;
                     }
-                    // If preserveLocalDependencyProtocols is true, and the dependency uses a local dependency protocol, skip updating the dependency
-                    if (cachedFinalConfigForProject.preserveLocalDependencyProtocols &&
-                        (await versionActions.isLocalDependencyProtocol(currentDependencyVersion))) {
-                        continue;
-                    }
                     let finalPrefix = '';
                     if (cachedFinalConfigForProject.versionPrefix === 'auto') {
                         const prefixMatch = currentDependencyVersion?.match(/^([~^=])/);

package/src/command-line/release/version/test-utils.d.ts

@@ -1,4 +1,4 @@
-import type { NxJsonConfiguration, NxReleaseVersionV2Configuration } from '../../../config/nx-json';
+import type { NxJsonConfiguration, NxReleaseVersionConfiguration } from '../../../config/nx-json';
 import type { ProjectGraph } from '../../../config/project-graph';
 import type { Tree } from '../../../generators/tree';
 import { NxReleaseConfig } from '../config/config';
@@ -48,7 +48,7 @@ export declare class ExampleRustVersionActions extends VersionActions {
         currentVersion: string;
         manifestPath: string;
     }>;
-    readCurrentVersionFromRegistry(tree: Tree, _currentVersionResolverMetadata: NxReleaseVersionV2Configuration['currentVersionResolverMetadata']): Promise<{
+    readCurrentVersionFromRegistry(tree: Tree, _currentVersionResolverMetadata: NxReleaseVersionConfiguration['currentVersionResolverMetadata']): Promise<{
         currentVersion: string;
         logText: string;
     }>;
@@ -57,7 +57,6 @@ export declare class ExampleRustVersionActions extends VersionActions {
         currentVersion: string;
         dependencyCollection: string;
     }>;
-    isLocalDependencyProtocol(_versionSpecifier: string): Promise<boolean>;
     updateProjectDependencies(tree: Tree, _projectGraph: ProjectGraph, dependenciesToUpdate: Record<string, string>): Promise<string[]>;
 }
 export declare class ExampleNonSemverVersionActions extends VersionActions {
@@ -68,7 +67,6 @@ export declare class ExampleNonSemverVersionActions extends VersionActions {
         currentVersion: any;
         dependencyCollection: any;
     }>;
-    isLocalDependencyProtocol(): Promise<boolean>;
     updateProjectVersion(tree: any, newVersion: any): Promise<any[]>;
     updateProjectDependencies(): Promise<any[]>;
     calculateNewVersion(currentVersion: string | null, newVersionInput: string, newVersionInputReason: string, newVersionInputReasonData: Record<string, unknown>, preid: string): Promise<{

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

@@ -91,13 +91,15 @@ class ExampleRustVersionActions extends version_actions_1.VersionActions {
     }
     async updateProjectVersion(tree, newVersion) {
         const logMessages = [];
-        for (const manifestPath of this.manifestsToUpdate) {
-            const cargoTomlString = tree.read(manifestPath, 'utf-8').toString();
+        for (const manifestToUpdate of this.manifestsToUpdate) {
+            const cargoTomlString = tree
+                .read(manifestToUpdate.manifestPath, 'utf-8')
+                .toString();
             const cargoToml = this.parseCargoToml(cargoTomlString);
             ExampleRustVersionActions.modifyCargoTable(cargoToml, 'package', 'version', newVersion);
             const updatedCargoTomlString = ExampleRustVersionActions.stringifyCargoToml(cargoToml);
-            tree.write(manifestPath, updatedCargoTomlString);
-            logMessages.push(`✍️  New version ${newVersion} written to manifest: ${manifestPath}`);
+            tree.write(manifestToUpdate.manifestPath, updatedCargoTomlString);
+            logMessages.push(`✍️  New version ${newVersion} written to manifest: ${manifestToUpdate.manifestPath}`);
         }
         return logMessages;
     }
@@ -117,9 +119,7 @@ class ExampleRustVersionActions extends version_actions_1.VersionActions {
             dependencyCollection: 'dependencies',
         };
     }
-    async isLocalDependencyProtocol(_versionSpecifier) {
-        return false;
-    }
+    // NOTE: Does not take the preserveLocalDependencyProtocols setting into account yet
     async updateProjectDependencies(tree, _projectGraph, dependenciesToUpdate) {
         const numDependenciesToUpdate = Object.keys(dependenciesToUpdate).length;
         const depText = numDependenciesToUpdate === 1 ? 'dependency' : 'dependencies';
@@ -127,15 +127,17 @@ class ExampleRustVersionActions extends version_actions_1.VersionActions {
             return [];
         }
         const logMessages = [];
-        for (const manifestPath of this.manifestsToUpdate) {
-            const cargoTomlString = tree.read(manifestPath, 'utf-8').toString();
+        for (const manifestToUpdate of this.manifestsToUpdate) {
+            const cargoTomlString = tree
+                .read(manifestToUpdate.manifestPath, 'utf-8')
+                .toString();
             const cargoToml = this.parseCargoToml(cargoTomlString);
             for (const [dep, version] of Object.entries(dependenciesToUpdate)) {
                 ExampleRustVersionActions.modifyCargoTable(cargoToml, 'dependencies', dep, version);
             }
             const updatedCargoTomlString = ExampleRustVersionActions.stringifyCargoToml(cargoToml);
-            tree.write(manifestPath, updatedCargoTomlString);
-            logMessages.push(`✍️  Updated ${numDependenciesToUpdate} ${depText} in manifest: ${manifestPath}`);
+            tree.write(manifestToUpdate.manifestPath, updatedCargoTomlString);
+            logMessages.push(`✍️  Updated ${numDependenciesToUpdate} ${depText} in manifest: ${manifestToUpdate.manifestPath}`);
         }
         return logMessages;
     }
@@ -158,9 +160,6 @@ class ExampleNonSemverVersionActions extends version_actions_1.VersionActions {
             dependencyCollection: null,
         };
     }
-    async isLocalDependencyProtocol() {
-        return false;
-    }
     async updateProjectVersion(tree, newVersion) {
         tree.write((0, node_path_1.join)(this.projectGraphNode.data.root, 'version.txt'), newVersion);
         return [];