nx 21.0.0-beta.1 → 21.0.0-beta.2

package/src/command-line/init/implementation/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNxJsonFile = createNxJsonFile;
+exports.createNxJsonFromTurboJson = createNxJsonFromTurboJson;
 exports.addDepsToPackageJson = addDepsToPackageJson;
 exports.updateGitIgnore = updateGitIgnore;
 exports.runInstall = runInstall;
@@ -10,6 +11,7 @@ exports.markRootPackageJsonAsNxProjectLegacy = markRootPackageJsonAsNxProjectLeg
 exports.markPackageJsonAsNxProject = markPackageJsonAsNxProject;
 exports.printFinalMessage = printFinalMessage;
 exports.isMonorepo = isMonorepo;
+exports.isCRA = isCRA;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const fileutils_1 = require("../../../utils/fileutils");
@@ -21,7 +23,8 @@ const fs_1 = require("fs");
 const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
 const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
 const connect_to_nx_cloud_2 = require("../../connect/connect-to-nx-cloud");
-const default_base_1 = require("../../../utils/default-base");
+const deduce_default_base_1 = require("./deduce-default-base");
+const child_process_2 = require("../../../utils/child-process");
 function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scriptOutputs) {
     const nxJsonPath = (0, path_2.joinPathFragments)(repoRoot, 'nx.json');
     let nxJson = {};
@@ -53,56 +56,104 @@ function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scr
     if (Object.keys(nxJson.targetDefaults).length === 0) {
         delete nxJson.targetDefaults;
     }
-    nxJson.defaultBase ??= deduceDefaultBase();
+    const defaultBase = (0, deduce_default_base_1.deduceDefaultBase)();
+    // Do not add defaultBase if it is inferred to be the Nx default value of main
+    if (defaultBase !== 'main') {
+        nxJson.defaultBase ??= defaultBase;
+    }
     (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
 }
-function deduceDefaultBase() {
-    try {
-        (0, child_process_1.execSync)(`git rev-parse --verify main`, {
-            stdio: ['ignore', 'ignore', 'ignore'],
-            windowsHide: false,
-        });
-        return 'main';
-    }
-    catch {
-        try {
-            (0, child_process_1.execSync)(`git rev-parse --verify dev`, {
-                stdio: ['ignore', 'ignore', 'ignore'],
-                windowsHide: false,
-            });
-            return 'dev';
+function createNxJsonFromTurboJson(turboJson) {
+    const nxJson = {
+        $schema: './node_modules/nx/schemas/nx-schema.json',
+    };
+    // Handle global dependencies
+    if (turboJson.globalDependencies?.length > 0) {
+        nxJson.namedInputs = {
+            sharedGlobals: turboJson.globalDependencies.map((dep) => `{workspaceRoot}/${dep}`),
+            default: ['{projectRoot}/**/*', 'sharedGlobals'],
+        };
+    }
+    // Handle global env vars
+    if (turboJson.globalEnv?.length > 0) {
+        nxJson.namedInputs = nxJson.namedInputs || {};
+        nxJson.namedInputs.sharedGlobals = nxJson.namedInputs.sharedGlobals || [];
+        nxJson.namedInputs.sharedGlobals.push(...turboJson.globalEnv.map((env) => ({ env })));
+        nxJson.namedInputs.default = nxJson.namedInputs.default || [];
+        if (!nxJson.namedInputs.default.includes('{projectRoot}/**/*')) {
+            nxJson.namedInputs.default.push('{projectRoot}/**/*');
         }
-        catch {
-            try {
-                (0, child_process_1.execSync)(`git rev-parse --verify develop`, {
-                    stdio: ['ignore', 'ignore', 'ignore'],
-                    windowsHide: false,
-                });
-                return 'develop';
+        if (!nxJson.namedInputs.default.includes('sharedGlobals')) {
+            nxJson.namedInputs.default.push('sharedGlobals');
+        }
+    }
+    // Handle task configurations
+    if (turboJson.tasks) {
+        nxJson.targetDefaults = {};
+        for (const [taskName, taskConfig] of Object.entries(turboJson.tasks)) {
+            // Skip project-specific tasks (containing #)
+            if (taskName.includes('#'))
+                continue;
+            const config = taskConfig;
+            nxJson.targetDefaults[taskName] = {};
+            // Handle dependsOn
+            if (config.dependsOn?.length > 0) {
+                nxJson.targetDefaults[taskName].dependsOn = config.dependsOn;
             }
-            catch {
-                try {
-                    (0, child_process_1.execSync)(`git rev-parse --verify next`, {
-                        stdio: ['ignore', 'ignore', 'ignore'],
-                        windowsHide: false,
-                    });
-                    return 'next';
-                }
-                catch {
-                    try {
-                        (0, child_process_1.execSync)(`git rev-parse --verify master`, {
-                            stdio: ['ignore', 'ignore', 'ignore'],
-                            windowsHide: false,
-                        });
-                        return 'master';
+            // Handle inputs
+            if (config.inputs?.length > 0) {
+                nxJson.targetDefaults[taskName].inputs = config.inputs
+                    .map((input) => {
+                    if (input === '$TURBO_DEFAULT$') {
+                        return '{projectRoot}/**/*';
                     }
-                    catch {
-                        return (0, default_base_1.deduceDefaultBase)();
+                    // Don't add projectRoot if it's already there or if it's an env var
+                    if (input.startsWith('{projectRoot}/') ||
+                        input.startsWith('{env.') ||
+                        input.startsWith('$'))
+                        return input;
+                    return `{projectRoot}/${input}`;
+                })
+                    .map((input) => {
+                    // Don't add projectRoot if it's already there or if it's an env var
+                    if (input.startsWith('{projectRoot}/') ||
+                        input.startsWith('{env.') ||
+                        input.startsWith('$'))
+                        return input;
+                    return `{projectRoot}/${input}`;
+                });
+            }
+            // Handle outputs
+            if (config.outputs?.length > 0) {
+                nxJson.targetDefaults[taskName].outputs = config.outputs.map((output) => {
+                    // Don't add projectRoot if it's already there
+                    if (output.startsWith('{projectRoot}/'))
+                        return output;
+                    // Handle negated patterns by adding projectRoot after the !
+                    if (output.startsWith('!')) {
+                        return `!{projectRoot}/${output.slice(1)}`;
                     }
-                }
+                    return `{projectRoot}/${output}`;
+                });
             }
+            // Handle cache setting - true by default in Turbo
+            nxJson.targetDefaults[taskName].cache = config.cache !== false;
         }
     }
+    /**
+     * The fact that cacheDir was in use suggests the user had a reason for deviating from the default.
+     * We can't know what that reason was, nor if it would still be applicable in Nx, but we can at least
+     * improve discoverability of the relevant Nx option by explicitly including it with its default value.
+     */
+    if (turboJson.cacheDir) {
+        nxJson.cacheDirectory = '.nx/cache';
+    }
+    const defaultBase = (0, deduce_default_base_1.deduceDefaultBase)();
+    // Do not add defaultBase if it is inferred to be the Nx default value of main
+    if (defaultBase !== 'main') {
+        nxJson.defaultBase ??= defaultBase;
+    }
+    return nxJson;
 }
 function addDepsToPackageJson(repoRoot, additionalPackages) {
     const path = (0, path_2.joinPathFragments)(repoRoot, `package.json`);
@@ -202,8 +253,8 @@ function printFinalMessage({ learnMoreLink, }) {
     output_1.output.success({
         title: '🎉 Done!',
         bodyLines: [
-            `- Run "${pmc.exec} nx run-many -t build" to run the build target for every project in the workspace. Run it again to replay the cached computation. https://nx.dev/features/cache-task-results`,
-            `- Run "${pmc.exec} nx graph" to see the graph of projects and tasks in your workspace. https://nx.dev/core-features/explore-graph`,
+            `- Run "${(0, child_process_2.getRunNxBaseCommand)(pmc)} run-many -t build" to run the build target for every project in the workspace. Run it again to replay the cached computation. https://nx.dev/features/cache-task-results`,
+            `- Run "${(0, child_process_2.getRunNxBaseCommand)(pmc)} graph" to see the graph of projects and tasks in your workspace. https://nx.dev/core-features/explore-graph`,
             learnMoreLink ? `- Learn more at ${learnMoreLink}.` : undefined,
         ].filter(Boolean),
     });
@@ -217,3 +268,16 @@ function isMonorepo(packageJson) {
         return true;
     return false;
 }
+function isCRA(packageJson) {
+    const combinedDependencies = {
+        ...packageJson.dependencies,
+        ...packageJson.devDependencies,
+    };
+    return (
+    // Required dependencies for CRA projects
+    combinedDependencies['react'] &&
+        combinedDependencies['react-dom'] &&
+        combinedDependencies['react-scripts'] &&
+        (0, fileutils_1.directoryExists)('src') &&
+        (0, fileutils_1.directoryExists)('public'));
+}

package/src/command-line/init/init-v1.js

@@ -18,7 +18,7 @@ const utils_1 = require("./implementation/utils");
 async function initHandler(options) {
     // strip the 'init' command itself so we don't forward it
     const args = process.argv.slice(3).join(' ');
-    const version = process.env.NX_VERSION ?? ((0, semver_1.prerelease)(versions_1.nxVersion) ? 'next' : 'latest');
+    const version = process.env.NX_VERSION ?? ((0, semver_1.prerelease)(versions_1.nxVersion) ? versions_1.nxVersion : 'latest');
     if (process.env.NX_VERSION) {
         console.log(`Using version ${process.env.NX_VERSION}`);
     }

package/src/command-line/init/init-v2.d.ts

@@ -5,6 +5,7 @@ export interface InitArgs {
     useDotNxInstallation?: boolean;
     integrated?: boolean;
     verbose?: boolean;
+    force?: boolean;
 }
 export declare function initHandler(options: InitArgs): Promise<void>;
 export declare function detectPlugins(nxJson: NxJsonConfiguration, interactive: boolean, includeAngularCli?: boolean): Promise<{

package/src/command-line/init/init-v2.js

@@ -3,48 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initHandler = initHandler;
 exports.detectPlugins = detectPlugins;
 const fs_1 = require("fs");
+const enquirer_1 = require("enquirer");
 const semver_1 = require("semver");
+const nx_json_1 = require("../../config/nx-json");
+const fileutils_1 = require("../../utils/fileutils");
+const get_package_name_from_import_path_1 = require("../../utils/get-package-name-from-import-path");
 const output_1 = require("../../utils/output");
 const package_manager_1 = require("../../utils/package-manager");
-const add_nx_scripts_1 = require("./implementation/dot-nx/add-nx-scripts");
-const child_process_1 = require("../../utils/child-process");
-const fileutils_1 = require("../../utils/fileutils");
 const versions_1 = require("../../utils/versions");
-const utils_1 = require("./implementation/utils");
-const enquirer_1 = require("enquirer");
-const angular_1 = require("./implementation/angular");
 const workspace_context_1 = require("../../utils/workspace-context");
 const connect_to_nx_cloud_1 = require("../connect/connect-to-nx-cloud");
-const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
-const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
-const nx_json_1 = require("../../config/nx-json");
-const get_package_name_from_import_path_1 = require("../../utils/get-package-name-from-import-path");
 const configure_plugins_1 = require("./configure-plugins");
+const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
+const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
+const add_nx_to_turborepo_1 = require("./implementation/add-nx-to-turborepo");
+const angular_1 = require("./implementation/angular");
+const add_nx_scripts_1 = require("./implementation/dot-nx/add-nx-scripts");
+const utils_1 = require("./implementation/utils");
+const react_1 = require("./implementation/react");
 async function initHandler(options) {
     process.env.NX_RUNNING_NX_INIT = 'true';
-    const version = process.env.NX_VERSION ?? ((0, semver_1.prerelease)(versions_1.nxVersion) ? 'next' : 'latest');
+    const version = process.env.NX_VERSION ?? ((0, semver_1.prerelease)(versions_1.nxVersion) ? versions_1.nxVersion : 'latest');
     if (process.env.NX_VERSION) {
         output_1.output.log({ title: `Using version ${process.env.NX_VERSION}` });
     }
-    if (!(0, fs_1.existsSync)('package.json') || options.useDotNxInstallation) {
-        if (process.platform !== 'win32') {
-            console.log('Setting Nx up installation in `.nx`. You can run Nx commands like: `./nx --help`');
-        }
-        else {
-            console.log('Setting Nx up installation in `.nx`. You can run Nx commands like: `./nx.bat --help`');
-        }
-        (0, add_nx_scripts_1.generateDotNxSetup)(version);
-        const nxJson = (0, nx_json_1.readNxJson)(process.cwd());
-        const { plugins } = await detectPlugins(nxJson, options.interactive);
-        plugins.forEach((plugin) => {
-            (0, child_process_1.runNxSync)(`add ${plugin}`, {
-                stdio: 'inherit',
-            });
-        });
-        // invokes the wrapper, thus invoking the initial installation process
-        (0, child_process_1.runNxSync)('--version', { stdio: 'ignore' });
-        return;
-    }
     // TODO(jack): Remove this Angular logic once `@nx/angular` is compatible with inferred targets.
     if ((0, fs_1.existsSync)('angular.json')) {
         await (0, angular_1.addNxToAngularCliRepo)({
@@ -56,33 +38,80 @@ async function initHandler(options) {
         });
         return;
     }
-    const packageJson = (0, fileutils_1.readJsonFile)('package.json');
-    if ((0, utils_1.isMonorepo)(packageJson)) {
+    const _isNonJs = !(0, fs_1.existsSync)('package.json') || options.useDotNxInstallation;
+    const packageJson = _isNonJs
+        ? null
+        : (0, fileutils_1.readJsonFile)('package.json');
+    const _isTurborepo = (0, fs_1.existsSync)('turbo.json');
+    const _isMonorepo = _isNonJs ? false : (0, utils_1.isMonorepo)(packageJson);
+    const _isCRA = _isNonJs ? false : (0, utils_1.isCRA)(packageJson);
+    const learnMoreLink = _isTurborepo
+        ? 'https://nx.dev/recipes/adopting-nx/from-turborepo'
+        : _isMonorepo
+            ? 'https://nx.dev/getting-started/tutorials/npm-workspaces-tutorial'
+            : 'https://nx.dev/recipes/adopting-nx/adding-to-existing-project';
+    /**
+     * Turborepo users must have set up individual scripts already, and we keep the transition as minimal as possible.
+     * We log a message during the conversion process in addNxToTurborepo about how they can learn more about the power
+     * of Nx plugins and how it would allow them to infer all the relevant scripts automatically, including all cache
+     * inputs and outputs.
+     */
+    if (_isTurborepo) {
+        await (0, add_nx_to_turborepo_1.addNxToTurborepo)({
+            interactive: options.interactive,
+        });
+        (0, utils_1.printFinalMessage)({
+            learnMoreLink,
+        });
+        return;
+    }
+    const pmc = (0, package_manager_1.getPackageManagerCommand)();
+    if (_isCRA) {
+        await (0, react_1.addNxToCraRepo)({
+            addE2e: false,
+            force: options.force,
+            vite: true,
+            integrated: false,
+            interactive: options.interactive,
+            nxCloud: false,
+        });
+    }
+    else if (_isMonorepo) {
         await (0, add_nx_to_monorepo_1.addNxToMonorepo)({
             interactive: options.interactive,
             nxCloud: false,
         });
     }
+    else if (_isNonJs) {
+        (0, add_nx_scripts_1.generateDotNxSetup)(version);
+        console.log('');
+    }
     else {
         await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({
             interactive: options.interactive,
             nxCloud: false,
         });
     }
-    const learnMoreLink = (0, utils_1.isMonorepo)(packageJson)
-        ? 'https://nx.dev/getting-started/tutorials/npm-workspaces-tutorial'
-        : 'https://nx.dev/recipes/adopting-nx/adding-to-existing-project';
     const useNxCloud = options.nxCloud ??
         (options.interactive ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)() : false);
     const repoRoot = process.cwd();
-    const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, utils_1.createNxJsonFile)(repoRoot, [], [], {});
     (0, utils_1.updateGitIgnore)(repoRoot);
     const nxJson = (0, nx_json_1.readNxJson)(repoRoot);
     output_1.output.log({ title: '🧐 Checking dependencies' });
-    const { plugins, updatePackageScripts } = await detectPlugins(nxJson, options.interactive);
+    let plugins;
+    let updatePackageScripts;
+    if (_isCRA) {
+        plugins = ['@nx/vite'];
+        updatePackageScripts = true;
+    }
+    else {
+        const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, options.interactive);
+        plugins = _plugins;
+        updatePackageScripts = _updatePackageScripts;
+    }
     output_1.output.log({ title: '📦 Installing Nx' });
-    (0, configure_plugins_1.runPackageManagerInstallPlugins)(repoRoot, pmc, plugins);
+    (0, configure_plugins_1.installPluginPackages)(repoRoot, pmc, plugins);
     await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, repoRoot, options.verbose);
     if (useNxCloud) {
         output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
@@ -114,6 +143,7 @@ const npmPackageToPluginMap = {
     'react-native': '@nx/react-native',
     '@remix-run/dev': '@nx/remix',
     '@rsbuild/core': '@nx/rsbuild',
+    '@react-router/dev': '@nx/react',
 };
 async function detectPlugins(nxJson, interactive, includeAngularCli) {
     let files = ['package.json'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), ['**/*/package.json']));

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.commandsObject = exports.parserConfiguration = void 0;
 const chalk = require("chalk");
 const yargs = require("yargs");
-const command_object_1 = require("./activate-powerpack/command-object");
+const command_object_1 = require("./register/command-object");
 const command_object_2 = require("./affected/command-object");
 const command_object_3 = require("./connect/command-object");
 const command_object_4 = require("./daemon/command-object");
@@ -46,7 +46,7 @@ exports.commandsObject = yargs
     .parserConfiguration(exports.parserConfiguration)
     .usage(chalk.bold('Smart Monorepos · Fast CI'))
     .demandCommand(1, '')
-    .command(command_object_1.yargsActivatePowerpackCommand)
+    .command(command_object_1.yargsRegisterCommand)
     .command(command_object_22.yargsAddCommand)
     .command(command_object_2.yargsAffectedBuildCommand)
     .command(command_object_2.yargsAffectedCommand)
@@ -99,7 +99,7 @@ function createMissingConformanceCommand(command) {
             output_1.output.error({
                 title: `${command} is not available`,
                 bodyLines: [
-                    `In order to use the \`nx ${command}\` command you must have an active Powerpack license and the \`@nx/powerpack-conformance\` plugin installed.`,
+                    `In order to use the \`nx ${command}\` command you must have an active Nx key and the \`@nx/conformance\` plugin installed.`,
                     '',
                     'To learn more, visit https://nx.dev/nx-enterprise/powerpack/conformance',
                 ],
@@ -110,7 +110,14 @@ function createMissingConformanceCommand(command) {
 }
 function resolveConformanceCommandObject() {
     try {
-        const { yargsConformanceCommand } = require('@nx/powerpack-conformance');
+        const { yargsConformanceCommand } = (() => {
+            try {
+                return require('@nx/powerpack-conformance');
+            }
+            catch {
+                return require('@nx/conformance');
+            }
+        })();
         return yargsConformanceCommand;
     }
     catch {
@@ -119,7 +126,14 @@ function resolveConformanceCommandObject() {
 }
 function resolveConformanceCheckCommandObject() {
     try {
-        const { yargsConformanceCheckCommand, } = require('@nx/powerpack-conformance');
+        const { yargsConformanceCheckCommand } = (() => {
+            try {
+                return require('@nx/powerpack-conformance');
+            }
+            catch {
+                return require('@nx/conformance');
+            }
+        })();
         return yargsConformanceCheckCommand;
     }
     catch {

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

@@ -0,0 +1,6 @@
+import { CommandModule } from 'yargs';
+export interface RegisterOptions {
+    key?: string;
+    verbose?: boolean;
+}
+export declare const yargsRegisterCommand: CommandModule<{}, RegisterOptions>;

package/src/command-line/{activate-powerpack → register}/command-object.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yargsActivatePowerpackCommand = void 0;
+exports.yargsRegisterCommand = void 0;
 const shared_options_1 = require("../yargs-utils/shared-options");
 const handle_errors_1 = require("../../utils/handle-errors");
-exports.yargsActivatePowerpackCommand = {
-    command: 'activate-powerpack <license>',
+exports.yargsRegisterCommand = {
+    command: 'register [key]',
+    aliases: ['activate-powerpack'],
     describe: false,
-    // describe: 'Activate a Nx Powerpack license.',
     builder: (yargs) => (0, shared_options_1.withVerbose)(yargs)
         .parserConfiguration({
         'strip-dashed': true,
         'unknown-options-as-args': true,
     })
-        .positional('license', {
+        .positional('key', {
         type: 'string',
-        description: 'This is a License Key for Nx Powerpack.',
+        description: 'This is a key for Nx.',
     })
-        .example('$0 activate-powerpack <license key>', 'Activate a Nx Powerpack license'),
+        .example('$0 register <key>', 'Register a Nx key'),
     handler: async (args) => {
-        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose, async () => {
-            return (await Promise.resolve().then(() => require('./activate-powerpack'))).handleActivatePowerpack(args);
+        const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? false, async () => {
+            return (await Promise.resolve().then(() => require('./register'))).handleRegister(args);
         });
         process.exit(exitCode);
     },

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

@@ -0,0 +1,2 @@
+import { RegisterOptions } from './command-object';
+export declare function handleRegister(options: RegisterOptions): Promise<import("@nx/key").NxKey>;

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

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleRegister = handleRegister;
+const workspace_root_1 = require("../../utils/workspace-root");
+const require_nx_key_1 = require("../../utils/require-nx-key");
+async function handleRegister(options) {
+    const nxKey = await (0, require_nx_key_1.requireNxKey)();
+    return nxKey.registerNxKey(workspace_root_1.workspaceRoot, options.key);
+}

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

@@ -13,14 +13,15 @@ const tree_1 = require("../../generators/tree");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const utils_1 = require("../../tasks-runner/utils");
+const handle_errors_1 = require("../../utils/handle-errors");
 const is_ci_1 = require("../../utils/is-ci");
 const output_1 = require("../../utils/output");
-const handle_errors_1 = require("../../utils/handle-errors");
 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 use_legacy_versioning_1 = require("./config/use-legacy-versioning");
 const version_plans_1 = require("./config/version-plans");
 const git_1 = require("./utils/git");
 const github_1 = require("./utils/github");
@@ -46,7 +47,8 @@ function createAPI(overrideReleaseConfig) {
         // Apply default configuration to any optional user configuration
         const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), userProvidedReleaseConfig);
         if (configError) {
-            return await (0, config_1.handleNxReleaseConfigError)(configError);
+            const USE_LEGACY_VERSIONING = (0, use_legacy_versioning_1.shouldUseLegacyVersioning)(userProvidedReleaseConfig);
+            return await (0, config_1.handleNxReleaseConfigError)(configError, USE_LEGACY_VERSIONING);
         }
         // --print-config exits directly as it is not designed to be combined with any other programmatic operations
         if (args.printConfig) {
@@ -137,7 +139,7 @@ function createAPI(overrideReleaseConfig) {
         (0, shared_1.handleDuplicateGitTags)(gitTagValues);
         const postGitTasks = [];
         let workspaceChangelogChanges = [];
-        // TODO: remove this after the changelog renderer is refactored to remove coupling with git commits
+        // TODO(v22): remove this after the changelog renderer is refactored to remove coupling with git commits
         let workspaceChangelogCommits = [];
         // If there are multiple release groups, we'll just skip the workspace changelog anyway.
         const versionPlansEnabledForWorkspaceChangelog = releaseGroups[0].resolvedVersionPlans;
@@ -191,8 +193,7 @@ function createAPI(overrideReleaseConfig) {
         }
         else {
             let workspaceChangelogFromRef = args.from ||
-                (await (0, git_1.getLatestGitTagForPattern)(nxReleaseConfig.releaseTagPattern))
-                    ?.tag;
+                (await (0, git_1.getLatestGitTagForPattern)(nxReleaseConfig.releaseTagPattern, {}, nxReleaseConfig.releaseTagPatternCheckAllBranchesWhen))?.tag;
             if (!workspaceChangelogFromRef) {
                 if (useAutomaticFromRef) {
                     workspaceChangelogFromRef = await (0, git_1.getFirstGitCommit)();
@@ -229,7 +230,7 @@ function createAPI(overrideReleaseConfig) {
             nxReleaseConfig,
             workspaceChangelogVersion,
             changes: workspaceChangelogChanges,
-            // TODO: remove this after the changelog renderer is refactored to remove coupling with git commits
+            // TODO(v22): remove this after the changelog renderer is refactored to remove coupling with git commits
             commits: filterHiddenCommits(workspaceChangelogCommits, nxReleaseConfig.conventionalCommits),
         });
         if (workspaceChangelog &&
@@ -260,7 +261,7 @@ function createAPI(overrideReleaseConfig) {
                     .map((dep) => {
                     return {
                         dependencyName: dep.source,
-                        newVersion: projectsVersionData[dep.source].newVersion,
+                        newVersion: projectsVersionData[dep.source]?.newVersion ?? null,
                     };
                 })
                     .filter((b) => b.newVersion !== null);
@@ -297,7 +298,7 @@ function createAPI(overrideReleaseConfig) {
             if (releaseGroup.projectsRelationship === 'independent') {
                 for (const project of projectNodes) {
                     let changes = null;
-                    // TODO: remove this after the changelog renderer is refactored to remove coupling with git commits
+                    // TODO(v22): remove this after the changelog renderer is refactored to remove coupling with git commits
                     let commits;
                     if (releaseGroup.resolvedVersionPlans) {
                         changes = releaseGroup.resolvedVersionPlans
@@ -335,7 +336,7 @@ function createAPI(overrideReleaseConfig) {
                             (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {
                                 projectName: project.name,
                                 releaseGroupName: releaseGroup.name,
-                            }))?.tag;
+                            }, releaseGroup.releaseTagPatternCheckAllBranchesWhen))?.tag;
                         if (!fromRef && useAutomaticFromRef) {
                             const firstCommit = await (0, git_1.getFirstGitCommit)();
                             const allCommits = await getCommits(firstCommit, toSHA);
@@ -396,7 +397,7 @@ function createAPI(overrideReleaseConfig) {
             }
             else {
                 let changes = [];
-                // TODO: remove this after the changelog renderer is refactored to remove coupling with git commits
+                // TODO(v22): remove this after the changelog renderer is refactored to remove coupling with git commits
                 let commits = [];
                 if (releaseGroup.resolvedVersionPlans) {
                     changes = releaseGroup.resolvedVersionPlans
@@ -442,8 +443,7 @@ function createAPI(overrideReleaseConfig) {
                 }
                 else {
                     let fromRef = args.from ||
-                        (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern))
-                            ?.tag;
+                        (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {}, releaseGroup.releaseTagPatternCheckAllBranchesWhen))?.tag;
                     if (!fromRef) {
                         if (useAutomaticFromRef) {
                             fromRef = await (0, git_1.getFirstGitCommit)();
@@ -644,11 +644,12 @@ async function applyChangesAndExit(args, nxReleaseConfig, tree, toSHA, postGitTa
         }
     }
     if (args.gitPush ?? nxReleaseConfig.changelog.git.push) {
-        output_1.output.logSingleLine(`Pushing to git remote "${args.gitRemote}"`);
+        output_1.output.logSingleLine(`Pushing to git remote "${args.gitRemote ?? 'origin'}"`);
         await (0, git_1.gitPush)({
             gitRemote: args.gitRemote,
             dryRun: args.dryRun,
             verbose: args.verbose,
+            additionalArgs: args.gitPushArgs || nxReleaseConfig.changelog.git.pushArgs,
         });
     }
     // Run any post-git tasks in series
@@ -902,7 +903,7 @@ function filterHiddenChanges(changes, conventionalCommitsConfig) {
         return !typeConfig.changelog.hidden;
     });
 }
-// TODO: remove this after the changelog renderer is refactored to remove coupling with git commits
+// TODO(v22): remove this after the changelog renderer is refactored to remove coupling with git commits
 function filterHiddenCommits(commits, conventionalCommitsConfig) {
     if (!commits) {
         return [];
@@ -937,7 +938,9 @@ async function promptForGitHubRelease() {
         ]);
         return result.confirmation;
     }
-    catch (e) {
+    catch {
+        // Ensure the cursor is always restored
+        process.stdout.write('\u001b[?25h');
         // Handle the case where the user exits the prompt with ctrl+c
         return false;
     }

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

@@ -19,6 +19,7 @@ interface GitOptions {
     gitTagMessage?: string;
     gitTagArgs?: string | string[];
     gitPush?: boolean;
+    gitPushArgs?: string | string[];
     gitRemote?: string;
 }
 export type VersionOptions = NxReleaseArgs & GitOptions & VersionPlanArgs & FirstReleaseArgs & {
@@ -58,6 +59,7 @@ export type PlanCheckOptions = BaseNxReleaseArgs & {
 export type ReleaseOptions = NxReleaseArgs & FirstReleaseArgs & {
     specifier?: string;
     yes?: boolean;
+    preid?: VersionOptions['preid'];
     skipPublish?: boolean;
 };
 export type VersionPlanArgs = {