nx 21.0.0-beta.1 → 21.0.0-beta.3

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

@@ -1,36 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.releaseVersionCLIHandler = exports.validReleaseVersionPrefixes = exports.deriveNewSemverVersion = void 0;
+exports.releaseVersionCLIHandler = exports.validReleaseVersionPrefixes = void 0;
 exports.createAPI = createAPI;
 const chalk = require("chalk");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
 const nx_json_1 = require("../../config/nx-json");
+const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 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 handle_errors_1 = require("../../utils/handle-errors");
 const output_1 = require("../../utils/output");
-const params_1 = require("../../utils/params");
 const path_1 = require("../../utils/path");
 const workspace_root_1 = require("../../utils/workspace-root");
-const generate_1 = require("../generate/generate");
-const generator_utils_1 = require("../generate/generator-utils");
 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 batch_projects_by_generator_config_1 = require("./utils/batch-projects-by-generator-config");
 const git_1 = require("./utils/git");
 const print_changes_1 = require("./utils/print-changes");
 const print_config_1 = require("./utils/print-config");
 const resolve_nx_json_error_message_1 = require("./utils/resolve-nx-json-error-message");
 const shared_1 = require("./utils/shared");
-const handle_errors_1 = require("../../utils/handle-errors");
+const version_legacy_1 = require("./version-legacy");
+const release_group_processor_1 = require("./version/release-group-processor");
+const use_legacy_versioning_1 = require("./config/use-legacy-versioning");
 const LARGE_BUFFER = 1024 * 1000000;
 // Reexport some utils for use in plugin release-version generator implementations
-var semver_1 = require("./utils/semver");
-Object.defineProperty(exports, "deriveNewSemverVersion", { enumerable: true, get: function () { return semver_1.deriveNewSemverVersion; } });
 exports.validReleaseVersionPrefixes = ['auto', '', '~', '^', '='];
 const releaseVersionCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, () => createAPI({})(args));
 exports.releaseVersionCLIHandler = releaseVersionCLIHandler;
