nx 21.0.0-beta.0 → 21.0.0-beta.10

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

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

@@ -75,6 +75,11 @@ const releaseCommand = {
         .positional('specifier', {
         type: 'string',
         describe: 'Exact version or semver keyword to apply to the selected release group.',
+    })
+        .option('preid', {
+        type: 'string',
+        describe: 'The optional prerelease identifier to apply to the version. This will only be applied in the case that the specifier argument has been set to `prerelease` OR when conventional commits are enabled, in which case it will modify the resolved specifier from conventional commits to be its prerelease equivalent. E.g. minor -> preminor.',
+        default: '',
     })
         .option('yes', {
         type: 'boolean',
@@ -284,6 +289,10 @@ function withGitOptions(yargs) {
         .option('git-push', {
         describe: 'Whether or not to automatically push the changes made by this command to the remote git repository.',
         type: 'boolean',
+    })
+        .option('git-push-args', {
+        describe: 'Additional arguments to pass to the `git push` command invoked behind the scenes.',
+        type: 'string',
     })
         .option('git-remote', {
         type: 'string',

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

@@ -1,4 +1,4 @@
-import { NxJsonConfiguration } from '../../../config/nx-json';
+import { NxJsonConfiguration, NxReleaseConfiguration } from '../../../config/nx-json';
 import { ProjectFileMap, ProjectGraph } from '../../../config/project-graph';
 type DeepRequired<T> = Required<{
     [K in keyof T]: T[K] extends Required<T[K]> ? T[K] : DeepRequired<T[K]>;
@@ -25,6 +25,7 @@ type RemoveBooleanFromPropertiesOnEach<T, K extends keyof T[keyof T]> = {
     [U in keyof T]: RemoveBooleanFromProperties<T[U], K>;
 };
 export declare const IMPLICIT_DEFAULT_RELEASE_GROUP = "__default__";
+export declare const DEFAULT_VERSION_ACTIONS_PATH = "@nx/js/src/release/version-actions";
 /**
  * Our source of truth is a deeply required variant of the user-facing config interface, so that command
  * implementations can be sure that properties will exist and do not need to repeat the same checks over
@@ -34,21 +35,21 @@ export declare const IMPLICIT_DEFAULT_RELEASE_GROUP = "__default__";
  * it easier to work with (the user could be specifying a single string, and they can also use any valid matcher
  * pattern such as directories and globs).
  */
-export type NxReleaseConfig = Omit<DeepRequired<NxJsonConfiguration['release'] & {
-    groups: DeepRequired<RemoveTrueFromPropertiesOnEach<EnsureProjectsArray<NxJsonConfiguration['release']['groups']>, 'changelog'>>;
-    changelog: RemoveTrueFromProperties<DeepRequired<NxJsonConfiguration['release']['changelog']>, 'workspaceChangelog' | 'projectChangelogs'>;
+export type NxReleaseConfig = Omit<DeepRequired<NxReleaseConfiguration & {
+    groups: DeepRequired<RemoveTrueFromPropertiesOnEach<EnsureProjectsArray<NxReleaseConfiguration['groups']>, 'changelog'>>;
+    changelog: RemoveTrueFromProperties<DeepRequired<NxReleaseConfiguration['changelog']>, 'workspaceChangelog' | 'projectChangelogs'>;
     conventionalCommits: {
-        types: RemoveBooleanFromPropertiesOnEach<DeepRequired<RemoveBooleanFromProperties<DeepRequired<NxJsonConfiguration['release']['conventionalCommits']['types']>, string>>, 'changelog'>;
+        types: RemoveBooleanFromPropertiesOnEach<DeepRequired<RemoveBooleanFromProperties<DeepRequired<NxReleaseConfiguration['conventionalCommits']['types']>, string>>, 'changelog'>;
     };
 }>, 'projects'>;
 export interface CreateNxReleaseConfigError {
-    code: 'PROJECTS_AND_GROUPS_DEFINED' | 'RELEASE_GROUP_MATCHES_NO_PROJECTS' | 'RELEASE_GROUP_RELEASE_TAG_PATTERN_VERSION_PLACEHOLDER_MISSING_OR_EXCESSIVE' | 'PROJECT_MATCHES_MULTIPLE_GROUPS' | 'CONVENTIONAL_COMMITS_SHORTHAND_MIXED_WITH_OVERLAPPING_GENERATOR_OPTIONS' | 'GLOBAL_GIT_CONFIG_MIXED_WITH_GRANULAR_GIT_CONFIG' | 'CANNOT_RESOLVE_CHANGELOG_RENDERER' | 'INVALID_CHANGELOG_CREATE_RELEASE_PROVIDER' | 'INVALID_CHANGELOG_CREATE_RELEASE_HOSTNAME' | 'INVALID_CHANGELOG_CREATE_RELEASE_API_BASE_URL' | 'GIT_PUSH_FALSE_WITH_CREATE_RELEASE';
+    code: 'PROJECTS_AND_GROUPS_DEFINED' | 'RELEASE_GROUP_MATCHES_NO_PROJECTS' | 'RELEASE_GROUP_RELEASE_TAG_PATTERN_VERSION_PLACEHOLDER_MISSING_OR_EXCESSIVE' | 'PROJECT_MATCHES_MULTIPLE_GROUPS' | 'CONVENTIONAL_COMMITS_SHORTHAND_MIXED_WITH_OVERLAPPING_OPTIONS' | 'GLOBAL_GIT_CONFIG_MIXED_WITH_GRANULAR_GIT_CONFIG' | 'CANNOT_RESOLVE_CHANGELOG_RENDERER' | 'INVALID_CHANGELOG_CREATE_RELEASE_PROVIDER' | 'INVALID_CHANGELOG_CREATE_RELEASE_HOSTNAME' | 'INVALID_CHANGELOG_CREATE_RELEASE_API_BASE_URL' | 'GIT_PUSH_FALSE_WITH_CREATE_RELEASE';
     data: Record<string, string | string[]>;
 }
 export declare function createNxReleaseConfig(projectGraph: ProjectGraph, projectFileMap: ProjectFileMap, userConfig?: NxJsonConfiguration['release']): Promise<{
     error: null | CreateNxReleaseConfigError;
     nxReleaseConfig: NxReleaseConfig | null;
 }>;
-export declare function handleNxReleaseConfigError(error: CreateNxReleaseConfigError): Promise<never>;
+export declare function handleNxReleaseConfigError(error: CreateNxReleaseConfigError, useLegacyVersioning: boolean): Promise<never>;
 export declare const defaultCreateReleaseProvider: any;
 export {};