@@ -42,13 +39,13 @@ function createAPI(overrideReleaseConfig) {
      */
     return async function releaseVersion(args) {
         const projectGraph = await (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
-        const { projects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
         const nxJson = (0, nx_json_1.readNxJson)();
         const userProvidedReleaseConfig = (0, deep_merge_json_1.deepMergeJson)(nxJson.release ?? {}, overrideReleaseConfig ?? {});
+        const USE_LEGACY_VERSIONING = (0, use_legacy_versioning_1.shouldUseLegacyVersioning)(userProvidedReleaseConfig);
         // 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);
+            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) {
@@ -58,6 +55,10 @@ function createAPI(overrideReleaseConfig) {
                 isDebug: args.printConfig === 'debug',
             });
         }
+        // TODO(v22): Remove support for the legacy versioning implementation in Nx v22
+        if (USE_LEGACY_VERSIONING) {
+            return await (0, version_legacy_1.releaseVersionLegacy)(projectGraph, args, nxJson, nxReleaseConfig, userProvidedReleaseConfig);
+        }
         // The nx release top level command will always override these three git args. This is how we can tell
         // if the top level release command was used or if the user is using the changelog subcommand.
         // If the user explicitly overrides these args, then it doesn't matter if the top level config is set,
@@ -98,169 +99,71 @@ function createAPI(overrideReleaseConfig) {
             // default to not delete version plans after versioning as they may be needed for changelog generation
             args.deleteVersionPlans = false;
         }
+        /**
+         * Run any configured top level pre-version command
+         */
         runPreVersionCommand(nxReleaseConfig.version.preVersionCommand, {
             dryRun: args.dryRun,
             verbose: args.verbose,
         });
+        /**
+         * Run any configured pre-version command for the selected release groups
+         */
+        for (const releaseGroup of releaseGroups) {
+            runPreVersionCommand(releaseGroup.version.groupPreVersionCommand, {
+                dryRun: args.dryRun,
+                verbose: args.verbose,
+            }, releaseGroup);
+        }
         const tree = new tree_1.FsTree(workspace_root_1.workspaceRoot, args.verbose);
-        const versionData = {};
         const commitMessage = args.gitCommitMessage || nxReleaseConfig.version.git.commitMessage;
-        const generatorCallbacks = [];
         /**
          * additionalChangedFiles are files which need to be updated as a side-effect of versioning (such as package manager lock files),
          * and need to get staged and committed as part of the existing commit, if applicable.
          */
         const additionalChangedFiles = new Set();
         const additionalDeletedFiles = new Set();
-        if (args.projects?.length) {
-            /**
-             * Run versioning for all remaining release groups and filtered projects within them
-             */
-            for (const releaseGroup of releaseGroups) {
-                const releaseGroupName = releaseGroup.name;
-                const releaseGroupProjectNames = Array.from(releaseGroupToFilteredProjects.get(releaseGroup));
-                const projectBatches = (0, batch_projects_by_generator_config_1.batchProjectsByGeneratorConfig)(projectGraph, releaseGroup, 
-                // Only batch based on the filtered projects within the release group
-                releaseGroupProjectNames);
-                for (const [generatorConfigString, projectNames,] of projectBatches.entries()) {
-                    const [generatorName, generatorOptions] = JSON.parse(generatorConfigString);
-                    // Resolve the generator for the batch and run versioning on the projects within the batch
-                    const generatorData = resolveGeneratorData({
-                        ...extractGeneratorCollectionAndName(`batch "${JSON.stringify(projectNames)}" for release-group "${releaseGroupName}"`, generatorName),
-                        configGeneratorOptions: generatorOptions,
-                        // all project data from the project graph (not to be confused with projectNamesToRunVersionOn)
-                        projects,
-                    });
-                    const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData, nxReleaseConfig.conventionalCommits);
-                    // Capture the callback so that we can run it after flushing the changes to disk
-                    generatorCallbacks.push(async () => {
-                        const result = await generatorCallback(tree, {
-                            dryRun: !!args.dryRun,
-                            verbose: !!args.verbose,
-                            generatorOptions: {
-                                ...generatorOptions,
-                                ...args.generatorOptionsOverrides,
-                            },
-                        });
-                        const { changedFiles, deletedFiles } = parseGeneratorCallbackResult(result);
-                        changedFiles.forEach((f) => additionalChangedFiles.add(f));
-                        deletedFiles.forEach((f) => additionalDeletedFiles.add(f));
-                    });
-                }
-            }
-            // 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.version.git.tag
-                ? (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects, versionData)
-                : [];
-            (0, shared_1.handleDuplicateGitTags)(gitTagValues);
-            printAndFlushChanges(tree, !!args.dryRun);
-            for (const generatorCallback of generatorCallbacks) {
-                await generatorCallback();
-            }
-            const changedFiles = [
-                ...tree.listChanges().map((f) => f.path),
-                ...additionalChangedFiles,
-            ];
-            // No further actions are necessary in this scenario (e.g. if conventional commits detected no changes)
-            if (!changedFiles.length) {
-                return {
-                    // An overall workspace version cannot be relevant when filtering to independent projects
-                    workspaceVersion: undefined,
-                    projectsVersionData: versionData,
-                };
-            }
-            if (args.gitCommit ?? nxReleaseConfig.version.git.commit) {
-                await (0, shared_1.commitChanges)({
-                    changedFiles,
-                    deletedFiles: Array.from(additionalDeletedFiles),
-                    isDryRun: !!args.dryRun,
-                    isVerbose: !!args.verbose,
-                    gitCommitMessages: (0, shared_1.createCommitMessageValues)(releaseGroups, releaseGroupToFilteredProjects, versionData, commitMessage),
-                    gitCommitArgs: args.gitCommitArgs || nxReleaseConfig.version.git.commitArgs,
-                });
-            }
-            else if (args.stageChanges ??
-                nxReleaseConfig.version.git.stageChanges) {
-                output_1.output.logSingleLine(`Staging changed files with git`);
-                await (0, git_1.gitAdd)({
-                    changedFiles,
-                    dryRun: args.dryRun,
-                    verbose: args.verbose,
-                });
-            }
-            if (args.gitTag ?? nxReleaseConfig.version.git.tag) {
-                output_1.output.logSingleLine(`Tagging commit with git`);
-                for (const tag of gitTagValues) {
-                    await (0, git_1.gitTag)({
-                        tag,
-                        message: args.gitTagMessage || nxReleaseConfig.version.git.tagMessage,
-                        additionalArgs: args.gitTagArgs || nxReleaseConfig.version.git.tagArgs,
-                        dryRun: args.dryRun,
-                        verbose: args.verbose,
-                    });
-                }
-            }
-            if (args.gitPush ?? nxReleaseConfig.version.git.push) {
-                output_1.output.logSingleLine(`Pushing to git remote "${args.gitRemote}"`);
-                await (0, git_1.gitPush)({
-                    gitRemote: args.gitRemote,
-                    dryRun: args.dryRun,
-                    verbose: args.verbose,
-                });
+        const processor = new release_group_processor_1.ReleaseGroupProcessor(tree, projectGraph, nxReleaseConfig, releaseGroups, releaseGroupToFilteredProjects, {
+            dryRun: args.dryRun,
+            verbose: args.verbose,
+            firstRelease: args.firstRelease,
+            preid: args.preid ?? '',
+            userGivenSpecifier: args.specifier,
+            filters: {
+                projects: args.projects,
+                groups: args.groups,
+            },
+        });
+        try {
+            await processor.init();
+            await processor.processGroups();
+            // Delete processed version plan files if applicable
+            if (args.deleteVersionPlans) {
+                processor.deleteProcessedVersionPlanFiles();
             }
-            return {
-                // An overall workspace version cannot be relevant when filtering to independent projects
-                workspaceVersion: undefined,
-                projectsVersionData: versionData,
-            };
+        }
+        catch (err) {
+            // Flush any pending project logs before printing the error to make troubleshooting easier
+            processor.flushAllProjectLoggers();
+            // Bubble up the error so that the CLI can print the error and exit, or the programmatic API can handle it
+            throw err;
         }
         /**
-         * Run versioning for all remaining release groups
+         * Ensure that formatting is applied so that version bump diffs are as minimal as possible
+         * within the context of the user's workspace.
          */
-        for (const releaseGroup of releaseGroups) {
-            const releaseGroupName = releaseGroup.name;
-            runPreVersionCommand(releaseGroup.version.groupPreVersionCommand, {
-                dryRun: args.dryRun,
-                verbose: args.verbose,
-            }, releaseGroup);
-            const projectBatches = (0, batch_projects_by_generator_config_1.batchProjectsByGeneratorConfig)(projectGraph, releaseGroup, 
-            // Batch based on all projects within the release group
-            releaseGroup.projects);
-            for (const [generatorConfigString, projectNames,] of projectBatches.entries()) {
-                const [generatorName, generatorOptions] = JSON.parse(generatorConfigString);
-                // Resolve the generator for the batch and run versioning on the projects within the batch
-                const generatorData = resolveGeneratorData({
-                    ...extractGeneratorCollectionAndName(`batch "${JSON.stringify(projectNames)}" for release-group "${releaseGroupName}"`, generatorName),
-                    configGeneratorOptions: generatorOptions,
-                    // all project data from the project graph (not to be confused with projectNamesToRunVersionOn)
-                    projects,
-                });
-                const generatorCallback = await runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, args.generatorOptionsOverrides, projectNames, releaseGroup, versionData, nxReleaseConfig.conventionalCommits);
-                // Capture the callback so that we can run it after flushing the changes to disk
-                generatorCallbacks.push(async () => {
-                    const result = await generatorCallback(tree, {
-                        dryRun: !!args.dryRun,
-                        verbose: !!args.verbose,
-                        generatorOptions: {
-                            ...generatorOptions,
-                            ...args.generatorOptionsOverrides,
-                        },
-                    });
-                    const { changedFiles, deletedFiles } = parseGeneratorCallbackResult(result);
-                    changedFiles.forEach((f) => additionalChangedFiles.add(f));
-                    deletedFiles.forEach((f) => additionalDeletedFiles.add(f));
-                });
-            }
-        }
+        await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree, { silent: true });
+        const versionData = processor.getVersionData();
         // 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.version.git.tag
             ? (0, shared_1.createGitTagValues)(releaseGroups, releaseGroupToFilteredProjects, versionData)
             : [];
         (0, shared_1.handleDuplicateGitTags)(gitTagValues);
         printAndFlushChanges(tree, !!args.dryRun);
-        for (const generatorCallback of generatorCallbacks) {
-            await generatorCallback();
-        }
+        const { changedFiles: changed, deletedFiles: deleted } = await processor.afterAllProjectsVersioned(nxReleaseConfig.version
+            .versionActionsOptions);
+        changed.forEach((f) => additionalChangedFiles.add(f));
+        deleted.forEach((f) => additionalDeletedFiles.add(f));
         // Only applicable when there is a single release group with a fixed relationship
         let workspaceVersion = undefined;
         if (releaseGroups.length === 1) {
@@ -314,11 +217,12 @@ function createAPI(overrideReleaseConfig) {
             }
         }
         if (args.gitPush ?? nxReleaseConfig.version.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.version.git.pushArgs,
             });
         }
         return {
@@ -327,109 +231,34 @@ function createAPI(overrideReleaseConfig) {
         };
     };
 }
-function appendVersionData(existingVersionData, newVersionData) {
-    // Mutate the existing version data
-    for (const [key, value] of Object.entries(newVersionData)) {
-        if (existingVersionData[key]) {
-            throw new Error(`Version data key "${key}" already exists in version data. This is likely a bug, please report your use-case on https://github.com/nrwl/nx`);
-        }
-        existingVersionData[key] = value;
-    }
-    return existingVersionData;
-}
-async function runVersionOnProjects(projectGraph, nxJson, args, tree, generatorData, generatorOverrides, projectNames, releaseGroup, versionData, conventionalCommitsConfig) {
-    const generatorOptions = {
-        // Always ensure a string to avoid generator schema validation errors
-        specifier: args.specifier ?? '',
-        preid: args.preid ?? '',
-        ...generatorData.configGeneratorOptions,
-        ...(generatorOverrides ?? {}),
-        // The following are not overridable by user config
-        projects: projectNames.map((p) => projectGraph.nodes[p]),
-        projectGraph,
-        releaseGroup,
-        firstRelease: args.firstRelease ?? false,
-        conventionalCommitsConfig,
-        deleteVersionPlans: args.deleteVersionPlans,
-    };
-    // Apply generator defaults from schema.json file etc
-    const combinedOpts = await (0, params_1.combineOptionsForGenerator)(generatorOptions, generatorData.collectionName, generatorData.normalizedGeneratorName, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson, generatorData.schema, false, null, (0, node_path_1.relative)(process.cwd(), workspace_root_1.workspaceRoot), args.verbose);
-    const releaseVersionGenerator = generatorData.implementationFactory();
-    // We expect all version generator implementations to return a ReleaseVersionGeneratorResult object, rather than a GeneratorCallback
-    const versionResult = (await releaseVersionGenerator(tree, combinedOpts));
-    if (typeof versionResult === 'function') {
-        throw new Error(`The version generator ${generatorData.collectionName}:${generatorData.normalizedGeneratorName} returned a function instead of an expected ReleaseVersionGeneratorResult`);
-    }
-    // Merge the extra version data into the existing
-    appendVersionData(versionData, versionResult.data);
-    return versionResult.callback;
-}
 function printAndFlushChanges(tree, isDryRun) {
     const changes = tree.listChanges();
     console.log('');
-    // Print the changes
-    changes.forEach((f) => {
-        if (f.type === 'CREATE') {
-            console.error(`${chalk.green('CREATE')} ${f.path}${isDryRun ? chalk.keyword('orange')(' [dry-run]') : ''}`);
-            (0, print_changes_1.printDiff)('', f.content?.toString() || '');
-        }
-        else if (f.type === 'UPDATE') {
-            console.error(`${chalk.white('UPDATE')} ${f.path}${isDryRun ? chalk.keyword('orange')(' [dry-run]') : ''}`);
-            const currentContentsOnDisk = (0, node_fs_1.readFileSync)((0, path_1.joinPathFragments)(tree.root, f.path)).toString();
-            (0, print_changes_1.printDiff)(currentContentsOnDisk, f.content?.toString() || '');
-        }
-        else if (f.type === 'DELETE' && !f.path.includes('.nx')) {
-            throw new Error('Unexpected DELETE change, please report this as an issue');
-        }
-    });
-    if (!isDryRun) {
-        (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, changes);
-    }
-}
-function extractGeneratorCollectionAndName(description, generatorString) {
-    let collectionName;
-    let generatorName;
-    const parsedGeneratorString = (0, generate_1.parseGeneratorString)(generatorString);
-    collectionName = parsedGeneratorString.collection;
-    generatorName = parsedGeneratorString.generator;
-    if (!collectionName || !generatorName) {
-        throw new Error(`Invalid generator string: ${generatorString} used for ${description}. Must be in the format of [collectionName]:[generatorName]`);
-    }
-    return { collectionName, generatorName };
-}
-function resolveGeneratorData({ collectionName, generatorName, configGeneratorOptions, projects, }) {
-    try {
-        const { normalizedGeneratorName, schema, implementationFactory } = (0, generator_utils_1.getGeneratorInformation)(collectionName, generatorName, workspace_root_1.workspaceRoot, projects);
-        return {
-            collectionName,
-            generatorName,
-            configGeneratorOptions,
-            normalizedGeneratorName,
-            schema,
-            implementationFactory,
-        };
-    }
-    catch (err) {
-        if (err.message.startsWith('Unable to resolve')) {
-            // See if it is because the plugin is not installed
-            try {
-                require.resolve(collectionName);
-                // is installed
-                throw new Error(`Unable to resolve the generator called "${generatorName}" within the "${collectionName}" package`);
+    if (changes.length > 0) {
+        // Print the changes
+        changes.forEach((f) => {
+            if (f.type === 'CREATE') {
+                console.error(`${chalk.green('CREATE')} ${f.path}${isDryRun ? chalk.keyword('orange')(' [dry-run]') : ''}`);
+                (0, print_changes_1.printDiff)('', f.content?.toString() || '');
             }
-            catch {
-                /**
-                 * Special messaging for the most common case (especially as the user is unlikely to explicitly have
-                 * the @nx/js generator config in their nx.json so we need to be clear about what the problem is)
-                 */
-                if (collectionName === '@nx/js') {
-                    throw new Error('The @nx/js plugin is required in order to version your JavaScript packages. Run "nx add @nx/js" to add it to your workspace.');
-                }
-                throw new Error(`Unable to resolve the package ${collectionName} in order to load the generator called ${generatorName}. Is the package installed?`);
+            else if (f.type === 'UPDATE') {
+                console.error(`${chalk.white('UPDATE')} ${f.path}${isDryRun ? chalk.keyword('orange')(' [dry-run]') : ''}`);
+                const currentContentsOnDisk = (0, node_fs_1.readFileSync)((0, path_1.joinPathFragments)(tree.root, f.path)).toString();
+                (0, print_changes_1.printDiff)(currentContentsOnDisk, f.content?.toString() || '');
             }
-        }
-        // Unexpected error, rethrow
-        throw err;
+            else if (f.type === 'DELETE' && !f.path.includes('.nx')) {
+                throw new Error('Unexpected DELETE change, please report this as an issue');
+            }
+        });
+    }
+    else {
+        let text = isDryRun ? ' would be ' : ' ';
+        output_1.output.warn({
+            title: `No files${text}changed as a result of running versioning`,
+        });
+    }
+    if (!isDryRun) {
+        (0, tree_1.flushChanges)(workspace_root_1.workspaceRoot, changes);
     }
 }
 function runPreVersionCommand(preVersionCommand, { dryRun, verbose }, releaseGroup) {
@@ -470,14 +299,3 @@ function runPreVersionCommand(preVersionCommand, { dryRun, verbose }, releaseGro
         process.exit(1);
     }
 }
-function parseGeneratorCallbackResult(result) {
-    if (Array.isArray(result)) {
-        return {
-            changedFiles: result,
-            deletedFiles: [],
-        };
-    }
-    else {
-        return result;
-    }
-}

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

@@ -1,7 +1,7 @@
 import { PackageManager } from '../../utils/package-manager';
 import { PackageJson } from '../../utils/package-json';
 import { NxJsonConfiguration } from '../../config/nx-json';
-import type { PowerpackLicense } from '@nx/powerpack-license';
+import { type NxKey } from '@nx/key';
 export declare const packagesWeCareAbout: string[];
 export declare const patternsWeIgnoreInCommunityReport: Array<string | RegExp>;
 /**
@@ -16,8 +16,8 @@ export declare function reportHandler(): Promise<void>;
 export interface ReportData {
     pm: PackageManager;
     pmVersion: string;
-    powerpackLicense: PowerpackLicense | null;
-    powerpackError: Error | null;
+    nxKey: NxKey | null;
+    nxKeyError: Error | null;
     powerpackPlugins: PackageJson[];
     localPlugins: string[];
     communityPlugins: PackageJson[];
@@ -36,6 +36,10 @@ export interface ReportData {
     };
     projectGraphError?: Error | null;
     nativeTarget: string | null;
+    cache: {
+        max: number;
+        used: number;
+    } | null;
 }
 export declare function getReportData(): Promise<ReportData>;
 interface OutOfSyncPackageGroup {

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

@@ -21,7 +21,10 @@ const installed_plugins_1 = require("../../utils/plugins/installed-plugins");
 const installation_directory_1 = require("../../utils/installation-directory");
 const nx_json_1 = require("../../config/nx-json");
 const error_types_1 = require("../../project-graph/error-types");
-const powerpack_1 = require("../../utils/powerpack");
+const nx_key_1 = require("../../utils/nx-key");
+const cache_1 = require("../../tasks-runner/cache");
+const native_1 = require("../../native");
+const cache_directory_1 = require("../../utils/cache-directory");
 const nxPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '../../../package.json'));
 exports.packagesWeCareAbout = [
     'lerna',
@@ -46,7 +49,7 @@ const LINE_SEPARATOR = '---------------------------------------';
  *
  */
 async function reportHandler() {
-    const { pm, pmVersion, powerpackLicense, powerpackError, localPlugins, powerpackPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, } = await getReportData();
+    const { pm, pmVersion, nxKey, nxKeyError, localPlugins, powerpackPlugins, communityPlugins, registeredPlugins, packageVersionsWeCareAbout, outOfSyncPackageGroup, projectGraphError, nativeTarget, cache, } = await getReportData();
     const fields = [
         ['Node', process.versions.node],
         ['OS', `${process.platform}-${process.arch}`],
@@ -61,13 +64,31 @@ async function reportHandler() {
     packageVersionsWeCareAbout.forEach((p) => {
         bodyLines.push(`${chalk.green(p.package.padEnd(padding))} : ${chalk.bold(p.version)}`);
     });
-    if (powerpackLicense) {
+    if (nxKey) {
         bodyLines.push('');
         bodyLines.push(LINE_SEPARATOR);
-        bodyLines.push(chalk.green('Nx Powerpack'));
-        bodyLines.push(`Licensed to ${powerpackLicense.organizationName} for ${powerpackLicense.seatCount} user${powerpackLicense.seatCount > 1 ? 's' : ''} in ${powerpackLicense.workspaceCount === 9999
-            ? 'an unlimited number of'
-            : powerpackLicense.workspaceCount} workspace${powerpackLicense.workspaceCount > 1 ? 's' : ''} until ${new Date((powerpackLicense.realExpiresAt ?? powerpackLicense.expiresAt) * 1000).toLocaleDateString()}`);
+        bodyLines.push(chalk.green('Nx key licensed packages'));
+        bodyLines.push((0, nx_key_1.createNxKeyLicenseeInformation)(nxKey));
+        if (nxKey.realExpiresAt || nxKey.expiresAt) {
+            const licenseExpiryDate = new Date((nxKey.realExpiresAt ?? nxKey.expiresAt) * 1000);
+            // license is not expired
+            if (licenseExpiryDate.getTime() >= Date.now()) {
+                if ('perpetualNxVersion' in nxKey) {
+                    bodyLines.push(`License expires on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${nxKey.perpetualNxVersion} and below.`);
+                }
+                else {
+                    bodyLines.push(`License expires on ${licenseExpiryDate.toLocaleDateString()}.`);
+                }
+            }
+            else {
+                if ('perpetualNxVersion' in nxKey) {
+                    bodyLines.push(`License expired on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${nxKey.perpetualNxVersion} and below.`);
+                }
+                else {
+                    bodyLines.push(`License expired on ${licenseExpiryDate.toLocaleDateString()}.`);
+                }
+            }
+        }
         bodyLines.push('');
         padding =
             Math.max(...powerpackPlugins.map((powerpackPlugin) => powerpackPlugin.name.length)) + 1;
@@ -76,11 +97,11 @@ async function reportHandler() {
         }
         bodyLines.push('');
     }
-    else if (powerpackError) {
+    else if (nxKeyError) {
         bodyLines.push('');
-        bodyLines.push(chalk.red('Nx Powerpack'));
+        bodyLines.push(chalk.red('Nx key'));
         bodyLines.push(LINE_SEPARATOR);
-        bodyLines.push(powerpackError.message);
+        bodyLines.push(nxKeyError.message);
         bodyLines.push('');
     }
     if (registeredPlugins.length) {
@@ -105,6 +126,10 @@ async function reportHandler() {
             bodyLines.push(`\t ${chalk.green(plugin)}`);
         }
     }
+    if (cache) {
+        bodyLines.push(LINE_SEPARATOR);
+        bodyLines.push(`Cache Usage: ${(0, cache_1.formatCacheSize)(cache.used)} / ${cache.max === 0 ? '∞' : (0, cache_1.formatCacheSize)(cache.max)}`);
+    }
     if (outOfSyncPackageGroup) {
         bodyLines.push(LINE_SEPARATOR);
         bodyLines.push(`The following packages should match the installed version of ${outOfSyncPackageGroup.basePackage}`);
@@ -147,20 +172,28 @@ async function getReportData() {
     }
     const outOfSyncPackageGroup = findMisalignedPackagesForPackage(nxPackageJson);
     const native = isNativeAvailable();
-    let powerpackLicense = null;
-    let powerpackError = null;
+    let nxKey = null;
+    let nxKeyError = null;
     try {
-        powerpackLicense = await (0, powerpack_1.getPowerpackLicenseInformation)();
+        nxKey = await (0, nx_key_1.getNxKeyInformation)();
     }
     catch (e) {
-        if (!(e instanceof powerpack_1.NxPowerpackNotInstalledError)) {
-            powerpackError = e;
+        if (!(e instanceof nx_key_1.NxKeyNotInstalledError)) {
+            nxKeyError = e;
         }
     }
+    let cache = (0, cache_1.dbCacheEnabled)(nxJson)
+        ? {
+            max: nxJson.maxCacheSize !== undefined
+                ? (0, cache_1.parseMaxCacheSize)(nxJson.maxCacheSize)
+                : (0, native_1.getDefaultMaxCacheSize)(cache_directory_1.cacheDir),
+            used: new cache_1.DbCache({ nxCloudRemoteCache: null }).getUsedCacheSpace(),
+        }
+        : null;
     return {
         pm,
-        powerpackLicense,
-        powerpackError,
+        nxKey,
+        nxKeyError,
         powerpackPlugins,
         pmVersion,
         localPlugins,
@@ -170,6 +203,7 @@ async function getReportData() {
         outOfSyncPackageGroup,
         projectGraphError,
         nativeTarget: native ? native.getBinaryTarget() : null,
+        cache,
     };
 }
 async function tryGetProjectGraph() {
@@ -238,7 +272,7 @@ function findMisalignedPackagesForPackage(base) {
 }
 function findInstalledPowerpackPlugins() {
     const installedPlugins = (0, installed_plugins_1.findInstalledPlugins)();
-    return installedPlugins.filter((dep) => new RegExp('@nx/powerpack*').test(dep.name));
+    return installedPlugins.filter((dep) => new RegExp('@nx/powerpack*|@nx/(.+)-cache|@nx/(conformance|owners|enterprise*)').test(dep.name));
 }
 function findInstalledCommunityPlugins() {
     const installedPlugins = (0, installed_plugins_1.findInstalledPlugins)();

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsNxInfixCommand = exports.yargsRunCommand = void 0;
 const yargs_1 = require("yargs");
-const shared_options_1 = require("../yargs-utils/shared-options");
 const handle_errors_1 = require("../../utils/handle-errors");
+const shared_options_1 = require("../yargs-utils/shared-options");
 exports.yargsRunCommand = {
     command: 'run [project][:target][:configuration] [_..]',
     describe: `Run a target for a project
@@ -13,7 +13,7 @@ exports.yargsRunCommand = {
     (e.g., nx serve myapp --configuration=production)
 
     You can skip the use of Nx cache by using the --skip-nx-cache option.`,
-    builder: (yargs) => (0, shared_options_1.withRunOneOptions)((0, shared_options_1.withBatch)(yargs)),
+    builder: (yargs) => (0, shared_options_1.withTuiOptions)((0, shared_options_1.withRunOneOptions)((0, shared_options_1.withBatch)(yargs))),
     handler: async (args) => {
         const exitCode = await (0, handle_errors_1.handleErrors)(args.verbose ?? process.env.NX_VERBOSE_LOGGING === 'true', async () => {
             await Promise.resolve().then(() => require('./run-one')).then((m) => m.runOne(process.cwd(), (0, shared_options_1.withOverrides)(args)));

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

@@ -66,7 +66,7 @@ async function printTargetRunHelpInternal({ project, target }, root, projectsCon
             ...localEnv,
         };
         if (pseudo_terminal_1.PseudoTerminal.isSupported()) {
-            const terminal = (0, pseudo_terminal_1.getPseudoTerminal)();
+            const terminal = (0, pseudo_terminal_1.createPseudoTerminal)();
             await new Promise(() => {
                 const cp = terminal.runCommand(helpCommand, { jsEnv: env });
                 cp.onExit((code) => {